1.1 --- a/buildconfigs/linux-defconfig_xen0_ia64	Fri Feb 24 14:03:07 2006 -0700
     1.2 +++ b/buildconfigs/linux-defconfig_xen0_ia64	Fri Feb 24 15:41:08 2006 -0700
     1.3 @@ -113,10 +113,10 @@ CONFIG_IA64_PAGE_SIZE_16KB=y
     1.4  # CONFIG_IA64_PAGE_SIZE_64KB is not set
     1.5  CONFIG_PGTABLE_3=y
     1.6  # CONFIG_PGTABLE_4 is not set
     1.7 -# CONFIG_HZ_100 is not set
     1.8 -CONFIG_HZ_250=y
     1.9 +CONFIG_HZ_100=y
    1.10 +# CONFIG_HZ_250 is not set
    1.11  # CONFIG_HZ_1000 is not set
    1.12 -CONFIG_HZ=250
    1.13 +CONFIG_HZ=100
    1.14  CONFIG_IA64_L1_CACHE_SHIFT=7
    1.15  CONFIG_IA64_CYCLONE=y
    1.16  CONFIG_IOSAPIC=y

     2.1 --- a/buildconfigs/linux-defconfig_xen0_x86_32	Fri Feb 24 14:03:07 2006 -0700
     2.2 +++ b/buildconfigs/linux-defconfig_xen0_x86_32	Fri Feb 24 15:41:08 2006 -0700
     2.3 @@ -175,10 +175,10 @@ CONFIG_SPLIT_PTLOCK_CPUS=4096
     2.4  CONFIG_MTRR=y
     2.5  # CONFIG_REGPARM is not set
     2.6  CONFIG_SECCOMP=y
     2.7 -# CONFIG_HZ_100 is not set
     2.8 -CONFIG_HZ_250=y
     2.9 +CONFIG_HZ_100=y
    2.10 +# CONFIG_HZ_250 is not set
    2.11  # CONFIG_HZ_1000 is not set
    2.12 -CONFIG_HZ=250
    2.13 +CONFIG_HZ=100
    2.14  # CONFIG_CRASH_DUMP is not set
    2.15  CONFIG_PHYSICAL_START=0x100000
    2.16  

     3.1 --- a/buildconfigs/linux-defconfig_xen0_x86_64	Fri Feb 24 14:03:07 2006 -0700
     3.2 +++ b/buildconfigs/linux-defconfig_xen0_x86_64	Fri Feb 24 15:41:08 2006 -0700
     3.3 @@ -1,7 +1,7 @@
     3.4  #
     3.5  # Automatically generated make config: don't edit
     3.6  # Linux kernel version: 2.6.16-rc3-xen0
     3.7 -# Thu Feb 16 22:55:30 2006
     3.8 +# Mon Feb 20 11:37:43 2006
     3.9  #
    3.10  CONFIG_X86_64=y
    3.11  CONFIG_64BIT=y
    3.12 @@ -126,10 +126,10 @@ CONFIG_SWIOTLB=y
    3.13  # CONFIG_CRASH_DUMP is not set
    3.14  CONFIG_PHYSICAL_START=0x100000
    3.15  CONFIG_SECCOMP=y
    3.16 -# CONFIG_HZ_100 is not set
    3.17 -CONFIG_HZ_250=y
    3.18 +CONFIG_HZ_100=y
    3.19 +# CONFIG_HZ_250 is not set
    3.20  # CONFIG_HZ_1000 is not set
    3.21 -CONFIG_HZ=250
    3.22 +CONFIG_HZ=100
    3.23  CONFIG_GENERIC_HARDIRQS=y
    3.24  CONFIG_GENERIC_IRQ_PROBE=y
    3.25  CONFIG_ISA_DMA_API=y
    3.26 @@ -162,6 +162,11 @@ CONFIG_ACPI_SYSTEM=y
    3.27  # CONFIG_ACPI_CONTAINER is not set
    3.28  
    3.29  #
    3.30 +# CPU Frequency scaling
    3.31 +#
    3.32 +# CONFIG_CPU_FREQ is not set
    3.33 +
    3.34 +#
    3.35  # Bus options (PCI etc.)
    3.36  #
    3.37  CONFIG_PCI=y

     4.1 --- a/buildconfigs/linux-defconfig_xenU_ia64	Fri Feb 24 14:03:07 2006 -0700
     4.2 +++ b/buildconfigs/linux-defconfig_xenU_ia64	Fri Feb 24 15:41:08 2006 -0700
     4.3 @@ -110,10 +110,10 @@ CONFIG_IA64_PAGE_SIZE_16KB=y
     4.4  # CONFIG_IA64_PAGE_SIZE_64KB is not set
     4.5  CONFIG_PGTABLE_3=y
     4.6  # CONFIG_PGTABLE_4 is not set
     4.7 -# CONFIG_HZ_100 is not set
     4.8 -CONFIG_HZ_250=y
     4.9 +CONFIG_HZ_100=y
    4.10 +# CONFIG_HZ_250 is not set
    4.11  # CONFIG_HZ_1000 is not set
    4.12 -CONFIG_HZ=250
    4.13 +CONFIG_HZ=100
    4.14  CONFIG_IA64_L1_CACHE_SHIFT=7
    4.15  # CONFIG_IA64_CYCLONE is not set
    4.16  CONFIG_IOSAPIC=y

     5.1 --- a/buildconfigs/linux-defconfig_xenU_x86_32	Fri Feb 24 14:03:07 2006 -0700
     5.2 +++ b/buildconfigs/linux-defconfig_xenU_x86_32	Fri Feb 24 15:41:08 2006 -0700
     5.3 @@ -174,10 +174,10 @@ CONFIG_FLAT_NODE_MEM_MAP=y
     5.4  CONFIG_SPLIT_PTLOCK_CPUS=4096
     5.5  # CONFIG_REGPARM is not set
     5.6  CONFIG_SECCOMP=y
     5.7 -# CONFIG_HZ_100 is not set
     5.8 -CONFIG_HZ_250=y
     5.9 +CONFIG_HZ_100=y
    5.10 +# CONFIG_HZ_250 is not set
    5.11  # CONFIG_HZ_1000 is not set
    5.12 -CONFIG_HZ=250
    5.13 +CONFIG_HZ=100
    5.14  # CONFIG_CRASH_DUMP is not set
    5.15  CONFIG_PHYSICAL_START=0x100000
    5.16  CONFIG_HOTPLUG_CPU=y

     6.1 --- a/buildconfigs/linux-defconfig_xenU_x86_64	Fri Feb 24 14:03:07 2006 -0700
     6.2 +++ b/buildconfigs/linux-defconfig_xenU_x86_64	Fri Feb 24 15:41:08 2006 -0700
     6.3 @@ -131,10 +131,10 @@ CONFIG_SWIOTLB=y
     6.4  # CONFIG_CRASH_DUMP is not set
     6.5  CONFIG_PHYSICAL_START=0x100000
     6.6  CONFIG_SECCOMP=y
     6.7 -# CONFIG_HZ_100 is not set
     6.8 -CONFIG_HZ_250=y
     6.9 +CONFIG_HZ_100=y
    6.10 +# CONFIG_HZ_250 is not set
    6.11  # CONFIG_HZ_1000 is not set
    6.12 -CONFIG_HZ=250
    6.13 +CONFIG_HZ=100
    6.14  CONFIG_GENERIC_HARDIRQS=y
    6.15  CONFIG_GENERIC_IRQ_PROBE=y
    6.16  CONFIG_ISA_DMA_API=y

     7.1 --- a/buildconfigs/linux-defconfig_xen_x86_32	Fri Feb 24 14:03:07 2006 -0700
     7.2 +++ b/buildconfigs/linux-defconfig_xen_x86_32	Fri Feb 24 15:41:08 2006 -0700
     7.3 @@ -180,10 +180,10 @@ CONFIG_SPLIT_PTLOCK_CPUS=4096
     7.4  CONFIG_MTRR=y
     7.5  # CONFIG_REGPARM is not set
     7.6  CONFIG_SECCOMP=y
     7.7 -# CONFIG_HZ_100 is not set
     7.8 -CONFIG_HZ_250=y
     7.9 +CONFIG_HZ_100=y
    7.10 +# CONFIG_HZ_250 is not set
    7.11  # CONFIG_HZ_1000 is not set
    7.12 -CONFIG_HZ=250
    7.13 +CONFIG_HZ=100
    7.14  # CONFIG_CRASH_DUMP is not set
    7.15  CONFIG_PHYSICAL_START=0x100000
    7.16  CONFIG_HOTPLUG_CPU=y

     8.1 --- a/buildconfigs/linux-defconfig_xen_x86_64	Fri Feb 24 14:03:07 2006 -0700
     8.2 +++ b/buildconfigs/linux-defconfig_xen_x86_64	Fri Feb 24 15:41:08 2006 -0700
     8.3 @@ -1,7 +1,7 @@
     8.4  #
     8.5  # Automatically generated make config: don't edit
     8.6 -# Linux kernel version: 2.6.16-rc3-xen0
     8.7 -# Thu Feb 16 22:56:25 2006
     8.8 +# Linux kernel version: 2.6.16-rc3-xen
     8.9 +# Mon Feb 20 11:37:11 2006
    8.10  #
    8.11  CONFIG_X86_64=y
    8.12  CONFIG_64BIT=y
    8.13 @@ -132,10 +132,10 @@ CONFIG_SWIOTLB=y
    8.14  # CONFIG_CRASH_DUMP is not set
    8.15  CONFIG_PHYSICAL_START=0x100000
    8.16  CONFIG_SECCOMP=y
    8.17 -# CONFIG_HZ_100 is not set
    8.18 -CONFIG_HZ_250=y
    8.19 +CONFIG_HZ_100=y
    8.20 +# CONFIG_HZ_250 is not set
    8.21  # CONFIG_HZ_1000 is not set
    8.22 -CONFIG_HZ=250
    8.23 +CONFIG_HZ=100
    8.24  CONFIG_GENERIC_HARDIRQS=y
    8.25  CONFIG_GENERIC_IRQ_PROBE=y
    8.26  CONFIG_ISA_DMA_API=y
    8.27 @@ -170,6 +170,11 @@ CONFIG_ACPI_SYSTEM=y
    8.28  CONFIG_ACPI_CONTAINER=m
    8.29  
    8.30  #
    8.31 +# CPU Frequency scaling
    8.32 +#
    8.33 +# CONFIG_CPU_FREQ is not set
    8.34 +
    8.35 +#
    8.36  # Bus options (PCI etc.)
    8.37  #
    8.38  CONFIG_PCI=y

     9.1 --- a/buildconfigs/mk.linux-2.6-xen	Fri Feb 24 14:03:07 2006 -0700
     9.2 +++ b/buildconfigs/mk.linux-2.6-xen	Fri Feb 24 15:41:08 2006 -0700
     9.3 @@ -2,8 +2,8 @@
     9.4  OS           = linux
     9.5  
     9.6  LINUX_SERIES = 2.6
     9.7 -LINUX_VER    = 2.6.16-rc3
     9.8 -LINUX_SRCS = linux-2.6.15.tar.bz2 patch-2.6.16-rc3.bz2
     9.9 +LINUX_VER    = 2.6.16-rc4
    9.10 +LINUX_SRCS = linux-2.6.15.tar.bz2 patch-2.6.16-rc4.bz2
    9.11  LINUX_PDIR = linux-$(LINUX_VER)
    9.12  
    9.13  EXTRAVERSION ?= xen
    9.14 @@ -34,7 +34,7 @@ pristine-$(LINUX_PDIR)/.valid-srcs: $(LI
    9.15  	touch $(@D)/.hgskip
    9.16  	touch $@
    9.17  
    9.18 -pristine-linux-%.16-rc3/.valid-pristine: pristine-$(LINUX_PDIR)/.valid-srcs
    9.19 +pristine-linux-%.16-rc4/.valid-pristine: pristine-$(LINUX_PDIR)/.valid-srcs
    9.20  	touch $@ # update timestamp to avoid rebuild
    9.21  
    9.22  $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref

    10.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.2 +++ b/extras/mini-os/include/hypercall-x86_32.h	Fri Feb 24 15:41:08 2006 -0700
    10.3 @@ -0,0 +1,326 @@
    10.4 +/******************************************************************************
    10.5 + * hypercall-x86_32.h
    10.6 + * 
    10.7 + * Copied from XenLinux.
    10.8 + * 
    10.9 + * Copyright (c) 2002-2004, K A Fraser
   10.10 + * 
   10.11 + * This file may be distributed separately from the Linux kernel, or
   10.12 + * incorporated into other software packages, subject to the following license:
   10.13 + * 
   10.14 + * Permission is hereby granted, free of charge, to any person obtaining a copy
   10.15 + * of this source file (the "Software"), to deal in the Software without
   10.16 + * restriction, including without limitation the rights to use, copy, modify,
   10.17 + * merge, publish, distribute, sublicense, and/or sell copies of the Software,
   10.18 + * and to permit persons to whom the Software is furnished to do so, subject to
   10.19 + * the following conditions:
   10.20 + * 
   10.21 + * The above copyright notice and this permission notice shall be included in
   10.22 + * all copies or substantial portions of the Software.
   10.23 + * 
   10.24 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
   10.25 + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
   10.26 + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
   10.27 + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
   10.28 + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
   10.29 + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
   10.30 + * IN THE SOFTWARE.
   10.31 + */
   10.32 +
   10.33 +#ifndef __HYPERCALL_X86_32_H__
   10.34 +#define __HYPERCALL_X86_32_H__
   10.35 +
   10.36 +#include <xen/xen.h>
   10.37 +#include <xen/sched.h>
   10.38 +#include <xen/nmi.h>
   10.39 +#include <mm.h>
   10.40 +
   10.41 +#define __STR(x) #x
   10.42 +#define STR(x) __STR(x)
   10.43 +
   10.44 +extern char hypercall_page[PAGE_SIZE];
   10.45 +
   10.46 +#define _hypercall0(type, name)			\
   10.47 +({						\
   10.48 +	long __res;				\
   10.49 +	asm volatile (				\
   10.50 +		"call hypercall_page + ("STR(__HYPERVISOR_##name)" * 32)"\
   10.51 +		: "=a" (__res)			\
   10.52 +		:				\
   10.53 +		: "memory" );			\
   10.54 +	(type)__res;				\
   10.55 +})
   10.56 +
   10.57 +#define _hypercall1(type, name, a1)				\
   10.58 +({								\
   10.59 +	long __res, __ign1;					\
   10.60 +	asm volatile (						\
   10.61 +		"call hypercall_page + ("STR(__HYPERVISOR_##name)" * 32)"\
   10.62 +		: "=a" (__res), "=b" (__ign1)			\
   10.63 +		: "1" ((long)(a1))				\
   10.64 +		: "memory" );					\
   10.65 +	(type)__res;						\
   10.66 +})
   10.67 +
   10.68 +#define _hypercall2(type, name, a1, a2)				\
   10.69 +({								\
   10.70 +	long __res, __ign1, __ign2;				\
   10.71 +	asm volatile (						\
   10.72 +		"call hypercall_page + ("STR(__HYPERVISOR_##name)" * 32)"\
   10.73 +		: "=a" (__res), "=b" (__ign1), "=c" (__ign2)	\
   10.74 +		: "1" ((long)(a1)), "2" ((long)(a2))		\
   10.75 +		: "memory" );					\
   10.76 +	(type)__res;						\
   10.77 +})
   10.78 +
   10.79 +#define _hypercall3(type, name, a1, a2, a3)			\
   10.80 +({								\
   10.81 +	long __res, __ign1, __ign2, __ign3;			\
   10.82 +	asm volatile (						\
   10.83 +		"call hypercall_page + ("STR(__HYPERVISOR_##name)" * 32)"\
   10.84 +		: "=a" (__res), "=b" (__ign1), "=c" (__ign2), 	\
   10.85 +		"=d" (__ign3)					\
   10.86 +		: "1" ((long)(a1)), "2" ((long)(a2)),		\
   10.87 +		"3" ((long)(a3))				\
   10.88 +		: "memory" );					\
   10.89 +	(type)__res;						\
   10.90 +})
   10.91 +
   10.92 +#define _hypercall4(type, name, a1, a2, a3, a4)			\
   10.93 +({								\
   10.94 +	long __res, __ign1, __ign2, __ign3, __ign4;		\
   10.95 +	asm volatile (						\
   10.96 +		"call hypercall_page + ("STR(__HYPERVISOR_##name)" * 32)"\
   10.97 +		: "=a" (__res), "=b" (__ign1), "=c" (__ign2),	\
   10.98 +		"=d" (__ign3), "=S" (__ign4)			\
   10.99 +		: "1" ((long)(a1)), "2" ((long)(a2)),		\
  10.100 +		"3" ((long)(a3)), "4" ((long)(a4))		\
  10.101 +		: "memory" );					\
  10.102 +	(type)__res;						\
  10.103 +})
  10.104 +
  10.105 +#define _hypercall5(type, name, a1, a2, a3, a4, a5)		\
  10.106 +({								\
  10.107 +	long __res, __ign1, __ign2, __ign3, __ign4, __ign5;	\
  10.108 +	asm volatile (						\
  10.109 +		"call hypercall_page + ("STR(__HYPERVISOR_##name)" * 32)"\
  10.110 +		: "=a" (__res), "=b" (__ign1), "=c" (__ign2),	\
  10.111 +		"=d" (__ign3), "=S" (__ign4), "=D" (__ign5)	\
  10.112 +		: "1" ((long)(a1)), "2" ((long)(a2)),		\
  10.113 +		"3" ((long)(a3)), "4" ((long)(a4)),		\
  10.114 +		"5" ((long)(a5))				\
  10.115 +		: "memory" );					\
  10.116 +	(type)__res;						\
  10.117 +})
  10.118 +
  10.119 +static inline int
  10.120 +HYPERVISOR_set_trap_table(
  10.121 +	trap_info_t *table)
  10.122 +{
  10.123 +	return _hypercall1(int, set_trap_table, table);
  10.124 +}
  10.125 +
  10.126 +static inline int
  10.127 +HYPERVISOR_mmu_update(
  10.128 +	mmu_update_t *req, int count, int *success_count, domid_t domid)
  10.129 +{
  10.130 +	return _hypercall4(int, mmu_update, req, count, success_count, domid);
  10.131 +}
  10.132 +
  10.133 +static inline int
  10.134 +HYPERVISOR_mmuext_op(
  10.135 +	struct mmuext_op *op, int count, int *success_count, domid_t domid)
  10.136 +{
  10.137 +	return _hypercall4(int, mmuext_op, op, count, success_count, domid);
  10.138 +}
  10.139 +
  10.140 +static inline int
  10.141 +HYPERVISOR_set_gdt(
  10.142 +	unsigned long *frame_list, int entries)
  10.143 +{
  10.144 +	return _hypercall2(int, set_gdt, frame_list, entries);
  10.145 +}
  10.146 +
  10.147 +static inline int
  10.148 +HYPERVISOR_stack_switch(
  10.149 +	unsigned long ss, unsigned long esp)
  10.150 +{
  10.151 +	return _hypercall2(int, stack_switch, ss, esp);
  10.152 +}
  10.153 +
  10.154 +static inline int
  10.155 +HYPERVISOR_set_callbacks(
  10.156 +	unsigned long event_selector, unsigned long event_address,
  10.157 +	unsigned long failsafe_selector, unsigned long failsafe_address)
  10.158 +{
  10.159 +	return _hypercall4(int, set_callbacks,
  10.160 +			   event_selector, event_address,
  10.161 +			   failsafe_selector, failsafe_address);
  10.162 +}
  10.163 +
  10.164 +static inline int
  10.165 +HYPERVISOR_fpu_taskswitch(
  10.166 +	int set)
  10.167 +{
  10.168 +	return _hypercall1(int, fpu_taskswitch, set);
  10.169 +}
  10.170 +
  10.171 +static inline int
  10.172 +HYPERVISOR_sched_op(
  10.173 +	int cmd, unsigned long arg)
  10.174 +{
  10.175 +	return _hypercall2(int, sched_op, cmd, arg);
  10.176 +}
  10.177 +
  10.178 +static inline long
  10.179 +HYPERVISOR_set_timer_op(
  10.180 +	u64 timeout)
  10.181 +{
  10.182 +	unsigned long timeout_hi = (unsigned long)(timeout>>32);
  10.183 +	unsigned long timeout_lo = (unsigned long)timeout;
  10.184 +	return _hypercall2(long, set_timer_op, timeout_lo, timeout_hi);
  10.185 +}
  10.186 +
  10.187 +static inline int
  10.188 +HYPERVISOR_dom0_op(
  10.189 +	dom0_op_t *dom0_op)
  10.190 +{
  10.191 +	dom0_op->interface_version = DOM0_INTERFACE_VERSION;
  10.192 +	return _hypercall1(int, dom0_op, dom0_op);
  10.193 +}
  10.194 +
  10.195 +static inline int
  10.196 +HYPERVISOR_set_debugreg(
  10.197 +	int reg, unsigned long value)
  10.198 +{
  10.199 +	return _hypercall2(int, set_debugreg, reg, value);
  10.200 +}
  10.201 +
  10.202 +static inline unsigned long
  10.203 +HYPERVISOR_get_debugreg(
  10.204 +	int reg)
  10.205 +{
  10.206 +	return _hypercall1(unsigned long, get_debugreg, reg);
  10.207 +}
  10.208 +
  10.209 +static inline int
  10.210 +HYPERVISOR_update_descriptor(
  10.211 +	u64 ma, u64 desc)
  10.212 +{
  10.213 +	return _hypercall4(int, update_descriptor, ma, ma>>32, desc, desc>>32);
  10.214 +}
  10.215 +
  10.216 +static inline int
  10.217 +HYPERVISOR_memory_op(
  10.218 +	unsigned int cmd, void *arg)
  10.219 +{
  10.220 +	return _hypercall2(int, memory_op, cmd, arg);
  10.221 +}
  10.222 +
  10.223 +static inline int
  10.224 +HYPERVISOR_multicall(
  10.225 +	void *call_list, int nr_calls)
  10.226 +{
  10.227 +	return _hypercall2(int, multicall, call_list, nr_calls);
  10.228 +}
  10.229 +
  10.230 +static inline int
  10.231 +HYPERVISOR_update_va_mapping(
  10.232 +	unsigned long va, pte_t new_val, unsigned long flags)
  10.233 +{
  10.234 +	unsigned long pte_hi = 0;
  10.235 +#ifdef CONFIG_X86_PAE
  10.236 +	pte_hi = new_val.pte_high;
  10.237 +#endif
  10.238 +	return _hypercall4(int, update_va_mapping, va,
  10.239 +			   new_val.pte_low, pte_hi, flags);
  10.240 +}
  10.241 +
  10.242 +static inline int
  10.243 +HYPERVISOR_event_channel_op(
  10.244 +	void *op)
  10.245 +{
  10.246 +	return _hypercall1(int, event_channel_op, op);
  10.247 +}
  10.248 +
  10.249 +static inline int
  10.250 +HYPERVISOR_xen_version(
  10.251 +	int cmd, void *arg)
  10.252 +{
  10.253 +	return _hypercall2(int, xen_version, cmd, arg);
  10.254 +}
  10.255 +
  10.256 +static inline int
  10.257 +HYPERVISOR_console_io(
  10.258 +	int cmd, int count, char *str)
  10.259 +{
  10.260 +	return _hypercall3(int, console_io, cmd, count, str);
  10.261 +}
  10.262 +
  10.263 +static inline int
  10.264 +HYPERVISOR_physdev_op(
  10.265 +	void *physdev_op)
  10.266 +{
  10.267 +	return _hypercall1(int, physdev_op, physdev_op);
  10.268 +}
  10.269 +
  10.270 +static inline int
  10.271 +HYPERVISOR_grant_table_op(
  10.272 +	unsigned int cmd, void *uop, unsigned int count)
  10.273 +{
  10.274 +	return _hypercall3(int, grant_table_op, cmd, uop, count);
  10.275 +}
  10.276 +
  10.277 +static inline int
  10.278 +HYPERVISOR_update_va_mapping_otherdomain(
  10.279 +	unsigned long va, pte_t new_val, unsigned long flags, domid_t domid)
  10.280 +{
  10.281 +	unsigned long pte_hi = 0;
  10.282 +#ifdef CONFIG_X86_PAE
  10.283 +	pte_hi = new_val.pte_high;
  10.284 +#endif
  10.285 +	return _hypercall5(int, update_va_mapping_otherdomain, va,
  10.286 +			   new_val.pte_low, pte_hi, flags, domid);
  10.287 +}
  10.288 +
  10.289 +static inline int
  10.290 +HYPERVISOR_vm_assist(
  10.291 +	unsigned int cmd, unsigned int type)
  10.292 +{
  10.293 +	return _hypercall2(int, vm_assist, cmd, type);
  10.294 +}
  10.295 +
  10.296 +static inline int
  10.297 +HYPERVISOR_vcpu_op(
  10.298 +	int cmd, int vcpuid, void *extra_args)
  10.299 +{
  10.300 +	return _hypercall3(int, vcpu_op, cmd, vcpuid, extra_args);
  10.301 +}
  10.302 +
  10.303 +static inline int
  10.304 +HYPERVISOR_suspend(
  10.305 +	unsigned long srec)
  10.306 +{
  10.307 +	return _hypercall3(int, sched_op, SCHEDOP_shutdown,
  10.308 +			   SHUTDOWN_suspend, srec);
  10.309 +}
  10.310 +
  10.311 +static inline int
  10.312 +HYPERVISOR_nmi_op(
  10.313 +	unsigned long op,
  10.314 +	unsigned long arg)
  10.315 +{
  10.316 +	return _hypercall2(int, nmi_op, op, arg);
  10.317 +}
  10.318 +
  10.319 +#endif /* __HYPERCALL_X86_32_H__ */
  10.320 +
  10.321 +/*
  10.322 + * Local variables:
  10.323 + *  c-file-style: "linux"
  10.324 + *  indent-tabs-mode: t
  10.325 + *  c-indent-level: 8
  10.326 + *  c-basic-offset: 8
  10.327 + *  tab-width: 8
  10.328 + * End:
  10.329 + */

    11.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.2 +++ b/extras/mini-os/include/hypercall-x86_64.h	Fri Feb 24 15:41:08 2006 -0700
    11.3 @@ -0,0 +1,326 @@
    11.4 +/******************************************************************************
    11.5 + * hypercall-x86_64.h
    11.6 + * 
    11.7 + * Copied from XenLinux.
    11.8 + * 
    11.9 + * Copyright (c) 2002-2004, K A Fraser
   11.10 + * 
   11.11 + * 64-bit updates:
   11.12 + *   Benjamin Liu <benjamin.liu@intel.com>
   11.13 + *   Jun Nakajima <jun.nakajima@intel.com>
   11.14 + * 
   11.15 + * This file may be distributed separately from the Linux kernel, or
   11.16 + * incorporated into other software packages, subject to the following license:
   11.17 + * 
   11.18 + * Permission is hereby granted, free of charge, to any person obtaining a copy
   11.19 + * of this source file (the "Software"), to deal in the Software without
   11.20 + * restriction, including without limitation the rights to use, copy, modify,
   11.21 + * merge, publish, distribute, sublicense, and/or sell copies of the Software,
   11.22 + * and to permit persons to whom the Software is furnished to do so, subject to
   11.23 + * the following conditions:
   11.24 + * 
   11.25 + * The above copyright notice and this permission notice shall be included in
   11.26 + * all copies or substantial portions of the Software.
   11.27 + * 
   11.28 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
   11.29 + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
   11.30 + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
   11.31 + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
   11.32 + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
   11.33 + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
   11.34 + * IN THE SOFTWARE.
   11.35 + */
   11.36 +
   11.37 +#ifndef __HYPERCALL_X86_64_H__
   11.38 +#define __HYPERCALL_X86_64_H__
   11.39 +
   11.40 +#include <xen/xen.h>
   11.41 +#include <xen/sched.h>
   11.42 +#include <mm.h>
   11.43 +
   11.44 +#define __STR(x) #x
   11.45 +#define STR(x) __STR(x)
   11.46 +
   11.47 +extern char hypercall_page[PAGE_SIZE];
   11.48 +
   11.49 +#define _hypercall0(type, name)			\
   11.50 +({						\
   11.51 +	long __res;				\
   11.52 +	asm volatile (				\
   11.53 +		"call hypercall_page + ("STR(__HYPERVISOR_##name)" * 32)"\
   11.54 +		: "=a" (__res)			\
   11.55 +		:				\
   11.56 +		: "memory" );			\
   11.57 +	(type)__res;				\
   11.58 +})
   11.59 +
   11.60 +#define _hypercall1(type, name, a1)				\
   11.61 +({								\
   11.62 +	long __res, __ign1;					\
   11.63 +	asm volatile (						\
   11.64 +		"call hypercall_page + ("STR(__HYPERVISOR_##name)" * 32)"\
   11.65 +		: "=a" (__res), "=D" (__ign1)			\
   11.66 +		: "1" ((long)(a1))				\
   11.67 +		: "memory" );					\
   11.68 +	(type)__res;						\
   11.69 +})
   11.70 +
   11.71 +#define _hypercall2(type, name, a1, a2)				\
   11.72 +({								\
   11.73 +	long __res, __ign1, __ign2;				\
   11.74 +	asm volatile (						\
   11.75 +		"call hypercall_page + ("STR(__HYPERVISOR_##name)" * 32)"\
   11.76 +		: "=a" (__res), "=D" (__ign1), "=S" (__ign2)	\
   11.77 +		: "1" ((long)(a1)), "2" ((long)(a2))		\
   11.78 +		: "memory" );					\
   11.79 +	(type)__res;						\
   11.80 +})
   11.81 +
   11.82 +#define _hypercall3(type, name, a1, a2, a3)			\
   11.83 +({								\
   11.84 +	long __res, __ign1, __ign2, __ign3;			\
   11.85 +	asm volatile (						\
   11.86 +		"call hypercall_page + ("STR(__HYPERVISOR_##name)" * 32)"\
   11.87 +		: "=a" (__res), "=D" (__ign1), "=S" (__ign2), 	\
   11.88 +		"=d" (__ign3)					\
   11.89 +		: "1" ((long)(a1)), "2" ((long)(a2)),		\
   11.90 +		"3" ((long)(a3))				\
   11.91 +		: "memory" );					\
   11.92 +	(type)__res;						\
   11.93 +})
   11.94 +
   11.95 +#define _hypercall4(type, name, a1, a2, a3, a4)			\
   11.96 +({								\
   11.97 +	long __res, __ign1, __ign2, __ign3;			\
   11.98 +	asm volatile (						\
   11.99 +		"movq %7,%%r10; "				\
  11.100 +		"call hypercall_page + ("STR(__HYPERVISOR_##name)" * 32)"\
  11.101 +		: "=a" (__res), "=D" (__ign1), "=S" (__ign2),	\
  11.102 +		"=d" (__ign3)					\
  11.103 +		: "1" ((long)(a1)), "2" ((long)(a2)),		\
  11.104 +		"3" ((long)(a3)), "g" ((long)(a4))		\
  11.105 +		: "memory", "r10" );				\
  11.106 +	(type)__res;						\
  11.107 +})
  11.108 +
  11.109 +#define _hypercall5(type, name, a1, a2, a3, a4, a5)		\
  11.110 +({								\
  11.111 +	long __res, __ign1, __ign2, __ign3;			\
  11.112 +	asm volatile (						\
  11.113 +		"movq %7,%%r10; movq %8,%%r8; "			\
  11.114 +		"call hypercall_page + ("STR(__HYPERVISOR_##name)" * 32)"\
  11.115 +		: "=a" (__res), "=D" (__ign1), "=S" (__ign2),	\
  11.116 +		"=d" (__ign3)					\
  11.117 +		: "1" ((long)(a1)), "2" ((long)(a2)),		\
  11.118 +		"3" ((long)(a3)), "g" ((long)(a4)),		\
  11.119 +		"g" ((long)(a5))				\
  11.120 +		: "memory", "r10", "r8" );			\
  11.121 +	(type)__res;						\
  11.122 +})
  11.123 +
  11.124 +static inline int
  11.125 +HYPERVISOR_set_trap_table(
  11.126 +	trap_info_t *table)
  11.127 +{
  11.128 +	return _hypercall1(int, set_trap_table, table);
  11.129 +}
  11.130 +
  11.131 +static inline int
  11.132 +HYPERVISOR_mmu_update(
  11.133 +	mmu_update_t *req, int count, int *success_count, domid_t domid)
  11.134 +{
  11.135 +	return _hypercall4(int, mmu_update, req, count, success_count, domid);
  11.136 +}
  11.137 +
  11.138 +static inline int
  11.139 +HYPERVISOR_mmuext_op(
  11.140 +	struct mmuext_op *op, int count, int *success_count, domid_t domid)
  11.141 +{
  11.142 +	return _hypercall4(int, mmuext_op, op, count, success_count, domid);
  11.143 +}
  11.144 +
  11.145 +static inline int
  11.146 +HYPERVISOR_set_gdt(
  11.147 +	unsigned long *frame_list, int entries)
  11.148 +{
  11.149 +	return _hypercall2(int, set_gdt, frame_list, entries);
  11.150 +}
  11.151 +
  11.152 +static inline int
  11.153 +HYPERVISOR_stack_switch(
  11.154 +	unsigned long ss, unsigned long esp)
  11.155 +{
  11.156 +	return _hypercall2(int, stack_switch, ss, esp);
  11.157 +}
  11.158 +
  11.159 +static inline int
  11.160 +HYPERVISOR_set_callbacks(
  11.161 +	unsigned long event_address, unsigned long failsafe_address, 
  11.162 +	unsigned long syscall_address)
  11.163 +{
  11.164 +	return _hypercall3(int, set_callbacks,
  11.165 +			   event_address, failsafe_address, syscall_address);
  11.166 +}
  11.167 +
  11.168 +static inline int
  11.169 +HYPERVISOR_fpu_taskswitch(
  11.170 +	int set)
  11.171 +{
  11.172 +	return _hypercall1(int, fpu_taskswitch, set);
  11.173 +}
  11.174 +
  11.175 +static inline int
  11.176 +HYPERVISOR_sched_op(
  11.177 +	int cmd, unsigned long arg)
  11.178 +{
  11.179 +	return _hypercall2(int, sched_op, cmd, arg);
  11.180 +}
  11.181 +
  11.182 +static inline long
  11.183 +HYPERVISOR_set_timer_op(
  11.184 +	u64 timeout)
  11.185 +{
  11.186 +	return _hypercall1(long, set_timer_op, timeout);
  11.187 +}
  11.188 +
  11.189 +static inline int
  11.190 +HYPERVISOR_dom0_op(
  11.191 +	dom0_op_t *dom0_op)
  11.192 +{
  11.193 +	dom0_op->interface_version = DOM0_INTERFACE_VERSION;
  11.194 +	return _hypercall1(int, dom0_op, dom0_op);
  11.195 +}
  11.196 +
  11.197 +static inline int
  11.198 +HYPERVISOR_set_debugreg(
  11.199 +	int reg, unsigned long value)
  11.200 +{
  11.201 +	return _hypercall2(int, set_debugreg, reg, value);
  11.202 +}
  11.203 +
  11.204 +static inline unsigned long
  11.205 +HYPERVISOR_get_debugreg(
  11.206 +	int reg)
  11.207 +{
  11.208 +	return _hypercall1(unsigned long, get_debugreg, reg);
  11.209 +}
  11.210 +
  11.211 +static inline int
  11.212 +HYPERVISOR_update_descriptor(
  11.213 +	unsigned long ma, unsigned long word)
  11.214 +{
  11.215 +	return _hypercall2(int, update_descriptor, ma, word);
  11.216 +}
  11.217 +
  11.218 +static inline int
  11.219 +HYPERVISOR_memory_op(
  11.220 +	unsigned int cmd, void *arg)
  11.221 +{
  11.222 +	return _hypercall2(int, memory_op, cmd, arg);
  11.223 +}
  11.224 +
  11.225 +static inline int
  11.226 +HYPERVISOR_multicall(
  11.227 +	void *call_list, int nr_calls)
  11.228 +{
  11.229 +	return _hypercall2(int, multicall, call_list, nr_calls);
  11.230 +}
  11.231 +
  11.232 +static inline int
  11.233 +HYPERVISOR_update_va_mapping(
  11.234 +	unsigned long va, pte_t new_val, unsigned long flags)
  11.235 +{
  11.236 +	return _hypercall3(int, update_va_mapping, va, new_val.pte, flags);
  11.237 +}
  11.238 +
  11.239 +static inline int
  11.240 +HYPERVISOR_event_channel_op(
  11.241 +	void *op)
  11.242 +{
  11.243 +	return _hypercall1(int, event_channel_op, op);
  11.244 +}
  11.245 +
  11.246 +static inline int
  11.247 +HYPERVISOR_xen_version(
  11.248 +	int cmd, void *arg)
  11.249 +{
  11.250 +	return _hypercall2(int, xen_version, cmd, arg);
  11.251 +}
  11.252 +
  11.253 +static inline int
  11.254 +HYPERVISOR_console_io(
  11.255 +	int cmd, int count, char *str)
  11.256 +{
  11.257 +	return _hypercall3(int, console_io, cmd, count, str);
  11.258 +}
  11.259 +
  11.260 +static inline int
  11.261 +HYPERVISOR_physdev_op(
  11.262 +	void *physdev_op)
  11.263 +{
  11.264 +	return _hypercall1(int, physdev_op, physdev_op);
  11.265 +}
  11.266 +
  11.267 +static inline int
  11.268 +HYPERVISOR_grant_table_op(
  11.269 +	unsigned int cmd, void *uop, unsigned int count)
  11.270 +{
  11.271 +	return _hypercall3(int, grant_table_op, cmd, uop, count);
  11.272 +}
  11.273 +
  11.274 +static inline int
  11.275 +HYPERVISOR_update_va_mapping_otherdomain(
  11.276 +	unsigned long va, pte_t new_val, unsigned long flags, domid_t domid)
  11.277 +{
  11.278 +	return _hypercall4(int, update_va_mapping_otherdomain, va,
  11.279 +			   new_val.pte, flags, domid);
  11.280 +}
  11.281 +
  11.282 +static inline int
  11.283 +HYPERVISOR_vm_assist(
  11.284 +	unsigned int cmd, unsigned int type)
  11.285 +{
  11.286 +	return _hypercall2(int, vm_assist, cmd, type);
  11.287 +}
  11.288 +
  11.289 +static inline int
  11.290 +HYPERVISOR_vcpu_op(
  11.291 +	int cmd, int vcpuid, void *extra_args)
  11.292 +{
  11.293 +	return _hypercall3(int, vcpu_op, cmd, vcpuid, extra_args);
  11.294 +}
  11.295 +
  11.296 +static inline int
  11.297 +HYPERVISOR_set_segment_base(
  11.298 +	int reg, unsigned long value)
  11.299 +{
  11.300 +	return _hypercall2(int, set_segment_base, reg, value);
  11.301 +}
  11.302 +
  11.303 +static inline int
  11.304 +HYPERVISOR_suspend(
  11.305 +	unsigned long srec)
  11.306 +{
  11.307 +	return _hypercall3(int, sched_op, SCHEDOP_shutdown,
  11.308 +			   SHUTDOWN_suspend, srec);
  11.309 +}
  11.310 +
  11.311 +static inline int
  11.312 +HYPERVISOR_nmi_op(
  11.313 +	unsigned long op,
  11.314 +	unsigned long arg)
  11.315 +{
  11.316 +	return _hypercall2(int, nmi_op, op, arg);
  11.317 +}
  11.318 +
  11.319 +#endif /* __HYPERCALL_X86_64_H__ */
  11.320 +
  11.321 +/*
  11.322 + * Local variables:
  11.323 + *  c-file-style: "linux"
  11.324 + *  indent-tabs-mode: t
  11.325 + *  c-indent-level: 8
  11.326 + *  c-basic-offset: 8
  11.327 + *  tab-width: 8
  11.328 + * End:
  11.329 + */

    12.1 --- a/extras/mini-os/include/hypervisor.h	Fri Feb 24 14:03:07 2006 -0700
    12.2 +++ b/extras/mini-os/include/hypervisor.h	Fri Feb 24 15:41:08 2006 -0700
    12.3 @@ -3,10 +3,10 @@
    12.4   * 
    12.5   * Hypervisor handling.
    12.6   * 
    12.7 - * TODO - x86_64 broken!
    12.8   *
    12.9   * Copyright (c) 2002, K A Fraser
   12.10   * Copyright (c) 2005, Grzegorz Milos
   12.11 + * Updates: Aravindh Puthiyaparambil <aravindh.puthiyaparambil@unisys.com>
   12.12   */
   12.13  
   12.14  #ifndef _HYPERVISOR_H_
   12.15 @@ -15,6 +15,13 @@
   12.16  #include <types.h>
   12.17  #include <xen/xen.h>
   12.18  #include <xen/dom0_ops.h>
   12.19 +#if defined(__i386__)
   12.20 +#include <hypercall-x86_32.h>
   12.21 +#elif defined(__x86_64__)
   12.22 +#include <hypercall-x86_64.h>
   12.23 +#else
   12.24 +#error "Unsupported architecture"
   12.25 +#endif
   12.26  
   12.27  /*
   12.28   * a placeholder for the start of day information passed up from the hypervisor
   12.29 @@ -27,503 +34,10 @@ union start_info_union
   12.30  extern union start_info_union start_info_union;
   12.31  #define start_info (start_info_union.start_info)
   12.32  
   12.33 -
   12.34  /* hypervisor.c */
   12.35  //void do_hypervisor_callback(struct pt_regs *regs);
   12.36  void mask_evtchn(u32 port);
   12.37  void unmask_evtchn(u32 port);
   12.38  void clear_evtchn(u32 port);
   12.39  
   12.40 -/*
   12.41 - * Assembler stubs for hyper-calls.
   12.42 - */
   12.43 -#if defined(__i386__)
   12.44 -/* Taken from Linux */
   12.45 -
   12.46 -#ifndef __HYPERCALL_H__
   12.47 -#define __HYPERCALL_H__
   12.48 -
   12.49 -#include <xen/sched.h>
   12.50 -
   12.51 -#define _hypercall0(type, name)			\
   12.52 -({						\
   12.53 -	long __res;				\
   12.54 -	asm volatile (				\
   12.55 -		TRAP_INSTR			\
   12.56 -		: "=a" (__res)			\
   12.57 -		: "0" (__HYPERVISOR_##name)	\
   12.58 -		: "memory" );			\
   12.59 -	(type)__res;				\
   12.60 -})
   12.61 -
   12.62 -#define _hypercall1(type, name, a1)				\
   12.63 -({								\
   12.64 -	long __res, __ign1;					\
   12.65 -	asm volatile (						\
   12.66 -		TRAP_INSTR					\
   12.67 -		: "=a" (__res), "=b" (__ign1)			\
   12.68 -		: "0" (__HYPERVISOR_##name), "1" ((long)(a1))	\
   12.69 -		: "memory" );					\
   12.70 -	(type)__res;						\
   12.71 -})
   12.72 -
   12.73 -#define _hypercall2(type, name, a1, a2)				\
   12.74 -({								\
   12.75 -	long __res, __ign1, __ign2;				\
   12.76 -	asm volatile (						\
   12.77 -		TRAP_INSTR					\
   12.78 -		: "=a" (__res), "=b" (__ign1), "=c" (__ign2)	\
   12.79 -		: "0" (__HYPERVISOR_##name), "1" ((long)(a1)),	\
   12.80 -		"2" ((long)(a2))				\
   12.81 -		: "memory" );					\
   12.82 -	(type)__res;						\
   12.83 -})
   12.84 -
   12.85 -#define _hypercall3(type, name, a1, a2, a3)			\
   12.86 -({								\
   12.87 -	long __res, __ign1, __ign2, __ign3;			\
   12.88 -	asm volatile (						\
   12.89 -		TRAP_INSTR					\
   12.90 -		: "=a" (__res), "=b" (__ign1), "=c" (__ign2), 	\
   12.91 -		"=d" (__ign3)					\
   12.92 -		: "0" (__HYPERVISOR_##name), "1" ((long)(a1)),	\
   12.93 -		"2" ((long)(a2)), "3" ((long)(a3))		\
   12.94 -		: "memory" );					\
   12.95 -	(type)__res;						\
   12.96 -})
   12.97 -
   12.98 -#define _hypercall4(type, name, a1, a2, a3, a4)			\
   12.99 -({								\
  12.100 -	long __res, __ign1, __ign2, __ign3, __ign4;		\
  12.101 -	asm volatile (						\
  12.102 -		TRAP_INSTR					\
  12.103 -		: "=a" (__res), "=b" (__ign1), "=c" (__ign2),	\
  12.104 -		"=d" (__ign3), "=S" (__ign4)			\
  12.105 -		: "0" (__HYPERVISOR_##name), "1" ((long)(a1)),	\
  12.106 -		"2" ((long)(a2)), "3" ((long)(a3)),		\
  12.107 -		"4" ((long)(a4))				\
  12.108 -		: "memory" );					\
  12.109 -	(type)__res;						\
  12.110 -})
  12.111 -
  12.112 -#define _hypercall5(type, name, a1, a2, a3, a4, a5)		\
  12.113 -({								\
  12.114 -	long __res, __ign1, __ign2, __ign3, __ign4, __ign5;	\
  12.115 -	asm volatile (						\
  12.116 -		TRAP_INSTR					\
  12.117 -		: "=a" (__res), "=b" (__ign1), "=c" (__ign2),	\
  12.118 -		"=d" (__ign3), "=S" (__ign4), "=D" (__ign5)	\
  12.119 -		: "0" (__HYPERVISOR_##name), "1" ((long)(a1)),	\
  12.120 -		"2" ((long)(a2)), "3" ((long)(a3)),		\
  12.121 -		"4" ((long)(a4)), "5" ((long)(a5))		\
  12.122 -		: "memory" );					\
  12.123 -	(type)__res;						\
  12.124 -})
  12.125 -
  12.126 -static inline int
  12.127 -HYPERVISOR_set_trap_table(
  12.128 -	trap_info_t *table)
  12.129 -{
  12.130 -	return _hypercall1(int, set_trap_table, table);
  12.131 -}
  12.132 -
  12.133 -static inline int
  12.134 -HYPERVISOR_mmu_update(
  12.135 -	mmu_update_t *req, int count, int *success_count, domid_t domid)
  12.136 -{
  12.137 -	return _hypercall4(int, mmu_update, req, count, success_count, domid);
  12.138 -}
  12.139 -
  12.140 -static inline int
  12.141 -HYPERVISOR_mmuext_op(
  12.142 -	struct mmuext_op *op, int count, int *success_count, domid_t domid)
  12.143 -{
  12.144 -	return _hypercall4(int, mmuext_op, op, count, success_count, domid);
  12.145 -}
  12.146 -
  12.147 -static inline int
  12.148 -HYPERVISOR_set_gdt(
  12.149 -	unsigned long *frame_list, int entries)
  12.150 -{
  12.151 -	return _hypercall2(int, set_gdt, frame_list, entries);
  12.152 -}
  12.153 -
  12.154 -static inline int
  12.155 -HYPERVISOR_stack_switch(
  12.156 -	unsigned long ss, unsigned long esp)
  12.157 -{
  12.158 -	return _hypercall2(int, stack_switch, ss, esp);
  12.159 -}
  12.160 -
  12.161 -static inline int
  12.162 -HYPERVISOR_set_callbacks(
  12.163 -	unsigned long event_selector, unsigned long event_address,
  12.164 -	unsigned long failsafe_selector, unsigned long failsafe_address)
  12.165 -{
  12.166 -	return _hypercall4(int, set_callbacks,
  12.167 -			   event_selector, event_address,
  12.168 -			   failsafe_selector, failsafe_address);
  12.169 -}
  12.170 -
  12.171 -static inline int
  12.172 -HYPERVISOR_fpu_taskswitch(
  12.173 -	int set)
  12.174 -{
  12.175 -	return _hypercall1(int, fpu_taskswitch, set);
  12.176 -}
  12.177 -
  12.178 -static inline int
  12.179 -HYPERVISOR_sched_op(
  12.180 -	int cmd, unsigned long arg)
  12.181 -{
  12.182 -	return _hypercall2(int, sched_op, cmd, arg);
  12.183 -}
  12.184 -
  12.185 -static inline long
  12.186 -HYPERVISOR_set_timer_op(
  12.187 -	u64 timeout)
  12.188 -{
  12.189 -	unsigned long timeout_hi = (unsigned long)(timeout>>32);
  12.190 -	unsigned long timeout_lo = (unsigned long)timeout;
  12.191 -	return _hypercall2(long, set_timer_op, timeout_lo, timeout_hi);
  12.192 -}
  12.193 -
  12.194 -static inline int
  12.195 -HYPERVISOR_dom0_op(
  12.196 -	dom0_op_t *dom0_op)
  12.197 -{
  12.198 -	dom0_op->interface_version = DOM0_INTERFACE_VERSION;
  12.199 -	return _hypercall1(int, dom0_op, dom0_op);
  12.200 -}
  12.201 -
  12.202 -static inline int
  12.203 -HYPERVISOR_set_debugreg(
  12.204 -	int reg, unsigned long value)
  12.205 -{
  12.206 -	return _hypercall2(int, set_debugreg, reg, value);
  12.207 -}
  12.208 -
  12.209 -static inline unsigned long
  12.210 -HYPERVISOR_get_debugreg(
  12.211 -	int reg)
  12.212 -{
  12.213 -	return _hypercall1(unsigned long, get_debugreg, reg);
  12.214 -}
  12.215 -
  12.216 -static inline int
  12.217 -HYPERVISOR_update_descriptor(
  12.218 -	u64 ma, u64 desc)
  12.219 -{
  12.220 -	return _hypercall4(int, update_descriptor, ma, ma>>32, desc, desc>>32);
  12.221 -}
  12.222 -
  12.223 -static inline int
  12.224 -HYPERVISOR_memory_op(
  12.225 -	unsigned int cmd, void *arg)
  12.226 -{
  12.227 -	return _hypercall2(int, memory_op, cmd, arg);
  12.228 -}
  12.229 -
  12.230 -static inline int
  12.231 -HYPERVISOR_multicall(
  12.232 -	void *call_list, int nr_calls)
  12.233 -{
  12.234 -	return _hypercall2(int, multicall, call_list, nr_calls);
  12.235 -}
  12.236 -
  12.237 -static inline int
  12.238 -HYPERVISOR_update_va_mapping(
  12.239 -	unsigned long va, pte_t new_val, unsigned long flags)
  12.240 -{
  12.241 -	unsigned long pte_hi = 0;
  12.242 -#ifdef CONFIG_X86_PAE
  12.243 -	pte_hi = new_val.pte_high;
  12.244 -#endif
  12.245 -	return _hypercall4(int, update_va_mapping, va,
  12.246 -			   new_val.pte_low, pte_hi, flags);
  12.247 -}
  12.248 -
  12.249 -static inline int
  12.250 -HYPERVISOR_event_channel_op(
  12.251 -	void *op)
  12.252 -{
  12.253 -	return _hypercall1(int, event_channel_op, op);
  12.254 -}
  12.255 -
  12.256 -static inline int
  12.257 -HYPERVISOR_xen_version(
  12.258 -	int cmd, void *arg)
  12.259 -{
  12.260 -	return _hypercall2(int, xen_version, cmd, arg);
  12.261 -}
  12.262 -
  12.263 -static inline int
  12.264 -HYPERVISOR_console_io(
  12.265 -	int cmd, int count, char *str)
  12.266 -{
  12.267 -	return _hypercall3(int, console_io, cmd, count, str);
  12.268 -}
  12.269 -
  12.270 -static inline int
  12.271 -HYPERVISOR_physdev_op(
  12.272 -	void *physdev_op)
  12.273 -{
  12.274 -	return _hypercall1(int, physdev_op, physdev_op);
  12.275 -}
  12.276 -
  12.277 -static inline int
  12.278 -HYPERVISOR_grant_table_op(
  12.279 -	unsigned int cmd, void *uop, unsigned int count)
  12.280 -{
  12.281 -	return _hypercall3(int, grant_table_op, cmd, uop, count);
  12.282 -}
  12.283 -
  12.284 -static inline int
  12.285 -HYPERVISOR_update_va_mapping_otherdomain(
  12.286 -	unsigned long va, pte_t new_val, unsigned long flags, domid_t domid)
  12.287 -{
  12.288 -	unsigned long pte_hi = 0;
  12.289 -#ifdef CONFIG_X86_PAE
  12.290 -	pte_hi = new_val.pte_high;
  12.291 -#endif
  12.292 -	return _hypercall5(int, update_va_mapping_otherdomain, va,
  12.293 -			   new_val.pte_low, pte_hi, flags, domid);
  12.294 -}
  12.295 -
  12.296 -static inline int
  12.297 -HYPERVISOR_vm_assist(
  12.298 -	unsigned int cmd, unsigned int type)
  12.299 -{
  12.300 -	return _hypercall2(int, vm_assist, cmd, type);
  12.301 -}
  12.302 -
  12.303 -static inline int
  12.304 -HYPERVISOR_vcpu_op(
  12.305 -	int cmd, int vcpuid, void *extra_args)
  12.306 -{
  12.307 -	return _hypercall3(int, vcpu_op, cmd, vcpuid, extra_args);
  12.308 -}
  12.309 -
  12.310 -static inline int
  12.311 -HYPERVISOR_suspend(
  12.312 -	unsigned long srec)
  12.313 -{
  12.314 -	return _hypercall3(int, sched_op, SCHEDOP_shutdown,
  12.315 -			   SHUTDOWN_suspend, srec);
  12.316 -}
  12.317 -
  12.318 -#endif /* __HYPERCALL_H__ */
  12.319 -#elif defined(__x86_64__)
  12.320 -
  12.321 -#define __syscall_clobber "r11","rcx","memory"
  12.322 -
  12.323 -/*
  12.324 - * Assembler stubs for hyper-calls.
  12.325 - */
  12.326 -static inline int
  12.327 -HYPERVISOR_set_trap_table(
  12.328 -    trap_info_t *table)
  12.329 -{
  12.330 -    int ret;
  12.331 -
  12.332 -    __asm__ __volatile__ (
  12.333 -        TRAP_INSTR
  12.334 -        : "=a" (ret)
  12.335 -	: "0" ((unsigned long)__HYPERVISOR_set_trap_table), "D" (table)
  12.336 -	: __syscall_clobber );
  12.337 -
  12.338 -    return ret;
  12.339 -}
  12.340 -
  12.341 -static inline int
  12.342 -HYPERVISOR_mmu_update(
  12.343 -    mmu_update_t *req, int count, int *success_count, domid_t domid)
  12.344 -{
  12.345 -    int ret;
  12.346 -
  12.347 -    __asm__ __volatile__ (
  12.348 -        "movq %5, %%r10;" TRAP_INSTR
  12.349 -        : "=a" (ret)
  12.350 -	: "0" ((unsigned long)__HYPERVISOR_mmu_update), "D" (req), "S" ((long)count),
  12.351 -	  "d" (success_count), "g" ((unsigned long)domid)
  12.352 -	: __syscall_clobber, "r10" );
  12.353 -
  12.354 -    return ret;
  12.355 -}
  12.356 -
  12.357 -static inline int
  12.358 -HYPERVISOR_mmuext_op(
  12.359 -    struct mmuext_op *op, int count, int *success_count, domid_t domid)
  12.360 -{
  12.361 -    int ret;
  12.362 -
  12.363 -    __asm__ __volatile__ (
  12.364 -        "movq %5, %%r10;" TRAP_INSTR
  12.365 -        : "=a" (ret)
  12.366 -        : "0" (__HYPERVISOR_mmuext_op), "D" (op), "S" ((long)count), 
  12.367 -          "d" (success_count), "g" ((unsigned long)domid)
  12.368 -        : __syscall_clobber, "r10" );
  12.369 -
  12.370 -    return ret;
  12.371 -}
  12.372 -
  12.373 -static inline int
  12.374 -HYPERVISOR_set_gdt(
  12.375 -    unsigned long *frame_list, int entries)
  12.376 -{
  12.377 -    int ret;
  12.378 -
  12.379 -    __asm__ __volatile__ (
  12.380 -        TRAP_INSTR
  12.381 -        : "=a" (ret)
  12.382 -	: "0" ((unsigned long)__HYPERVISOR_set_gdt), "D" (frame_list), "S" ((long)entries)
  12.383 -	: __syscall_clobber );
  12.384 -
  12.385 -
  12.386 -    return ret;
  12.387 -}
  12.388 -static inline int
  12.389 -HYPERVISOR_stack_switch(
  12.390 -    unsigned long ss, unsigned long esp)
  12.391 -{
  12.392 -    int ret;
  12.393 -
  12.394 -    __asm__ __volatile__ (
  12.395 -        TRAP_INSTR
  12.396 -        : "=a" (ret)
  12.397 -	: "0" ((unsigned long)__HYPERVISOR_stack_switch), "D" (ss), "S" (esp)
  12.398 -	: __syscall_clobber );
  12.399 -
  12.400 -    return ret;
  12.401 -}
  12.402 -
  12.403 -static inline int
  12.404 -HYPERVISOR_set_callbacks(
  12.405 -    unsigned long event_address, unsigned long failsafe_address, 
  12.406 -    unsigned long syscall_address)
  12.407 -{
  12.408 -    int ret;
  12.409 -
  12.410 -    __asm__ __volatile__ (
  12.411 -        TRAP_INSTR
  12.412 -        : "=a" (ret)
  12.413 -	: "0" ((unsigned long)__HYPERVISOR_set_callbacks), "D" (event_address),
  12.414 -	  "S" (failsafe_address), "d" (syscall_address)
  12.415 -	: __syscall_clobber );
  12.416 -
  12.417 -    return ret;
  12.418 -}
  12.419 -
  12.420 -static inline int
  12.421 -HYPERVISOR_fpu_taskswitch(
  12.422 -    int set)
  12.423 -{
  12.424 -    int ret;
  12.425 -    __asm__ __volatile__ (
  12.426 -        TRAP_INSTR
  12.427 -        : "=a" (ret) : "0" ((unsigned long)__HYPERVISOR_fpu_taskswitch),
  12.428 -          "D" ((unsigned long) set) : __syscall_clobber );
  12.429 -
  12.430 -    return ret;
  12.431 -}
  12.432 -
  12.433 -static inline int
  12.434 -HYPERVISOR_yield(
  12.435 -    void)
  12.436 -{
  12.437 -    int ret;
  12.438 -
  12.439 -    __asm__ __volatile__ (
  12.440 -        TRAP_INSTR
  12.441 -        : "=a" (ret)
  12.442 -	: "0" ((unsigned long)__HYPERVISOR_sched_op), "D" ((unsigned long)SCHEDOP_yield)
  12.443 -	: __syscall_clobber );
  12.444 -
  12.445 -    return ret;
  12.446 -}
  12.447 -
  12.448 -static inline int
  12.449 -HYPERVISOR_block(
  12.450 -    void)
  12.451 -{
  12.452 -    int ret;
  12.453 -    __asm__ __volatile__ (
  12.454 -        TRAP_INSTR
  12.455 -        : "=a" (ret)
  12.456 -	: "0" ((unsigned long)__HYPERVISOR_sched_op), "D" ((unsigned long)SCHEDOP_block)
  12.457 -	: __syscall_clobber );
  12.458 -
  12.459 -    return ret;
  12.460 -}
  12.461 -
  12.462 -static inline int
  12.463 -HYPERVISOR_shutdown(
  12.464 -    void)
  12.465 -{
  12.466 -    int ret;
  12.467 -    __asm__ __volatile__ (
  12.468 -        TRAP_INSTR
  12.469 -        : "=a" (ret)
  12.470 -	: "0" ((unsigned long)__HYPERVISOR_sched_op),
  12.471 -	  "D" ((unsigned long)(SCHEDOP_shutdown | (SHUTDOWN_poweroff << SCHEDOP_reasonshift)))
  12.472 -	: __syscall_clobber );
  12.473 -
  12.474 -    return ret;
  12.475 -}
  12.476 -
  12.477 -static inline int
  12.478 -HYPERVISOR_reboot(
  12.479 -    void)
  12.480 -{
  12.481 -    int ret;
  12.482 -
  12.483 -    __asm__ __volatile__ (
  12.484 -        TRAP_INSTR
  12.485 -        : "=a" (ret)
  12.486 -	: "0" ((unsigned long)__HYPERVISOR_sched_op),
  12.487 -	  "D" ((unsigned long)(SCHEDOP_shutdown | (SHUTDOWN_reboot << SCHEDOP_reasonshift)))
  12.488 -	: __syscall_clobber );
  12.489 -
  12.490 -    return ret;
  12.491 -}
  12.492 -
  12.493 -static inline int
  12.494 -HYPERVISOR_suspend(
  12.495 -    unsigned long srec)
  12.496 -{
  12.497 -    int ret;
  12.498 -
  12.499 -    /* NB. On suspend, control software expects a suspend record in %esi. */
  12.500 -    __asm__ __volatile__ (
  12.501 -        TRAP_INSTR
  12.502 -        : "=a" (ret)
  12.503 -	: "0" ((unsigned long)__HYPERVISOR_sched_op),
  12.504 -        "D" ((unsigned long)(SCHEDOP_shutdown | (SHUTDOWN_suspend << SCHEDOP_reasonshift))), 
  12.505 -        "S" (srec)
  12.506 -	: __syscall_clobber );
  12.507 -
  12.508 -    return ret;
  12.509 -}
  12.510 -
  12.511 -/*
  12.512 - * We can have the timeout value in a single argument for the hypercall, but
  12.513 - * that will break the common code. 
  12.514 - */
  12.515 -static inline long
  12.516 -HYPERVISOR_set_timer_op(
  12.517 -    u64 timeout)
  12.518 -{
  12.519 -    int ret;
  12.520 -
  12.521 -    __asm__ __volatile__ (
  12.522 -        TRAP_INSTR
  12.523 -        : "=a" (ret)
  12.524 -	: "0" ((unsigned long)__HYPERVISOR_set_timer_op),
  12.525 -	  "D" (timeout)
  12.526 -	: __syscall_clobber );
  12.527 -
  12.528 -    return ret;
  12.529 -}
  12.530 -#endif
  12.531 -
  12.532  #endif /* __HYPERVISOR_H__ */

    13.1 --- a/extras/mini-os/x86_32.S	Fri Feb 24 14:03:07 2006 -0700
    13.2 +++ b/extras/mini-os/x86_32.S	Fri Feb 24 15:41:08 2006 -0700
    13.3 @@ -1,16 +1,16 @@
    13.4  #include <os.h>
    13.5  #include <xen/arch-x86_32.h>
    13.6  
    13.7 -
    13.8  .section __xen_guest
    13.9  	.ascii	"GUEST_OS=Mini-OS"
   13.10  	.ascii	",XEN_VER=xen-3.0"
   13.11 +	.ascii	",HYPERCALL_PAGE=0x2"
   13.12  	.ascii	",LOADER=generic"
   13.13  	.ascii	",PT_MODE_WRITABLE"
   13.14  	.byte	0
   13.15  .text
   13.16  
   13.17 -.globl _start, shared_info
   13.18 +.globl _start, shared_info, hypercall_page
   13.19                          
   13.20  _start:
   13.21          cld
   13.22 @@ -26,7 +26,9 @@ stack_start:
   13.23          .org 0x1000
   13.24  shared_info:
   13.25          .org 0x2000
   13.26 -        
   13.27 +
   13.28 +hypercall_page:
   13.29 +        .org 0x3000
   13.30  
   13.31  ES		= 0x20
   13.32  ORIG_EAX	= 0x24

    14.1 --- a/extras/mini-os/x86_64.S	Fri Feb 24 14:03:07 2006 -0700
    14.2 +++ b/extras/mini-os/x86_64.S	Fri Feb 24 15:41:08 2006 -0700
    14.3 @@ -1,11 +1,16 @@
    14.4  #include <os.h>
    14.5  
    14.6  .section __xen_guest
    14.7 -        .asciz  "XEN_VER=3.0,LOADER=generic,PT_MODE_WRITABLE"
    14.8 +	.ascii	"GUEST_OS=Mini-OS"
    14.9 +	.ascii	",XEN_VER=xen-3.0"
   14.10 +	.ascii	",HYPERCALL_PAGE=0x2"
   14.11 +	.ascii	",LOADER=generic"
   14.12 +	.ascii	",PT_MODE_WRITABLE"
   14.13 +	.byte	0
   14.14  .text
   14.15  
   14.16  #define ENTRY(X) .globl X ; X :
   14.17 -.globl _start, shared_info
   14.18 +.globl _start, shared_info, hypercall_page
   14.19  
   14.20  #define SAVE_ALL \
   14.21          cld; \
   14.22 @@ -57,6 +62,9 @@ stack_start:
   14.23  shared_info:
   14.24          .org 0x2000
   14.25  
   14.26 +hypercall_page:
   14.27 +        .org 0x3000
   14.28 +
   14.29  ENTRY(hypervisor_callback)
   14.30          popq  %rcx
   14.31          popq  %r11

    15.1 --- a/linux-2.6-xen-sparse/arch/i386/Kconfig	Fri Feb 24 14:03:07 2006 -0700
    15.2 +++ b/linux-2.6-xen-sparse/arch/i386/Kconfig	Fri Feb 24 15:41:08 2006 -0700
    15.3 @@ -780,7 +780,7 @@ config HOTPLUG_CPU
    15.4  config DOUBLEFAULT
    15.5  	default y
    15.6  	bool "Enable doublefault exception handler" if EMBEDDED
    15.7 -	depends on !XEN
    15.8 +	depends on !X86_NO_TSS
    15.9  	help
   15.10            This option allows trapping of rare doublefault exceptions that
   15.11            would otherwise cause a system to silently reboot. Disabling this
   15.12 @@ -1176,6 +1176,21 @@ config X86_TRAMPOLINE
   15.13  	depends on X86_SMP || (X86_VOYAGER && SMP)
   15.14  	default y
   15.15  
   15.16 +config X86_NO_TSS
   15.17 +	bool
   15.18 +	depends on X86_XEN
   15.19 +	default y
   15.20 +
   15.21 +config X86_SYSENTER
   15.22 +	bool
   15.23 +	depends on !X86_NO_TSS
   15.24 +	default y
   15.25 +
   15.26 +config X86_NO_IDT
   15.27 +	bool
   15.28 +	depends on X86_XEN
   15.29 +	default y
   15.30 +
   15.31  config KTIME_SCALAR
   15.32  	bool
   15.33  	default y

    16.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    16.2 +++ b/linux-2.6-xen-sparse/arch/i386/Kconfig.cpu	Fri Feb 24 15:41:08 2006 -0700
    16.3 @@ -0,0 +1,315 @@
    16.4 +# Put here option for CPU selection and depending optimization
    16.5 +if !X86_ELAN
    16.6 +
    16.7 +choice
    16.8 +	prompt "Processor family"
    16.9 +	default M686
   16.10 +
   16.11 +config M386
   16.12 +	bool "386"
   16.13 +	---help---
   16.14 +	  This is the processor type of your CPU. This information is used for
   16.15 +	  optimizing purposes. In order to compile a kernel that can run on
   16.16 +	  all x86 CPU types (albeit not optimally fast), you can specify
   16.17 +	  "386" here.
   16.18 +
   16.19 +	  The kernel will not necessarily run on earlier architectures than
   16.20 +	  the one you have chosen, e.g. a Pentium optimized kernel will run on
   16.21 +	  a PPro, but not necessarily on a i486.
   16.22 +
   16.23 +	  Here are the settings recommended for greatest speed:
   16.24 +	  - "386" for the AMD/Cyrix/Intel 386DX/DXL/SL/SLC/SX, Cyrix/TI
   16.25 +	  486DLC/DLC2, UMC 486SX-S and NexGen Nx586.  Only "386" kernels
   16.26 +	  will run on a 386 class machine.
   16.27 +	  - "486" for the AMD/Cyrix/IBM/Intel 486DX/DX2/DX4 or
   16.28 +	  SL/SLC/SLC2/SLC3/SX/SX2 and UMC U5D or U5S.
   16.29 +	  - "586" for generic Pentium CPUs lacking the TSC
   16.30 +	  (time stamp counter) register.
   16.31 +	  - "Pentium-Classic" for the Intel Pentium.
   16.32 +	  - "Pentium-MMX" for the Intel Pentium MMX.
   16.33 +	  - "Pentium-Pro" for the Intel Pentium Pro.
   16.34 +	  - "Pentium-II" for the Intel Pentium II or pre-Coppermine Celeron.
   16.35 +	  - "Pentium-III" for the Intel Pentium III or Coppermine Celeron.
   16.36 +	  - "Pentium-4" for the Intel Pentium 4 or P4-based Celeron.
   16.37 +	  - "K6" for the AMD K6, K6-II and K6-III (aka K6-3D).
   16.38 +	  - "Athlon" for the AMD K7 family (Athlon/Duron/Thunderbird).
   16.39 +	  - "Crusoe" for the Transmeta Crusoe series.
   16.40 +	  - "Efficeon" for the Transmeta Efficeon series.
   16.41 +	  - "Winchip-C6" for original IDT Winchip.
   16.42 +	  - "Winchip-2" for IDT Winchip 2.
   16.43 +	  - "Winchip-2A" for IDT Winchips with 3dNow! capabilities.
   16.44 +	  - "GeodeGX1" for Geode GX1 (Cyrix MediaGX).
   16.45 +	  - "Geode GX/LX" For AMD Geode GX and LX processors.
   16.46 +	  - "CyrixIII/VIA C3" for VIA Cyrix III or VIA C3.
   16.47 +	  - "VIA C3-2 for VIA C3-2 "Nehemiah" (model 9 and above).
   16.48 +
   16.49 +	  If you don't know what to do, choose "386".
   16.50 +
   16.51 +config M486
   16.52 +	bool "486"
   16.53 +	help
   16.54 +	  Select this for a 486 series processor, either Intel or one of the
   16.55 +	  compatible processors from AMD, Cyrix, IBM, or Intel.  Includes DX,
   16.56 +	  DX2, and DX4 variants; also SL/SLC/SLC2/SLC3/SX/SX2 and UMC U5D or
   16.57 +	  U5S.
   16.58 +
   16.59 +config M586
   16.60 +	bool "586/K5/5x86/6x86/6x86MX"
   16.61 +	help
   16.62 +	  Select this for an 586 or 686 series processor such as the AMD K5,
   16.63 +	  the Cyrix 5x86, 6x86 and 6x86MX.  This choice does not
   16.64 +	  assume the RDTSC (Read Time Stamp Counter) instruction.
   16.65 +
   16.66 +config M586TSC
   16.67 +	bool "Pentium-Classic"
   16.68 +	help
   16.69 +	  Select this for a Pentium Classic processor with the RDTSC (Read
   16.70 +	  Time Stamp Counter) instruction for benchmarking.
   16.71 +
   16.72 +config M586MMX
   16.73 +	bool "Pentium-MMX"
   16.74 +	help
   16.75 +	  Select this for a Pentium with the MMX graphics/multimedia
   16.76 +	  extended instructions.
   16.77 +
   16.78 +config M686
   16.79 +	bool "Pentium-Pro"
   16.80 +	help
   16.81 +	  Select this for Intel Pentium Pro chips.  This enables the use of
   16.82 +	  Pentium Pro extended instructions, and disables the init-time guard
   16.83 +	  against the f00f bug found in earlier Pentiums.
   16.84 +
   16.85 +config MPENTIUMII
   16.86 +	bool "Pentium-II/Celeron(pre-Coppermine)"
   16.87 +	help
   16.88 +	  Select this for Intel chips based on the Pentium-II and
   16.89 +	  pre-Coppermine Celeron core.  This option enables an unaligned
   16.90 +	  copy optimization, compiles the kernel with optimization flags
   16.91 +	  tailored for the chip, and applies any applicable Pentium Pro
   16.92 +	  optimizations.
   16.93 +
   16.94 +config MPENTIUMIII
   16.95 +	bool "Pentium-III/Celeron(Coppermine)/Pentium-III Xeon"
   16.96 +	help
   16.97 +	  Select this for Intel chips based on the Pentium-III and
   16.98 +	  Celeron-Coppermine core.  This option enables use of some
   16.99 +	  extended prefetch instructions in addition to the Pentium II
  16.100 +	  extensions.
  16.101 +
  16.102 +config MPENTIUMM
  16.103 +	bool "Pentium M"
  16.104 +	help
  16.105 +	  Select this for Intel Pentium M (not Pentium-4 M)
  16.106 +	  notebook chips.
  16.107 +
  16.108 +config MPENTIUM4
  16.109 +	bool "Pentium-4/Celeron(P4-based)/Pentium-4 M/Xeon"
  16.110 +	help
  16.111 +	  Select this for Intel Pentium 4 chips.  This includes the
  16.112 +	  Pentium 4, P4-based Celeron and Xeon, and Pentium-4 M
  16.113 +	  (not Pentium M) chips.  This option enables compile flags
  16.114 +	  optimized for the chip, uses the correct cache shift, and
  16.115 +	  applies any applicable Pentium III optimizations.
  16.116 +
  16.117 +config MK6
  16.118 +	bool "K6/K6-II/K6-III"
  16.119 +	help
  16.120 +	  Select this for an AMD K6-family processor.  Enables use of
  16.121 +	  some extended instructions, and passes appropriate optimization
  16.122 +	  flags to GCC.
  16.123 +
  16.124 +config MK7
  16.125 +	bool "Athlon/Duron/K7"
  16.126 +	help
  16.127 +	  Select this for an AMD Athlon K7-family processor.  Enables use of
  16.128 +	  some extended instructions, and passes appropriate optimization
  16.129 +	  flags to GCC.
  16.130 +
  16.131 +config MK8
  16.132 +	bool "Opteron/Athlon64/Hammer/K8"
  16.133 +	help
  16.134 +	  Select this for an AMD Opteron or Athlon64 Hammer-family processor.  Enables
  16.135 +	  use of some extended instructions, and passes appropriate optimization
  16.136 +	  flags to GCC.
  16.137 +
  16.138 +config MCRUSOE
  16.139 +	bool "Crusoe"
  16.140 +	help
  16.141 +	  Select this for a Transmeta Crusoe processor.  Treats the processor
  16.142 +	  like a 586 with TSC, and sets some GCC optimization flags (like a
  16.143 +	  Pentium Pro with no alignment requirements).
  16.144 +
  16.145 +config MEFFICEON
  16.146 +	bool "Efficeon"
  16.147 +	help
  16.148 +	  Select this for a Transmeta Efficeon processor.
  16.149 +
  16.150 +config MWINCHIPC6
  16.151 +	bool "Winchip-C6"
  16.152 +	help
  16.153 +	  Select this for an IDT Winchip C6 chip.  Linux and GCC
  16.154 +	  treat this chip as a 586TSC with some extended instructions
  16.155 +	  and alignment requirements.
  16.156 +
  16.157 +config MWINCHIP2
  16.158 +	bool "Winchip-2"
  16.159 +	help
  16.160 +	  Select this for an IDT Winchip-2.  Linux and GCC
  16.161 +	  treat this chip as a 586TSC with some extended instructions
  16.162 +	  and alignment requirements.
  16.163 +
  16.164 +config MWINCHIP3D
  16.165 +	bool "Winchip-2A/Winchip-3"
  16.166 +	help
  16.167 +	  Select this for an IDT Winchip-2A or 3.  Linux and GCC
  16.168 +	  treat this chip as a 586TSC with some extended instructions
  16.169 +	  and alignment reqirements.  Also enable out of order memory
  16.170 +	  stores for this CPU, which can increase performance of some
  16.171 +	  operations.
  16.172 +
  16.173 +config MGEODEGX1
  16.174 +	bool "GeodeGX1"
  16.175 +	help
  16.176 +	  Select this for a Geode GX1 (Cyrix MediaGX) chip.
  16.177 +
  16.178 +config MGEODE_LX
  16.179 +       bool "Geode GX/LX"
  16.180 +       help
  16.181 +         Select this for AMD Geode GX and LX processors.
  16.182 +
  16.183 +config MCYRIXIII
  16.184 +	bool "CyrixIII/VIA-C3"
  16.185 +	help
  16.186 +	  Select this for a Cyrix III or C3 chip.  Presently Linux and GCC
  16.187 +	  treat this chip as a generic 586. Whilst the CPU is 686 class,
  16.188 +	  it lacks the cmov extension which gcc assumes is present when
  16.189 +	  generating 686 code.
  16.190 +	  Note that Nehemiah (Model 9) and above will not boot with this
  16.191 +	  kernel due to them lacking the 3DNow! instructions used in earlier
  16.192 +	  incarnations of the CPU.
  16.193 +
  16.194 +config MVIAC3_2
  16.195 +	bool "VIA C3-2 (Nehemiah)"
  16.196 +	help
  16.197 +	  Select this for a VIA C3 "Nehemiah". Selecting this enables usage
  16.198 +	  of SSE and tells gcc to treat the CPU as a 686.
  16.199 +	  Note, this kernel will not boot on older (pre model 9) C3s.
  16.200 +
  16.201 +endchoice
  16.202 +
  16.203 +config X86_GENERIC
  16.204 +       bool "Generic x86 support"
  16.205 +       help
  16.206 +	  Instead of just including optimizations for the selected
  16.207 +	  x86 variant (e.g. PII, Crusoe or Athlon), include some more
  16.208 +	  generic optimizations as well. This will make the kernel
  16.209 +	  perform better on x86 CPUs other than that selected.
  16.210 +
  16.211 +	  This is really intended for distributors who need more
  16.212 +	  generic optimizations.
  16.213 +
  16.214 +endif
  16.215 +
  16.216 +#
  16.217 +# Define implied options from the CPU selection here
  16.218 +#
  16.219 +config X86_CMPXCHG
  16.220 +	bool
  16.221 +	depends on !M386
  16.222 +	default y
  16.223 +
  16.224 +config X86_XADD
  16.225 +	bool
  16.226 +	depends on !M386
  16.227 +	default y
  16.228 +
  16.229 +config X86_L1_CACHE_SHIFT
  16.230 +	int
  16.231 +	default "7" if MPENTIUM4 || X86_GENERIC
  16.232 +	default "4" if X86_ELAN || M486 || M386 || MGEODEGX1
  16.233 +	default "5" if MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE_LX
  16.234 +	default "6" if MK7 || MK8 || MPENTIUMM
  16.235 +
  16.236 +config RWSEM_GENERIC_SPINLOCK
  16.237 +	bool
  16.238 +	depends on M386
  16.239 +	default y
  16.240 +
  16.241 +config RWSEM_XCHGADD_ALGORITHM
  16.242 +	bool
  16.243 +	depends on !M386
  16.244 +	default y
  16.245 +
  16.246 +config GENERIC_CALIBRATE_DELAY
  16.247 +	bool
  16.248 +	default y
  16.249 +
  16.250 +config X86_PPRO_FENCE
  16.251 +	bool
  16.252 +	depends on M686 || M586MMX || M586TSC || M586 || M486 || M386 || MGEODEGX1
  16.253 +	default y
  16.254 +
  16.255 +config X86_F00F_BUG
  16.256 +	bool
  16.257 +	depends on (M586MMX || M586TSC || M586 || M486 || M386) && !X86_NO_IDT
  16.258 +	default y
  16.259 +
  16.260 +config X86_WP_WORKS_OK
  16.261 +	bool
  16.262 +	depends on !M386
  16.263 +	default y
  16.264 +
  16.265 +config X86_INVLPG
  16.266 +	bool
  16.267 +	depends on !M386
  16.268 +	default y
  16.269 +
  16.270 +config X86_BSWAP
  16.271 +	bool
  16.272 +	depends on !M386
  16.273 +	default y
  16.274 +
  16.275 +config X86_POPAD_OK
  16.276 +	bool
  16.277 +	depends on !M386
  16.278 +	default y
  16.279 +
  16.280 +config X86_CMPXCHG64
  16.281 +	bool
  16.282 +	depends on !M386 && !M486
  16.283 +	default y
  16.284 +
  16.285 +config X86_ALIGNMENT_16
  16.286 +	bool
  16.287 +	depends on MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
  16.288 +	default y
  16.289 +
  16.290 +config X86_GOOD_APIC
  16.291 +	bool
  16.292 +	depends on MK7 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || MK8 || MEFFICEON
  16.293 +	default y
  16.294 +
  16.295 +config X86_INTEL_USERCOPY
  16.296 +	bool
  16.297 +	depends on MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M586MMX || X86_GENERIC || MK8 || MK7 || MEFFICEON
  16.298 +	default y
  16.299 +
  16.300 +config X86_USE_PPRO_CHECKSUM
  16.301 +	bool
  16.302 +	depends on MWINCHIP3D || MWINCHIP2 || MWINCHIPC6 || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MK8 || MVIAC3_2 || MEFFICEON || MGEODE_LX
  16.303 +	default y
  16.304 +
  16.305 +config X86_USE_3DNOW
  16.306 +	bool
  16.307 +	depends on MCYRIXIII || MK7 || MGEODE_LX
  16.308 +	default y
  16.309 +
  16.310 +config X86_OOSTORE
  16.311 +	bool
  16.312 +	depends on (MWINCHIP3D || MWINCHIP2 || MWINCHIPC6) && MTRR
  16.313 +	default y
  16.314 +
  16.315 +config X86_TSC
  16.316 +	bool
  16.317 +	depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1) && !X86_NUMAQ
  16.318 +	default y

    17.1 --- a/linux-2.6-xen-sparse/arch/i386/kernel/Makefile	Fri Feb 24 14:03:07 2006 -0700
    17.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/Makefile	Fri Feb 24 15:41:08 2006 -0700
    17.3 @@ -49,11 +49,13 @@ else
    17.4  vsyscall_note := vsyscall-note.o
    17.5  endif
    17.6  
    17.7 +VSYSCALL_TYPES-y			:= int80
    17.8 +VSYSCALL_TYPES-$(CONFIG_X86_SYSENTER)	+= sysenter
    17.9  # vsyscall.o contains the vsyscall DSO images as __initdata.
   17.10  # We must build both images before we can assemble it.
   17.11  # Note: kbuild does not track this dependency due to usage of .incbin
   17.12 -$(obj)/vsyscall.o: $(obj)/vsyscall-int80.so $(obj)/vsyscall-sysenter.so
   17.13 -targets += $(foreach F,int80 sysenter,vsyscall-$F.o vsyscall-$F.so)
   17.14 +$(obj)/vsyscall.o: $(foreach F,$(VSYSCALL_TYPES-y),$(obj)/vsyscall-$F.so)
   17.15 +targets += $(foreach F,$(VSYSCALL_TYPES-y),vsyscall-$F.o vsyscall-$F.so)
   17.16  targets += $(vsyscall_note) vsyscall.lds
   17.17  
   17.18  # The DSO images are built using a special linker script.
   17.19 @@ -81,7 +83,8 @@ extra-y += vsyscall-syms.o
   17.20  
   17.21  SYSCFLAGS_vsyscall-syms.o = -r
   17.22  $(obj)/vsyscall-syms.o: $(src)/vsyscall.lds \
   17.23 -			$(obj)/vsyscall-sysenter.o $(obj)/$(vsyscall_note) FORCE
   17.24 +			$(foreach F,$(VSYSCALL_TYPES-y),$(obj)/vsyscall-$F.o) \
   17.25 +			$(obj)/$(vsyscall_note) FORCE
   17.26  	$(call if_changed,syscall)
   17.27  
   17.28  ifdef CONFIG_XEN

    18.1 --- a/linux-2.6-xen-sparse/arch/i386/kernel/apic-xen.c	Fri Feb 24 14:03:07 2006 -0700
    18.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/apic-xen.c	Fri Feb 24 15:41:08 2006 -0700
    18.3 @@ -85,13 +85,6 @@ int get_physical_broadcast(void)
    18.4          return 0xff;
    18.5  }
    18.6  
    18.7 -#ifdef CONFIG_XEN
    18.8 -void switch_APIC_timer_to_ipi(void *cpumask) { }
    18.9 -EXPORT_SYMBOL(switch_APIC_timer_to_ipi);
   18.10 -void switch_ipi_to_APIC_timer(void *cpumask) { }
   18.11 -EXPORT_SYMBOL(switch_ipi_to_APIC_timer);
   18.12 -#endif
   18.13 -
   18.14  #ifndef CONFIG_XEN
   18.15  #ifndef CONFIG_SMP
   18.16  static void up_apic_timer_interrupt_call(struct pt_regs *regs)

    19.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    19.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/asm-offsets.c	Fri Feb 24 15:41:08 2006 -0700
    19.3 @@ -0,0 +1,75 @@
    19.4 +/*
    19.5 + * Generate definitions needed by assembly language modules.
    19.6 + * This code generates raw asm output which is post-processed
    19.7 + * to extract and format the required data.
    19.8 + */
    19.9 +
   19.10 +#include <linux/sched.h>
   19.11 +#include <linux/signal.h>
   19.12 +#include <linux/personality.h>
   19.13 +#include <linux/suspend.h>
   19.14 +#include <asm/ucontext.h>
   19.15 +#include "sigframe.h"
   19.16 +#include <asm/fixmap.h>
   19.17 +#include <asm/processor.h>
   19.18 +#include <asm/thread_info.h>
   19.19 +#include <asm/elf.h>
   19.20 +
   19.21 +#define DEFINE(sym, val) \
   19.22 +        asm volatile("\n->" #sym " %0 " #val : : "i" (val))
   19.23 +
   19.24 +#define BLANK() asm volatile("\n->" : : )
   19.25 +
   19.26 +#define OFFSET(sym, str, mem) \
   19.27 +	DEFINE(sym, offsetof(struct str, mem));
   19.28 +
   19.29 +void foo(void)
   19.30 +{
   19.31 +	OFFSET(SIGCONTEXT_eax, sigcontext, eax);
   19.32 +	OFFSET(SIGCONTEXT_ebx, sigcontext, ebx);
   19.33 +	OFFSET(SIGCONTEXT_ecx, sigcontext, ecx);
   19.34 +	OFFSET(SIGCONTEXT_edx, sigcontext, edx);
   19.35 +	OFFSET(SIGCONTEXT_esi, sigcontext, esi);
   19.36 +	OFFSET(SIGCONTEXT_edi, sigcontext, edi);
   19.37 +	OFFSET(SIGCONTEXT_ebp, sigcontext, ebp);
   19.38 +	OFFSET(SIGCONTEXT_esp, sigcontext, esp);
   19.39 +	OFFSET(SIGCONTEXT_eip, sigcontext, eip);
   19.40 +	BLANK();
   19.41 +
   19.42 +	OFFSET(CPUINFO_x86, cpuinfo_x86, x86);
   19.43 +	OFFSET(CPUINFO_x86_vendor, cpuinfo_x86, x86_vendor);
   19.44 +	OFFSET(CPUINFO_x86_model, cpuinfo_x86, x86_model);
   19.45 +	OFFSET(CPUINFO_x86_mask, cpuinfo_x86, x86_mask);
   19.46 +	OFFSET(CPUINFO_hard_math, cpuinfo_x86, hard_math);
   19.47 +	OFFSET(CPUINFO_cpuid_level, cpuinfo_x86, cpuid_level);
   19.48 +	OFFSET(CPUINFO_x86_capability, cpuinfo_x86, x86_capability);
   19.49 +	OFFSET(CPUINFO_x86_vendor_id, cpuinfo_x86, x86_vendor_id);
   19.50 +	BLANK();
   19.51 +
   19.52 +	OFFSET(TI_task, thread_info, task);
   19.53 +	OFFSET(TI_exec_domain, thread_info, exec_domain);
   19.54 +	OFFSET(TI_flags, thread_info, flags);
   19.55 +	OFFSET(TI_status, thread_info, status);
   19.56 +	OFFSET(TI_cpu, thread_info, cpu);
   19.57 +	OFFSET(TI_preempt_count, thread_info, preempt_count);
   19.58 +	OFFSET(TI_addr_limit, thread_info, addr_limit);
   19.59 +	OFFSET(TI_restart_block, thread_info, restart_block);
   19.60 +	BLANK();
   19.61 +
   19.62 +	OFFSET(EXEC_DOMAIN_handler, exec_domain, handler);
   19.63 +	OFFSET(RT_SIGFRAME_sigcontext, rt_sigframe, uc.uc_mcontext);
   19.64 +	BLANK();
   19.65 +
   19.66 +	OFFSET(pbe_address, pbe, address);
   19.67 +	OFFSET(pbe_orig_address, pbe, orig_address);
   19.68 +	OFFSET(pbe_next, pbe, next);
   19.69 +
   19.70 +#ifdef CONFIG_X86_SYSENTER
   19.71 +	/* Offset from the sysenter stack to tss.esp0 */
   19.72 +	DEFINE(TSS_sysenter_esp0, offsetof(struct tss_struct, esp0) -
   19.73 +		 sizeof(struct tss_struct));
   19.74 +#endif
   19.75 +
   19.76 +	DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
   19.77 +	DEFINE(VSYSCALL_BASE, VSYSCALL_BASE);
   19.78 +}

    20.1 --- a/linux-2.6-xen-sparse/arch/i386/kernel/cpu/common-xen.c	Fri Feb 24 14:03:07 2006 -0700
    20.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/cpu/common-xen.c	Fri Feb 24 15:41:08 2006 -0700
    20.3 @@ -583,7 +583,6 @@ void __cpuinit cpu_gdt_init(struct Xgt_d
    20.4  	}
    20.5  	if (HYPERVISOR_set_gdt(frames, gdt_descr->size / 8))
    20.6  		BUG();
    20.7 -	lgdt_finish();
    20.8  }
    20.9  
   20.10  /*
   20.11 @@ -595,7 +594,9 @@ void __cpuinit cpu_gdt_init(struct Xgt_d
   20.12  void __cpuinit cpu_init(void)
   20.13  {
   20.14  	int cpu = smp_processor_id();
   20.15 +#ifndef CONFIG_X86_NO_TSS
   20.16  	struct tss_struct * t = &per_cpu(init_tss, cpu);
   20.17 +#endif
   20.18  	struct thread_struct *thread = &current->thread;
   20.19  
   20.20  	if (cpu_test_and_set(cpu, cpu_initialized)) {

    21.1 --- a/linux-2.6-xen-sparse/arch/i386/kernel/entry-xen.S	Fri Feb 24 14:03:07 2006 -0700
    21.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/entry-xen.S	Fri Feb 24 15:41:08 2006 -0700
    21.3 @@ -223,6 +223,7 @@ need_resched:
    21.4  	jmp need_resched
    21.5  #endif
    21.6  
    21.7 +#ifdef CONFIG_X86_SYSENTER
    21.8  /* SYSENTER_RETURN points to after the "sysenter" instruction in
    21.9     the vsyscall page.  See vsyscall-sysentry.S, which defines the symbol.  */
   21.10  
   21.11 @@ -270,6 +271,7 @@ 1:	movl (%ebp),%ebp
   21.12  	xorl %ebp,%ebp
   21.13  	sti
   21.14  	sysexit
   21.15 +#endif /* CONFIG_X86_SYSENTER */
   21.16  
   21.17  
   21.18  	# system call handler stub
   21.19 @@ -662,6 +664,7 @@ ENTRY(device_not_available)
   21.20  	call math_state_restore
   21.21  	jmp ret_from_exception
   21.22  
   21.23 +#ifdef CONFIG_X86_SYSENTER
   21.24  /*
   21.25   * Debug traps and NMI can happen at the one SYSENTER instruction
   21.26   * that sets up the real kernel stack. Check here, since we can't
   21.27 @@ -683,12 +686,15 @@ label:						\
   21.28  	pushfl;					\
   21.29  	pushl $__KERNEL_CS;			\
   21.30  	pushl $sysenter_past_esp
   21.31 +#endif /* CONFIG_X86_SYSENTER */
   21.32  
   21.33  KPROBE_ENTRY(debug)
   21.34 +#ifdef CONFIG_X86_SYSENTER
   21.35  	cmpl $sysenter_entry,(%esp)
   21.36  	jne debug_stack_correct
   21.37  	FIX_STACK(12, debug_stack_correct, debug_esp_fix_insn)
   21.38  debug_stack_correct:
   21.39 +#endif /* !CONFIG_X86_SYSENTER */
   21.40  	pushl $-1			# mark this as an int
   21.41  	SAVE_ALL
   21.42  	xorl %edx,%edx			# error code 0

    22.1 --- a/linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S	Fri Feb 24 14:03:07 2006 -0700
    22.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S	Fri Feb 24 15:41:08 2006 -0700
    22.3 @@ -1,23 +1,11 @@
    22.4 -
    22.5 -#include <linux/config.h>
    22.6  
    22.7 -.section __xen_guest
    22.8 -	.ascii	"GUEST_OS=linux,GUEST_VER=2.6"
    22.9 -	.ascii	",XEN_VER=xen-3.0"
   22.10 -	.ascii	",VIRT_BASE=0xC0000000"
   22.11 -	.ascii	",HYPERCALL_PAGE=0x104" /* __pa(hypercall_page) >> 12 */
   22.12 -#ifdef CONFIG_X86_PAE
   22.13 -	.ascii	",PAE=yes"
   22.14 -#else
   22.15 -	.ascii	",PAE=no"
   22.16 -#endif
   22.17 -	.ascii	",LOADER=generic"
   22.18 -	.byte	0
   22.19  
   22.20  .text
   22.21 +#include <linux/config.h>
   22.22  #include <linux/threads.h>
   22.23  #include <linux/linkage.h>
   22.24  #include <asm/segment.h>
   22.25 +#include <asm/page.h>
   22.26  #include <asm/thread_info.h>
   22.27  #include <asm/asm-offsets.h>
   22.28  #include <xen/interface/arch-x86_32.h>
   22.29 @@ -37,15 +25,10 @@
   22.30  
   22.31  ENTRY(startup_32)
   22.32  	movl %esi,xen_start_info
   22.33 -
   22.34 -#if 0
   22.35 -ENTRY(startup_32_smp)
   22.36 -#endif /* CONFIG_SMP */
   22.37 -
   22.38  	cld
   22.39  
   22.40  	/* Set up the stack pointer */
   22.41 -	lss stack_start,%esp
   22.42 +	movl $(init_thread_union+THREAD_SIZE),%esp
   22.43  
   22.44  checkCPUtype:
   22.45  
   22.46 @@ -69,66 +52,54 @@ checkCPUtype:
   22.47  	movb %cl,X86_MASK
   22.48  	movl %edx,X86_CAPABILITY
   22.49  
   22.50 +	movb $1,X86_HARD_MATH
   22.51 +
   22.52  	xorl %eax,%eax			# Clear FS/GS and LDT
   22.53  	movl %eax,%fs
   22.54  	movl %eax,%gs
   22.55  	cld			# gcc2 wants the direction flag cleared at all times
   22.56  
   22.57 -#if 0
   22.58 -	movb ready, %cl
   22.59 -	movb $1, ready
   22.60 -	cmpb $0,%cl
   22.61 -	je 1f			# the first CPU calls start_kernel
   22.62 -				# all other CPUs call initialize_secondary
   22.63 -	call initialize_secondary
   22.64 -	jmp L6
   22.65 -1:
   22.66 -#endif /* CONFIG_SMP */
   22.67  	call start_kernel
   22.68  L6:
   22.69  	jmp L6			# main should never return here, but
   22.70  				# just in case, we know what happens.
   22.71  
   22.72 -ENTRY(lgdt_finish)
   22.73 -	movl $(__KERNEL_DS),%eax	# reload all the segment registers
   22.74 -	movw %ax,%ss			# after changing gdt.
   22.75 -
   22.76 -	movl $(__USER_DS),%eax		# DS/ES contains default USER segment
   22.77 -	movw %ax,%ds
   22.78 -	movw %ax,%es
   22.79 +#define HYPERCALL_PAGE_OFFSET 0x1000
   22.80 +.org HYPERCALL_PAGE_OFFSET
   22.81 +ENTRY(hypercall_page)
   22.82 +.skip 0x1000
   22.83  
   22.84 -	popl %eax			# reload CS by intersegment return
   22.85 -	pushl $(__KERNEL_CS)
   22.86 -	pushl %eax
   22.87 -	lret
   22.88 +/*
   22.89 + * Real beginning of normal "text" segment
   22.90 + */
   22.91 +ENTRY(stext)
   22.92 +ENTRY(_stext)
   22.93  
   22.94 -ENTRY(stack_start)
   22.95 -	.long init_thread_union+THREAD_SIZE
   22.96 -	.long __BOOT_DS
   22.97 +/*
   22.98 + * BSS section
   22.99 + */
  22.100 +.section ".bss.page_aligned","w"
  22.101 +ENTRY(empty_zero_page)
  22.102 +	.fill 4096,1,0
  22.103  
  22.104 -ready:	.byte 0
  22.105 -
  22.106 -.globl idt_descr
  22.107 -.globl cpu_gdt_descr
  22.108 +/*
  22.109 + * This starts the data section.
  22.110 + */
  22.111 +.data
  22.112  
  22.113  	ALIGN
  22.114 -	.word 0				# 32-bit align idt_desc.address
  22.115 -idt_descr:
  22.116 -	.word IDT_ENTRIES*8-1		# idt contains 256 entries
  22.117 -	.long idt_table
  22.118 -
  22.119 -# boot GDT descriptor (later on used by CPU#0):
  22.120  	.word 0				# 32 bit align gdt_desc.address
  22.121 +	.globl cpu_gdt_descr
  22.122  cpu_gdt_descr:
  22.123  	.word GDT_SIZE
  22.124  	.long cpu_gdt_table
  22.125  
  22.126  	.fill NR_CPUS-1,8,0		# space for the other GDT descriptors
  22.127  
  22.128 -.org 0x1000
  22.129 -ENTRY(empty_zero_page)
  22.130 -
  22.131 -.org 0x2000
  22.132 +/*
  22.133 + * The Global Descriptor Table contains 28 quadwords, per-CPU.
  22.134 + */
  22.135 +	.align PAGE_SIZE_asm
  22.136  ENTRY(cpu_gdt_table)
  22.137  	.quad 0x0000000000000000	/* NULL descriptor */
  22.138  	.quad 0x0000000000000000	/* 0x0b reserved */
  22.139 @@ -143,17 +114,10 @@ ENTRY(cpu_gdt_table)
  22.140  	.quad 0x0000000000000000	/* 0x53 reserved */
  22.141  	.quad 0x0000000000000000	/* 0x5b reserved */
  22.142  
  22.143 -#ifdef CONFIG_X86_PAE
  22.144 -	.quad 0x00cfbb00000067ff	/* 0x60 kernel 4GB code at 0x00000000 */
  22.145 -	.quad 0x00cfb300000067ff	/* 0x68 kernel 4GB data at 0x00000000 */
  22.146 -	.quad 0x00cffb00000067ff	/* 0x73 user 4GB code at 0x00000000 */
  22.147 -	.quad 0x00cff300000067ff	/* 0x7b user 4GB data at 0x00000000 */
  22.148 -#else
  22.149 -	.quad 0x00cfbb000000c3ff	/* 0x60 kernel 4GB code at 0x00000000 */
  22.150 -	.quad 0x00cfb3000000c3ff	/* 0x68 kernel 4GB data at 0x00000000 */
  22.151 -	.quad 0x00cffb000000c3ff	/* 0x73 user 4GB code at 0x00000000 */
  22.152 -	.quad 0x00cff3000000c3ff	/* 0x7b user 4GB data at 0x00000000 */
  22.153 -#endif
  22.154 +	.quad 0x00cf9a000000ffff	/* 0x60 kernel 4GB code at 0x00000000 */
  22.155 +	.quad 0x00cf92000000ffff	/* 0x68 kernel 4GB data at 0x00000000 */
  22.156 +	.quad 0x00cffa000000ffff	/* 0x73 user 4GB code at 0x00000000 */
  22.157 +	.quad 0x00cff2000000ffff	/* 0x7b user 4GB data at 0x00000000 */
  22.158  
  22.159  	.quad 0x0000000000000000	/* 0x80 TSS descriptor */
  22.160  	.quad 0x0000000000000000	/* 0x88 LDT descriptor */
  22.161 @@ -187,15 +151,36 @@ ENTRY(cpu_gdt_table)
  22.162  	/* Be sure this is zeroed to avoid false validations in Xen */
  22.163  	.fill PAGE_SIZE_asm / 8 - GDT_ENTRIES,8,0
  22.164  
  22.165 -.org 0x3000
  22.166 -ENTRY(default_ldt)
  22.167 -
  22.168 -.org 0x4000
  22.169 -ENTRY(hypercall_page)
  22.170  
  22.171 -.org 0x5000
  22.172  /*
  22.173 - * Real beginning of normal "text" segment
  22.174 + * __xen_guest information
  22.175   */
  22.176 -ENTRY(stext)
  22.177 -ENTRY(_stext)
  22.178 +.macro utoa value
  22.179 + .if (\value) < 0 || (\value) >= 0x10
  22.180 +	utoa (((\value)>>4)&0x0fffffff)
  22.181 + .endif
  22.182 + .if ((\value) & 0xf) < 10
  22.183 +  .byte '0' + ((\value) & 0xf)
  22.184 + .else
  22.185 +  .byte 'A' + ((\value) & 0xf) - 10
  22.186 + .endif
  22.187 +.endm
  22.188 +
  22.189 +.section __xen_guest
  22.190 +	.ascii	"GUEST_OS=linux,GUEST_VER=2.6"
  22.191 +	.ascii	",XEN_VER=xen-3.0"
  22.192 +	.ascii	",VIRT_BASE=0x"
  22.193 +		utoa __PAGE_OFFSET
  22.194 +	.ascii	",HYPERCALL_PAGE=0x"
  22.195 +		utoa ((__PHYSICAL_START+HYPERCALL_PAGE_OFFSET)>>PAGE_SHIFT)
  22.196 +	.ascii  ",FEATURES=writable_page_tables"
  22.197 +	.ascii	         "|writable_descriptor_tables"
  22.198 +	.ascii	         "|auto_translated_physmap"
  22.199 +	.ascii	         "|supervisor_mode_kernel"
  22.200 +#ifdef CONFIG_X86_PAE
  22.201 +	.ascii	",PAE=yes"
  22.202 +#else
  22.203 +	.ascii	",PAE=no"
  22.204 +#endif
  22.205 +	.ascii	",LOADER=generic"
  22.206 +	.byte	0

    23.1 --- a/linux-2.6-xen-sparse/arch/i386/kernel/init_task-xen.c	Fri Feb 24 14:03:07 2006 -0700
    23.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/init_task-xen.c	Fri Feb 24 15:41:08 2006 -0700
    23.3 @@ -41,9 +41,11 @@ struct task_struct init_task = INIT_TASK
    23.4  
    23.5  EXPORT_SYMBOL(init_task);
    23.6  
    23.7 +#ifndef CONFIG_X86_NO_TSS
    23.8  /*
    23.9   * per-CPU TSS segments. Threads are completely 'soft' on Linux,
   23.10   * no more per-task TSS's.
   23.11   */ 
   23.12  DEFINE_PER_CPU(struct tss_struct, init_tss) ____cacheline_internodealigned_in_smp = INIT_TSS;
   23.13 +#endif
   23.14  

    24.1 --- a/linux-2.6-xen-sparse/arch/i386/kernel/process-xen.c	Fri Feb 24 14:03:07 2006 -0700
    24.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/process-xen.c	Fri Feb 24 15:41:08 2006 -0700
    24.3 @@ -272,7 +272,7 @@ int kernel_thread(int (*fn)(void *), voi
    24.4  	regs.xes = __USER_DS;
    24.5  	regs.orig_eax = -1;
    24.6  	regs.eip = (unsigned long) kernel_thread_helper;
    24.7 -	regs.xcs = __KERNEL_CS;
    24.8 +	regs.xcs = GET_KERNEL_CS();
    24.9  	regs.eflags = X86_EFLAGS_IF | X86_EFLAGS_SF | X86_EFLAGS_PF | 0x2;
   24.10  
   24.11  	/* Ok, create the new process.. */
   24.12 @@ -518,7 +518,9 @@ struct task_struct fastcall * __switch_t
   24.13  	struct thread_struct *prev = &prev_p->thread,
   24.14  				 *next = &next_p->thread;
   24.15  	int cpu = smp_processor_id();
   24.16 +#ifndef CONFIG_X86_NO_TSS
   24.17  	struct tss_struct *tss = &per_cpu(init_tss, cpu);
   24.18 +#endif
   24.19  	physdev_op_t iopl_op, iobmp_op;
   24.20  	multicall_entry_t _mcl[8], *mcl = _mcl;
   24.21  
   24.22 @@ -543,10 +545,9 @@ struct task_struct fastcall * __switch_t
   24.23  	 * Reload esp0.
   24.24  	 * This is load_esp0(tss, next) with a multicall.
   24.25  	 */
   24.26 -	tss->esp0 = next->esp0;
   24.27  	mcl->op      = __HYPERVISOR_stack_switch;
   24.28 -	mcl->args[0] = tss->ss0;
   24.29 -	mcl->args[1] = tss->esp0;
   24.30 +	mcl->args[0] = __KERNEL_DS;
   24.31 +	mcl->args[1] = next->esp0;
   24.32  	mcl++;
   24.33  
   24.34  	/*

    25.1 --- a/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c	Fri Feb 24 14:03:07 2006 -0700
    25.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c	Fri Feb 24 15:41:08 2006 -0700
    25.3 @@ -94,9 +94,9 @@ EXPORT_SYMBOL(efi_enabled);
    25.4  #endif
    25.5  
    25.6  /* cpu data as detected by the assembly code in head.S */
    25.7 -struct cpuinfo_x86 new_cpu_data __initdata = { 0, 0, 0, 0, -1, 0, 1, 0, -1 };
    25.8 +struct cpuinfo_x86 new_cpu_data __initdata = { 0, 0, 0, 0, -1, 1, 0, 0, -1 };
    25.9  /* common cpu data for all cpus */
   25.10 -struct cpuinfo_x86 boot_cpu_data __read_mostly = { 0, 0, 0, 0, -1, 0, 1, 0, -1 };
   25.11 +struct cpuinfo_x86 boot_cpu_data __read_mostly = { 0, 0, 0, 0, -1, 1, 0, 0, -1 };
   25.12  EXPORT_SYMBOL(boot_cpu_data);
   25.13  
   25.14  unsigned long mmu_cr4_features;

    26.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    26.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/sysenter.c	Fri Feb 24 15:41:08 2006 -0700
    26.3 @@ -0,0 +1,137 @@
    26.4 +/*
    26.5 + * linux/arch/i386/kernel/sysenter.c
    26.6 + *
    26.7 + * (C) Copyright 2002 Linus Torvalds
    26.8 + *
    26.9 + * This file contains the needed initializations to support sysenter.
   26.10 + */
   26.11 +
   26.12 +#include <linux/init.h>
   26.13 +#include <linux/smp.h>
   26.14 +#include <linux/thread_info.h>
   26.15 +#include <linux/sched.h>
   26.16 +#include <linux/gfp.h>
   26.17 +#include <linux/string.h>
   26.18 +#include <linux/elf.h>
   26.19 +#include <linux/mm.h>
   26.20 +
   26.21 +#include <asm/cpufeature.h>
   26.22 +#include <asm/msr.h>
   26.23 +#include <asm/pgtable.h>
   26.24 +#include <asm/unistd.h>
   26.25 +
   26.26 +extern asmlinkage void sysenter_entry(void);
   26.27 +
   26.28 +void enable_sep_cpu(void)
   26.29 +{
   26.30 +#ifdef CONFIG_X86_SYSENTER
   26.31 +	int cpu = get_cpu();
   26.32 +	struct tss_struct *tss = &per_cpu(init_tss, cpu);
   26.33 +
   26.34 +	if (!boot_cpu_has(X86_FEATURE_SEP)) {
   26.35 +		put_cpu();
   26.36 +		return;
   26.37 +	}
   26.38 +
   26.39 +	tss->ss1 = __KERNEL_CS;
   26.40 +	tss->esp1 = sizeof(struct tss_struct) + (unsigned long) tss;
   26.41 +	wrmsr(MSR_IA32_SYSENTER_CS, __KERNEL_CS, 0);
   26.42 +	wrmsr(MSR_IA32_SYSENTER_ESP, tss->esp1, 0);
   26.43 +	wrmsr(MSR_IA32_SYSENTER_EIP, (unsigned long) sysenter_entry, 0);
   26.44 +	put_cpu();	
   26.45 +#endif
   26.46 +}
   26.47 +
   26.48 +/*
   26.49 + * These symbols are defined by vsyscall.o to mark the bounds
   26.50 + * of the ELF DSO images included therein.
   26.51 + */
   26.52 +extern const char vsyscall_int80_start, vsyscall_int80_end;
   26.53 +extern const char vsyscall_sysenter_start, vsyscall_sysenter_end;
   26.54 +static void *syscall_page;
   26.55 +
   26.56 +int __init sysenter_setup(void)
   26.57 +{
   26.58 +	syscall_page = (void *)get_zeroed_page(GFP_ATOMIC);
   26.59 +
   26.60 +#ifdef CONFIG_X86_SYSENTER
   26.61 +	if (boot_cpu_has(X86_FEATURE_SEP)) {
   26.62 +		memcpy(syscall_page,
   26.63 +		       &vsyscall_sysenter_start,
   26.64 +		       &vsyscall_sysenter_end - &vsyscall_sysenter_start);
   26.65 +		return 0;
   26.66 +	}
   26.67 +#endif
   26.68 +
   26.69 +	memcpy(syscall_page,
   26.70 +	       &vsyscall_int80_start,
   26.71 +	       &vsyscall_int80_end - &vsyscall_int80_start);
   26.72 +
   26.73 +	return 0;
   26.74 +}
   26.75 +
   26.76 +static struct page*
   26.77 +syscall_nopage(struct vm_area_struct *vma, unsigned long adr, int *type)
   26.78 +{
   26.79 +	struct page *p = virt_to_page(adr - vma->vm_start + syscall_page);
   26.80 +	get_page(p);
   26.81 +	return p;
   26.82 +}
   26.83 +
   26.84 +/* Prevent VMA merging */
   26.85 +static void syscall_vma_close(struct vm_area_struct *vma)
   26.86 +{
   26.87 +}
   26.88 +
   26.89 +static struct vm_operations_struct syscall_vm_ops = {
   26.90 +	.close = syscall_vma_close,
   26.91 +	.nopage = syscall_nopage,
   26.92 +};
   26.93 +
   26.94 +/* Setup a VMA at program startup for the vsyscall page */
   26.95 +int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack)
   26.96 +{
   26.97 +	struct vm_area_struct *vma;
   26.98 +	struct mm_struct *mm = current->mm;
   26.99 +	int ret;
  26.100 +
  26.101 +	vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);
  26.102 +	if (!vma)
  26.103 +		return -ENOMEM;
  26.104 +
  26.105 +	memset(vma, 0, sizeof(struct vm_area_struct));
  26.106 +	/* Could randomize here */
  26.107 +	vma->vm_start = VSYSCALL_BASE;
  26.108 +	vma->vm_end = VSYSCALL_BASE + PAGE_SIZE;
  26.109 +	/* MAYWRITE to allow gdb to COW and set breakpoints */
  26.110 +	vma->vm_flags = VM_READ|VM_EXEC|VM_MAYREAD|VM_MAYEXEC|VM_MAYWRITE;
  26.111 +	vma->vm_flags |= mm->def_flags;
  26.112 +	vma->vm_page_prot = protection_map[vma->vm_flags & 7];
  26.113 +	vma->vm_ops = &syscall_vm_ops;
  26.114 +	vma->vm_mm = mm;
  26.115 +
  26.116 +	down_write(&mm->mmap_sem);
  26.117 +	if ((ret = insert_vm_struct(mm, vma))) {
  26.118 +		up_write(&mm->mmap_sem);
  26.119 +		kmem_cache_free(vm_area_cachep, vma);
  26.120 +		return ret;
  26.121 +	}
  26.122 +	mm->total_vm++;
  26.123 +	up_write(&mm->mmap_sem);
  26.124 +	return 0;
  26.125 +}
  26.126 +
  26.127 +struct vm_area_struct *get_gate_vma(struct task_struct *tsk)
  26.128 +{
  26.129 +	return NULL;
  26.130 +}
  26.131 +
  26.132 +int in_gate_area(struct task_struct *task, unsigned long addr)
  26.133 +{
  26.134 +	return 0;
  26.135 +}
  26.136 +
  26.137 +int in_gate_area_no_task(unsigned long addr)
  26.138 +{
  26.139 +	return 0;
  26.140 +}

    27.1 --- a/linux-2.6-xen-sparse/arch/i386/kernel/traps-xen.c	Fri Feb 24 14:03:07 2006 -0700
    27.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/traps-xen.c	Fri Feb 24 15:41:08 2006 -0700
    27.3 @@ -58,15 +58,20 @@
    27.4  
    27.5  asmlinkage int system_call(void);
    27.6  
    27.7 +struct desc_struct default_ldt[] = { { 0, 0 }, { 0, 0 }, { 0, 0 },
    27.8 +		{ 0, 0 }, { 0, 0 } };
    27.9 +
   27.10  /* Do we ignore FPU interrupts ? */
   27.11  char ignore_fpu_irq = 0;
   27.12  
   27.13 +#ifndef CONFIG_X86_NO_IDT
   27.14  /*
   27.15   * The IDT has to be page-aligned to simplify the Pentium
   27.16   * F0 0F bug workaround.. We have a special link segment
   27.17   * for this.
   27.18   */
   27.19  struct desc_struct idt_table[256] __attribute__((__section__(".data.idt"))) = { {0, 0}, };
   27.20 +#endif
   27.21  
   27.22  asmlinkage void divide_error(void);
   27.23  asmlinkage void debug(void);
   27.24 @@ -496,20 +501,6 @@ DO_ERROR_INFO(32, SIGSEGV, "iret excepti
   27.25  fastcall void __kprobes do_general_protection(struct pt_regs * regs,
   27.26  					      long error_code)
   27.27  {
   27.28 -	/*
   27.29 -	 * If we trapped on an LDT access then ensure that the default_ldt is
   27.30 -	 * loaded, if nothing else. We load default_ldt lazily because LDT
   27.31 -	 * switching costs time and many applications don't need it.
   27.32 -	 */
   27.33 -	if (unlikely((error_code & 6) == 4)) {
   27.34 -		unsigned long ldt;
   27.35 -		__asm__ __volatile__ ("sldt %0" : "=r" (ldt));
   27.36 -		if (ldt == 0) {
   27.37 -			xen_set_ldt((unsigned long)&default_ldt[0], 5);
   27.38 -			return;
   27.39 -		}
   27.40 -	}
   27.41 -
   27.42  	current->thread.error_code = error_code;
   27.43  	current->thread.trap_no = 13;
   27.44  
   27.45 @@ -1079,13 +1070,6 @@ void __init trap_init(void)
   27.46  	}
   27.47  
   27.48  	/*
   27.49 -	 * default LDT is a single-entry callgate to lcall7 for iBCS
   27.50 -	 * and a callgate to lcall27 for Solaris/x86 binaries
   27.51 -	 */
   27.52 -	make_lowmem_page_readonly(
   27.53 -		&default_ldt[0], XENFEAT_writable_descriptor_tables);
   27.54 -
   27.55 -	/*
   27.56  	 * Should be a barrier for any external CPU state.
   27.57  	 */
   27.58  	cpu_init();
   27.59 @@ -1094,12 +1078,6 @@ void __init trap_init(void)
   27.60  void smp_trap_init(trap_info_t *trap_ctxt)
   27.61  {
   27.62  	trap_info_t *t = trap_table;
   27.63 -	int i;
   27.64 -
   27.65 -	for (i = 0; i < 256; i++) {
   27.66 -		trap_ctxt[i].vector = i;
   27.67 -		trap_ctxt[i].cs     = FLAT_KERNEL_CS;
   27.68 -	}
   27.69  
   27.70  	for (t = trap_table; t->address; t++) {
   27.71  		trap_ctxt[t->vector].flags = t->flags;

    28.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    28.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/vm86.c	Fri Feb 24 15:41:08 2006 -0700
    28.3 @@ -0,0 +1,817 @@
    28.4 +/*
    28.5 + *  linux/kernel/vm86.c
    28.6 + *
    28.7 + *  Copyright (C) 1994  Linus Torvalds
    28.8 + *
    28.9 + *  29 dec 2001 - Fixed oopses caused by unchecked access to the vm86
   28.10 + *                stack - Manfred Spraul <manfred@colorfullife.com>
   28.11 + *
   28.12 + *  22 mar 2002 - Manfred detected the stackfaults, but didn't handle
   28.13 + *                them correctly. Now the emulation will be in a
   28.14 + *                consistent state after stackfaults - Kasper Dupont
   28.15 + *                <kasperd@daimi.au.dk>
   28.16 + *
   28.17 + *  22 mar 2002 - Added missing clear_IF in set_vflags_* Kasper Dupont
   28.18 + *                <kasperd@daimi.au.dk>
   28.19 + *
   28.20 + *  ?? ??? 2002 - Fixed premature returns from handle_vm86_fault
   28.21 + *                caused by Kasper Dupont's changes - Stas Sergeev
   28.22 + *
   28.23 + *   4 apr 2002 - Fixed CHECK_IF_IN_TRAP broken by Stas' changes.
   28.24 + *                Kasper Dupont <kasperd@daimi.au.dk>
   28.25 + *
   28.26 + *   9 apr 2002 - Changed syntax of macros in handle_vm86_fault.
   28.27 + *                Kasper Dupont <kasperd@daimi.au.dk>
   28.28 + *
   28.29 + *   9 apr 2002 - Changed stack access macros to jump to a label
   28.30 + *                instead of returning to userspace. This simplifies
   28.31 + *                do_int, and is needed by handle_vm6_fault. Kasper
   28.32 + *                Dupont <kasperd@daimi.au.dk>
   28.33 + *
   28.34 + */
   28.35 +
   28.36 +#include <linux/capability.h>
   28.37 +#include <linux/config.h>
   28.38 +#include <linux/errno.h>
   28.39 +#include <linux/interrupt.h>
   28.40 +#include <linux/sched.h>
   28.41 +#include <linux/kernel.h>
   28.42 +#include <linux/signal.h>
   28.43 +#include <linux/string.h>
   28.44 +#include <linux/mm.h>
   28.45 +#include <linux/smp.h>
   28.46 +#include <linux/smp_lock.h>
   28.47 +#include <linux/highmem.h>
   28.48 +#include <linux/ptrace.h>
   28.49 +
   28.50 +#include <asm/uaccess.h>
   28.51 +#include <asm/io.h>
   28.52 +#include <asm/tlbflush.h>
   28.53 +#include <asm/irq.h>
   28.54 +
   28.55 +/*
   28.56 + * Known problems:
   28.57 + *
   28.58 + * Interrupt handling is not guaranteed:
   28.59 + * - a real x86 will disable all interrupts for one instruction
   28.60 + *   after a "mov ss,xx" to make stack handling atomic even without
   28.61 + *   the 'lss' instruction. We can't guarantee this in v86 mode,
   28.62 + *   as the next instruction might result in a page fault or similar.
   28.63 + * - a real x86 will have interrupts disabled for one instruction
   28.64 + *   past the 'sti' that enables them. We don't bother with all the
   28.65 + *   details yet.
   28.66 + *
   28.67 + * Let's hope these problems do not actually matter for anything.
   28.68 + */
   28.69 +
   28.70 +
   28.71 +#define KVM86	((struct kernel_vm86_struct *)regs)
   28.72 +#define VMPI 	KVM86->vm86plus
   28.73 +
   28.74 +
   28.75 +/*
   28.76 + * 8- and 16-bit register defines..
   28.77 + */
   28.78 +#define AL(regs)	(((unsigned char *)&((regs)->eax))[0])
   28.79 +#define AH(regs)	(((unsigned char *)&((regs)->eax))[1])
   28.80 +#define IP(regs)	(*(unsigned short *)&((regs)->eip))
   28.81 +#define SP(regs)	(*(unsigned short *)&((regs)->esp))
   28.82 +
   28.83 +/*
   28.84 + * virtual flags (16 and 32-bit versions)
   28.85 + */
   28.86 +#define VFLAGS	(*(unsigned short *)&(current->thread.v86flags))
   28.87 +#define VEFLAGS	(current->thread.v86flags)
   28.88 +
   28.89 +#define set_flags(X,new,mask) \
   28.90 +((X) = ((X) & ~(mask)) | ((new) & (mask)))
   28.91 +
   28.92 +#define SAFE_MASK	(0xDD5)
   28.93 +#define RETURN_MASK	(0xDFF)
   28.94 +
   28.95 +#define VM86_REGS_PART2 orig_eax
   28.96 +#define VM86_REGS_SIZE1 \
   28.97 +        ( (unsigned)( & (((struct kernel_vm86_regs *)0)->VM86_REGS_PART2) ) )
   28.98 +#define VM86_REGS_SIZE2 (sizeof(struct kernel_vm86_regs) - VM86_REGS_SIZE1)
   28.99 +
  28.100 +struct pt_regs * FASTCALL(save_v86_state(struct kernel_vm86_regs * regs));
  28.101 +struct pt_regs * fastcall save_v86_state(struct kernel_vm86_regs * regs)
  28.102 +{
  28.103 +#ifndef CONFIG_X86_NO_TSS
  28.104 +	struct tss_struct *tss;
  28.105 +#endif
  28.106 +	struct pt_regs *ret;
  28.107 +	unsigned long tmp;
  28.108 +
  28.109 +	/*
  28.110 +	 * This gets called from entry.S with interrupts disabled, but
  28.111 +	 * from process context. Enable interrupts here, before trying
  28.112 +	 * to access user space.
  28.113 +	 */
  28.114 +	local_irq_enable();
  28.115 +
  28.116 +	if (!current->thread.vm86_info) {
  28.117 +		printk("no vm86_info: BAD\n");
  28.118 +		do_exit(SIGSEGV);
  28.119 +	}
  28.120 +	set_flags(regs->eflags, VEFLAGS, VIF_MASK | current->thread.v86mask);
  28.121 +	tmp = copy_to_user(&current->thread.vm86_info->regs,regs, VM86_REGS_SIZE1);
  28.122 +	tmp += copy_to_user(&current->thread.vm86_info->regs.VM86_REGS_PART2,
  28.123 +		&regs->VM86_REGS_PART2, VM86_REGS_SIZE2);
  28.124 +	tmp += put_user(current->thread.screen_bitmap,&current->thread.vm86_info->screen_bitmap);
  28.125 +	if (tmp) {
  28.126 +		printk("vm86: could not access userspace vm86_info\n");
  28.127 +		do_exit(SIGSEGV);
  28.128 +	}
  28.129 +
  28.130 +#ifndef CONFIG_X86_NO_TSS
  28.131 +	tss = &per_cpu(init_tss, get_cpu());
  28.132 +#endif
  28.133 +	current->thread.esp0 = current->thread.saved_esp0;
  28.134 +	current->thread.sysenter_cs = __KERNEL_CS;
  28.135 +	load_esp0(tss, &current->thread);
  28.136 +	current->thread.saved_esp0 = 0;
  28.137 +	put_cpu();
  28.138 +
  28.139 +	loadsegment(fs, current->thread.saved_fs);
  28.140 +	loadsegment(gs, current->thread.saved_gs);
  28.141 +	ret = KVM86->regs32;
  28.142 +	return ret;
  28.143 +}
  28.144 +
  28.145 +static void mark_screen_rdonly(struct mm_struct *mm)
  28.146 +{
  28.147 +	pgd_t *pgd;
  28.148 +	pud_t *pud;
  28.149 +	pmd_t *pmd;
  28.150 +	pte_t *pte;
  28.151 +	spinlock_t *ptl;
  28.152 +	int i;
  28.153 +
  28.154 +	pgd = pgd_offset(mm, 0xA0000);
  28.155 +	if (pgd_none_or_clear_bad(pgd))
  28.156 +		goto out;
  28.157 +	pud = pud_offset(pgd, 0xA0000);
  28.158 +	if (pud_none_or_clear_bad(pud))
  28.159 +		goto out;
  28.160 +	pmd = pmd_offset(pud, 0xA0000);
  28.161 +	if (pmd_none_or_clear_bad(pmd))
  28.162 +		goto out;
  28.163 +	pte = pte_offset_map_lock(mm, pmd, 0xA0000, &ptl);
  28.164 +	for (i = 0; i < 32; i++) {
  28.165 +		if (pte_present(*pte))
  28.166 +			set_pte(pte, pte_wrprotect(*pte));
  28.167 +		pte++;
  28.168 +	}
  28.169 +	pte_unmap_unlock(pte, ptl);
  28.170 +out:
  28.171 +	flush_tlb();
  28.172 +}
  28.173 +
  28.174 +
  28.175 +
  28.176 +static int do_vm86_irq_handling(int subfunction, int irqnumber);
  28.177 +static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk);
  28.178 +
  28.179 +asmlinkage int sys_vm86old(struct pt_regs regs)
  28.180 +{
  28.181 +	struct vm86_struct __user *v86 = (struct vm86_struct __user *)regs.ebx;
  28.182 +	struct kernel_vm86_struct info; /* declare this _on top_,
  28.183 +					 * this avoids wasting of stack space.
  28.184 +					 * This remains on the stack until we
  28.185 +					 * return to 32 bit user space.
  28.186 +					 */
  28.187 +	struct task_struct *tsk;
  28.188 +	int tmp, ret = -EPERM;
  28.189 +
  28.190 +	tsk = current;
  28.191 +	if (tsk->thread.saved_esp0)
  28.192 +		goto out;
  28.193 +	tmp  = copy_from_user(&info, v86, VM86_REGS_SIZE1);
  28.194 +	tmp += copy_from_user(&info.regs.VM86_REGS_PART2, &v86->regs.VM86_REGS_PART2,
  28.195 +		(long)&info.vm86plus - (long)&info.regs.VM86_REGS_PART2);
  28.196 +	ret = -EFAULT;
  28.197 +	if (tmp)
  28.198 +		goto out;
  28.199 +	memset(&info.vm86plus, 0, (int)&info.regs32 - (int)&info.vm86plus);
  28.200 +	info.regs32 = &regs;
  28.201 +	tsk->thread.vm86_info = v86;
  28.202 +	do_sys_vm86(&info, tsk);
  28.203 +	ret = 0;	/* we never return here */
  28.204 +out:
  28.205 +	return ret;
  28.206 +}
  28.207 +
  28.208 +
  28.209 +asmlinkage int sys_vm86(struct pt_regs regs)
  28.210 +{
  28.211 +	struct kernel_vm86_struct info; /* declare this _on top_,
  28.212 +					 * this avoids wasting of stack space.
  28.213 +					 * This remains on the stack until we
  28.214 +					 * return to 32 bit user space.
  28.215 +					 */
  28.216 +	struct task_struct *tsk;
  28.217 +	int tmp, ret;
  28.218 +	struct vm86plus_struct __user *v86;
  28.219 +
  28.220 +	tsk = current;
  28.221 +	switch (regs.ebx) {
  28.222 +		case VM86_REQUEST_IRQ:
  28.223 +		case VM86_FREE_IRQ:
  28.224 +		case VM86_GET_IRQ_BITS:
  28.225 +		case VM86_GET_AND_RESET_IRQ:
  28.226 +			ret = do_vm86_irq_handling(regs.ebx, (int)regs.ecx);
  28.227 +			goto out;
  28.228 +		case VM86_PLUS_INSTALL_CHECK:
  28.229 +			/* NOTE: on old vm86 stuff this will return the error
  28.230 +			   from access_ok(), because the subfunction is
  28.231 +			   interpreted as (invalid) address to vm86_struct.
  28.232 +			   So the installation check works.
  28.233 +			 */
  28.234 +			ret = 0;
  28.235 +			goto out;
  28.236 +	}
  28.237 +
  28.238 +	/* we come here only for functions VM86_ENTER, VM86_ENTER_NO_BYPASS */
  28.239 +	ret = -EPERM;
  28.240 +	if (tsk->thread.saved_esp0)
  28.241 +		goto out;
  28.242 +	v86 = (struct vm86plus_struct __user *)regs.ecx;
  28.243 +	tmp  = copy_from_user(&info, v86, VM86_REGS_SIZE1);
  28.244 +	tmp += copy_from_user(&info.regs.VM86_REGS_PART2, &v86->regs.VM86_REGS_PART2,
  28.245 +		(long)&info.regs32 - (long)&info.regs.VM86_REGS_PART2);
  28.246 +	ret = -EFAULT;
  28.247 +	if (tmp)
  28.248 +		goto out;
  28.249 +	info.regs32 = &regs;
  28.250 +	info.vm86plus.is_vm86pus = 1;
  28.251 +	tsk->thread.vm86_info = (struct vm86_struct __user *)v86;
  28.252 +	do_sys_vm86(&info, tsk);
  28.253 +	ret = 0;	/* we never return here */
  28.254 +out:
  28.255 +	return ret;
  28.256 +}
  28.257 +
  28.258 +
  28.259 +static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk)
  28.260 +{
  28.261 +#ifndef CONFIG_X86_NO_TSS
  28.262 +	struct tss_struct *tss;
  28.263 +#endif
  28.264 +/*
  28.265 + * make sure the vm86() system call doesn't try to do anything silly
  28.266 + */
  28.267 +	info->regs.__null_ds = 0;
  28.268 +	info->regs.__null_es = 0;
  28.269 +
  28.270 +/* we are clearing fs,gs later just before "jmp resume_userspace",
  28.271 + * because starting with Linux 2.1.x they aren't no longer saved/restored
  28.272 + */
  28.273 +
  28.274 +/*
  28.275 + * The eflags register is also special: we cannot trust that the user
  28.276 + * has set it up safely, so this makes sure interrupt etc flags are
  28.277 + * inherited from protected mode.
  28.278 + */
  28.279 + 	VEFLAGS = info->regs.eflags;
  28.280 +	info->regs.eflags &= SAFE_MASK;
  28.281 +	info->regs.eflags |= info->regs32->eflags & ~SAFE_MASK;
  28.282 +	info->regs.eflags |= VM_MASK;
  28.283 +
  28.284 +	switch (info->cpu_type) {
  28.285 +		case CPU_286:
  28.286 +			tsk->thread.v86mask = 0;
  28.287 +			break;
  28.288 +		case CPU_386:
  28.289 +			tsk->thread.v86mask = NT_MASK | IOPL_MASK;
  28.290 +			break;
  28.291 +		case CPU_486:
  28.292 +			tsk->thread.v86mask = AC_MASK | NT_MASK | IOPL_MASK;
  28.293 +			break;
  28.294 +		default:
  28.295 +			tsk->thread.v86mask = ID_MASK | AC_MASK | NT_MASK | IOPL_MASK;
  28.296 +			break;
  28.297 +	}
  28.298 +
  28.299 +/*
  28.300 + * Save old state, set default return value (%eax) to 0
  28.301 + */
  28.302 +	info->regs32->eax = 0;
  28.303 +	tsk->thread.saved_esp0 = tsk->thread.esp0;
  28.304 +	savesegment(fs, tsk->thread.saved_fs);
  28.305 +	savesegment(gs, tsk->thread.saved_gs);
  28.306 +
  28.307 +#ifndef CONFIG_X86_NO_TSS
  28.308 +	tss = &per_cpu(init_tss, get_cpu());
  28.309 +#endif
  28.310 +	tsk->thread.esp0 = (unsigned long) &info->VM86_TSS_ESP0;
  28.311 +	if (cpu_has_sep)
  28.312 +		tsk->thread.sysenter_cs = 0;
  28.313 +	load_esp0(tss, &tsk->thread);
  28.314 +	put_cpu();
  28.315 +
  28.316 +	tsk->thread.screen_bitmap = info->screen_bitmap;
  28.317 +	if (info->flags & VM86_SCREEN_BITMAP)
  28.318 +		mark_screen_rdonly(tsk->mm);
  28.319 +	__asm__ __volatile__(
  28.320 +		"xorl %%eax,%%eax; movl %%eax,%%fs; movl %%eax,%%gs\n\t"
  28.321 +		"movl %0,%%esp\n\t"
  28.322 +		"movl %1,%%ebp\n\t"
  28.323 +		"jmp resume_userspace"
  28.324 +		: /* no outputs */
  28.325 +		:"r" (&info->regs), "r" (task_thread_info(tsk)) : "ax");
  28.326 +	/* we never return here */
  28.327 +}
  28.328 +
  28.329 +static inline void return_to_32bit(struct kernel_vm86_regs * regs16, int retval)
  28.330 +{
  28.331 +	struct pt_regs * regs32;
  28.332 +
  28.333 +	regs32 = save_v86_state(regs16);
  28.334 +	regs32->eax = retval;
  28.335 +	__asm__ __volatile__("movl %0,%%esp\n\t"
  28.336 +		"movl %1,%%ebp\n\t"
  28.337 +		"jmp resume_userspace"
  28.338 +		: : "r" (regs32), "r" (current_thread_info()));
  28.339 +}
  28.340 +
  28.341 +static inline void set_IF(struct kernel_vm86_regs * regs)
  28.342 +{
  28.343 +	VEFLAGS |= VIF_MASK;
  28.344 +	if (VEFLAGS & VIP_MASK)
  28.345 +		return_to_32bit(regs, VM86_STI);
  28.346 +}
  28.347 +
  28.348 +static inline void clear_IF(struct kernel_vm86_regs * regs)
  28.349 +{
  28.350 +	VEFLAGS &= ~VIF_MASK;
  28.351 +}
  28.352 +
  28.353 +static inline void clear_TF(struct kernel_vm86_regs * regs)
  28.354 +{
  28.355 +	regs->eflags &= ~TF_MASK;
  28.356 +}
  28.357 +
  28.358 +static inline void clear_AC(struct kernel_vm86_regs * regs)
  28.359 +{
  28.360 +	regs->eflags &= ~AC_MASK;
  28.361 +}
  28.362 +
  28.363 +/* It is correct to call set_IF(regs) from the set_vflags_*
  28.364 + * functions. However someone forgot to call clear_IF(regs)
  28.365 + * in the opposite case.
  28.366 + * After the command sequence CLI PUSHF STI POPF you should
  28.367 + * end up with interrups disabled, but you ended up with
  28.368 + * interrupts enabled.
  28.369 + *  ( I was testing my own changes, but the only bug I
  28.370 + *    could find was in a function I had not changed. )
  28.371 + * [KD]
  28.372 + */
  28.373 +
  28.374 +static inline void set_vflags_long(unsigned long eflags, struct kernel_vm86_regs * regs)
  28.375 +{
  28.376 +	set_flags(VEFLAGS, eflags, current->thread.v86mask);
  28.377 +	set_flags(regs->eflags, eflags, SAFE_MASK);
  28.378 +	if (eflags & IF_MASK)
  28.379 +		set_IF(regs);
  28.380 +	else
  28.381 +		clear_IF(regs);
  28.382 +}
  28.383 +
  28.384 +static inline void set_vflags_short(unsigned short flags, struct kernel_vm86_regs * regs)
  28.385 +{
  28.386 +	set_flags(VFLAGS, flags, current->thread.v86mask);
  28.387 +	set_flags(regs->eflags, flags, SAFE_MASK);
  28.388 +	if (flags & IF_MASK)
  28.389 +		set_IF(regs);
  28.390 +	else
  28.391 +		clear_IF(regs);
  28.392 +}
  28.393 +
  28.394 +static inline unsigned long get_vflags(struct kernel_vm86_regs * regs)
  28.395 +{
  28.396 +	unsigned long flags = regs->eflags & RETURN_MASK;
  28.397 +
  28.398 +	if (VEFLAGS & VIF_MASK)
  28.399 +		flags |= IF_MASK;
  28.400 +	flags |= IOPL_MASK;
  28.401 +	return flags | (VEFLAGS & current->thread.v86mask);
  28.402 +}
  28.403 +
  28.404 +static inline int is_revectored(int nr, struct revectored_struct * bitmap)
  28.405 +{
  28.406 +	__asm__ __volatile__("btl %2,%1\n\tsbbl %0,%0"
  28.407 +		:"=r" (nr)
  28.408 +		:"m" (*bitmap),"r" (nr));
  28.409 +	return nr;
  28.410 +}
  28.411 +
  28.412 +#define val_byte(val, n) (((__u8 *)&val)[n])
  28.413 +
  28.414 +#define pushb(base, ptr, val, err_label) \
  28.415 +	do { \
  28.416 +		__u8 __val = val; \
  28.417 +		ptr--; \
  28.418 +		if (put_user(__val, base + ptr) < 0) \
  28.419 +			goto err_label; \
  28.420 +	} while(0)
  28.421 +
  28.422 +#define pushw(base, ptr, val, err_label) \
  28.423 +	do { \
  28.424 +		__u16 __val = val; \
  28.425 +		ptr--; \
  28.426 +		if (put_user(val_byte(__val, 1), base + ptr) < 0) \
  28.427 +			goto err_label; \
  28.428 +		ptr--; \
  28.429 +		if (put_user(val_byte(__val, 0), base + ptr) < 0) \
  28.430 +			goto err_label; \
  28.431 +	} while(0)
  28.432 +
  28.433 +#define pushl(base, ptr, val, err_label) \
  28.434 +	do { \
  28.435 +		__u32 __val = val; \
  28.436 +		ptr--; \
  28.437 +		if (put_user(val_byte(__val, 3), base + ptr) < 0) \
  28.438 +			goto err_label; \
  28.439 +		ptr--; \
  28.440 +		if (put_user(val_byte(__val, 2), base + ptr) < 0) \
  28.441 +			goto err_label; \
  28.442 +		ptr--; \
  28.443 +		if (put_user(val_byte(__val, 1), base + ptr) < 0) \
  28.444 +			goto err_label; \
  28.445 +		ptr--; \
  28.446 +		if (put_user(val_byte(__val, 0), base + ptr) < 0) \
  28.447 +			goto err_label; \
  28.448 +	} while(0)
  28.449 +
  28.450 +#define popb(base, ptr, err_label) \
  28.451 +	({ \
  28.452 +		__u8 __res; \
  28.453 +		if (get_user(__res, base + ptr) < 0) \
  28.454 +			goto err_label; \
  28.455 +		ptr++; \
  28.456 +		__res; \
  28.457 +	})
  28.458 +
  28.459 +#define popw(base, ptr, err_label) \
  28.460 +	({ \
  28.461 +		__u16 __res; \
  28.462 +		if (get_user(val_byte(__res, 0), base + ptr) < 0) \
  28.463 +			goto err_label; \
  28.464 +		ptr++; \
  28.465 +		if (get_user(val_byte(__res, 1), base + ptr) < 0) \
  28.466 +			goto err_label; \
  28.467 +		ptr++; \
  28.468 +		__res; \
  28.469 +	})
  28.470 +
  28.471 +#define popl(base, ptr, err_label) \
  28.472 +	({ \
  28.473 +		__u32 __res; \
  28.474 +		if (get_user(val_byte(__res, 0), base + ptr) < 0) \
  28.475 +			goto err_label; \
  28.476 +		ptr++; \
  28.477 +		if (get_user(val_byte(__res, 1), base + ptr) < 0) \
  28.478 +			goto err_label; \
  28.479 +		ptr++; \
  28.480 +		if (get_user(val_byte(__res, 2), base + ptr) < 0) \
  28.481 +			goto err_label; \
  28.482 +		ptr++; \
  28.483 +		if (get_user(val_byte(__res, 3), base + ptr) < 0) \
  28.484 +			goto err_label; \
  28.485 +		ptr++; \
  28.486 +		__res; \
  28.487 +	})
  28.488 +
  28.489 +/* There are so many possible reasons for this function to return
  28.490 + * VM86_INTx, so adding another doesn't bother me. We can expect
  28.491 + * userspace programs to be able to handle it. (Getting a problem
  28.492 + * in userspace is always better than an Oops anyway.) [KD]
  28.493 + */
  28.494 +static void do_int(struct kernel_vm86_regs *regs, int i,
  28.495 +    unsigned char __user * ssp, unsigned short sp)
  28.496 +{
  28.497 +	unsigned long __user *intr_ptr;
  28.498 +	unsigned long segoffs;
  28.499 +
  28.500 +	if (regs->cs == BIOSSEG)
  28.501 +		goto cannot_handle;
  28.502 +	if (is_revectored(i, &KVM86->int_revectored))
  28.503 +		goto cannot_handle;
  28.504 +	if (i==0x21 && is_revectored(AH(regs),&KVM86->int21_revectored))
  28.505 +		goto cannot_handle;
  28.506 +	intr_ptr = (unsigned long __user *) (i << 2);
  28.507 +	if (get_user(segoffs, intr_ptr))
  28.508 +		goto cannot_handle;
  28.509 +	if ((segoffs >> 16) == BIOSSEG)
  28.510 +		goto cannot_handle;
  28.511 +	pushw(ssp, sp, get_vflags(regs), cannot_handle);
  28.512 +	pushw(ssp, sp, regs->cs, cannot_handle);
  28.513 +	pushw(ssp, sp, IP(regs), cannot_handle);
  28.514 +	regs->cs = segoffs >> 16;
  28.515 +	SP(regs) -= 6;
  28.516 +	IP(regs) = segoffs & 0xffff;
  28.517 +	clear_TF(regs);
  28.518 +	clear_IF(regs);
  28.519 +	clear_AC(regs);
  28.520 +	return;
  28.521 +
  28.522 +cannot_handle:
  28.523 +	return_to_32bit(regs, VM86_INTx + (i << 8));
  28.524 +}
  28.525 +
  28.526 +int handle_vm86_trap(struct kernel_vm86_regs * regs, long error_code, int trapno)
  28.527 +{
  28.528 +	if (VMPI.is_vm86pus) {
  28.529 +		if ( (trapno==3) || (trapno==1) )
  28.530 +			return_to_32bit(regs, VM86_TRAP + (trapno << 8));
  28.531 +		do_int(regs, trapno, (unsigned char __user *) (regs->ss << 4), SP(regs));
  28.532 +		return 0;
  28.533 +	}
  28.534 +	if (trapno !=1)
  28.535 +		return 1; /* we let this handle by the calling routine */
  28.536 +	if (current->ptrace & PT_PTRACED) {
  28.537 +		unsigned long flags;
  28.538 +		spin_lock_irqsave(&current->sighand->siglock, flags);
  28.539 +		sigdelset(&current->blocked, SIGTRAP);
  28.540 +		recalc_sigpending();
  28.541 +		spin_unlock_irqrestore(&current->sighand->siglock, flags);
  28.542 +	}
  28.543 +	send_sig(SIGTRAP, current, 1);
  28.544 +	current->thread.trap_no = trapno;
  28.545 +	current->thread.error_code = error_code;
  28.546 +	return 0;
  28.547 +}
  28.548 +
  28.549 +void handle_vm86_fault(struct kernel_vm86_regs * regs, long error_code)
  28.550 +{
  28.551 +	unsigned char opcode;
  28.552 +	unsigned char __user *csp;
  28.553 +	unsigned char __user *ssp;
  28.554 +	unsigned short ip, sp, orig_flags;
  28.555 +	int data32, pref_done;
  28.556 +
  28.557 +#define CHECK_IF_IN_TRAP \
  28.558 +	if (VMPI.vm86dbg_active && VMPI.vm86dbg_TFpendig) \
  28.559 +		newflags |= TF_MASK
  28.560 +#define VM86_FAULT_RETURN do { \
  28.561 +	if (VMPI.force_return_for_pic  && (VEFLAGS & (IF_MASK | VIF_MASK))) \
  28.562 +		return_to_32bit(regs, VM86_PICRETURN); \
  28.563 +	if (orig_flags & TF_MASK) \
  28.564 +		handle_vm86_trap(regs, 0, 1); \
  28.565 +	return; } while (0)
  28.566 +
  28.567 +	orig_flags = *(unsigned short *)&regs->eflags;
  28.568 +
  28.569 +	csp = (unsigned char __user *) (regs->cs << 4);
  28.570 +	ssp = (unsigned char __user *) (regs->ss << 4);
  28.571 +	sp = SP(regs);
  28.572 +	ip = IP(regs);
  28.573 +
  28.574 +	data32 = 0;
  28.575 +	pref_done = 0;
  28.576 +	do {
  28.577 +		switch (opcode = popb(csp, ip, simulate_sigsegv)) {
  28.578 +			case 0x66:      /* 32-bit data */     data32=1; break;
  28.579 +			case 0x67:      /* 32-bit address */  break;
  28.580 +			case 0x2e:      /* CS */              break;
  28.581 +			case 0x3e:      /* DS */              break;
  28.582 +			case 0x26:      /* ES */              break;
  28.583 +			case 0x36:      /* SS */              break;
  28.584 +			case 0x65:      /* GS */              break;
  28.585 +			case 0x64:      /* FS */              break;
  28.586 +			case 0xf2:      /* repnz */       break;
  28.587 +			case 0xf3:      /* rep */             break;
  28.588 +			default: pref_done = 1;
  28.589 +		}
  28.590 +	} while (!pref_done);
  28.591 +
  28.592 +	switch (opcode) {
  28.593 +
  28.594 +	/* pushf */
  28.595 +	case 0x9c:
  28.596 +		if (data32) {
  28.597 +			pushl(ssp, sp, get_vflags(regs), simulate_sigsegv);
  28.598 +			SP(regs) -= 4;
  28.599 +		} else {
  28.600 +			pushw(ssp, sp, get_vflags(regs), simulate_sigsegv);
  28.601 +			SP(regs) -= 2;
  28.602 +		}
  28.603 +		IP(regs) = ip;
  28.604 +		VM86_FAULT_RETURN;
  28.605 +
  28.606 +	/* popf */
  28.607 +	case 0x9d:
  28.608 +		{
  28.609 +		unsigned long newflags;
  28.610 +		if (data32) {
  28.611 +			newflags=popl(ssp, sp, simulate_sigsegv);
  28.612 +			SP(regs) += 4;
  28.613 +		} else {
  28.614 +			newflags = popw(ssp, sp, simulate_sigsegv);
  28.615 +			SP(regs) += 2;
  28.616 +		}
  28.617 +		IP(regs) = ip;
  28.618 +		CHECK_IF_IN_TRAP;
  28.619 +		if (data32) {
  28.620 +			set_vflags_long(newflags, regs);
  28.621 +		} else {
  28.622 +			set_vflags_short(newflags, regs);
  28.623 +		}
  28.624 +		VM86_FAULT_RETURN;
  28.625 +		}
  28.626 +
  28.627 +	/* int xx */
  28.628 +	case 0xcd: {
  28.629 +		int intno=popb(csp, ip, simulate_sigsegv);
  28.630 +		IP(regs) = ip;
  28.631 +		if (VMPI.vm86dbg_active) {
  28.632 +			if ( (1 << (intno &7)) & VMPI.vm86dbg_intxxtab[intno >> 3] )
  28.633 +				return_to_32bit(regs, VM86_INTx + (intno << 8));
  28.634 +		}
  28.635 +		do_int(regs, intno, ssp, sp);
  28.636 +		return;
  28.637 +	}
  28.638 +
  28.639 +	/* iret */
  28.640 +	case 0xcf:
  28.641 +		{
  28.642 +		unsigned long newip;
  28.643 +		unsigned long newcs;
  28.644 +		unsigned long newflags;
  28.645 +		if (data32) {
  28.646 +			newip=popl(ssp, sp, simulate_sigsegv);
  28.647 +			newcs=popl(ssp, sp, simulate_sigsegv);
  28.648 +			newflags=popl(ssp, sp, simulate_sigsegv);
  28.649 +			SP(regs) += 12;
  28.650 +		} else {
  28.651 +			newip = popw(ssp, sp, simulate_sigsegv);
  28.652 +			newcs = popw(ssp, sp, simulate_sigsegv);
  28.653 +			newflags = popw(ssp, sp, simulate_sigsegv);
  28.654 +			SP(regs) += 6;
  28.655 +		}
  28.656 +		IP(regs) = newip;
  28.657 +		regs->cs = newcs;
  28.658 +		CHECK_IF_IN_TRAP;
  28.659 +		if (data32) {
  28.660 +			set_vflags_long(newflags, regs);
  28.661 +		} else {
  28.662 +			set_vflags_short(newflags, regs);
  28.663 +		}
  28.664 +		VM86_FAULT_RETURN;
  28.665 +		}
  28.666 +
  28.667 +	/* cli */
  28.668 +	case 0xfa:
  28.669 +		IP(regs) = ip;
  28.670 +		clear_IF(regs);
  28.671 +		VM86_FAULT_RETURN;
  28.672 +
  28.673 +	/* sti */
  28.674 +	/*
  28.675 +	 * Damn. This is incorrect: the 'sti' instruction should actually
  28.676 +	 * enable interrupts after the /next/ instruction. Not good.
  28.677 +	 *
  28.678 +	 * Probably needs some horsing around with the TF flag. Aiee..
  28.679 +	 */
  28.680 +	case 0xfb:
  28.681 +		IP(regs) = ip;
  28.682 +		set_IF(regs);
  28.683 +		VM86_FAULT_RETURN;
  28.684 +
  28.685 +	default:
  28.686 +		return_to_32bit(regs, VM86_UNKNOWN);
  28.687 +	}
  28.688 +
  28.689 +	return;
  28.690 +
  28.691 +simulate_sigsegv:
  28.692 +	/* FIXME: After a long discussion with Stas we finally
  28.693 +	 *        agreed, that this is wrong. Here we should
  28.694 +	 *        really send a SIGSEGV to the user program.
  28.695 +	 *        But how do we create the correct context? We
  28.696 +	 *        are inside a general protection fault handler
  28.697 +	 *        and has just returned from a page fault handler.
  28.698 +	 *        The correct context for the signal handler
  28.699 +	 *        should be a mixture of the two, but how do we
  28.700 +	 *        get the information? [KD]
  28.701 +	 */
  28.702 +	return_to_32bit(regs, VM86_UNKNOWN);
  28.703 +}
  28.704 +
  28.705 +/* ---------------- vm86 special IRQ passing stuff ----------------- */
  28.706 +
  28.707 +#define VM86_IRQNAME		"vm86irq"
  28.708 +
  28.709 +static struct vm86_irqs {
  28.710 +	struct task_struct *tsk;
  28.711 +	int sig;
  28.712 +} vm86_irqs[16];
  28.713 +
  28.714 +static DEFINE_SPINLOCK(irqbits_lock);
  28.715 +static int irqbits;
  28.716 +
  28.717 +#define ALLOWED_SIGS ( 1 /* 0 = don't send a signal */ \
  28.718 +	| (1 << SIGUSR1) | (1 << SIGUSR2) | (1 << SIGIO)  | (1 << SIGURG) \
  28.719 +	| (1 << SIGUNUSED) )
  28.720 +	
  28.721 +static irqreturn_t irq_handler(int intno, void *dev_id, struct pt_regs * regs)
  28.722 +{
  28.723 +	int irq_bit;
  28.724 +	unsigned long flags;
  28.725 +
  28.726 +	spin_lock_irqsave(&irqbits_lock, flags);	
  28.727 +	irq_bit = 1 << intno;
  28.728 +	if ((irqbits & irq_bit) || ! vm86_irqs[intno].tsk)
  28.729 +		goto out;
  28.730 +	irqbits |= irq_bit;
  28.731 +	if (vm86_irqs[intno].sig)
  28.732 +		send_sig(vm86_irqs[intno].sig, vm86_irqs[intno].tsk, 1);
  28.733 +	/*
  28.734 +	 * IRQ will be re-enabled when user asks for the irq (whether
  28.735 +	 * polling or as a result of the signal)
  28.736 +	 */
  28.737 +	disable_irq_nosync(intno);
  28.738 +	spin_unlock_irqrestore(&irqbits_lock, flags);
  28.739 +	return IRQ_HANDLED;
  28.740 +
  28.741 +out:
  28.742 +	spin_unlock_irqrestore(&irqbits_lock, flags);	
  28.743 +	return IRQ_NONE;
  28.744 +}
  28.745 +
  28.746 +static inline void free_vm86_irq(int irqnumber)
  28.747 +{
  28.748 +	unsigned long flags;
  28.749 +
  28.750 +	free_irq(irqnumber, NULL);
  28.751 +	vm86_irqs[irqnumber].tsk = NULL;
  28.752 +
  28.753 +	spin_lock_irqsave(&irqbits_lock, flags);	
  28.754 +	irqbits &= ~(1 << irqnumber);
  28.755 +	spin_unlock_irqrestore(&irqbits_lock, flags);	
  28.756 +}
  28.757 +
  28.758 +void release_vm86_irqs(struct task_struct *task)
  28.759 +{
  28.760 +	int i;
  28.761 +	for (i = FIRST_VM86_IRQ ; i <= LAST_VM86_IRQ; i++)
  28.762 +	    if (vm86_irqs[i].tsk == task)
  28.763 +		free_vm86_irq(i);
  28.764 +}
  28.765 +
  28.766 +static inline int get_and_reset_irq(int irqnumber)
  28.767 +{
  28.768 +	int bit;
  28.769 +	unsigned long flags;
  28.770 +	int ret = 0;
  28.771 +	
  28.772 +	if (invalid_vm86_irq(irqnumber)) return 0;
  28.773 +	if (vm86_irqs[irqnumber].tsk != current) return 0;
  28.774 +	spin_lock_irqsave(&irqbits_lock, flags);	
  28.775 +	bit = irqbits & (1 << irqnumber);
  28.776 +	irqbits &= ~bit;
  28.777 +	if (bit) {
  28.778 +		enable_irq(irqnumber);
  28.779 +		ret = 1;
  28.780 +	}
  28.781 +
  28.782 +	spin_unlock_irqrestore(&irqbits_lock, flags);	
  28.783 +	return ret;
  28.784 +}
  28.785 +
  28.786 +
  28.787 +static int do_vm86_irq_handling(int subfunction, int irqnumber)
  28.788 +{
  28.789 +	int ret;
  28.790 +	switch (subfunction) {
  28.791 +		case VM86_GET_AND_RESET_IRQ: {
  28.792 +			return get_and_reset_irq(irqnumber);
  28.793 +		}
  28.794 +		case VM86_GET_IRQ_BITS: {
  28.795 +			return irqbits;
  28.796 +		}
  28.797 +		case VM86_REQUEST_IRQ: {
  28.798 +			int sig = irqnumber >> 8;
  28.799 +			int irq = irqnumber & 255;
  28.800 +			if (!capable(CAP_SYS_ADMIN)) return -EPERM;
  28.801 +			if (!((1 << sig) & ALLOWED_SIGS)) return -EPERM;
  28.802 +			if (invalid_vm86_irq(irq)) return -EPERM;
  28.803 +			if (vm86_irqs[irq].tsk) return -EPERM;
  28.804 +			ret = request_irq(irq, &irq_handler, 0, VM86_IRQNAME, NULL);
  28.805 +			if (ret) return ret;
  28.806 +			vm86_irqs[irq].sig = sig;
  28.807 +			vm86_irqs[irq].tsk = current;
  28.808 +			return irq;
  28.809 +		}
  28.810 +		case  VM86_FREE_IRQ: {
  28.811 +			if (invalid_vm86_irq(irqnumber)) return -EPERM;
  28.812 +			if (!vm86_irqs[irqnumber].tsk) return 0;
  28.813 +			if (vm86_irqs[irqnumber].tsk != current) return -EPERM;
  28.814 +			free_vm86_irq(irqnumber);
  28.815 +			return 0;
  28.816 +		}
  28.817 +	}
  28.818 +	return -EINVAL;
  28.819 +}
  28.820 +

    29.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    29.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/vsyscall.S	Fri Feb 24 15:41:08 2006 -0700
    29.3 @@ -0,0 +1,17 @@
    29.4 +#include <linux/init.h>
    29.5 +
    29.6 +__INITDATA
    29.7 +
    29.8 +	.globl vsyscall_int80_start, vsyscall_int80_end
    29.9 +vsyscall_int80_start:
   29.10 +	.incbin "arch/i386/kernel/vsyscall-int80.so"
   29.11 +vsyscall_int80_end:
   29.12 +
   29.13 +#ifdef CONFIG_X86_SYSENTER
   29.14 +	.globl vsyscall_sysenter_start, vsyscall_sysenter_end
   29.15 +vsyscall_sysenter_start:
   29.16 +	.incbin "arch/i386/kernel/vsyscall-sysenter.so"
   29.17 +vsyscall_sysenter_end:
   29.18 +#endif
   29.19 +
   29.20 +__FINIT

    30.1 --- a/linux-2.6-xen-sparse/arch/i386/mm/fault-xen.c	Fri Feb 24 14:03:07 2006 -0700
    30.2 +++ b/linux-2.6-xen-sparse/arch/i386/mm/fault-xen.c	Fri Feb 24 15:41:08 2006 -0700
    30.3 @@ -85,7 +85,7 @@ static inline unsigned long get_segment_
    30.4  		return eip + (seg << 4);
    30.5  	
    30.6  	/* By far the most common cases. */
    30.7 -	if (likely(seg == __USER_CS || seg == __KERNEL_CS))
    30.8 +	if (likely(seg == __USER_CS || seg == GET_KERNEL_CS()))
    30.9  		return eip;
   30.10  
   30.11  	/* Check the segment exists, is within the current LDT/GDT size,
   30.12 @@ -396,7 +396,7 @@ good_area:
   30.13  	switch (error_code & 3) {
   30.14  		default:	/* 3: write, present */
   30.15  #ifdef TEST_VERIFY_AREA
   30.16 -			if (regs->cs == KERNEL_CS)
   30.17 +			if (regs->cs == GET_KERNEL_CS())
   30.18  				printk("WP fault at %08lx\n", regs->eip);
   30.19  #endif
   30.20  			/* fall through */

    31.1 --- a/linux-2.6-xen-sparse/arch/i386/mm/hypervisor.c	Fri Feb 24 14:03:07 2006 -0700
    31.2 +++ b/linux-2.6-xen-sparse/arch/i386/mm/hypervisor.c	Fri Feb 24 15:41:08 2006 -0700
    31.3 @@ -324,10 +324,13 @@ int xen_create_contiguous_region(
    31.4  		.domid        = DOMID_SELF
    31.5  	};
    31.6  
    31.7 -	if (xen_feature(XENFEAT_auto_translated_physmap)) {
    31.8 -		BUG_ON(order >= 1);
    31.9 +	/*
   31.10 +	 * Currently an auto-translated guest will not perform I/O, nor will
   31.11 +	 * it require PAE page directories below 4GB. Therefore any calls to
   31.12 +	 * this function are redundant and can be ignored.
   31.13 +	 */
   31.14 +	if (xen_feature(XENFEAT_auto_translated_physmap))
   31.15  		return 0;
   31.16 -	}
   31.17  
   31.18  	scrub_pages(vstart, 1 << order);
   31.19  

    32.1 --- a/linux-2.6-xen-sparse/arch/i386/mm/init-xen.c	Fri Feb 24 14:03:07 2006 -0700
    32.2 +++ b/linux-2.6-xen-sparse/arch/i386/mm/init-xen.c	Fri Feb 24 15:41:08 2006 -0700
    32.3 @@ -759,7 +759,7 @@ void __init pgtable_cache_init(void)
    32.4  #endif
    32.5  				0,
    32.6  				pgd_ctor,
    32.7 -				PTRS_PER_PMD == 1 ? pgd_dtor : NULL);
    32.8 +				pgd_dtor);
    32.9  	if (!pgd_cache)
   32.10  		panic("pgtable_cache_init(): Cannot create pgd cache");
   32.11  }

    33.1 --- a/linux-2.6-xen-sparse/arch/i386/mm/pgtable-xen.c	Fri Feb 24 14:03:07 2006 -0700
    33.2 +++ b/linux-2.6-xen-sparse/arch/i386/mm/pgtable-xen.c	Fri Feb 24 15:41:08 2006 -0700
    33.3 @@ -13,6 +13,7 @@
    33.4  #include <linux/slab.h>
    33.5  #include <linux/pagemap.h>
    33.6  #include <linux/spinlock.h>
    33.7 +#include <linux/module.h>
    33.8  
    33.9  #include <asm/system.h>
   33.10  #include <asm/pgtable.h>
   33.11 @@ -184,6 +185,10 @@ void set_pmd_pfn(unsigned long vaddr, un
   33.12  	__flush_tlb_one(vaddr);
   33.13  }
   33.14  
   33.15 +static int nr_fixmaps = 0;
   33.16 +unsigned long __FIXADDR_TOP = (HYPERVISOR_VIRT_START - 2 * PAGE_SIZE);
   33.17 +EXPORT_SYMBOL(__FIXADDR_TOP);
   33.18 +
   33.19  void __set_fixmap (enum fixed_addresses idx, maddr_t phys, pgprot_t flags)
   33.20  {
   33.21  	unsigned long address = __fix_to_virt(idx);
   33.22 @@ -194,7 +199,6 @@ void __set_fixmap (enum fixed_addresses 
   33.23  	}
   33.24  	switch (idx) {
   33.25  	case FIX_WP_TEST:
   33.26 -	case FIX_VSYSCALL:
   33.27  #ifdef CONFIG_X86_F00F_BUG
   33.28  	case FIX_F00F_IDT:
   33.29  #endif
   33.30 @@ -204,6 +208,13 @@ void __set_fixmap (enum fixed_addresses 
   33.31  		set_pte_pfn_ma(address, phys >> PAGE_SHIFT, flags);
   33.32  		break;
   33.33  	}
   33.34 +	nr_fixmaps++;
   33.35 +}
   33.36 +
   33.37 +void set_fixaddr_top(unsigned long top)
   33.38 +{
   33.39 +	BUG_ON(nr_fixmaps > 0);
   33.40 +	__FIXADDR_TOP = top - PAGE_SIZE;
   33.41  }
   33.42  
   33.43  pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
   33.44 @@ -289,10 +300,11 @@ void pgd_ctor(void *pgd, kmem_cache_t *c
   33.45  	unsigned long flags;
   33.46  
   33.47  	if (PTRS_PER_PMD > 1) {
   33.48 -		/* Ensure pgd resides below 4GB. */
   33.49 -		int rc = xen_create_contiguous_region(
   33.50 -			(unsigned long)pgd, 0, 32);
   33.51 -		BUG_ON(rc);
   33.52 +		if (!xen_feature(XENFEAT_pae_pgdir_above_4gb)) {
   33.53 +			int rc = xen_create_contiguous_region(
   33.54 +				(unsigned long)pgd, 0, 32);
   33.55 +			BUG_ON(rc);
   33.56 +		}
   33.57  		if (HAVE_SHARED_KERNEL_PMD)
   33.58  			memcpy((pgd_t *)pgd + USER_PTRS_PER_PGD,
   33.59  			       swapper_pg_dir + USER_PTRS_PER_PGD,
   33.60 @@ -308,16 +320,20 @@ void pgd_ctor(void *pgd, kmem_cache_t *c
   33.61  	}
   33.62  }
   33.63  
   33.64 -/* never called when PTRS_PER_PMD > 1 */
   33.65  void pgd_dtor(void *pgd, kmem_cache_t *cache, unsigned long unused)
   33.66  {
   33.67  	unsigned long flags; /* can be called from interrupt context */
   33.68  
   33.69 -	spin_lock_irqsave(&pgd_lock, flags);
   33.70 -	pgd_list_del(pgd);
   33.71 -	spin_unlock_irqrestore(&pgd_lock, flags);
   33.72 +	if (PTRS_PER_PMD > 1) {
   33.73 +		if (!xen_feature(XENFEAT_pae_pgdir_above_4gb))
   33.74 +			xen_destroy_contiguous_region((unsigned long)pgd, 0);
   33.75 +	} else {
   33.76 +		spin_lock_irqsave(&pgd_lock, flags);
   33.77 +		pgd_list_del(pgd);
   33.78 +		spin_unlock_irqrestore(&pgd_lock, flags);
   33.79  
   33.80 -	pgd_test_and_unpin(pgd);
   33.81 +		pgd_test_and_unpin(pgd);
   33.82 +	}
   33.83  }
   33.84  
   33.85  pgd_t *pgd_alloc(struct mm_struct *mm)

    34.1 --- a/linux-2.6-xen-sparse/arch/ia64/kernel/entry.S	Fri Feb 24 14:03:07 2006 -0700
    34.2 +++ b/linux-2.6-xen-sparse/arch/ia64/kernel/entry.S	Fri Feb 24 15:41:08 2006 -0700
    34.3 @@ -569,7 +569,9 @@ GLOBAL_ENTRY(__ia64_trace_syscall)
    34.4  .mem.offset 0,0; st8.spill [r2]=r8		// store return value in slot for r8
    34.5  .mem.offset 8,0; st8.spill [r3]=r10		// clear error indication in slot for r10
    34.6  	br.call.sptk.many rp=syscall_trace_leave // give parent a chance to catch return value
    34.7 -.ret3:	br.cond.sptk .work_pending_syscall_end
    34.8 +.ret3:
    34.9 +(pUStk)	cmp.eq.unc p6,p0=r0,r0			// p6 <- pUStk
   34.10 +	br.cond.sptk .work_pending_syscall_end
   34.11  
   34.12  strace_error:
   34.13  	ld8 r3=[r2]				// load pt_regs.r8

    35.1 --- a/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c	Fri Feb 24 14:03:07 2006 -0700
    35.2 +++ b/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c	Fri Feb 24 15:41:08 2006 -0700
    35.3 @@ -446,6 +446,7 @@ setup_arch (char **cmdline_p)
    35.4  	if (early_console_setup(*cmdline_p) == 0)
    35.5  		mark_bsp_online();
    35.6  
    35.7 +	parse_early_param();
    35.8  #ifdef CONFIG_ACPI
    35.9  	/* Initialize the ACPI boot-time table parser */
   35.10  	acpi_table_init();
   35.11 @@ -704,6 +705,9 @@ void
   35.12  setup_per_cpu_areas (void)
   35.13  {
   35.14  	/* start_kernel() requires this... */
   35.15 +#ifdef CONFIG_ACPI_HOTPLUG_CPU
   35.16 +	prefill_possible_map();
   35.17 +#endif
   35.18  }
   35.19  
   35.20  /*

    36.1 --- a/linux-2.6-xen-sparse/arch/x86_64/Kconfig	Fri Feb 24 14:03:07 2006 -0700
    36.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/Kconfig	Fri Feb 24 15:41:08 2006 -0700
    36.3 @@ -125,6 +125,16 @@ config X86_64_XEN
    36.4  	help
    36.5  	  This option will compile a kernel compatible with Xen hypervisor
    36.6  
    36.7 +config X86_NO_TSS
    36.8 +	bool
    36.9 +	depends on X86_64_XEN
   36.10 +	default y
   36.11 +
   36.12 +config X86_NO_IDT
   36.13 +	bool
   36.14 +	depends on X86_64_XEN
   36.15 +	default y
   36.16 +
   36.17  #
   36.18  # Define implied options from the CPU selection here
   36.19  #
   36.20 @@ -529,9 +539,7 @@ endif
   36.21  
   36.22  source "drivers/acpi/Kconfig"
   36.23  
   36.24 -if !X86_64_XEN
   36.25  source "arch/x86_64/kernel/cpufreq/Kconfig"
   36.26 -endif
   36.27  
   36.28  endmenu
   36.29  

    37.1 --- a/linux-2.6-xen-sparse/arch/x86_64/ia32/syscall32-xen.c	Fri Feb 24 14:03:07 2006 -0700
    37.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/ia32/syscall32-xen.c	Fri Feb 24 15:41:08 2006 -0700
    37.3 @@ -119,7 +119,7 @@ void syscall32_cpu_init(void)
    37.4  
    37.5  	/* Load these always in case some future AMD CPU supports
    37.6  	   SYSENTER from compat mode too. */
    37.7 -	checking_wrmsrl(MSR_IA32_SYSENTER_CS, (u64)(__KERNEL_CS | 3));
    37.8 +	checking_wrmsrl(MSR_IA32_SYSENTER_CS, (u64)__KERNEL_CS);
    37.9  	checking_wrmsrl(MSR_IA32_SYSENTER_ESP, 0ULL);
   37.10  	checking_wrmsrl(MSR_IA32_SYSENTER_EIP, (u64)ia32_sysenter_target);
   37.11  

    38.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/apic-xen.c	Fri Feb 24 14:03:07 2006 -0700
    38.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/apic-xen.c	Fri Feb 24 15:41:08 2006 -0700
    38.3 @@ -58,13 +58,6 @@ void ack_bad_irq(unsigned int irq)
    38.4  		ack_APIC_irq();
    38.5  }
    38.6  
    38.7 -#ifdef CONFIG_XEN
    38.8 -void switch_APIC_timer_to_ipi(void *cpumask) { }
    38.9 -EXPORT_SYMBOL(switch_APIC_timer_to_ipi);
   38.10 -void switch_ipi_to_APIC_timer(void *cpumask) { }
   38.11 -EXPORT_SYMBOL(switch_ipi_to_APIC_timer);
   38.12 -#endif
   38.13 -
   38.14  int setup_profiling_timer(unsigned int multiplier)
   38.15  {
   38.16  	return -EINVAL;

    39.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    39.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/asm-offsets.c	Fri Feb 24 15:41:08 2006 -0700
    39.3 @@ -0,0 +1,74 @@
    39.4 +/*
    39.5 + * Generate definitions needed by assembly language modules.
    39.6 + * This code generates raw asm output which is post-processed to extract
    39.7 + * and format the required data.
    39.8 + */
    39.9 +
   39.10 +#include <linux/sched.h> 
   39.11 +#include <linux/stddef.h>
   39.12 +#include <linux/errno.h> 
   39.13 +#include <linux/hardirq.h>
   39.14 +#include <linux/suspend.h>
   39.15 +#include <asm/pda.h>
   39.16 +#include <asm/processor.h>
   39.17 +#include <asm/segment.h>
   39.18 +#include <asm/thread_info.h>
   39.19 +#include <asm/ia32.h>
   39.20 +
   39.21 +#define DEFINE(sym, val) \
   39.22 +        asm volatile("\n->" #sym " %0 " #val : : "i" (val))
   39.23 +
   39.24 +#define BLANK() asm volatile("\n->" : : )
   39.25 +
   39.26 +int main(void)
   39.27 +{
   39.28 +#define ENTRY(entry) DEFINE(tsk_ ## entry, offsetof(struct task_struct, entry))
   39.29 +	ENTRY(state);
   39.30 +	ENTRY(flags); 
   39.31 +	ENTRY(thread); 
   39.32 +	ENTRY(pid);
   39.33 +	BLANK();
   39.34 +#undef ENTRY
   39.35 +#define ENTRY(entry) DEFINE(threadinfo_ ## entry, offsetof(struct thread_info, entry))
   39.36 +	ENTRY(flags);
   39.37 +	ENTRY(addr_limit);
   39.38 +	ENTRY(preempt_count);
   39.39 +	ENTRY(status);
   39.40 +	BLANK();
   39.41 +#undef ENTRY
   39.42 +#define ENTRY(entry) DEFINE(pda_ ## entry, offsetof(struct x8664_pda, entry))
   39.43 +	ENTRY(kernelstack); 
   39.44 +	ENTRY(oldrsp); 
   39.45 +	ENTRY(pcurrent); 
   39.46 +	ENTRY(irqcount);
   39.47 +	ENTRY(cpunumber);
   39.48 +	ENTRY(irqstackptr);
   39.49 +	ENTRY(data_offset);
   39.50 +	BLANK();
   39.51 +#undef ENTRY
   39.52 +#ifdef CONFIG_IA32_EMULATION
   39.53 +#define ENTRY(entry) DEFINE(IA32_SIGCONTEXT_ ## entry, offsetof(struct sigcontext_ia32, entry))
   39.54 +	ENTRY(eax);
   39.55 +	ENTRY(ebx);
   39.56 +	ENTRY(ecx);
   39.57 +	ENTRY(edx);
   39.58 +	ENTRY(esi);
   39.59 +	ENTRY(edi);
   39.60 +	ENTRY(ebp);
   39.61 +	ENTRY(esp);
   39.62 +	ENTRY(eip);
   39.63 +	BLANK();
   39.64 +#undef ENTRY
   39.65 +	DEFINE(IA32_RT_SIGFRAME_sigcontext,
   39.66 +	       offsetof (struct rt_sigframe32, uc.uc_mcontext));
   39.67 +	BLANK();
   39.68 +#endif
   39.69 +	DEFINE(pbe_address, offsetof(struct pbe, address));
   39.70 +	DEFINE(pbe_orig_address, offsetof(struct pbe, orig_address));
   39.71 +	DEFINE(pbe_next, offsetof(struct pbe, next));
   39.72 +#ifndef CONFIG_X86_NO_TSS
   39.73 +	BLANK();
   39.74 +	DEFINE(TSS_ist, offsetof(struct tss_struct, ist));
   39.75 +#endif
   39.76 +	return 0;
   39.77 +}

    40.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/entry-xen.S	Fri Feb 24 14:03:07 2006 -0700
    40.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/entry-xen.S	Fri Feb 24 15:41:08 2006 -0700
    40.3 @@ -61,6 +61,8 @@
    40.4  #ifndef CONFIG_PREEMPT
    40.5  #define retint_kernel retint_restore_args
    40.6  #endif	
    40.7 +
    40.8 +NMI_MASK = 0x80000000
    40.9  	
   40.10  /*
   40.11   * C code is not supposed to know about undefined top of stack. Every time 
   40.12 @@ -143,6 +145,18 @@
   40.13           * #define VGCF_IN_SYSCALL (1<<8) 
   40.14           */
   40.15  	.macro HYPERVISOR_IRET flag
   40.16 +	testb $3,1*8(%rsp)
   40.17 +	jnz   1f
   40.18 +	testl $NMI_MASK,2*8(%rsp)
   40.19 +	jnz   1f
   40.20 +
   40.21 +	/* Direct iret to kernel space. Correct CS and SS. */
   40.22 +	orb   $3,1*8(%rsp)
   40.23 +	orb   $3,4*8(%rsp)
   40.24 +	iretq
   40.25 +
   40.26 +1:	/* Slow iret via hypervisor. */
   40.27 +	andl  $~NMI_MASK, 16(%rsp)
   40.28  	pushq $\flag
   40.29  	jmp  hypercall_page + (__HYPERVISOR_iret * 32)
   40.30  	.endm
   40.31 @@ -510,13 +524,7 @@ retint_restore_args:
   40.32  	jnz restore_all_enable_events	# != 0 => reenable event delivery      
   40.33          XEN_PUT_VCPU_INFO(%rsi)
   40.34  		
   40.35 -	RESTORE_ARGS 0,8,0						
   40.36 -	testb $3,8(%rsp)                # check CS
   40.37 -	jnz  user_mode
   40.38 -kernel_mode:
   40.39 -        orb   $3,1*8(%rsp)
   40.40 -	iretq
   40.41 -user_mode:
   40.42 +	RESTORE_ARGS 0,8,0
   40.43  	HYPERVISOR_IRET 0
   40.44  	
   40.45  	/* edi: workmask, edx: work */
   40.46 @@ -811,6 +819,7 @@ ENTRY(nmi)
   40.47  ENTRY(do_nmi_callback)
   40.48          addq $8, %rsp
   40.49          call do_nmi
   40.50 +        orl  $NMI_MASK,EFLAGS(%rsp)
   40.51          RESTORE_REST
   40.52          XEN_BLOCK_EVENTS(%rsi)
   40.53          GET_THREAD_INFO(%rcx)
   40.54 @@ -826,11 +835,6 @@ scrit:	/**** START OF CRITICAL REGION **
   40.55  	jnz  14f			# process more events if necessary...
   40.56  	XEN_PUT_VCPU_INFO(%rsi)
   40.57          RESTORE_ARGS 0,8,0
   40.58 -        testb $3,8(%rsp)                # check CS
   40.59 -        jnz  crit_user_mode
   40.60 -        orb   $3,1*8(%rsp)
   40.61 -        iretq
   40.62 -crit_user_mode:
   40.63          HYPERVISOR_IRET 0
   40.64          
   40.65  14:	XEN_LOCKED_BLOCK_EVENTS(%rsi)

    41.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/head-xen.S	Fri Feb 24 14:03:07 2006 -0700
    41.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/head-xen.S	Fri Feb 24 15:41:08 2006 -0700
    41.3 @@ -14,15 +14,6 @@
    41.4  
    41.5  
    41.6  #include <linux/linkage.h>
    41.7 -
    41.8 -.section __xen_guest
    41.9 -	.ascii	"GUEST_OS=linux,GUEST_VER=2.6"
   41.10 -	.ascii	",XEN_VER=xen-3.0"
   41.11 -	.ascii	",VIRT_BASE=0xffffffff80000000"
   41.12 -	.ascii	",HYPERCALL_PAGE=0x10a" /* __pa(hypercall_page) >> 12 */
   41.13 -	.ascii	",LOADER=generic"
   41.14 -	.byte	0
   41.15 -      
   41.16  #include <linux/threads.h>
   41.17  #include <linux/init.h>
   41.18  #include <asm/desc.h>
   41.19 @@ -30,64 +21,21 @@
   41.20  #include <asm/page.h>
   41.21  #include <asm/msr.h>
   41.22  #include <asm/cache.h>
   41.23 -	
   41.24 -/* we are not able to switch in one step to the final KERNEL ADRESS SPACE
   41.25 - * because we need identity-mapped pages on setup so define __START_KERNEL to
   41.26 - * 0x100000 for this stage
   41.27 - * 
   41.28 - */
   41.29  
   41.30  	.text
   41.31  	.code64
   41.32  	.globl startup_64
   41.33  startup_64:
   41.34  ENTRY(_start)
   41.35 -	movq %rsi,xen_start_info(%rip)
   41.36 -
   41.37 -#ifdef CONFIG_SMP
   41.38 -ENTRY(startup_64_smp)
   41.39 -#endif /* CONFIG_SMP */
   41.40 -
   41.41 -	cld
   41.42 -
   41.43 -	movq init_rsp(%rip),%rsp
   41.44 +	movq $(init_thread_union+THREAD_SIZE-8),%rsp
   41.45  	/* zero EFLAGS after setting rsp */
   41.46  	pushq $0
   41.47  	popfq
   41.48 -	movq	initial_code(%rip),%rax
   41.49 -	jmp	*%rax
   41.50 -
   41.51 -	/* SMP bootup changes these two */	
   41.52 -	.globl	initial_code
   41.53 -initial_code:
   41.54 -	.quad	x86_64_start_kernel
   41.55 -	.globl init_rsp
   41.56 -init_rsp:
   41.57 -	.quad  init_thread_union+THREAD_SIZE-8
   41.58  
   41.59 -ENTRY(early_idt_handler)
   41.60 -	xorl %eax,%eax
   41.61 -	movq 8(%rsp),%rsi	# get rip
   41.62 -	movq (%rsp),%rdx
   41.63 -	leaq early_idt_msg(%rip),%rdi
   41.64 -1:	hlt                     # generate #GP
   41.65 -	jmp 1b
   41.66 -
   41.67 -early_idt_msg:
   41.68 -	.asciz "PANIC: early exception rip %lx error %lx cr2 %lx\n"
   41.69 -
   41.70 -#if 0
   41.71 -ENTRY(lgdt_finish)
   41.72 -        movl $(__USER_DS),%eax          # DS/ES contains default USER segment
   41.73 -        movw %ax,%ds
   41.74 -        movw %ax,%es
   41.75 -        movl $(__KERNEL_DS),%eax        
   41.76 -        movw %ax,%ss                    # after changing gdt.
   41.77 -        popq %rax                       # get the retrun address
   41.78 -        pushq $(__KERNEL_CS)
   41.79 -        pushq %rax
   41.80 -        lretq
   41.81 -#endif 
   41.82 +	/* rsi is pointer to startup info structure.
   41.83 +	   pass it to C */
   41.84 +	movq %rsi,%rdi
   41.85 +	jmp x86_64_start_kernel
   41.86  
   41.87  ENTRY(stext)
   41.88  ENTRY(_stext)
   41.89 @@ -113,39 +61,9 @@ NEXT_PAGE(init_level4_pgt)
   41.90  NEXT_PAGE(init_level4_user_pgt)
   41.91  	.fill	512,8,0
   41.92  
   41.93 -	/*
   41.94 -	 * In Xen the following pre-initialized pgt entries are re-initialized.
   41.95 -	 */
   41.96  NEXT_PAGE(level3_kernel_pgt)
   41.97 -	.fill	510,8,0
   41.98 -	/* (2^48-(2*1024*1024*1024)-((2^39)*511))/(2^30) = 510 */
   41.99 -	.quad	phys_level2_kernel_pgt | 0x007
  41.100 -	.fill	1,8,0
  41.101 +	.fill	512,8,0
  41.102  
  41.103 -NEXT_PAGE(level2_ident_pgt)
  41.104 -	/* 40MB for bootup. 	*/
  41.105 -	i = 0
  41.106 -	.rept 20
  41.107 -	.quad	i << 21 | 0x083
  41.108 -	i = i + 1
  41.109 -	.endr
  41.110 -	/* Temporary mappings for the super early allocator in arch/x86_64/mm/init.c */
  41.111 -	.globl temp_boot_pmds
  41.112 -temp_boot_pmds:
  41.113 -	.fill	492,8,0
  41.114 -
  41.115 -NEXT_PAGE(level2_kernel_pgt)
  41.116 -	/* 40MB kernel mapping. The kernel code cannot be bigger than that.
  41.117 -	   When you change this change KERNEL_TEXT_SIZE in page.h too. */
  41.118 -	/* (2^48-(2*1024*1024*1024)-((2^39)*511)-((2^30)*510)) = 0 */
  41.119 -	i = 0
  41.120 -	.rept 20
  41.121 -	.quad	i << 21 | 0x183
  41.122 -	i = i + 1
  41.123 -	.endr
  41.124 -	/* Module mapping starts here */
  41.125 -	.fill	492,8,0
  41.126 -	
  41.127          /*
  41.128           * This is used for vsyscall area mapping as we have a different
  41.129           * level4 page table for user.
  41.130 @@ -153,81 +71,19 @@ NEXT_PAGE(level2_kernel_pgt)
  41.131  NEXT_PAGE(level3_user_pgt)
  41.132          .fill	512,8,0
  41.133  
  41.134 -NEXT_PAGE(cpu_gdt_table)
  41.135 -/* The TLS descriptors are currently at a different place compared to i386.
  41.136 -   Hopefully nobody expects them at a fixed place (Wine?) */
  41.137 -	.quad	0x0000000000000000	/* NULL descriptor */
  41.138 -	.quad	0x0			/* unused */
  41.139 -	.quad	0x00affa000000ffff	/* __KERNEL_CS */
  41.140 -	.quad	0x00cff2000000ffff	/* __KERNEL_DS */
  41.141 -       	.quad	0x00cffa000000ffff	/* __USER32_CS */
  41.142 -	.quad	0x00cff2000000ffff	/* __USER_DS, __USER32_DS  */		
  41.143 -	.quad	0x00affa000000ffff	/* __USER_CS */
  41.144 -	.quad	0x00cffa000000ffff	/* __KERNEL32_CS */        
  41.145 -	.quad	0,0			/* TSS */
  41.146 -	.quad	0,0			/* LDT */
  41.147 -	.quad   0,0,0			/* three TLS descriptors */ 
  41.148 -	.quad	0			/* unused */
  41.149 -gdt_end:
  41.150 -#if 0
  41.151 -	/* asm/segment.h:GDT_ENTRIES must match this */	
  41.152 -	/* This should be a multiple of the cache line size */
  41.153 -	/* GDTs of other CPUs are now dynamically allocated */
  41.154 -
  41.155 -	/* zero the remaining page */
  41.156 -	.fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0
  41.157 -#endif
  41.158 +NEXT_PAGE(level2_kernel_pgt)
  41.159 +	.fill	512,8,0
  41.160  
  41.161  NEXT_PAGE(empty_zero_page)
  41.162 -
  41.163 -NEXT_PAGE(level3_physmem_pgt)
  41.164 -	.quad	phys_level2_kernel_pgt | 0x007	/* so that __va works even before pagetable_init */
  41.165 +	.skip PAGE_SIZE
  41.166  
  41.167  NEXT_PAGE(hypercall_page)
  41.168 -.if (phys_hypercall_page - 0x10a000)
  41.169 -	/* cause compiler error if the hypercall_page is at a
  41.170 -	 * different address than expected. */
  41.171 -	.quad	__adjust_hypercall_page_in_header
  41.172 -.endif
  41.173  	.fill	512,8,0
  41.174  
  41.175  #undef NEXT_PAGE
  41.176  
  41.177  	.data
  41.178  
  41.179 -#ifndef CONFIG_XEN
  41.180 -#ifdef CONFIG_ACPI_SLEEP
  41.181 -	.align PAGE_SIZE
  41.182 -ENTRY(wakeup_level4_pgt)
  41.183 -	.quad	phys_level3_ident_pgt | 0x007
  41.184 -	.fill	255,8,0
  41.185 -	.quad	phys_level3_physmem_pgt | 0x007
  41.186 -	.fill	254,8,0
  41.187 -	/* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
  41.188 -	.quad	phys_level3_kernel_pgt | 0x007
  41.189 -#endif
  41.190 -
  41.191 -#ifndef CONFIG_HOTPLUG_CPU
  41.192 -	__INITDATA
  41.193 -#endif
  41.194 -	/*
  41.195 -	 * This default setting generates an ident mapping at address 0x100000
  41.196 -	 * and a mapping for the kernel that precisely maps virtual address
  41.197 -	 * 0xffffffff80000000 to physical address 0x000000. (always using
  41.198 -	 * 2Mbyte large pages provided by PAE mode)
  41.199 -	 */
  41.200 -	.align PAGE_SIZE
  41.201 -ENTRY(boot_level4_pgt)
  41.202 -	.quad	phys_level3_ident_pgt | 0x007
  41.203 -	.fill	255,8,0
  41.204 -	.quad	phys_level3_physmem_pgt | 0x007
  41.205 -	.fill	254,8,0
  41.206 -	/* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
  41.207 -	.quad	phys_level3_kernel_pgt | 0x007
  41.208 -#endif
  41.209 -
  41.210 -	.data
  41.211 -
  41.212  	.align 16
  41.213  	.globl cpu_gdt_descr
  41.214  cpu_gdt_descr:
  41.215 @@ -246,11 +102,55 @@ gdt:
  41.216   * Also sysret mandates a special GDT layout 
  41.217   */
  41.218  		 		
  41.219 -.align PAGE_SIZE
  41.220 +	.section .data.page_aligned, "aw"
  41.221 +	.align PAGE_SIZE
  41.222  
  41.223 -ENTRY(idt_table)	
  41.224 -	.rept   256
  41.225 -	.quad   0
  41.226 -	.quad 	0
  41.227 -	.endr
  41.228 +/* The TLS descriptors are currently at a different place compared to i386.
  41.229 +   Hopefully nobody expects them at a fixed place (Wine?) */
  41.230  
  41.231 +ENTRY(cpu_gdt_table)
  41.232 +	.quad	0x0000000000000000	/* NULL descriptor */
  41.233 +	.quad	0x0			/* unused */
  41.234 +	.quad	0x00af9a000000ffff	/* __KERNEL_CS */
  41.235 +	.quad	0x00cf92000000ffff	/* __KERNEL_DS */
  41.236 +	.quad	0x00cffa000000ffff	/* __USER32_CS */
  41.237 +	.quad	0x00cff2000000ffff	/* __USER_DS, __USER32_DS  */
  41.238 +	.quad	0x00affa000000ffff	/* __USER_CS */
  41.239 +	.quad	0x00cf9a000000ffff	/* __KERNEL32_CS */
  41.240 +	.quad	0,0			/* TSS */
  41.241 +	.quad	0,0			/* LDT */
  41.242 +	.quad   0,0,0			/* three TLS descriptors */
  41.243 +	.quad	0			/* unused */
  41.244 +gdt_end:
  41.245 +	/* asm/segment.h:GDT_ENTRIES must match this */
  41.246 +	/* This should be a multiple of the cache line size */
  41.247 +	/* GDTs of other CPUs are now dynamically allocated */
  41.248 +
  41.249 +	/* zero the remaining page */
  41.250 +	.fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0
  41.251 +
  41.252 +/*
  41.253 + * __xen_guest information
  41.254 + */
  41.255 +.macro utoh value
  41.256 + .if (\value) < 0 || (\value) >= 0x10
  41.257 +	utoh (((\value)>>4)&0x0fffffffffffffff)
  41.258 + .endif
  41.259 + .if ((\value) & 0xf) < 10
  41.260 +  .byte '0' + ((\value) & 0xf)
  41.261 + .else
  41.262 +  .byte 'A' + ((\value) & 0xf) - 10
  41.263 + .endif
  41.264 +.endm
  41.265 +
  41.266 +.section __xen_guest
  41.267 +	.ascii	"GUEST_OS=linux,GUEST_VER=2.6"
  41.268 +	.ascii	",XEN_VER=xen-3.0"
  41.269 +	.ascii	",VIRT_BASE=0x"; utoh __START_KERNEL_map
  41.270 +	.ascii	",HYPERCALL_PAGE=0x"; utoh (phys_hypercall_page >> PAGE_SHIFT)
  41.271 +	.ascii  ",FEATURES=writable_page_tables"
  41.272 +	.ascii		 "|writable_descriptor_tables"
  41.273 +	.ascii		 "|auto_translated_physmap"
  41.274 +	.ascii	         "|supervisor_mode_kernel"
  41.275 +	.ascii	",LOADER=generic"
  41.276 +	.byte	0

    42.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/head64-xen.c	Fri Feb 24 14:03:07 2006 -0700
    42.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/head64-xen.c	Fri Feb 24 15:41:08 2006 -0700
    42.3 @@ -47,7 +47,7 @@ extern char saved_command_line[];
    42.4  
    42.5  static void __init copy_bootdata(char *real_mode_data)
    42.6  {
    42.7 -#if 0
    42.8 +#ifndef CONFIG_XEN
    42.9  	int new_data;
   42.10  	char * command_line;
   42.11  
   42.12 @@ -63,7 +63,6 @@ static void __init copy_bootdata(char *r
   42.13  	}
   42.14  	command_line = (char *) ((u64)(new_data));
   42.15  	memcpy(saved_command_line, command_line, COMMAND_LINE_SIZE);
   42.16 -	printk("Bootdata ok (command line is %s)\n", saved_command_line);
   42.17  #else
   42.18  	int max_cmdline;
   42.19  	
   42.20 @@ -71,8 +70,8 @@ static void __init copy_bootdata(char *r
   42.21  		max_cmdline = COMMAND_LINE_SIZE;
   42.22  	memcpy(saved_command_line, xen_start_info->cmd_line, max_cmdline);
   42.23  	saved_command_line[max_cmdline-1] = '\0';
   42.24 +#endif
   42.25  	printk("Bootdata ok (command line is %s)\n", saved_command_line);
   42.26 -#endif
   42.27  }
   42.28  
   42.29  static void __init setup_boot_cpu_data(void)
   42.30 @@ -98,6 +97,7 @@ void __init x86_64_start_kernel(char * r
   42.31  	char *s;
   42.32  	int i;
   42.33  
   42.34 +	xen_start_info = (struct start_info *)real_mode_data;
   42.35  	if (!xen_feature(XENFEAT_auto_translated_physmap)) {
   42.36  		phys_to_machine_mapping =
   42.37  			(unsigned long *)xen_start_info->mfn_list;
   42.38 @@ -105,9 +105,9 @@ void __init x86_64_start_kernel(char * r
   42.39  			xen_start_info->nr_pt_frames;
   42.40  	}
   42.41  
   42.42 +#if 0
   42.43  	for (i = 0; i < 256; i++)
   42.44  		set_intr_gate(i, early_idt_handler);
   42.45 -#if 0
   42.46  	asm volatile("lidt %0" :: "m" (idt_descr));
   42.47  #endif
   42.48  

    43.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    43.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/init_task.c	Fri Feb 24 15:41:08 2006 -0700
    43.3 @@ -0,0 +1,52 @@
    43.4 +#include <linux/mm.h>
    43.5 +#include <linux/module.h>
    43.6 +#include <linux/sched.h>
    43.7 +#include <linux/init.h>
    43.8 +#include <linux/init_task.h>
    43.9 +#include <linux/fs.h>
   43.10 +#include <linux/mqueue.h>
   43.11 +
   43.12 +#include <asm/uaccess.h>
   43.13 +#include <asm/pgtable.h>
   43.14 +#include <asm/desc.h>
   43.15 +
   43.16 +static struct fs_struct init_fs = INIT_FS;
   43.17 +static struct files_struct init_files = INIT_FILES;
   43.18 +static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
   43.19 +static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
   43.20 +struct mm_struct init_mm = INIT_MM(init_mm);
   43.21 +
   43.22 +EXPORT_SYMBOL(init_mm);
   43.23 +
   43.24 +/*
   43.25 + * Initial task structure.
   43.26 + *
   43.27 + * We need to make sure that this is 8192-byte aligned due to the
   43.28 + * way process stacks are handled. This is done by having a special
   43.29 + * "init_task" linker map entry..
   43.30 + */
   43.31 +union thread_union init_thread_union 
   43.32 +	__attribute__((__section__(".data.init_task"))) =
   43.33 +		{ INIT_THREAD_INFO(init_task) };
   43.34 +
   43.35 +/*
   43.36 + * Initial task structure.
   43.37 + *
   43.38 + * All other task structs will be allocated on slabs in fork.c
   43.39 + */
   43.40 +struct task_struct init_task = INIT_TASK(init_task);
   43.41 +
   43.42 +EXPORT_SYMBOL(init_task);
   43.43 +
   43.44 +#ifndef CONFIG_X86_NO_TSS
   43.45 +/*
   43.46 + * per-CPU TSS segments. Threads are completely 'soft' on Linux,
   43.47 + * no more per-task TSS's. The TSS size is kept cacheline-aligned
   43.48 + * so they are allowed to end up in the .data.cacheline_aligned
   43.49 + * section. Since TSS's are completely CPU-local, we want them
   43.50 + * on exact cacheline boundaries, to eliminate cacheline ping-pong.
   43.51 + */ 
   43.52 +DEFINE_PER_CPU(struct tss_struct, init_tss) ____cacheline_internodealigned_in_smp = INIT_TSS;
   43.53 +#endif
   43.54 +
   43.55 +#define ALIGN_TO_4K __attribute__((section(".data.init_task")))

    44.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/io_apic-xen.c	Fri Feb 24 14:03:07 2006 -0700
    44.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/io_apic-xen.c	Fri Feb 24 15:41:08 2006 -0700
    44.3 @@ -30,6 +30,9 @@
    44.4  #include <linux/mc146818rtc.h>
    44.5  #include <linux/acpi.h>
    44.6  #include <linux/sysdev.h>
    44.7 +#ifdef CONFIG_ACPI
    44.8 +#include <acpi/acpi_bus.h>
    44.9 +#endif
   44.10  
   44.11  #include <asm/io.h>
   44.12  #include <asm/smp.h>
   44.13 @@ -310,6 +313,8 @@ static int __init enable_ioapic_setup(ch
   44.14  
   44.15     And another hack to disable the IOMMU on VIA chipsets.
   44.16  
   44.17 +   ... and others. Really should move this somewhere else.
   44.18 +
   44.19     Kludge-O-Rama. */
   44.20  void __init check_ioapic(void) 
   44.21  { 
   44.22 @@ -358,6 +363,17 @@ void __init check_ioapic(void)
   44.23  #ifndef CONFIG_XEN
   44.24  					if (apic_runs_main_timer != 0)
   44.25  						break;
   44.26 +#ifdef CONFIG_ACPI
   44.27 +					/* Don't do this for laptops right
   44.28 +					   right now because their timer
   44.29 +					   doesn't necessarily tick in C2/3 */
   44.30 +					if (acpi_fadt.revision >= 3 &&
   44.31 +			(acpi_fadt.plvl2_lat + acpi_fadt.plvl3_lat) < 1100) {
   44.32 +						printk(KERN_INFO
   44.33 +"ATI board detected, but seems to be a laptop. Timer might be shakey, sorry\n");
   44.34 +						break;
   44.35 +					}
   44.36 +#endif					
   44.37  					printk(KERN_INFO
   44.38  	     "ATI board detected. Using APIC/PM timer.\n");
   44.39  					apic_runs_main_timer = 1;

    45.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/mpparse-xen.c	Fri Feb 24 14:03:07 2006 -0700
    45.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/mpparse-xen.c	Fri Feb 24 15:41:08 2006 -0700
    45.3 @@ -295,9 +295,9 @@ static int __init smp_read_mpc(struct mp
    45.4  
    45.5  	memcpy(str,mpc->mpc_productid,12);
    45.6  	str[12]=0;
    45.7 -	printk(KERN_INFO "Product ID: %s ",str);
    45.8 +	printk("Product ID: %s ",str);
    45.9  
   45.10 -	printk(KERN_INFO "APIC at: 0x%X\n",mpc->mpc_lapic);
   45.11 +	printk("APIC at: 0x%X\n",mpc->mpc_lapic);
   45.12  
   45.13  	/* save the local APIC address, it might be non-default */
   45.14  	if (!acpi_lapic)

    46.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/process-xen.c	Fri Feb 24 14:03:07 2006 -0700
    46.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/process-xen.c	Fri Feb 24 15:41:08 2006 -0700
    46.3 @@ -289,16 +289,28 @@ void exit_thread(void)
    46.4  	kprobe_flush_task(me);
    46.5  
    46.6  	if (me->thread.io_bitmap_ptr) { 
    46.7 +#ifndef CONFIG_X86_NO_TSS
    46.8  		struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
    46.9 +#endif
   46.10 +#ifdef CONFIG_XEN
   46.11 +		static physdev_op_t iobmp_op = {
   46.12 +			.cmd = PHYSDEVOP_SET_IOBITMAP
   46.13 +		};
   46.14 +#endif
   46.15  
   46.16  		kfree(t->io_bitmap_ptr);
   46.17  		t->io_bitmap_ptr = NULL;
   46.18  		/*
   46.19  		 * Careful, clear this in the TSS too:
   46.20  		 */
   46.21 +#ifndef CONFIG_X86_NO_TSS
   46.22  		memset(tss->io_bitmap, 0xff, t->io_bitmap_max);
   46.23 +		put_cpu();
   46.24 +#endif
   46.25 +#ifdef CONFIG_XEN
   46.26 +		HYPERVISOR_physdev_op(&iobmp_op);
   46.27 +#endif
   46.28  		t->io_bitmap_max = 0;
   46.29 -		put_cpu();
   46.30  	}
   46.31  }
   46.32  
   46.33 @@ -463,7 +475,9 @@ static inline void __save_init_fpu( stru
   46.34  	struct thread_struct *prev = &prev_p->thread,
   46.35  				 *next = &next_p->thread;
   46.36  	int cpu = smp_processor_id();  
   46.37 +#ifndef CONFIG_X86_NO_TSS
   46.38  	struct tss_struct *tss = &per_cpu(init_tss, cpu);
   46.39 +#endif
   46.40  	physdev_op_t iopl_op, iobmp_op;
   46.41  	multicall_entry_t _mcl[8], *mcl = _mcl;
   46.42  
   46.43 @@ -482,10 +496,9 @@ static inline void __save_init_fpu( stru
   46.44  	/*
   46.45  	 * Reload esp0, LDT and the page table pointer:
   46.46  	 */
   46.47 -	tss->rsp0 = next->rsp0;
   46.48  	mcl->op      = __HYPERVISOR_stack_switch;
   46.49  	mcl->args[0] = __KERNEL_DS;
   46.50 -	mcl->args[1] = tss->rsp0;
   46.51 +	mcl->args[1] = next->rsp0;
   46.52  	mcl++;
   46.53  
   46.54  	/*

    47.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup64-xen.c	Fri Feb 24 14:03:07 2006 -0700
    47.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup64-xen.c	Fri Feb 24 15:41:08 2006 -0700
    47.3 @@ -40,7 +40,9 @@ cpumask_t cpu_initialized __cpuinitdata 
    47.4  struct x8664_pda *_cpu_pda[NR_CPUS] __read_mostly;
    47.5  struct x8664_pda boot_cpu_pda[NR_CPUS] __cacheline_aligned;
    47.6  
    47.7 +#ifndef CONFIG_X86_NO_IDT
    47.8  struct desc_ptr idt_descr = { 256 * 16, (unsigned long) idt_table }; 
    47.9 +#endif
   47.10  
   47.11  char boot_cpu_stack[IRQSTACKSIZE] __attribute__((section(".bss.page_aligned")));
   47.12  
   47.13 @@ -155,13 +157,7 @@ static void switch_pt(void)
   47.14  
   47.15  void __init cpu_gdt_init(struct desc_ptr *gdt_descr)
   47.16  {
   47.17 -#ifdef CONFIG_SMP
   47.18 -	int cpu = stack_smp_processor_id();
   47.19 -#else
   47.20 -	int cpu = smp_processor_id();
   47.21 -#endif
   47.22 -
   47.23 -	asm volatile("lgdt %0" :: "m" (cpu_gdt_descr[cpu]));
   47.24 +	asm volatile("lgdt %0" :: "m" (*gdt_descr));
   47.25  	asm volatile("lidt %0" :: "m" (idt_descr));
   47.26  }
   47.27  #endif
   47.28 @@ -203,8 +199,10 @@ void pda_init(int cpu)
   47.29  	pda->irqstackptr += IRQSTACKSIZE-64;
   47.30  } 
   47.31  
   47.32 +#ifndef CONFIG_X86_NO_TSS
   47.33  char boot_exception_stacks[(N_EXCEPTION_STACKS - 1) * EXCEPTION_STKSZ + DEBUG_STKSZ]
   47.34  __attribute__((section(".bss.page_aligned")));
   47.35 +#endif
   47.36  
   47.37  /* May not be marked __init: used by software suspend */
   47.38  void syscall_init(void)
   47.39 @@ -246,18 +244,23 @@ void __cpuinit check_efer(void)
   47.40  void __cpuinit cpu_init (void)
   47.41  {
   47.42  	int cpu = stack_smp_processor_id();
   47.43 +#ifndef CONFIG_X86_NO_TSS
   47.44  	struct tss_struct *t = &per_cpu(init_tss, cpu);
   47.45  	unsigned long v; 
   47.46  	char *estacks = NULL; 
   47.47 +	unsigned i;
   47.48 +#endif
   47.49  	struct task_struct *me;
   47.50 -	int i;
   47.51  
   47.52  	/* CPU 0 is initialised in head64.c */
   47.53  	if (cpu != 0) {
   47.54  		pda_init(cpu);
   47.55  		zap_low_mappings(cpu);
   47.56 -	} else 
   47.57 +	}
   47.58 +#ifndef CONFIG_X86_NO_TSS
   47.59 +	else
   47.60  		estacks = boot_exception_stacks; 
   47.61 +#endif
   47.62  
   47.63  	me = current;
   47.64  
   47.65 @@ -278,12 +281,7 @@ void __cpuinit cpu_init (void)
   47.66  #endif
   47.67  
   47.68  	cpu_gdt_descr[cpu].size = GDT_SIZE;
   47.69 -#ifndef CONFIG_XEN 
   47.70 - 	asm volatile("lgdt %0" :: "m" (cpu_gdt_descr[cpu]));
   47.71 - 	asm volatile("lidt %0" :: "m" (idt_descr));
   47.72 -#else
   47.73  	cpu_gdt_init(&cpu_gdt_descr[cpu]);
   47.74 -#endif
   47.75  
   47.76  	memset(me->thread.tls_array, 0, GDT_ENTRY_TLS_ENTRIES * 8);
   47.77  	syscall_init();
   47.78 @@ -294,6 +292,7 @@ void __cpuinit cpu_init (void)
   47.79  
   47.80  	check_efer();
   47.81  
   47.82 +#ifndef CONFIG_X86_NO_TSS
   47.83  	/*
   47.84  	 * set up and load the per-CPU TSS
   47.85  	 */
   47.86 @@ -330,6 +329,7 @@ void __cpuinit cpu_init (void)
   47.87  	 */
   47.88  	for (i = 0; i <= IO_BITMAP_LONGS; i++)
   47.89  		t->io_bitmap[i] = ~0UL;
   47.90 +#endif
   47.91  
   47.92  	atomic_inc(&init_mm.mm_count);
   47.93  	me->active_mm = &init_mm;
   47.94 @@ -337,8 +337,10 @@ void __cpuinit cpu_init (void)
   47.95  		BUG();
   47.96  	enter_lazy_tlb(&init_mm, me);
   47.97  
   47.98 +#ifndef CONFIG_X86_NO_TSS
   47.99 +	set_tss_desc(cpu, t);
  47.100 +#endif
  47.101  #ifndef CONFIG_XEN
  47.102 -	set_tss_desc(cpu, t);
  47.103  	load_TR_desc();
  47.104  #endif
  47.105  	load_LDT(&init_mm.context);

    48.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/traps-xen.c	Fri Feb 24 14:03:07 2006 -0700
    48.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/traps-xen.c	Fri Feb 24 15:41:08 2006 -0700
    48.3 @@ -47,7 +47,9 @@
    48.4  #include <asm/proto.h>
    48.5  #include <asm/nmi.h>
    48.6  
    48.7 +#ifndef CONFIG_X86_NO_IDT
    48.8  extern struct gate_struct idt_table[256]; 
    48.9 +#endif
   48.10  
   48.11  asmlinkage void divide_error(void);
   48.12  asmlinkage void debug(void);
   48.13 @@ -134,6 +136,7 @@ int printk_address(unsigned long address
   48.14  static unsigned long *in_exception_stack(unsigned cpu, unsigned long stack,
   48.15  					unsigned *usedp, const char **idp)
   48.16  {
   48.17 +#ifndef CONFIG_X86_NO_TSS
   48.18  	static char ids[][8] = {
   48.19  		[DEBUG_STACK - 1] = "#DB",
   48.20  		[NMI_STACK - 1] = "NMI",
   48.21 @@ -185,6 +188,7 @@ static unsigned long *in_exception_stack
   48.22  		}
   48.23  #endif
   48.24  	}
   48.25 +#endif
   48.26  	return NULL;
   48.27  }
   48.28  
   48.29 @@ -948,28 +952,28 @@ asmlinkage void math_state_restore(void)
   48.30   * specify <dpl>|4 in the second field.
   48.31   */
   48.32  static trap_info_t trap_table[] = {
   48.33 -        {  0, 0|4, (__KERNEL_CS|0x3), (unsigned long)divide_error               },
   48.34 -        {  1, 0|4, (__KERNEL_CS|0x3), (unsigned long)debug                      },
   48.35 -        {  3, 3|4, (__KERNEL_CS|0x3), (unsigned long)int3                       },
   48.36 -        {  4, 3|4, (__KERNEL_CS|0x3), (unsigned long)overflow                   },
   48.37 -        {  5, 0|4, (__KERNEL_CS|0x3), (unsigned long)bounds                     },
   48.38 -        {  6, 0|4, (__KERNEL_CS|0x3), (unsigned long)invalid_op                 },
   48.39 -        {  7, 0|4, (__KERNEL_CS|0x3), (unsigned long)device_not_available       },
   48.40 -        {  9, 0|4, (__KERNEL_CS|0x3), (unsigned long)coprocessor_segment_overrun},
   48.41 -        { 10, 0|4, (__KERNEL_CS|0x3), (unsigned long)invalid_TSS                },
   48.42 -        { 11, 0|4, (__KERNEL_CS|0x3), (unsigned long)segment_not_present        },
   48.43 -        { 12, 0|4, (__KERNEL_CS|0x3), (unsigned long)stack_segment              },
   48.44 -        { 13, 0|4, (__KERNEL_CS|0x3), (unsigned long)general_protection         },
   48.45 -        { 14, 0|4, (__KERNEL_CS|0x3), (unsigned long)page_fault                 },
   48.46 -        { 15, 0|4, (__KERNEL_CS|0x3), (unsigned long)spurious_interrupt_bug     },
   48.47 -        { 16, 0|4, (__KERNEL_CS|0x3), (unsigned long)coprocessor_error          },
   48.48 -        { 17, 0|4, (__KERNEL_CS|0x3), (unsigned long)alignment_check            },
   48.49 +        {  0, 0|4, __KERNEL_CS, (unsigned long)divide_error               },
   48.50 +        {  1, 0|4, __KERNEL_CS, (unsigned long)debug                      },
   48.51 +        {  3, 3|4, __KERNEL_CS, (unsigned long)int3                       },
   48.52 +        {  4, 3|4, __KERNEL_CS, (unsigned long)overflow                   },
   48.53 +        {  5, 0|4, __KERNEL_CS, (unsigned long)bounds                     },
   48.54 +        {  6, 0|4, __KERNEL_CS, (unsigned long)invalid_op                 },
   48.55 +        {  7, 0|4, __KERNEL_CS, (unsigned long)device_not_available       },
   48.56 +        {  9, 0|4, __KERNEL_CS, (unsigned long)coprocessor_segment_overrun},
   48.57 +        { 10, 0|4, __KERNEL_CS, (unsigned long)invalid_TSS                },
   48.58 +        { 11, 0|4, __KERNEL_CS, (unsigned long)segment_not_present        },
   48.59 +        { 12, 0|4, __KERNEL_CS, (unsigned long)stack_segment              },
   48.60 +        { 13, 0|4, __KERNEL_CS, (unsigned long)general_protection         },
   48.61 +        { 14, 0|4, __KERNEL_CS, (unsigned long)page_fault                 },
   48.62 +        { 15, 0|4, __KERNEL_CS, (unsigned long)spurious_interrupt_bug     },
   48.63 +        { 16, 0|4, __KERNEL_CS, (unsigned long)coprocessor_error          },
   48.64 +        { 17, 0|4, __KERNEL_CS, (unsigned long)alignment_check            },
   48.65  #ifdef CONFIG_X86_MCE
   48.66 -        { 18, 0|4, (__KERNEL_CS|0x3), (unsigned long)machine_check              },
   48.67 +        { 18, 0|4, __KERNEL_CS, (unsigned long)machine_check              },
   48.68  #endif
   48.69 -        { 19, 0|4, (__KERNEL_CS|0x3), (unsigned long)simd_coprocessor_error     },
   48.70 +        { 19, 0|4, __KERNEL_CS, (unsigned long)simd_coprocessor_error     },
   48.71  #ifdef CONFIG_IA32_EMULATION
   48.72 -	{ IA32_SYSCALL_VECTOR, 3|4, (__KERNEL_CS|0x3), (unsigned long)ia32_syscall},
   48.73 +	{ IA32_SYSCALL_VECTOR, 3|4, __KERNEL_CS, (unsigned long)ia32_syscall},
   48.74  #endif
   48.75          {  0, 0,           0, 0                                              }
   48.76  };
   48.77 @@ -984,10 +988,6 @@ void __init trap_init(void)
   48.78                  printk("HYPERVISOR_set_trap_table faild: error %d\n",
   48.79                         ret);
   48.80  
   48.81 -#ifdef CONFIG_IA32_EMULATION
   48.82 -	set_system_gate(IA32_SYSCALL_VECTOR, ia32_syscall);
   48.83 -#endif
   48.84 -       
   48.85  	/*
   48.86  	 * Should be a barrier for any external CPU state.
   48.87  	 */
   48.88 @@ -997,12 +997,6 @@ void __init trap_init(void)
   48.89  void smp_trap_init(trap_info_t *trap_ctxt)
   48.90  {
   48.91  	trap_info_t *t = trap_table;
   48.92 -	int i;
   48.93 -
   48.94 -	for (i = 0; i < 256; i++) {
   48.95 -		trap_ctxt[i].vector = i;
   48.96 -		trap_ctxt[i].cs     = FLAT_KERNEL_CS;
   48.97 -	}
   48.98  
   48.99  	for (t = trap_table; t->address; t++) {
  48.100  		trap_ctxt[t->vector].flags = t->flags;