The patch titled
Xen-paravirt: allow paravirt backend to select PGD allocation alignment
has been removed from the -mm tree. Its filename was
xen-paravirt-allow-paravirt-backend-to-select-pgd-allocation-alignment.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
Subject: Xen-paravirt: allow paravirt backend to select PGD allocation alignment
From: Jeremy Fitzhardinge <jeremy@xxxxxxxx>
Xen requires pgds to be page-aligned, so make this a parameter which can be
set in the paravirt_ops structure.
Signed-off-by: Jeremy Fitzhardinge <jeremy@xxxxxxxxxxxxx>
Cc: Zachary Amsden <zach@xxxxxxxxxx>
Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Cc: Chris Wright <chrisw@xxxxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/i386/kernel/paravirt.c | 1 +
arch/i386/mm/init.c | 2 +-
include/asm-i386/paravirt.h | 5 ++++-
include/asm-i386/pgtable.h | 6 ++++++
4 files changed, 12 insertions(+), 2 deletions(-)
diff -puN arch/i386/kernel/paravirt.c~xen-paravirt-allow-paravirt-backend-to-select-pgd-allocation-alignment arch/i386/kernel/paravirt.c
--- a/arch/i386/kernel/paravirt.c~xen-paravirt-allow-paravirt-backend-to-select-pgd-allocation-alignment
+++ a/arch/i386/kernel/paravirt.c
@@ -605,6 +605,7 @@ struct paravirt_ops paravirt_ops = {
.paravirt_enabled = 0,
.kernel_rpl = 0,
.shared_kernel_pmd = 1, /* Only used when CONFIG_X86_PAE is set */
+ .pgd_alignment = sizeof(pgd_t) * PTRS_PER_PGD,
.patch = native_patch,
.banner = default_banner,
diff -puN arch/i386/mm/init.c~xen-paravirt-allow-paravirt-backend-to-select-pgd-allocation-alignment arch/i386/mm/init.c
--- a/arch/i386/mm/init.c~xen-paravirt-allow-paravirt-backend-to-select-pgd-allocation-alignment
+++ a/arch/i386/mm/init.c
@@ -729,7 +729,7 @@ void __init pgtable_cache_init(void)
}
pgd_cache = kmem_cache_create("pgd",
PTRS_PER_PGD*sizeof(pgd_t),
- PTRS_PER_PGD*sizeof(pgd_t),
+ PGD_ALIGNMENT,
0, NULL, NULL);
if (!pgd_cache)
panic("pgtable_cache_init(): Cannot create pgd cache");
diff -puN include/asm-i386/paravirt.h~xen-paravirt-allow-paravirt-backend-to-select-pgd-allocation-alignment include/asm-i386/paravirt.h
--- a/include/asm-i386/paravirt.h~xen-paravirt-allow-paravirt-backend-to-select-pgd-allocation-alignment
+++ a/include/asm-i386/paravirt.h
@@ -33,9 +33,12 @@ struct tss_struct;
struct mm_struct;
struct paravirt_ops
{
+ int paravirt_enabled;
unsigned int kernel_rpl;
+
int shared_kernel_pmd;
- int paravirt_enabled;
+ int pgd_alignment;
+
const char *name;
/*
diff -puN include/asm-i386/pgtable.h~xen-paravirt-allow-paravirt-backend-to-select-pgd-allocation-alignment include/asm-i386/pgtable.h
--- a/include/asm-i386/pgtable.h~xen-paravirt-allow-paravirt-backend-to-select-pgd-allocation-alignment
+++ a/include/asm-i386/pgtable.h
@@ -273,6 +273,12 @@ static inline void vmalloc_sync_all(void
#define pte_update_defer(mm, addr, ptep) do { } while (0)
#endif
+#ifdef CONFIG_PARAVIRT
+#define PGD_ALIGNMENT (paravirt_ops.pgd_alignment)
+#else
+#define PGD_ALIGNMENT (sizeof(pgd_t) * PTRS_PER_PGD)
+#endif
+
/*
* We only update the dirty/accessed state if we set
* the dirty bit by hand in the kernel, since the hardware
_
Patches currently in -mm which might be from jeremy@xxxxxxxx are
xen-paravirt-allow-paravirt-backend-to-select-pgd-allocation-alignment.patch
xen-paravirt-add-hooks-to-intercept-mm-creation-and-destruction.patch
xen-paravirt-add-apply_to_page_range-which-applies-a-function-to-a-pte-range.patch
xen-paravirt-allocate-and-free-vmalloc-areas.patch
xen-paravirt-add-nosegneg-capability-to-the-vsyscall-page-notes.patch
xen-paravirt-add-xen-config-options-and-disable-unsupported-config-options.patch
xen-paravirt-add-xen-interface-header-files.patch
xen-paravirt-core-xen-implementation.patch
xen-paravirt-core-xen-implementation-fix.patch
xen-paravirt-add-the-xen-virtual-console-driver.patch
xen-paravirt-add-xen-grant-table-support.patch
xen-paravirt-add-the-xenbus-sysfs-and-virtual-device-hotplug-driver.patch
xen-paravirt-add-xen-virtual-block-device-driver.patch
xen-paravirt-add-the-xen-virtual-network-device-driver.patch
fixes-and-cleanups-for-earlyprintk-aka-boot-console.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
