Thu May 29 16:35:07 UTC 2008

Author: markmc

Update of /cvs/pkgs/rpms/kernel-xen-2.6/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5924

Modified Files:
	Makefile Makefile.config config-xen-x86_64 kernel.spec 
Added Files:
	linux-2.6-xen-0157-ia32entry.S-Replace-cli-sti-cases-with-DISABLE_INTE.patch 
	linux-2.6-xen-0158-Introduce-xen_ia32_syscall.patch 
	linux-2.6-xen-0159-Use-xen_ia32_syscall-if-CONFIG_XEN-is-enabled-FIX.patch 
	linux-2.6-xen-0160-Make-the-int80-and-syscall-vdso32-implementations-se.patch 
	linux-2.6-xen-0161-Use-vdso32-int80-by-default-if-Xen-is-enabled-FIXME.patch 
	linux-2.6-xen-0162-xen_pgd_pin-use-TASK_SIZE64-on-x86_64.patch 
	linux-2.6-xen-0163-paravirt-ops-64-Save-rdi-also-on-asm-version-of-PV.patch 
Log Message:
* Thu May 29 2008 Mark McLoughlin <markmc at redhat.com>
- Enable ia32 emulation (ehabkost, #437358)


linux-2.6-xen-0157-ia32entry.S-Replace-cli-sti-cases-with-DISABLE_INTE.patch:

--- NEW FILE linux-2.6-xen-0157-ia32entry.S-Replace-cli-sti-cases-with-DISABLE_INTE.patch ---
>From 183992d602add28d75847b8aaaf8ee8996a31f59 Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost at redhat.com>
Date: Thu, 20 Mar 2008 18:44:54 -0300
Subject: [PATCH] ia32entry.S: Replace cli/sti cases with DISABLE_INTERRUPTS/DISABLE_INTERRUPTS

Replace almost all cases of cli/sti, except one more complicated case
involving sysexit.

Signed-off-by: Eduardo Habkost <ehabkost at redhat.com>
---
 arch/x86/ia32/ia32entry.S |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
index b5e329d..4d5e9ae 100644
--- a/arch/x86/ia32/ia32entry.S
+++ b/arch/x86/ia32/ia32entry.S
@@ -92,7 +92,7 @@ ENTRY(ia32_sysenter_target)
 	 * No need to follow this irqs on/off section: the syscall
 	 * disabled irqs, here we enable it straight after entry:
 	 */
-	sti	
+	ENABLE_INTERRUPTS(CLBR_NONE)
  	movl	%ebp,%ebp		/* zero extension */
 	pushq	$__USER32_DS
 	CFI_ADJUST_CFA_OFFSET 8
@@ -134,7 +134,7 @@ sysenter_do_call:
 	call	*ia32_sys_call_table(,%rax,8)
 	movq	%rax,RAX-ARGOFFSET(%rsp)
 	GET_THREAD_INFO(%r10)
-	cli
+	DISABLE_INTERRUPTS(CLBR_NONE)
 	TRACE_IRQS_OFF
 	testl	$_TIF_ALLWORK_MASK,threadinfo_flags(%r10)
 	jnz	int_ret_from_sys_call
@@ -208,7 +208,7 @@ ENTRY(ia32_cstar_target)
 	 * No need to follow this irqs on/off section: the syscall
 	 * disabled irqs and here we enable it straight after entry:
 	 */
-	sti
+	ENABLE_INTERRUPTS(CLBR_NONE)
 	SAVE_ARGS 8,1,1
 	movl 	%eax,%eax	/* zero extension */
 	movq	%rax,ORIG_RAX-ARGOFFSET(%rsp)
@@ -241,7 +241,7 @@ cstar_do_call:
 	call *ia32_sys_call_table(,%rax,8)
 	movq %rax,RAX-ARGOFFSET(%rsp)
 	GET_THREAD_INFO(%r10)
-	cli
+	DISABLE_INTERRUPTS(CLBR_NONE)
 	TRACE_IRQS_OFF
 	testl $_TIF_ALLWORK_MASK,threadinfo_flags(%r10)
 	jnz  int_ret_from_sys_call
@@ -315,7 +315,7 @@ ENTRY(ia32_syscall)
 	 * No need to follow this irqs on/off section: the syscall
 	 * disabled irqs and here we enable it straight after entry:
 	 */
-	sti
+	ENABLE_INTERRUPTS(CLBR_NONE)
 	movl %eax,%eax
 	pushq %rax
 	CFI_ADJUST_CFA_OFFSET 8
-- 
1.5.4.1


linux-2.6-xen-0158-Introduce-xen_ia32_syscall.patch:

--- NEW FILE linux-2.6-xen-0158-Introduce-xen_ia32_syscall.patch ---
>From a7e56c1811b9c30e81d1e9a750b033359c9e4f15 Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost at redhat.com>
Date: Thu, 20 Mar 2008 18:45:57 -0300
Subject: [PATCH] Introduce xen_ia32_syscall()

Used for ia32 emulation under Xen.

Signed-off-by: Eduardo Habkost <ehabkost at redhat.com>
---
 arch/x86/ia32/ia32entry.S |   23 +++++++++++++++++++++++
 include/asm-x86/proto.h   |    1 +
 2 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
index 4d5e9ae..3b25947 100644
--- a/arch/x86/ia32/ia32entry.S
+++ b/arch/x86/ia32/ia32entry.S
@@ -280,6 +280,27 @@ ia32_badarg:
 	jmp ia32_sysret
 	CFI_ENDPROC
 
+
+#ifdef CONFIG_XEN
+
+/* The entry point for Xen IA32 syscall
+ *
+ * The stack format is a bit different under Xen, so we restore
+ * RCX and R11 from the stack and then continue on the standard
+ * path.
+ */
+ENTRY(xen_ia32_syscall)
+	/* Restore rcx and r11 from stack */
+	movq (%rsp),%rcx
+	movq 8(%rsp),%r11
+	addq $0x10,%rsp /* skip rcx and r11 */
+
+	/* Continue on the normal path */
+	jmp ia32_syscall_after_swapgs
+
+#endif
+
+
 /* 
  * Emulated IA32 system calls via int 0x80. 
  *
@@ -311,6 +332,8 @@ ENTRY(ia32_syscall)
 	/*CFI_REL_OFFSET	cs,CS-RIP*/
 	CFI_REL_OFFSET	rip,RIP-RIP
 	swapgs
+
+ia32_syscall_after_swapgs:
 	/*
 	 * No need to follow this irqs on/off section: the syscall
 	 * disabled irqs and here we enable it straight after entry:
diff --git a/include/asm-x86/proto.h b/include/asm-x86/proto.h
index b562df5..6bee0b7 100644
--- a/include/asm-x86/proto.h
+++ b/include/asm-x86/proto.h
@@ -14,6 +14,7 @@ extern void system_call_after_swapgs(void);
 extern void syscall_init(void);
 
 extern void ia32_syscall(void);
+extern void xen_ia32_syscall(void);
 extern void ia32_cstar_target(void);
 extern void ia32_sysenter_target(void);
 
-- 
1.5.4.1


linux-2.6-xen-0159-Use-xen_ia32_syscall-if-CONFIG_XEN-is-enabled-FIX.patch:

--- NEW FILE linux-2.6-xen-0159-Use-xen_ia32_syscall-if-CONFIG_XEN-is-enabled-FIX.patch ---
>From af4e9b351285b6c025ab80c712411bdf69522c1e Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost at redhat.com>
Date: Thu, 20 Mar 2008 18:46:27 -0300
Subject: [PATCH] Use xen_ia32_syscall() if CONFIG_XEN is enabled (FIXME)

This needs to be implemented at runtime, also.

Signed-off-by: Eduardo Habkost <ehabkost at redhat.com>
---
 arch/x86/kernel/traps_64.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kernel/traps_64.c b/arch/x86/kernel/traps_64.c
index 0454666..a2964e7 100644
--- a/arch/x86/kernel/traps_64.c
+++ b/arch/x86/kernel/traps_64.c
@@ -1150,7 +1150,11 @@ void __init trap_init(void)
 	set_intr_gate(19,&simd_coprocessor_error);
 
 #ifdef CONFIG_IA32_EMULATION
+# ifdef CONFIG_XEN
+	set_system_gate(IA32_SYSCALL_VECTOR, xen_ia32_syscall);
+# else
 	set_system_gate(IA32_SYSCALL_VECTOR, ia32_syscall);
+# endif
 #endif
        
 	/*
-- 
1.5.4.1


linux-2.6-xen-0160-Make-the-int80-and-syscall-vdso32-implementations-se.patch:

--- NEW FILE linux-2.6-xen-0160-Make-the-int80-and-syscall-vdso32-implementations-se.patch ---
>From 6f8e3d574b8184cc904d15deeb748e5c548b16cd Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost at redhat.com>
Date: Wed, 26 Mar 2008 13:16:40 -0300
Subject: [PATCH] Make the int80 and syscall vdso32 implementations selectable by .config

This will allow us to enable it when needed under Xen, on a further patch.

This commit should be a no-op for existing code.

Signed-off-by: Eduardo Habkost <ehabkost at redhat.com>
---
 arch/x86/Kconfig             |   19 +++++++++++++++++++
 arch/x86/vdso/Makefile       |    2 +-
 arch/x86/vdso/vdso32-setup.c |   18 +++++++++++++++++-
 arch/x86/vdso/vdso32.S       |   16 +++++++++++-----
 4 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index f18418d..310ff62 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1216,6 +1216,25 @@ config COMPAT_VDSO
 
 	  If unsure, say Y.
 
+
+config VDSO_INT80
+	def_bool X86_32
+
+config VDSO_SYSCALL
+	def_bool !X86_32
+
+
+config VDSO_DEFAULT_INT80
+	bool
+	default X86_32
+	depends on VDSO_INT80
+
+config VDSO_DEFAULT_SYSCALL
+	bool
+	default !X86_32
+	depends on VDSO_SYSCALL
+
+
 endmenu
 
 config ARCH_ENABLE_MEMORY_HOTPLUG
diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
index 0a8f474..783fc0a 100644
--- a/arch/x86/vdso/Makefile
+++ b/arch/x86/vdso/Makefile
@@ -61,7 +61,7 @@ $(obj)/%-syms.lds: $(obj)/%.so.dbg FORCE
 # Build multiple 32-bit vDSO images to choose from at boot time.
 #
 obj-$(VDSO32-y)			+= vdso32-syms.lds
-vdso32.so-$(CONFIG_X86_32)	+= int80
+vdso32.so-$(CONFIG_VDSO_INT80)	+= int80
 vdso32.so-$(CONFIG_COMPAT)	+= syscall
 vdso32.so-$(VDSO32-y)		+= sysenter
 
diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
index 4a0ae65..0a585ae 100644
--- a/arch/x86/vdso/vdso32-setup.c
+++ b/arch/x86/vdso/vdso32-setup.c
@@ -197,10 +197,26 @@ static __init void relocate_vdso(Elf32_Ehdr *ehdr)
  * These symbols are defined by vdso32.S to mark the bounds
  * of the ELF DSO images included therein.
  */
-extern const char vdso32_default_start, vdso32_default_end;
+#ifdef CONFIG_VDSO_INT80
+extern const char vdso32_int80_start, vdso32_int80_end;
+#endif
+#ifdef CONFIG_VDSO_SYSCALL
+extern const char vdso32_syscall_start, vdso32_syscall_end;
+#endif
 extern const char vdso32_sysenter_start, vdso32_sysenter_end;
 static struct page *vdso32_pages[1];
 
+
+#ifdef CONFIG_VDSO_DEFAULT_INT80
+# define vdso32_default_start vdso32_int80_start
+# define vdso32_default_end   vdso32_int80_end
+#elif defined(CONFIG_VDSO_DEFAULT_SYSCALL)
+# define vdso32_default_start vdso32_syscall_start
+# define vdso32_default_end   vdso32_syscall_end
+#else
+# error No CONFIG_VDSO_DEFAULT_ option is set
+#endif
+
 #ifdef CONFIG_X86_64
 
 static int use_sysenter __read_mostly = -1;
diff --git a/arch/x86/vdso/vdso32.S b/arch/x86/vdso/vdso32.S
index 1e36f72..d4485fb 100644
--- a/arch/x86/vdso/vdso32.S
+++ b/arch/x86/vdso/vdso32.S
@@ -2,14 +2,20 @@
 
 __INITDATA
 
-	.globl vdso32_default_start, vdso32_default_end
-vdso32_default_start:
-#ifdef CONFIG_X86_32
+#ifdef CONFIG_VDSO_INT80
+	.globl vdso32_int80_start, vdso32_int80_end
+vdso32_int80_start:
 	.incbin "arch/x86/vdso/vdso32-int80.so"
-#else
+vdso32_int80_end:
+#endif
+
+#ifdef CONFIG_VDSO_SYSCALL
+	.globl vdso32_syscall_start, vdso32_syscall_end
+vdso32_syscall_start:
 	.incbin "arch/x86/vdso/vdso32-syscall.so"
+vdso32_syscall_end:
 #endif
-vdso32_default_end:
+
 
 	.globl vdso32_sysenter_start, vdso32_sysenter_end
 vdso32_sysenter_start:
-- 
1.5.4.1


linux-2.6-xen-0161-Use-vdso32-int80-by-default-if-Xen-is-enabled-FIXME.patch:

--- NEW FILE linux-2.6-xen-0161-Use-vdso32-int80-by-default-if-Xen-is-enabled-FIXME.patch ---
>From 40258b5cfacebb481d24e62134527129db013d1d Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost at redhat.com>
Date: Wed, 26 Mar 2008 13:25:35 -0300
Subject: [PATCH] Use vdso32-int80 by default if Xen is enabled (FIXME)

Temporary fix. This should be selected at runtime instead.

Signed-off-by: Eduardo Habkost <ehabkost at redhat.com>
---
 arch/x86/Kconfig |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 310ff62..99fdddc 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1218,7 +1218,7 @@ config COMPAT_VDSO
 
 
 config VDSO_INT80
-	def_bool X86_32
+	def_bool X86_32 || XEN
 
 config VDSO_SYSCALL
 	def_bool !X86_32
@@ -1226,12 +1226,12 @@ config VDSO_SYSCALL
 
 config VDSO_DEFAULT_INT80
 	bool
-	default X86_32
+	default X86_32 || XEN
 	depends on VDSO_INT80
 
 config VDSO_DEFAULT_SYSCALL
 	bool
-	default !X86_32
+	default !X86_32 && !XEN
 	depends on VDSO_SYSCALL
 
 
-- 
1.5.4.1


linux-2.6-xen-0162-xen_pgd_pin-use-TASK_SIZE64-on-x86_64.patch:

--- NEW FILE linux-2.6-xen-0162-xen_pgd_pin-use-TASK_SIZE64-on-x86_64.patch ---
>From c2c0ed0bdb888784c0247842c658243825df653a Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost at redhat.com>
Date: Fri, 25 Apr 2008 18:40:41 -0300
Subject: [PATCH] xen_pgd_pin(): use TASK_SIZE64 on x86_64

We need to walk the whole address space, even on 32-bit tasks.

Signed-off-by: Eduardo Habkost <ehabkost at redhat.com>
---
 arch/x86/xen/mmu.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
index 11a4543..10f1dc9 100644
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -501,6 +501,14 @@ static int pin_page(struct page *page, enum pt_level level)
 	return flush;
 }
 
+
+#ifdef CONFIG_X86_64
+#  define PGD_WALK_SIZE TASK_SIZE64
+#else
+#  define PGD_WALK_SIZE TASK_SIZE
+#endif
+
+
 /* This is called just after a mm has been created, but it has not
    been used yet.  We need to make sure that its pagetable is all
    read-only, and can be pinned. */
@@ -510,7 +518,7 @@ void xen_pgd_pin(pgd_t *pgd)
 
 	xen_mc_batch();
 
-	if (pgd_walk(CHILD_FIRST, pgd, pin_page, 0, TASK_SIZE)) {
+	if (pgd_walk(CHILD_FIRST, pgd, pin_page, 0, PGD_WALK_SIZE)) {
 		/* re-enable interrupts for kmap_flush_unused */
 		xen_mc_issue(0);
 		kmap_flush_unused();
-- 
1.5.4.1


linux-2.6-xen-0163-paravirt-ops-64-Save-rdi-also-on-asm-version-of-PV.patch:

--- NEW FILE linux-2.6-xen-0163-paravirt-ops-64-Save-rdi-also-on-asm-version-of-PV.patch ---
>From 3fd3c479373ad3fa49d6a3bd29283aef8d9d9cef Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost at redhat.com>
Date: Wed, 28 May 2008 14:12:59 -0300
Subject: [PATCH] paravirt-ops-64: Save %rdi also on asm version of PV_SAVE_REGS

Function being called on ENABLE_INTERRUPTS may clobber %rdi, in
addition to the other registers that are already saved.

Signed-off-by: Eduardo Habkost <ehabkost at redhat.com>
---
 include/asm-x86/paravirt.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/asm-x86/paravirt.h b/include/asm-x86/paravirt.h
index 3fddadc..2c3b305 100644
--- a/include/asm-x86/paravirt.h
+++ b/include/asm-x86/paravirt.h
@@ -1388,8 +1388,8 @@ static inline unsigned long __raw_local_irq_save(void)
 
 
 #ifdef CONFIG_X86_64
-#define PV_SAVE_REGS   pushq %rax; pushq %rdi; pushq %rcx; pushq %rdx
-#define PV_RESTORE_REGS popq %rdx; popq %rcx; popq %rdi; popq %rax
+#define PV_SAVE_REGS   pushq %rax; pushq %rdi; pushq %rsi; pushq %rcx; pushq %rdx
+#define PV_RESTORE_REGS popq %rdx; popq %rcx; popq %rsi; popq %rdi; popq %rax
 #define PARA_PATCH(struct, off)        ((PARAVIRT_PATCH_##struct + (off)) / 8)
 #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .quad, 8)
 #else
-- 
1.5.4.1







Index: config-xen-x86_64
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/F-9/config-xen-x86_64,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- config-xen-x86_64	13 Mar 2008 17:30:17 -0000	1.5
+++ config-xen-x86_64	29 May 2008 16:34:24 -0000	1.6
@@ -10,7 +10,3 @@
 
 # x86_64 breaks with CONFIG_SPARSEMEM_VMEMMAP, currently
 # CONFIG_SPARSEMEM_VMEMMAP is not set
-
-
-# 32-bit emulation isn't ready yet
-# CONFIG_IA32_EMULATION is not set


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/F-9/kernel.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- kernel.spec	13 May 2008 15:16:19 -0000	1.44
+++ kernel.spec	29 May 2008 16:34:24 -0000	1.45
@@ -840,6 +840,13 @@
 Patch5153: linux-2.6-xen-0154-Pull-xen_failsafe_callback-implementation-from-XenSo.patch
 Patch5154: linux-2.6-xen-0155-Save-fs-and-gs-before-load_TLS-and-arch_leave_la.patch
 Patch5155: linux-2.6-xen-0156-xen-64-Clear-fs-on-xen_load_tls.patch
+Patch5156: linux-2.6-xen-0157-ia32entry.S-Replace-cli-sti-cases-with-DISABLE_INTE.patch
+Patch5157: linux-2.6-xen-0158-Introduce-xen_ia32_syscall.patch
+Patch5158: linux-2.6-xen-0159-Use-xen_ia32_syscall-if-CONFIG_XEN-is-enabled-FIX.patch
+Patch5159: linux-2.6-xen-0160-Make-the-int80-and-syscall-vdso32-implementations-se.patch
+Patch5160: linux-2.6-xen-0161-Use-vdso32-int80-by-default-if-Xen-is-enabled-FIXME.patch
+Patch5161: linux-2.6-xen-0162-xen_pgd_pin-use-TASK_SIZE64-on-x86_64.patch
+Patch5162: linux-2.6-xen-0163-paravirt-ops-64-Save-rdi-also-on-asm-version-of-PV.patch
 # kernel-xen patches end
 
 # Xen hypervisor patches (20000+)
@@ -1565,6 +1572,13 @@
 ApplyPatch linux-2.6-xen-0154-Pull-xen_failsafe_callback-implementation-from-XenSo.patch
 ApplyPatch linux-2.6-xen-0155-Save-fs-and-gs-before-load_TLS-and-arch_leave_la.patch
 ApplyPatch linux-2.6-xen-0156-xen-64-Clear-fs-on-xen_load_tls.patch
+ApplyPatch linux-2.6-xen-0157-ia32entry.S-Replace-cli-sti-cases-with-DISABLE_INTE.patch
+ApplyPatch linux-2.6-xen-0158-Introduce-xen_ia32_syscall.patch
+ApplyPatch linux-2.6-xen-0159-Use-xen_ia32_syscall-if-CONFIG_XEN-is-enabled-FIX.patch
+ApplyPatch linux-2.6-xen-0160-Make-the-int80-and-syscall-vdso32-implementations-se.patch
+ApplyPatch linux-2.6-xen-0161-Use-vdso32-int80-by-default-if-Xen-is-enabled-FIXME.patch
+ApplyPatch linux-2.6-xen-0162-xen_pgd_pin-use-TASK_SIZE64-on-x86_64.patch
+ApplyPatch linux-2.6-xen-0163-paravirt-ops-64-Save-rdi-also-on-asm-version-of-PV.patch
 %endif
 # kernel-xen apply end
 
@@ -2174,6 +2188,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Thu May 29 2008 Mark McLoughlin <markmc at redhat.com>
+- Enable ia32 emulation (ehabkost, #437358)
+
 * Tue May 13 2008 Mark McLoughlin <markmc at redhat.com>
 - Rebase to kernel-2_6_25_3-18_fc9
 


