ChangeSet 1.1262, 2005/03/24 20:20:12+00:00, mafetter@xxxxxxxxxxxxxxxx
Remove the changes to linux for running in shadow translate mode.
These changes are still in the bitkeeper tree, and will probably be
pulled
forward at some future date.
Signed-off-by: michael.fetterman@xxxxxxxxxxxx
b/linux-2.6.10-xen-sparse/arch/xen/Kconfig | 37
b/linux-2.6.10-xen-sparse/arch/xen/configs/xen0_defconfig | 12
b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/Makefile | 2
b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/cpu/common.c | 4
b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/entry.S | 10
b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/ldt.c | 12
b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/pci-dma.c | 2
b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/process.c | 8
b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/setup.c | 34
b/linux-2.6.10-xen-sparse/arch/xen/i386/mm/fault.c | 27
b/linux-2.6.10-xen-sparse/arch/xen/i386/mm/hypervisor.c | 99
b/linux-2.6.10-xen-sparse/arch/xen/i386/mm/init.c | 21
b/linux-2.6.10-xen-sparse/arch/xen/i386/mm/ioremap.c | 33
b/linux-2.6.10-xen-sparse/arch/xen/i386/mm/pageattr.c | 10
b/linux-2.6.10-xen-sparse/arch/xen/i386/mm/pgtable.c | 49
b/linux-2.6.10-xen-sparse/arch/xen/kernel/reboot.c | 19
b/linux-2.6.10-xen-sparse/drivers/xen/balloon/balloon.c | 13
b/linux-2.6.10-xen-sparse/drivers/xen/blkback/blkback.c | 4
b/linux-2.6.10-xen-sparse/drivers/xen/blkfront/blkfront.c | 16
b/linux-2.6.10-xen-sparse/drivers/xen/blkfront/vbd.c | 4
b/linux-2.6.10-xen-sparse/drivers/xen/netback/netback.c | 12
b/linux-2.6.10-xen-sparse/drivers/xen/netfront/netfront.c | 25
b/linux-2.6.10-xen-sparse/drivers/xen/privcmd/privcmd.c | 4
b/linux-2.6.10-xen-sparse/include/asm-xen/asm-i386/desc.h | 4
b/linux-2.6.10-xen-sparse/include/asm-xen/asm-i386/fixmap.h | 11
b/linux-2.6.10-xen-sparse/include/asm-xen/asm-i386/io.h | 31
b/linux-2.6.10-xen-sparse/include/asm-xen/asm-i386/page.h | 43
b/linux-2.6.10-xen-sparse/include/asm-xen/asm-i386/pgalloc.h | 4
b/linux-2.6.10-xen-sparse/include/asm-xen/asm-i386/pgtable-2level.h | 29
b/linux-2.6.10-xen-sparse/include/asm-xen/asm-i386/pgtable.h | 30
b/linux-2.6.10-xen-sparse/mm/memory.c | 94
b/xen/include/public/arch-x86_32.h | 6
linux-2.6.10-xen-sparse/arch/xen/i386/kernel/syscall_stats.c | 101
linux-2.6.10-xen-sparse/fs/exec.c | 1432
--------
linux-2.6.10-xen-sparse/mm/highmem.c | 607 ---
linux-2.6.10-xen-sparse/mm/swapfile.c | 1711
----------
36 files changed, 11 insertions(+), 4549 deletions(-)
diff -Nru a/linux-2.6.10-xen-sparse/arch/xen/Kconfig
b/linux-2.6.10-xen-sparse/arch/xen/Kconfig
--- a/linux-2.6.10-xen-sparse/arch/xen/Kconfig 2005-04-05 12:18:57 -04:00
+++ b/linux-2.6.10-xen-sparse/arch/xen/Kconfig 2005-04-05 12:18:57 -04:00
@@ -115,43 +115,8 @@
space. Odds are that you want to say N here.
config XEN_WRITABLE_PAGETABLES
- bool "writable page tables"
+ bool
default y
-
-config XEN_SYSCALL_STATS
- bool "system call statistics"
- default n
-
-config XEN_DEBUG_NO_MMU_BATCHING
- bool "Disables batching on MMU updates"
- default n
- help
- This does a hypercall per PTE update
- we only use this for benchmarking
- enable only if you know what you are doing
-
-config XEN_BATCH_MODE1
- bool "A variant of writable pagetable using the batch interface"
- default n
- help
- default is no batching and minor mods for some batching
- we only use this for benchmarking
- enable only if you know what you are doing
-
-config XEN_BATCH_MODE2
- bool "forward port of 2.4 batching"
- default n
- help
- default is batching + flushes where 2.4 had them
- we only use this for benchmarking
- enable only if you know what you are doing
-
-config XEN_SHADOW_MODE
- bool "Fake shadow mode"
- default n
- help
- fakes out a shadow mode kernel
-
config XEN_SCRUB_PAGES
bool "Scrub memory before freeing it to Xen"
diff -Nru a/linux-2.6.10-xen-sparse/arch/xen/configs/xen0_defconfig
b/linux-2.6.10-xen-sparse/arch/xen/configs/xen0_defconfig
--- a/linux-2.6.10-xen-sparse/arch/xen/configs/xen0_defconfig 2005-04-05
12:18:57 -04:00
+++ b/linux-2.6.10-xen-sparse/arch/xen/configs/xen0_defconfig 2005-04-05
12:18:57 -04:00
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.10-xen0
-# Mon Mar 21 17:07:15 2005
+# Mon Feb 21 13:46:38 2005
#
CONFIG_XEN=y
CONFIG_ARCH_XEN=y
@@ -12,18 +12,14 @@
#
CONFIG_XEN_PRIVILEGED_GUEST=y
CONFIG_XEN_PHYSDEV_ACCESS=y
-# CONFIG_XEN_BLKDEV_BACKEND is not set
-# CONFIG_XEN_NETDEV_BACKEND is not set
+CONFIG_XEN_BLKDEV_BACKEND=y
+# CONFIG_XEN_BLKDEV_TAP_BE is not set
+CONFIG_XEN_NETDEV_BACKEND=y
CONFIG_XEN_BLKDEV_FRONTEND=y
CONFIG_XEN_NETDEV_FRONTEND=y
# CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set
# CONFIG_XEN_BLKDEV_TAP is not set
CONFIG_XEN_WRITABLE_PAGETABLES=y
-CONFIG_XEN_SYSCALL_STATS=y
-# CONFIG_XEN_DEBUG_NO_MMU_BATCHING is not set
-# CONFIG_XEN_BATCH_MODE1 is not set
-# CONFIG_XEN_BATCH_MODE2 is not set
-CONFIG_XEN_SHADOW_MODE=y
CONFIG_XEN_SCRUB_PAGES=y
CONFIG_X86=y
# CONFIG_X86_64 is not set
diff -Nru a/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/Makefile
b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/Makefile
--- a/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/Makefile 2005-04-05
12:18:59 -04:00
+++ b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/Makefile 2005-04-05
12:18:59 -04:00
@@ -43,8 +43,6 @@
c-obj-$(CONFIG_EFI) += efi.o efi_stub.o
c-obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
-c-obj-$(CONFIG_XEN_SYSCALL_STATS) += syscall_stats.o
-
EXTRA_AFLAGS := -traditional
c-obj-$(CONFIG_SCx200) += scx200.o
diff -Nru a/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/cpu/common.c
b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/cpu/common.c
--- a/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/cpu/common.c 2005-04-05
12:18:57 -04:00
+++ b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/cpu/common.c 2005-04-05
12:18:57 -04:00
@@ -512,11 +512,7 @@
for (va = gdt_descr->address, f = 0;
va < gdt_descr->address + gdt_descr->size;
va += PAGE_SIZE, f++) {
-#ifndef CONFIG_XEN_SHADOW_MODE
frames[f] = virt_to_machine(va) >> PAGE_SHIFT;
-#else /* CONFIG_XEN_SHADOW_MODE */
- frames[f] = __vms_virt_to_machine(va) >> PAGE_SHIFT;
-#endif /* CONFIG_XEN_SHADOW_MODE */
make_page_readonly((void *)va);
}
flush_page_update_queue();
diff -Nru a/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/entry.S
b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/entry.S
--- a/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/entry.S 2005-04-05
12:18:59 -04:00
+++ b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/entry.S 2005-04-05
12:18:59 -04:00
@@ -280,10 +280,7 @@
jnz syscall_trace_entry
cmpl $(nr_syscalls), %eax
jae syscall_badsys
-#ifdef CONFIG_XEN_SYSCALL_STATS
- lock incl syscall_stats(,%eax,4)
-#endif
- call *sys_call_table(,%eax,4)
+ call *sys_call_table(,%eax,4)
movl %eax,EAX(%esp)
cli
movl TI_flags(%ebp), %ecx
@@ -308,10 +305,7 @@
cmpl $(nr_syscalls), %eax
jae syscall_badsys
syscall_call:
-#ifdef CONFIG_XEN_SYSCALL_STATS
- lock incl syscall_stats(,%eax,4)
-#endif
- call *sys_call_table(,%eax,4)
+ call *sys_call_table(,%eax,4)
movl %eax,EAX(%esp) # store the return value
syscall_exit:
XEN_BLOCK_EVENTS(%esi) # make sure we don't miss an interrupt
diff -Nru a/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/ldt.c
b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/ldt.c
--- a/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/ldt.c 2005-04-05
12:18:59 -04:00
+++ b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/ldt.c 2005-04-05
12:18:59 -04:00
@@ -61,10 +61,8 @@
cpumask_t mask;
preempt_disable();
#endif
-#ifndef CONFIG_XEN_SHADOW_MODE
make_pages_readonly(pc->ldt, (pc->size * LDT_ENTRY_SIZE) /
PAGE_SIZE);
-#endif /* CONFIG_XEN_SHADOW_MODE */
load_LDT(pc);
flush_page_update_queue();
#ifdef CONFIG_SMP
@@ -75,10 +73,8 @@
#endif
}
if (oldsize) {
-#ifndef CONFIG_XEN_SHADOW_MODE
make_pages_writable(oldldt, (oldsize * LDT_ENTRY_SIZE) /
PAGE_SIZE);
-#endif /* ! CONFIG_XEN_SHADOW_MODE */
flush_page_update_queue();
if (oldsize*LDT_ENTRY_SIZE > PAGE_SIZE)
vfree(oldldt);
@@ -94,10 +90,8 @@
if (err < 0)
return err;
memcpy(new->ldt, old->ldt, old->size*LDT_ENTRY_SIZE);
-#ifndef CONFIG_XEN_SHADOW_MODE
make_pages_readonly(new->ldt, (new->size * LDT_ENTRY_SIZE) /
PAGE_SIZE);
-#endif /* ! CONFIG_XEN_SHADOW_MODE */
flush_page_update_queue();
return 0;
}
@@ -130,11 +124,9 @@
if (mm->context.size) {
if (mm == current->active_mm)
clear_LDT();
-#ifndef CONFIG_XEN_SHADOW_MODE
make_pages_writable(mm->context.ldt,
(mm->context.size * LDT_ENTRY_SIZE) /
PAGE_SIZE);
-#endif /* ! CONFIG_XEN_SHADOW_MODE */
flush_page_update_queue();
if (mm->context.size*LDT_ENTRY_SIZE > PAGE_SIZE)
vfree(mm->context.ldt);
@@ -230,11 +222,7 @@
}
lp = (__u32 *) ((ldt_info.entry_number << 3) + (char *)
mm->context.ldt);
-#ifndef CONFIG_XEN_SHADOW_MODE
mach_lp = arbitrary_virt_to_machine(lp);
-#else /* CONFIG_XEN_SHADOW_MODE */
- mach_lp = arbitrary_virt_to_phys(lp);
-#endif /* CONFIG_XEN_SHADOW_MODE */
/* Allow LDTs to be cleared by the user. */
if (ldt_info.base_addr == 0 && ldt_info.limit == 0) {
diff -Nru a/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/pci-dma.c
b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/pci-dma.c
--- a/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/pci-dma.c 2005-04-05
12:18:59 -04:00
+++ b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/pci-dma.c 2005-04-05
12:18:59 -04:00
@@ -30,7 +30,6 @@
static void
xen_contig_memory(unsigned long vstart, unsigned int order)
{
-#ifndef CONFIG_XEN_SHADOW_MODE
/*
* Ensure multi-page extents are contiguous in machine memory.
* This code could be cleaned up some, and the number of
@@ -77,7 +76,6 @@
xen_tlb_flush();
balloon_unlock(flags);
-#endif /* CONFIG_XEN_SHADOW_MODE */
}
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
diff -Nru a/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/process.c
b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/process.c
--- a/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/process.c 2005-04-05
12:18:57 -04:00
+++ b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/process.c 2005-04-05
12:18:57 -04:00
@@ -514,23 +514,17 @@
* Load the per-thread Thread-Local Storage descriptor.
* This is load_TLS(next, cpu) with multicalls.
*/
-#ifndef CONFIG_XEN_SHADOW_MODE
-#define C_VIRT_TO_MACH virt_to_machine
-#else /* CONFIG_XEN_SHADOW_MODE */
-#define C_VIRT_TO_MACH virt_to_phys
-#endif
#define C(i) do { \
if (unlikely(next->tls_array[i].a != prev->tls_array[i].a || \
next->tls_array[i].b != prev->tls_array[i].b)) \
queue_multicall3(__HYPERVISOR_update_descriptor, \
- C_VIRT_TO_MACH(&get_cpu_gdt_table(cpu) \
+ virt_to_machine(&get_cpu_gdt_table(cpu) \
[GDT_ENTRY_TLS_MIN + i]), \
((u32 *)&next->tls_array[i])[0], \
((u32 *)&next->tls_array[i])[1]); \
} while (0)
C(0); C(1); C(2);
#undef C
-#undef C_VIRT_TO_MACH
if (xen_start_info.flags & SIF_PRIVILEGED) {
op.cmd = DOM0_IOPL;
diff -Nru a/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/setup.c
b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/setup.c
--- a/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/setup.c 2005-04-05
12:19:00 -04:00
+++ b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/setup.c 2005-04-05
12:19:00 -04:00
@@ -345,13 +345,8 @@
shared_info_t *HYPERVISOR_shared_info = (shared_info_t *)empty_zero_page;
EXPORT_SYMBOL(HYPERVISOR_shared_info);
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home