Commit 7f3591cf 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 

* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest: (31 commits)
  lguest: add support for indirect ring entries
  lguest: suppress notifications in example Launcher
  lguest: try to batch interrupts on network receive
  lguest: avoid sending interrupts to Guest when no activity occurs.
  lguest: implement deferred interrupts in example Launcher
  lguest: remove obsolete LHREQ_BREAK call
  lguest: have example Launcher service all devices in separate threads
  lguest: use eventfds for device notification
  eventfd: export eventfd_signal and eventfd_fget for lguest
  lguest: allow any process to send interrupts
  lguest: PAE fixes
  lguest: PAE support
  lguest: Add support for kvm_hypercall4()
  lguest: replace hypercall name LHCALL_SET_PMD with LHCALL_SET_PGD
  lguest: use native_set_* macros, which properly handle 64-bit entries when PAE is activated
  lguest: map switcher with executable page table entries
  lguest: fix writev returning short on console output
  lguest: clean up length-used value in example launcher
  lguest: Segment selectors are 16-bit long. Fix lg_cpu.ss1 definition.
  lguest: beyond ARRAY_SIZE of cpu->arch.gdt
  ...
parents 16ffc3ee d1f0132e

Documentation/lguest/Makefile

+1 −2
Original line number Diff line number Diff line 
# This creates the demonstration utility "lguest" which runs a Linux guest.

CFLAGS:=-Wall -Wmissing-declarations -Wmissing-prototypes -O3 -I../../include -I../../arch/x86/include -U_FORTIFY_SOURCE

LDLIBS:=-lz

CFLAGS:=-m32 -Wall -Wmissing-declarations -Wmissing-prototypes -O3 -I../../include -I../../arch/x86/include -U_FORTIFY_SOURCE



all: lguest

Documentation/lguest/lguest.c

+374 −634

File changed.

Preview size limit exceeded, changes collapsed.

Documentation/lguest/lguest.txt

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 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.h

+6 −1
Original line number Diff line number Diff line
@@ -17,8 +17,13 @@ 
/* Pages for switcher itself, then two pages per cpu */

#define TOTAL_SWITCHER_PAGES (SHARED_SWITCHER_PAGES + 2 * nr_cpu_ids)



/* We map at -4M for ease of mapping into the guest (one PTE page). */

/* We map at -4M (-2M when PAE is activated) for ease of mapping

 * into the guest (one PTE page). */

#ifdef CONFIG_X86_PAE

#define SWITCHER_ADDR 0xFFE00000

#else

#define SWITCHER_ADDR 0xFFC00000

#endif



/* Found in switcher.S */

extern unsigned long default_idt_entries[];

arch/x86/include/asm/lguest_hcall.h

+9 −6
Original line number Diff line number Diff line
@@ -12,11 +12,13 @@ 
#define LHCALL_TS		8

#define LHCALL_SET_CLOCKEVENT	9

#define LHCALL_HALT		10

#define LHCALL_SET_PMD		13

#define LHCALL_SET_PTE		14

#define LHCALL_SET_PMD		15

#define LHCALL_SET_PGD		15

#define LHCALL_LOAD_TLS		16

#define LHCALL_NOTIFY		17

#define LHCALL_LOAD_GDT_ENTRY	18

#define LHCALL_SEND_INTERRUPTS	19



#define LGUEST_TRAP_ENTRY 0x1F
@@ -32,10 +34,10 @@ 
 * operations?  There are two ways: the direct way is to make a "hypercall",

 * to make requests of the Host Itself.

 *

 * We use the KVM hypercall mechanism. Eighteen hypercalls are

 * We use the KVM hypercall mechanism. Seventeen hypercalls are

 * available: the hypercall number is put in the %eax register, and the

 * arguments (when required) are placed in %ebx, %ecx and %edx.  If a return

 * value makes sense, it's returned in %eax.

 * arguments (when required) are placed in %ebx, %ecx, %edx and %esi.

 * If a return value makes sense, it's returned in %eax.

 *

 * Grossly invalid calls result in Sudden Death at the hands of the vengeful

 * Host, rather than returning failure.  This reflects Winston Churchill's
@@ -47,8 +49,9 @@ 


#define LHCALL_RING_SIZE 64

struct hcall_args {

	/* These map directly onto eax, ebx, ecx, edx in struct lguest_regs */

	unsigned long arg0, arg1, arg2, arg3;

	/* These map directly onto eax, ebx, ecx, edx and esi

	 * in struct lguest_regs */

	unsigned long arg0, arg1, arg2, arg3, arg4;

};



#endif /* !__ASSEMBLY__ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE