Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d91dfbb4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest-and-virtio 

* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest-and-virtio:
  lguest: document 32-bit and PAE requirements
  lguest: tell git to ignore Documentation/lguest/lguest
  virtio: fix suspend when using virtio_balloon
  lguest: fix guest crash on non-linear addresses in gdt pvops
  lguest: fix crash on vmlinux images
parents af8f9372 38cfe968

Documentation/lguest/.gitignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
lguest

Documentation/lguest/lguest.txt

+6 −5
Original line number Diff line number Diff line
@@ -3,11 +3,11 @@ 
 /,    /`      - or, A Young Coder's Illustrated Hypervisor

 \\"--\\    http://lguest.ozlabs.org



Lguest is designed to be a minimal hypervisor for the Linux kernel, for

Linux developers and users to experiment with virtualization with the

minimum of complexity.  Nonetheless, it should have sufficient

features to make it useful for specific tasks, and, of course, you are

encouraged to fork and enhance it (see drivers/lguest/README).

Lguest is designed to be a minimal 32-bit x86 hypervisor for the Linux kernel,

for Linux developers and users to experiment with virtualization with the

minimum of complexity.  Nonetheless, it should have sufficient features to

make it useful for specific tasks, and, of course, you are encouraged to fork

and enhance it (see drivers/lguest/README).



Features:
@@ -37,6 +37,7 @@ Running Lguest: 
     "Paravirtualized guest support" = Y

        "Lguest guest support" = Y

     "High Memory Support" = off/4GB

     "PAE (Physical Address Extension) Support" = N

     "Alignment value to which kernel should be aligned" = 0x100000

        (CONFIG_PARAVIRT=y, CONFIG_LGUEST_GUEST=y, CONFIG_HIGHMEM64G=n and

         CONFIG_PHYSICAL_ALIGN=0x100000)

arch/x86/include/asm/lguest_hcall.h

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
#define LHCALL_FLUSH_ASYNC	0

#define LHCALL_LGUEST_INIT	1

#define LHCALL_SHUTDOWN		2

#define LHCALL_LOAD_GDT		3

#define LHCALL_NEW_PGTABLE	4

#define LHCALL_FLUSH_TLB	5

#define LHCALL_LOAD_IDT_ENTRY	6
@@ -17,6 +16,7 @@ 
#define LHCALL_SET_PMD		15

#define LHCALL_LOAD_TLS		16

#define LHCALL_NOTIFY		17

#define LHCALL_LOAD_GDT_ENTRY	18



#define LGUEST_TRAP_ENTRY 0x1F

arch/x86/lguest/boot.c

+9 −7
Original line number Diff line number Diff line
@@ -273,15 +273,15 @@ static void lguest_load_idt(const struct desc_ptr *desc) 
 * controls the entire thing and the Guest asks it to make changes using the

 * LOAD_GDT hypercall.

 *

 * This is the opposite of the IDT code where we have a LOAD_IDT_ENTRY

 * hypercall and use that repeatedly to load a new IDT.  I don't think it

 * really matters, but wouldn't it be nice if they were the same?  Wouldn't

 * it be even better if you were the one to send the patch to fix it?

 * This is the exactly like the IDT code.

 */

static void lguest_load_gdt(const struct desc_ptr *desc)

{

	BUG_ON((desc->size + 1) / 8 != GDT_ENTRIES);

	kvm_hypercall2(LHCALL_LOAD_GDT, __pa(desc->address), GDT_ENTRIES);

	unsigned int i;

	struct desc_struct *gdt = (void *)desc->address;



	for (i = 0; i < (desc->size+1)/8; i++)

		kvm_hypercall3(LHCALL_LOAD_GDT_ENTRY, i, gdt[i].a, gdt[i].b);

}



/* For a single GDT entry which changes, we do the lazy thing: alter our GDT,
@@ -291,7 +291,9 @@ static void lguest_write_gdt_entry(struct desc_struct *dt, int entrynum, 
				   const void *desc, int type)

{

	native_write_gdt_entry(dt, entrynum, desc, type);

	kvm_hypercall2(LHCALL_LOAD_GDT, __pa(dt), GDT_ENTRIES);

	/* Tell Host about this new entry. */

	kvm_hypercall3(LHCALL_LOAD_GDT_ENTRY, entrynum,

		       dt[entrynum].a, dt[entrynum].b);

}



/* OK, I lied.  There are three "thread local storage" GDT entries which change

drivers/lguest/lg.h

+2 −1
Original line number Diff line number Diff line
@@ -158,7 +158,8 @@ void free_interrupts(void); 
/* segments.c: */

void setup_default_gdt_entries(struct lguest_ro_state *state);

void setup_guest_gdt(struct lg_cpu *cpu);

void load_guest_gdt(struct lg_cpu *cpu, unsigned long table, u32 num);

void load_guest_gdt_entry(struct lg_cpu *cpu, unsigned int i,

			  u32 low, u32 hi);

void guest_load_tls(struct lg_cpu *cpu, unsigned long tls_array);

void copy_gdt(const struct lg_cpu *cpu, struct desc_struct *gdt);

void copy_gdt_tls(const struct lg_cpu *cpu, struct desc_struct *gdt);