diff for duplicates of <20200216081843.28670-2-rppt@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 877a11b..0bd61ba 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -688,13 +688,13 @@ index acb0751a6606..b8f158ae2527 100644 @@ -44,13 +45,11 @@ typedef struct { pteval_t pgprot; } pgprot_t; #define __pgprot(x) ((pgprot_t) { (x) } ) - #if CONFIG_PGTABLE_LEVELS = 2 + #if CONFIG_PGTABLE_LEVELS == 2 -#define __ARCH_USE_5LEVEL_HACK #include <asm-generic/pgtable-nopmd.h> - #elif CONFIG_PGTABLE_LEVELS = 3 + #elif CONFIG_PGTABLE_LEVELS == 3 -#define __ARCH_USE_5LEVEL_HACK #include <asm-generic/pgtable-nopud.h> - #elif CONFIG_PGTABLE_LEVELS = 4 + #elif CONFIG_PGTABLE_LEVELS == 4 -#include <asm-generic/5level-fixup.h> +#include <asm-generic/pgtable-nop4d.h> #endif @@ -1013,7 +1013,7 @@ index bbeb6a5a6ba6..b8a9f26f3790 100644 + p4dp = p4d_offset(pgdp, addr); + pudp = pud_offset(p4dp, addr); pmdp = pmd_offset(pudp, addr); - if ((pte_t *)pmdp = ptep) { + if ((pte_t *)pmdp == ptep) { *pgsize = PMD_SIZE; @@ -217,12 +219,14 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz) @@ -1242,8 +1242,8 @@ index 128f70852bf3..ad4be3e8e0c1 100644 + p4dp = p4d_offset(pgdp, addr); + p4d = READ_ONCE(*p4dp); if (CONFIG_PGTABLE_LEVELS > 3 && -- !(pgd_none(pgd) || pgd_page_paddr(pgd) = __pa_symbol(bm_pud))) { -+ !(p4d_none(p4d) || p4d_page_paddr(p4d) = __pa_symbol(bm_pud))) { +- !(pgd_none(pgd) || pgd_page_paddr(pgd) == __pa_symbol(bm_pud))) { ++ !(p4d_none(p4d) || p4d_page_paddr(p4d) == __pa_symbol(bm_pud))) { /* * We only end up here if the kernel mapping and the fixmap * share the top level pgd entry, which should only happen on @@ -1699,3 +1699,8 @@ index 19c961ac4e3c..3d250fa3d2b9 100644 -- 2.24.0 + +_______________________________________________ +kvmarm mailing list +kvmarm@lists.cs.columbia.edu +https://lists.cs.columbia.edu/mailman/listinfo/kvmarm diff --git a/a/content_digest b/N1/content_digest index 1502f85..ff78967 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020200216081843.28670-1-rppt@kernel.org\0" "From\0Mike Rapoport <rppt@kernel.org>\0" "Subject\0[PATCH v2 01/13] arm/arm64: add support for folded p4d page tables\0" - "Date\0Sun, 16 Feb 2020 08:18:31 +0000\0" + "Date\0Sun, 16 Feb 2020 10:18:31 +0200\0" "To\0linux-kernel@vger.kernel.org\0" "Cc\0Rich Felker <dalias@libc.org>" linux-ia64@vger.kernel.org @@ -730,13 +730,13 @@ "@@ -44,13 +45,11 @@ typedef struct { pteval_t pgprot; } pgprot_t;\n" " #define __pgprot(x)\t((pgprot_t) { (x) } )\n" " \n" - " #if CONFIG_PGTABLE_LEVELS = 2\n" + " #if CONFIG_PGTABLE_LEVELS == 2\n" "-#define __ARCH_USE_5LEVEL_HACK\n" " #include <asm-generic/pgtable-nopmd.h>\n" - " #elif CONFIG_PGTABLE_LEVELS = 3\n" + " #elif CONFIG_PGTABLE_LEVELS == 3\n" "-#define __ARCH_USE_5LEVEL_HACK\n" " #include <asm-generic/pgtable-nopud.h>\n" - " #elif CONFIG_PGTABLE_LEVELS = 4\n" + " #elif CONFIG_PGTABLE_LEVELS == 4\n" "-#include <asm-generic/5level-fixup.h>\n" "+#include <asm-generic/pgtable-nop4d.h>\n" " #endif\n" @@ -1055,7 +1055,7 @@ "+\tp4dp = p4d_offset(pgdp, addr);\n" "+\tpudp = pud_offset(p4dp, addr);\n" " \tpmdp = pmd_offset(pudp, addr);\n" - " \tif ((pte_t *)pmdp = ptep) {\n" + " \tif ((pte_t *)pmdp == ptep) {\n" " \t\t*pgsize = PMD_SIZE;\n" "@@ -217,12 +219,14 @@ pte_t *huge_pte_alloc(struct mm_struct *mm,\n" " \t\t unsigned long addr, unsigned long sz)\n" @@ -1284,8 +1284,8 @@ "+\tp4dp = p4d_offset(pgdp, addr);\n" "+\tp4d = READ_ONCE(*p4dp);\n" " \tif (CONFIG_PGTABLE_LEVELS > 3 &&\n" - "-\t !(pgd_none(pgd) || pgd_page_paddr(pgd) = __pa_symbol(bm_pud))) {\n" - "+\t !(p4d_none(p4d) || p4d_page_paddr(p4d) = __pa_symbol(bm_pud))) {\n" + "-\t !(pgd_none(pgd) || pgd_page_paddr(pgd) == __pa_symbol(bm_pud))) {\n" + "+\t !(p4d_none(p4d) || p4d_page_paddr(p4d) == __pa_symbol(bm_pud))) {\n" " \t\t/*\n" " \t\t * We only end up here if the kernel mapping and the fixmap\n" " \t\t * share the top level pgd entry, which should only happen on\n" @@ -1740,6 +1740,11 @@ " }\n" " \n" "-- \n" - 2.24.0 + "2.24.0\n" + "\n" + "_______________________________________________\n" + "kvmarm mailing list\n" + "kvmarm@lists.cs.columbia.edu\n" + https://lists.cs.columbia.edu/mailman/listinfo/kvmarm -336709c3a0c69b97a87b5920e21645a986767f20445684601ae8b376a745289f +bc5bc55916fb86b494c356a0f80ed758cc89ad2273cb8119a44e4236f6218768
diff --git a/a/1.txt b/N2/1.txt index 877a11b..c6f5c15 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -688,13 +688,13 @@ index acb0751a6606..b8f158ae2527 100644 @@ -44,13 +45,11 @@ typedef struct { pteval_t pgprot; } pgprot_t; #define __pgprot(x) ((pgprot_t) { (x) } ) - #if CONFIG_PGTABLE_LEVELS = 2 + #if CONFIG_PGTABLE_LEVELS == 2 -#define __ARCH_USE_5LEVEL_HACK #include <asm-generic/pgtable-nopmd.h> - #elif CONFIG_PGTABLE_LEVELS = 3 + #elif CONFIG_PGTABLE_LEVELS == 3 -#define __ARCH_USE_5LEVEL_HACK #include <asm-generic/pgtable-nopud.h> - #elif CONFIG_PGTABLE_LEVELS = 4 + #elif CONFIG_PGTABLE_LEVELS == 4 -#include <asm-generic/5level-fixup.h> +#include <asm-generic/pgtable-nop4d.h> #endif @@ -1013,7 +1013,7 @@ index bbeb6a5a6ba6..b8a9f26f3790 100644 + p4dp = p4d_offset(pgdp, addr); + pudp = pud_offset(p4dp, addr); pmdp = pmd_offset(pudp, addr); - if ((pte_t *)pmdp = ptep) { + if ((pte_t *)pmdp == ptep) { *pgsize = PMD_SIZE; @@ -217,12 +219,14 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz) @@ -1242,8 +1242,8 @@ index 128f70852bf3..ad4be3e8e0c1 100644 + p4dp = p4d_offset(pgdp, addr); + p4d = READ_ONCE(*p4dp); if (CONFIG_PGTABLE_LEVELS > 3 && -- !(pgd_none(pgd) || pgd_page_paddr(pgd) = __pa_symbol(bm_pud))) { -+ !(p4d_none(p4d) || p4d_page_paddr(p4d) = __pa_symbol(bm_pud))) { +- !(pgd_none(pgd) || pgd_page_paddr(pgd) == __pa_symbol(bm_pud))) { ++ !(p4d_none(p4d) || p4d_page_paddr(p4d) == __pa_symbol(bm_pud))) { /* * We only end up here if the kernel mapping and the fixmap * share the top level pgd entry, which should only happen on diff --git a/a/content_digest b/N2/content_digest index 1502f85..48870b3 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,43 +1,27 @@ "ref\020200216081843.28670-1-rppt@kernel.org\0" "From\0Mike Rapoport <rppt@kernel.org>\0" "Subject\0[PATCH v2 01/13] arm/arm64: add support for folded p4d page tables\0" - "Date\0Sun, 16 Feb 2020 08:18:31 +0000\0" + "Date\0Sun, 16 Feb 2020 10:18:31 +0200\0" "To\0linux-kernel@vger.kernel.org\0" - "Cc\0Rich Felker <dalias@libc.org>" - linux-ia64@vger.kernel.org - Geert Uytterhoeven <geert+renesas@glider.be> - linux-sh@vger.kernel.org + "Cc\0Andrew Morton <akpm@linux-foundation.org>" + Arnd Bergmann <arnd@arndb.de> Benjamin Herrenschmidt <benh@kernel.crashing.org> - linux-mm@kvack.org - Paul Mackerras <paulus@samba.org> - linux-hexagon@vger.kernel.org - Will Deacon <will@kernel.org> - kvmarm@lists.cs.columbia.edu - Jonas Bonn <jonas@southpole.se> - linux-arch@vger.kernel.org Brian Cain <bcain@codeaurora.org> - Marc Zyngier <maz@kernel.org> - Russell King <linux@armlinux.org.uk> - Ley Foon Tan <ley.foon.tan@intel.com> - Mike Rapoport <rppt@linux.ibm.com> Catalin Marinas <catalin.marinas@arm.com> - uclinux-h8-devel@lists.sourceforge.jp + Christophe Leroy <christophe.leroy@c-s.fr> Fenghua Yu <fenghua.yu@intel.com> - Arnd Bergmann <arnd@arndb.de> - kvm-ppc@vger.kernel.org - Stefan Kristiansson <stefan.kristiansson@saunalahti.fi> - openrisc@lists.librecores.org - Stafford Horne <shorne@gmail.com> + Geert Uytterhoeven <geert+renesas@glider.be> Guan Xuetao <gxt@pku.edu.cn> - linux-arm-kernel@lists.infradead.org - Christophe Leroy <christophe.leroy@c-s.fr> - Tony Luck <tony.luck@intel.com> - Yoshinori Sato <ysato@users.sourceforge.jp> + James Morse <james.morse@arm.com> + Jonas Bonn <jonas@southpole.se> + Julien Thierry <julien.thierry.kdev@gmail.com> + Ley Foon Tan <ley.foon.tan@intel.com> + Marc Zyngier <maz@kernel.org> Michael Ellerman <mpe@ellerman.id.au> - nios2-dev@lists.rocketboards.org - Andrew Morton <akpm@linux-foundation.org> - linuxppc-dev@lists.ozlabs.org - " Mike Rapoport <rppt@kernel.org>\0" + Paul Mackerras <paulus@samba.org> + Rich Felker <dalias@libc.org> + Russell King <linux@armlinux.org.uk> + " Stafford Horne <shorne@gmail.com>Stefan Kristiansson <s>\0" "\00:1\0" "b\0" "From: Mike Rapoport <rppt@linux.ibm.com>\n" @@ -730,13 +714,13 @@ "@@ -44,13 +45,11 @@ typedef struct { pteval_t pgprot; } pgprot_t;\n" " #define __pgprot(x)\t((pgprot_t) { (x) } )\n" " \n" - " #if CONFIG_PGTABLE_LEVELS = 2\n" + " #if CONFIG_PGTABLE_LEVELS == 2\n" "-#define __ARCH_USE_5LEVEL_HACK\n" " #include <asm-generic/pgtable-nopmd.h>\n" - " #elif CONFIG_PGTABLE_LEVELS = 3\n" + " #elif CONFIG_PGTABLE_LEVELS == 3\n" "-#define __ARCH_USE_5LEVEL_HACK\n" " #include <asm-generic/pgtable-nopud.h>\n" - " #elif CONFIG_PGTABLE_LEVELS = 4\n" + " #elif CONFIG_PGTABLE_LEVELS == 4\n" "-#include <asm-generic/5level-fixup.h>\n" "+#include <asm-generic/pgtable-nop4d.h>\n" " #endif\n" @@ -1055,7 +1039,7 @@ "+\tp4dp = p4d_offset(pgdp, addr);\n" "+\tpudp = pud_offset(p4dp, addr);\n" " \tpmdp = pmd_offset(pudp, addr);\n" - " \tif ((pte_t *)pmdp = ptep) {\n" + " \tif ((pte_t *)pmdp == ptep) {\n" " \t\t*pgsize = PMD_SIZE;\n" "@@ -217,12 +219,14 @@ pte_t *huge_pte_alloc(struct mm_struct *mm,\n" " \t\t unsigned long addr, unsigned long sz)\n" @@ -1284,8 +1268,8 @@ "+\tp4dp = p4d_offset(pgdp, addr);\n" "+\tp4d = READ_ONCE(*p4dp);\n" " \tif (CONFIG_PGTABLE_LEVELS > 3 &&\n" - "-\t !(pgd_none(pgd) || pgd_page_paddr(pgd) = __pa_symbol(bm_pud))) {\n" - "+\t !(p4d_none(p4d) || p4d_page_paddr(p4d) = __pa_symbol(bm_pud))) {\n" + "-\t !(pgd_none(pgd) || pgd_page_paddr(pgd) == __pa_symbol(bm_pud))) {\n" + "+\t !(p4d_none(p4d) || p4d_page_paddr(p4d) == __pa_symbol(bm_pud))) {\n" " \t\t/*\n" " \t\t * We only end up here if the kernel mapping and the fixmap\n" " \t\t * share the top level pgd entry, which should only happen on\n" @@ -1742,4 +1726,4 @@ "-- \n" 2.24.0 -336709c3a0c69b97a87b5920e21645a986767f20445684601ae8b376a745289f +258b3ce002eb21c80a93b8da9766ff5eac2c678c82e174fd3b4dd41d21930749
diff --git a/a/1.txt b/N3/1.txt index 877a11b..c6f5c15 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -688,13 +688,13 @@ index acb0751a6606..b8f158ae2527 100644 @@ -44,13 +45,11 @@ typedef struct { pteval_t pgprot; } pgprot_t; #define __pgprot(x) ((pgprot_t) { (x) } ) - #if CONFIG_PGTABLE_LEVELS = 2 + #if CONFIG_PGTABLE_LEVELS == 2 -#define __ARCH_USE_5LEVEL_HACK #include <asm-generic/pgtable-nopmd.h> - #elif CONFIG_PGTABLE_LEVELS = 3 + #elif CONFIG_PGTABLE_LEVELS == 3 -#define __ARCH_USE_5LEVEL_HACK #include <asm-generic/pgtable-nopud.h> - #elif CONFIG_PGTABLE_LEVELS = 4 + #elif CONFIG_PGTABLE_LEVELS == 4 -#include <asm-generic/5level-fixup.h> +#include <asm-generic/pgtable-nop4d.h> #endif @@ -1013,7 +1013,7 @@ index bbeb6a5a6ba6..b8a9f26f3790 100644 + p4dp = p4d_offset(pgdp, addr); + pudp = pud_offset(p4dp, addr); pmdp = pmd_offset(pudp, addr); - if ((pte_t *)pmdp = ptep) { + if ((pte_t *)pmdp == ptep) { *pgsize = PMD_SIZE; @@ -217,12 +219,14 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz) @@ -1242,8 +1242,8 @@ index 128f70852bf3..ad4be3e8e0c1 100644 + p4dp = p4d_offset(pgdp, addr); + p4d = READ_ONCE(*p4dp); if (CONFIG_PGTABLE_LEVELS > 3 && -- !(pgd_none(pgd) || pgd_page_paddr(pgd) = __pa_symbol(bm_pud))) { -+ !(p4d_none(p4d) || p4d_page_paddr(p4d) = __pa_symbol(bm_pud))) { +- !(pgd_none(pgd) || pgd_page_paddr(pgd) == __pa_symbol(bm_pud))) { ++ !(p4d_none(p4d) || p4d_page_paddr(p4d) == __pa_symbol(bm_pud))) { /* * We only end up here if the kernel mapping and the fixmap * share the top level pgd entry, which should only happen on diff --git a/a/content_digest b/N3/content_digest index 1502f85..5a8570f 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,43 +1,46 @@ "ref\020200216081843.28670-1-rppt@kernel.org\0" "From\0Mike Rapoport <rppt@kernel.org>\0" "Subject\0[PATCH v2 01/13] arm/arm64: add support for folded p4d page tables\0" - "Date\0Sun, 16 Feb 2020 08:18:31 +0000\0" + "Date\0Sun, 16 Feb 2020 10:18:31 +0200\0" "To\0linux-kernel@vger.kernel.org\0" - "Cc\0Rich Felker <dalias@libc.org>" - linux-ia64@vger.kernel.org - Geert Uytterhoeven <geert+renesas@glider.be> - linux-sh@vger.kernel.org + "Cc\0Andrew Morton <akpm@linux-foundation.org>" + Arnd Bergmann <arnd@arndb.de> Benjamin Herrenschmidt <benh@kernel.crashing.org> - linux-mm@kvack.org - Paul Mackerras <paulus@samba.org> - linux-hexagon@vger.kernel.org - Will Deacon <will@kernel.org> - kvmarm@lists.cs.columbia.edu - Jonas Bonn <jonas@southpole.se> - linux-arch@vger.kernel.org Brian Cain <bcain@codeaurora.org> - Marc Zyngier <maz@kernel.org> - Russell King <linux@armlinux.org.uk> - Ley Foon Tan <ley.foon.tan@intel.com> - Mike Rapoport <rppt@linux.ibm.com> Catalin Marinas <catalin.marinas@arm.com> - uclinux-h8-devel@lists.sourceforge.jp + Christophe Leroy <christophe.leroy@c-s.fr> Fenghua Yu <fenghua.yu@intel.com> - Arnd Bergmann <arnd@arndb.de> - kvm-ppc@vger.kernel.org - Stefan Kristiansson <stefan.kristiansson@saunalahti.fi> - openrisc@lists.librecores.org - Stafford Horne <shorne@gmail.com> + Geert Uytterhoeven <geert+renesas@glider.be> Guan Xuetao <gxt@pku.edu.cn> - linux-arm-kernel@lists.infradead.org - Christophe Leroy <christophe.leroy@c-s.fr> + James Morse <james.morse@arm.com> + Jonas Bonn <jonas@southpole.se> + Julien Thierry <julien.thierry.kdev@gmail.com> + Ley Foon Tan <ley.foon.tan@intel.com> + Marc Zyngier <maz@kernel.org> + Michael Ellerman <mpe@ellerman.id.au> + Paul Mackerras <paulus@samba.org> + Rich Felker <dalias@libc.org> + Russell King <linux@armlinux.org.uk> + Stafford Horne <shorne@gmail.com> + Stefan Kristiansson <stefan.kristiansson@saunalahti.fi> + Suzuki K Poulose <suzuki.poulose@arm.com> Tony Luck <tony.luck@intel.com> + Will Deacon <will@kernel.org> Yoshinori Sato <ysato@users.sourceforge.jp> - Michael Ellerman <mpe@ellerman.id.au> - nios2-dev@lists.rocketboards.org - Andrew Morton <akpm@linux-foundation.org> + kvmarm@lists.cs.columbia.edu + kvm-ppc@vger.kernel.org + linux-arch@vger.kernel.org + linux-arm-kernel@lists.infradead.org + linux-hexagon@vger.kernel.org + linux-ia64@vger.kernel.org + linux-mm@kvack.org linuxppc-dev@lists.ozlabs.org - " Mike Rapoport <rppt@kernel.org>\0" + linux-sh@vger.kernel.org + nios2-dev@lists.rocketboards.org + openrisc@lists.librecores.org + uclinux-h8-devel@lists.sourceforge.jp + Mike Rapoport <rppt@kernel.org> + " Mike Rapoport <rppt@linux.ibm.com>\0" "\00:1\0" "b\0" "From: Mike Rapoport <rppt@linux.ibm.com>\n" @@ -730,13 +733,13 @@ "@@ -44,13 +45,11 @@ typedef struct { pteval_t pgprot; } pgprot_t;\n" " #define __pgprot(x)\t((pgprot_t) { (x) } )\n" " \n" - " #if CONFIG_PGTABLE_LEVELS = 2\n" + " #if CONFIG_PGTABLE_LEVELS == 2\n" "-#define __ARCH_USE_5LEVEL_HACK\n" " #include <asm-generic/pgtable-nopmd.h>\n" - " #elif CONFIG_PGTABLE_LEVELS = 3\n" + " #elif CONFIG_PGTABLE_LEVELS == 3\n" "-#define __ARCH_USE_5LEVEL_HACK\n" " #include <asm-generic/pgtable-nopud.h>\n" - " #elif CONFIG_PGTABLE_LEVELS = 4\n" + " #elif CONFIG_PGTABLE_LEVELS == 4\n" "-#include <asm-generic/5level-fixup.h>\n" "+#include <asm-generic/pgtable-nop4d.h>\n" " #endif\n" @@ -1055,7 +1058,7 @@ "+\tp4dp = p4d_offset(pgdp, addr);\n" "+\tpudp = pud_offset(p4dp, addr);\n" " \tpmdp = pmd_offset(pudp, addr);\n" - " \tif ((pte_t *)pmdp = ptep) {\n" + " \tif ((pte_t *)pmdp == ptep) {\n" " \t\t*pgsize = PMD_SIZE;\n" "@@ -217,12 +219,14 @@ pte_t *huge_pte_alloc(struct mm_struct *mm,\n" " \t\t unsigned long addr, unsigned long sz)\n" @@ -1284,8 +1287,8 @@ "+\tp4dp = p4d_offset(pgdp, addr);\n" "+\tp4d = READ_ONCE(*p4dp);\n" " \tif (CONFIG_PGTABLE_LEVELS > 3 &&\n" - "-\t !(pgd_none(pgd) || pgd_page_paddr(pgd) = __pa_symbol(bm_pud))) {\n" - "+\t !(p4d_none(p4d) || p4d_page_paddr(p4d) = __pa_symbol(bm_pud))) {\n" + "-\t !(pgd_none(pgd) || pgd_page_paddr(pgd) == __pa_symbol(bm_pud))) {\n" + "+\t !(p4d_none(p4d) || p4d_page_paddr(p4d) == __pa_symbol(bm_pud))) {\n" " \t\t/*\n" " \t\t * We only end up here if the kernel mapping and the fixmap\n" " \t\t * share the top level pgd entry, which should only happen on\n" @@ -1742,4 +1745,4 @@ "-- \n" 2.24.0 -336709c3a0c69b97a87b5920e21645a986767f20445684601ae8b376a745289f +9e43ca2abf1f93cfd6842d9e0126737259c3dd1d9fb77c6eee8dfc313363466b
diff --git a/a/1.txt b/N4/1.txt index 877a11b..c6f5c15 100644 --- a/a/1.txt +++ b/N4/1.txt @@ -688,13 +688,13 @@ index acb0751a6606..b8f158ae2527 100644 @@ -44,13 +45,11 @@ typedef struct { pteval_t pgprot; } pgprot_t; #define __pgprot(x) ((pgprot_t) { (x) } ) - #if CONFIG_PGTABLE_LEVELS = 2 + #if CONFIG_PGTABLE_LEVELS == 2 -#define __ARCH_USE_5LEVEL_HACK #include <asm-generic/pgtable-nopmd.h> - #elif CONFIG_PGTABLE_LEVELS = 3 + #elif CONFIG_PGTABLE_LEVELS == 3 -#define __ARCH_USE_5LEVEL_HACK #include <asm-generic/pgtable-nopud.h> - #elif CONFIG_PGTABLE_LEVELS = 4 + #elif CONFIG_PGTABLE_LEVELS == 4 -#include <asm-generic/5level-fixup.h> +#include <asm-generic/pgtable-nop4d.h> #endif @@ -1013,7 +1013,7 @@ index bbeb6a5a6ba6..b8a9f26f3790 100644 + p4dp = p4d_offset(pgdp, addr); + pudp = pud_offset(p4dp, addr); pmdp = pmd_offset(pudp, addr); - if ((pte_t *)pmdp = ptep) { + if ((pte_t *)pmdp == ptep) { *pgsize = PMD_SIZE; @@ -217,12 +219,14 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz) @@ -1242,8 +1242,8 @@ index 128f70852bf3..ad4be3e8e0c1 100644 + p4dp = p4d_offset(pgdp, addr); + p4d = READ_ONCE(*p4dp); if (CONFIG_PGTABLE_LEVELS > 3 && -- !(pgd_none(pgd) || pgd_page_paddr(pgd) = __pa_symbol(bm_pud))) { -+ !(p4d_none(p4d) || p4d_page_paddr(p4d) = __pa_symbol(bm_pud))) { +- !(pgd_none(pgd) || pgd_page_paddr(pgd) == __pa_symbol(bm_pud))) { ++ !(p4d_none(p4d) || p4d_page_paddr(p4d) == __pa_symbol(bm_pud))) { /* * We only end up here if the kernel mapping and the fixmap * share the top level pgd entry, which should only happen on diff --git a/a/content_digest b/N4/content_digest index 1502f85..732f5aa 100644 --- a/a/content_digest +++ b/N4/content_digest @@ -1,43 +1,28 @@ "ref\020200216081843.28670-1-rppt@kernel.org\0" "From\0Mike Rapoport <rppt@kernel.org>\0" "Subject\0[PATCH v2 01/13] arm/arm64: add support for folded p4d page tables\0" - "Date\0Sun, 16 Feb 2020 08:18:31 +0000\0" + "Date\0Sun, 16 Feb 2020 10:18:31 +0200\0" "To\0linux-kernel@vger.kernel.org\0" - "Cc\0Rich Felker <dalias@libc.org>" - linux-ia64@vger.kernel.org - Geert Uytterhoeven <geert+renesas@glider.be> - linux-sh@vger.kernel.org + "Cc\0Andrew Morton <akpm@linux-foundation.org>" + Arnd Bergmann <arnd@arndb.de> Benjamin Herrenschmidt <benh@kernel.crashing.org> - linux-mm@kvack.org - Paul Mackerras <paulus@samba.org> - linux-hexagon@vger.kernel.org - Will Deacon <will@kernel.org> - kvmarm@lists.cs.columbia.edu - Jonas Bonn <jonas@southpole.se> - linux-arch@vger.kernel.org Brian Cain <bcain@codeaurora.org> - Marc Zyngier <maz@kernel.org> - Russell King <linux@armlinux.org.uk> - Ley Foon Tan <ley.foon.tan@intel.com> - Mike Rapoport <rppt@linux.ibm.com> Catalin Marinas <catalin.marinas@arm.com> - uclinux-h8-devel@lists.sourceforge.jp + Christophe Leroy <christophe.leroy@c-s.fr> Fenghua Yu <fenghua.yu@intel.com> - Arnd Bergmann <arnd@arndb.de> - kvm-ppc@vger.kernel.org - Stefan Kristiansson <stefan.kristiansson@saunalahti.fi> - openrisc@lists.librecores.org - Stafford Horne <shorne@gmail.com> + Geert Uytterhoeven <geert+renesas@glider.be> Guan Xuetao <gxt@pku.edu.cn> - linux-arm-kernel@lists.infradead.org - Christophe Leroy <christophe.leroy@c-s.fr> - Tony Luck <tony.luck@intel.com> - Yoshinori Sato <ysato@users.sourceforge.jp> + James Morse <james.morse@arm.com> + Jonas Bonn <jonas@southpole.se> + Julien Thierry <julien.thierry.kdev@gmail.com> + Ley Foon Tan <ley.foon.tan@intel.com> + Marc Zyngier <maz@kernel.org> Michael Ellerman <mpe@ellerman.id.au> - nios2-dev@lists.rocketboards.org - Andrew Morton <akpm@linux-foundation.org> - linuxppc-dev@lists.ozlabs.org - " Mike Rapoport <rppt@kernel.org>\0" + Paul Mackerras <paulus@samba.org> + Rich Felker <dalias@libc.org> + Russell King <linux@armlinux.org.uk> + Stafford Horne <shorne@gmail.com> + " Stefan Kristiansson <s>\0" "\00:1\0" "b\0" "From: Mike Rapoport <rppt@linux.ibm.com>\n" @@ -730,13 +715,13 @@ "@@ -44,13 +45,11 @@ typedef struct { pteval_t pgprot; } pgprot_t;\n" " #define __pgprot(x)\t((pgprot_t) { (x) } )\n" " \n" - " #if CONFIG_PGTABLE_LEVELS = 2\n" + " #if CONFIG_PGTABLE_LEVELS == 2\n" "-#define __ARCH_USE_5LEVEL_HACK\n" " #include <asm-generic/pgtable-nopmd.h>\n" - " #elif CONFIG_PGTABLE_LEVELS = 3\n" + " #elif CONFIG_PGTABLE_LEVELS == 3\n" "-#define __ARCH_USE_5LEVEL_HACK\n" " #include <asm-generic/pgtable-nopud.h>\n" - " #elif CONFIG_PGTABLE_LEVELS = 4\n" + " #elif CONFIG_PGTABLE_LEVELS == 4\n" "-#include <asm-generic/5level-fixup.h>\n" "+#include <asm-generic/pgtable-nop4d.h>\n" " #endif\n" @@ -1055,7 +1040,7 @@ "+\tp4dp = p4d_offset(pgdp, addr);\n" "+\tpudp = pud_offset(p4dp, addr);\n" " \tpmdp = pmd_offset(pudp, addr);\n" - " \tif ((pte_t *)pmdp = ptep) {\n" + " \tif ((pte_t *)pmdp == ptep) {\n" " \t\t*pgsize = PMD_SIZE;\n" "@@ -217,12 +219,14 @@ pte_t *huge_pte_alloc(struct mm_struct *mm,\n" " \t\t unsigned long addr, unsigned long sz)\n" @@ -1284,8 +1269,8 @@ "+\tp4dp = p4d_offset(pgdp, addr);\n" "+\tp4d = READ_ONCE(*p4dp);\n" " \tif (CONFIG_PGTABLE_LEVELS > 3 &&\n" - "-\t !(pgd_none(pgd) || pgd_page_paddr(pgd) = __pa_symbol(bm_pud))) {\n" - "+\t !(p4d_none(p4d) || p4d_page_paddr(p4d) = __pa_symbol(bm_pud))) {\n" + "-\t !(pgd_none(pgd) || pgd_page_paddr(pgd) == __pa_symbol(bm_pud))) {\n" + "+\t !(p4d_none(p4d) || p4d_page_paddr(p4d) == __pa_symbol(bm_pud))) {\n" " \t\t/*\n" " \t\t * We only end up here if the kernel mapping and the fixmap\n" " \t\t * share the top level pgd entry, which should only happen on\n" @@ -1742,4 +1727,4 @@ "-- \n" 2.24.0 -336709c3a0c69b97a87b5920e21645a986767f20445684601ae8b376a745289f +98fc35bf20af3c56349d73facb92dd6dfdca18be066d4ed2e9996c522cc197d9
diff --git a/a/1.txt b/N5/1.txt index 877a11b..c6f5c15 100644 --- a/a/1.txt +++ b/N5/1.txt @@ -688,13 +688,13 @@ index acb0751a6606..b8f158ae2527 100644 @@ -44,13 +45,11 @@ typedef struct { pteval_t pgprot; } pgprot_t; #define __pgprot(x) ((pgprot_t) { (x) } ) - #if CONFIG_PGTABLE_LEVELS = 2 + #if CONFIG_PGTABLE_LEVELS == 2 -#define __ARCH_USE_5LEVEL_HACK #include <asm-generic/pgtable-nopmd.h> - #elif CONFIG_PGTABLE_LEVELS = 3 + #elif CONFIG_PGTABLE_LEVELS == 3 -#define __ARCH_USE_5LEVEL_HACK #include <asm-generic/pgtable-nopud.h> - #elif CONFIG_PGTABLE_LEVELS = 4 + #elif CONFIG_PGTABLE_LEVELS == 4 -#include <asm-generic/5level-fixup.h> +#include <asm-generic/pgtable-nop4d.h> #endif @@ -1013,7 +1013,7 @@ index bbeb6a5a6ba6..b8a9f26f3790 100644 + p4dp = p4d_offset(pgdp, addr); + pudp = pud_offset(p4dp, addr); pmdp = pmd_offset(pudp, addr); - if ((pte_t *)pmdp = ptep) { + if ((pte_t *)pmdp == ptep) { *pgsize = PMD_SIZE; @@ -217,12 +219,14 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz) @@ -1242,8 +1242,8 @@ index 128f70852bf3..ad4be3e8e0c1 100644 + p4dp = p4d_offset(pgdp, addr); + p4d = READ_ONCE(*p4dp); if (CONFIG_PGTABLE_LEVELS > 3 && -- !(pgd_none(pgd) || pgd_page_paddr(pgd) = __pa_symbol(bm_pud))) { -+ !(p4d_none(p4d) || p4d_page_paddr(p4d) = __pa_symbol(bm_pud))) { +- !(pgd_none(pgd) || pgd_page_paddr(pgd) == __pa_symbol(bm_pud))) { ++ !(p4d_none(p4d) || p4d_page_paddr(p4d) == __pa_symbol(bm_pud))) { /* * We only end up here if the kernel mapping and the fixmap * share the top level pgd entry, which should only happen on diff --git a/a/content_digest b/N5/content_digest index 1502f85..579d571 100644 --- a/a/content_digest +++ b/N5/content_digest @@ -1,43 +1,8 @@ "ref\020200216081843.28670-1-rppt@kernel.org\0" "From\0Mike Rapoport <rppt@kernel.org>\0" - "Subject\0[PATCH v2 01/13] arm/arm64: add support for folded p4d page tables\0" - "Date\0Sun, 16 Feb 2020 08:18:31 +0000\0" - "To\0linux-kernel@vger.kernel.org\0" - "Cc\0Rich Felker <dalias@libc.org>" - linux-ia64@vger.kernel.org - Geert Uytterhoeven <geert+renesas@glider.be> - linux-sh@vger.kernel.org - Benjamin Herrenschmidt <benh@kernel.crashing.org> - linux-mm@kvack.org - Paul Mackerras <paulus@samba.org> - linux-hexagon@vger.kernel.org - Will Deacon <will@kernel.org> - kvmarm@lists.cs.columbia.edu - Jonas Bonn <jonas@southpole.se> - linux-arch@vger.kernel.org - Brian Cain <bcain@codeaurora.org> - Marc Zyngier <maz@kernel.org> - Russell King <linux@armlinux.org.uk> - Ley Foon Tan <ley.foon.tan@intel.com> - Mike Rapoport <rppt@linux.ibm.com> - Catalin Marinas <catalin.marinas@arm.com> - uclinux-h8-devel@lists.sourceforge.jp - Fenghua Yu <fenghua.yu@intel.com> - Arnd Bergmann <arnd@arndb.de> - kvm-ppc@vger.kernel.org - Stefan Kristiansson <stefan.kristiansson@saunalahti.fi> - openrisc@lists.librecores.org - Stafford Horne <shorne@gmail.com> - Guan Xuetao <gxt@pku.edu.cn> - linux-arm-kernel@lists.infradead.org - Christophe Leroy <christophe.leroy@c-s.fr> - Tony Luck <tony.luck@intel.com> - Yoshinori Sato <ysato@users.sourceforge.jp> - Michael Ellerman <mpe@ellerman.id.au> - nios2-dev@lists.rocketboards.org - Andrew Morton <akpm@linux-foundation.org> - linuxppc-dev@lists.ozlabs.org - " Mike Rapoport <rppt@kernel.org>\0" + "Subject\0[OpenRISC] [PATCH v2 01/13] arm/arm64: add support for folded p4d page tables\0" + "Date\0Sun, 16 Feb 2020 10:18:31 +0200\0" + "To\0openrisc@lists.librecores.org\0" "\00:1\0" "b\0" "From: Mike Rapoport <rppt@linux.ibm.com>\n" @@ -730,13 +695,13 @@ "@@ -44,13 +45,11 @@ typedef struct { pteval_t pgprot; } pgprot_t;\n" " #define __pgprot(x)\t((pgprot_t) { (x) } )\n" " \n" - " #if CONFIG_PGTABLE_LEVELS = 2\n" + " #if CONFIG_PGTABLE_LEVELS == 2\n" "-#define __ARCH_USE_5LEVEL_HACK\n" " #include <asm-generic/pgtable-nopmd.h>\n" - " #elif CONFIG_PGTABLE_LEVELS = 3\n" + " #elif CONFIG_PGTABLE_LEVELS == 3\n" "-#define __ARCH_USE_5LEVEL_HACK\n" " #include <asm-generic/pgtable-nopud.h>\n" - " #elif CONFIG_PGTABLE_LEVELS = 4\n" + " #elif CONFIG_PGTABLE_LEVELS == 4\n" "-#include <asm-generic/5level-fixup.h>\n" "+#include <asm-generic/pgtable-nop4d.h>\n" " #endif\n" @@ -1055,7 +1020,7 @@ "+\tp4dp = p4d_offset(pgdp, addr);\n" "+\tpudp = pud_offset(p4dp, addr);\n" " \tpmdp = pmd_offset(pudp, addr);\n" - " \tif ((pte_t *)pmdp = ptep) {\n" + " \tif ((pte_t *)pmdp == ptep) {\n" " \t\t*pgsize = PMD_SIZE;\n" "@@ -217,12 +219,14 @@ pte_t *huge_pte_alloc(struct mm_struct *mm,\n" " \t\t unsigned long addr, unsigned long sz)\n" @@ -1284,8 +1249,8 @@ "+\tp4dp = p4d_offset(pgdp, addr);\n" "+\tp4d = READ_ONCE(*p4dp);\n" " \tif (CONFIG_PGTABLE_LEVELS > 3 &&\n" - "-\t !(pgd_none(pgd) || pgd_page_paddr(pgd) = __pa_symbol(bm_pud))) {\n" - "+\t !(p4d_none(p4d) || p4d_page_paddr(p4d) = __pa_symbol(bm_pud))) {\n" + "-\t !(pgd_none(pgd) || pgd_page_paddr(pgd) == __pa_symbol(bm_pud))) {\n" + "+\t !(p4d_none(p4d) || p4d_page_paddr(p4d) == __pa_symbol(bm_pud))) {\n" " \t\t/*\n" " \t\t * We only end up here if the kernel mapping and the fixmap\n" " \t\t * share the top level pgd entry, which should only happen on\n" @@ -1742,4 +1707,4 @@ "-- \n" 2.24.0 -336709c3a0c69b97a87b5920e21645a986767f20445684601ae8b376a745289f +a847b2dbee285bb8a9ad0afcd32a340d36d4aeb111b7ed41af2f36ce4512ac03
diff --git a/a/1.txt b/N6/1.txt index 877a11b..c6f5c15 100644 --- a/a/1.txt +++ b/N6/1.txt @@ -688,13 +688,13 @@ index acb0751a6606..b8f158ae2527 100644 @@ -44,13 +45,11 @@ typedef struct { pteval_t pgprot; } pgprot_t; #define __pgprot(x) ((pgprot_t) { (x) } ) - #if CONFIG_PGTABLE_LEVELS = 2 + #if CONFIG_PGTABLE_LEVELS == 2 -#define __ARCH_USE_5LEVEL_HACK #include <asm-generic/pgtable-nopmd.h> - #elif CONFIG_PGTABLE_LEVELS = 3 + #elif CONFIG_PGTABLE_LEVELS == 3 -#define __ARCH_USE_5LEVEL_HACK #include <asm-generic/pgtable-nopud.h> - #elif CONFIG_PGTABLE_LEVELS = 4 + #elif CONFIG_PGTABLE_LEVELS == 4 -#include <asm-generic/5level-fixup.h> +#include <asm-generic/pgtable-nop4d.h> #endif @@ -1013,7 +1013,7 @@ index bbeb6a5a6ba6..b8a9f26f3790 100644 + p4dp = p4d_offset(pgdp, addr); + pudp = pud_offset(p4dp, addr); pmdp = pmd_offset(pudp, addr); - if ((pte_t *)pmdp = ptep) { + if ((pte_t *)pmdp == ptep) { *pgsize = PMD_SIZE; @@ -217,12 +219,14 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz) @@ -1242,8 +1242,8 @@ index 128f70852bf3..ad4be3e8e0c1 100644 + p4dp = p4d_offset(pgdp, addr); + p4d = READ_ONCE(*p4dp); if (CONFIG_PGTABLE_LEVELS > 3 && -- !(pgd_none(pgd) || pgd_page_paddr(pgd) = __pa_symbol(bm_pud))) { -+ !(p4d_none(p4d) || p4d_page_paddr(p4d) = __pa_symbol(bm_pud))) { +- !(pgd_none(pgd) || pgd_page_paddr(pgd) == __pa_symbol(bm_pud))) { ++ !(p4d_none(p4d) || p4d_page_paddr(p4d) == __pa_symbol(bm_pud))) { /* * We only end up here if the kernel mapping and the fixmap * share the top level pgd entry, which should only happen on diff --git a/a/content_digest b/N6/content_digest index 1502f85..7de9245 100644 --- a/a/content_digest +++ b/N6/content_digest @@ -1,13 +1,12 @@ "ref\020200216081843.28670-1-rppt@kernel.org\0" "From\0Mike Rapoport <rppt@kernel.org>\0" "Subject\0[PATCH v2 01/13] arm/arm64: add support for folded p4d page tables\0" - "Date\0Sun, 16 Feb 2020 08:18:31 +0000\0" + "Date\0Sun, 16 Feb 2020 10:18:31 +0200\0" "To\0linux-kernel@vger.kernel.org\0" "Cc\0Rich Felker <dalias@libc.org>" linux-ia64@vger.kernel.org Geert Uytterhoeven <geert+renesas@glider.be> linux-sh@vger.kernel.org - Benjamin Herrenschmidt <benh@kernel.crashing.org> linux-mm@kvack.org Paul Mackerras <paulus@samba.org> linux-hexagon@vger.kernel.org @@ -21,19 +20,20 @@ Ley Foon Tan <ley.foon.tan@intel.com> Mike Rapoport <rppt@linux.ibm.com> Catalin Marinas <catalin.marinas@arm.com> + Julien Thierry <julien.thierry.kdev@gmail.com> uclinux-h8-devel@lists.sourceforge.jp Fenghua Yu <fenghua.yu@intel.com> Arnd Bergmann <arnd@arndb.de> + Suzuki K Poulose <suzuki.poulose@arm.com> kvm-ppc@vger.kernel.org Stefan Kristiansson <stefan.kristiansson@saunalahti.fi> openrisc@lists.librecores.org Stafford Horne <shorne@gmail.com> Guan Xuetao <gxt@pku.edu.cn> linux-arm-kernel@lists.infradead.org - Christophe Leroy <christophe.leroy@c-s.fr> Tony Luck <tony.luck@intel.com> Yoshinori Sato <ysato@users.sourceforge.jp> - Michael Ellerman <mpe@ellerman.id.au> + James Morse <james.morse@arm.com> nios2-dev@lists.rocketboards.org Andrew Morton <akpm@linux-foundation.org> linuxppc-dev@lists.ozlabs.org @@ -730,13 +730,13 @@ "@@ -44,13 +45,11 @@ typedef struct { pteval_t pgprot; } pgprot_t;\n" " #define __pgprot(x)\t((pgprot_t) { (x) } )\n" " \n" - " #if CONFIG_PGTABLE_LEVELS = 2\n" + " #if CONFIG_PGTABLE_LEVELS == 2\n" "-#define __ARCH_USE_5LEVEL_HACK\n" " #include <asm-generic/pgtable-nopmd.h>\n" - " #elif CONFIG_PGTABLE_LEVELS = 3\n" + " #elif CONFIG_PGTABLE_LEVELS == 3\n" "-#define __ARCH_USE_5LEVEL_HACK\n" " #include <asm-generic/pgtable-nopud.h>\n" - " #elif CONFIG_PGTABLE_LEVELS = 4\n" + " #elif CONFIG_PGTABLE_LEVELS == 4\n" "-#include <asm-generic/5level-fixup.h>\n" "+#include <asm-generic/pgtable-nop4d.h>\n" " #endif\n" @@ -1055,7 +1055,7 @@ "+\tp4dp = p4d_offset(pgdp, addr);\n" "+\tpudp = pud_offset(p4dp, addr);\n" " \tpmdp = pmd_offset(pudp, addr);\n" - " \tif ((pte_t *)pmdp = ptep) {\n" + " \tif ((pte_t *)pmdp == ptep) {\n" " \t\t*pgsize = PMD_SIZE;\n" "@@ -217,12 +219,14 @@ pte_t *huge_pte_alloc(struct mm_struct *mm,\n" " \t\t unsigned long addr, unsigned long sz)\n" @@ -1284,8 +1284,8 @@ "+\tp4dp = p4d_offset(pgdp, addr);\n" "+\tp4d = READ_ONCE(*p4dp);\n" " \tif (CONFIG_PGTABLE_LEVELS > 3 &&\n" - "-\t !(pgd_none(pgd) || pgd_page_paddr(pgd) = __pa_symbol(bm_pud))) {\n" - "+\t !(p4d_none(p4d) || p4d_page_paddr(p4d) = __pa_symbol(bm_pud))) {\n" + "-\t !(pgd_none(pgd) || pgd_page_paddr(pgd) == __pa_symbol(bm_pud))) {\n" + "+\t !(p4d_none(p4d) || p4d_page_paddr(p4d) == __pa_symbol(bm_pud))) {\n" " \t\t/*\n" " \t\t * We only end up here if the kernel mapping and the fixmap\n" " \t\t * share the top level pgd entry, which should only happen on\n" @@ -1742,4 +1742,4 @@ "-- \n" 2.24.0 -336709c3a0c69b97a87b5920e21645a986767f20445684601ae8b376a745289f +f1c8e9f93a3788a08e77da12912d1e01dbf528591452e2c19e1701673671e746
diff --git a/a/1.txt b/N7/1.txt index 877a11b..c727eff 100644 --- a/a/1.txt +++ b/N7/1.txt @@ -688,13 +688,13 @@ index acb0751a6606..b8f158ae2527 100644 @@ -44,13 +45,11 @@ typedef struct { pteval_t pgprot; } pgprot_t; #define __pgprot(x) ((pgprot_t) { (x) } ) - #if CONFIG_PGTABLE_LEVELS = 2 + #if CONFIG_PGTABLE_LEVELS == 2 -#define __ARCH_USE_5LEVEL_HACK #include <asm-generic/pgtable-nopmd.h> - #elif CONFIG_PGTABLE_LEVELS = 3 + #elif CONFIG_PGTABLE_LEVELS == 3 -#define __ARCH_USE_5LEVEL_HACK #include <asm-generic/pgtable-nopud.h> - #elif CONFIG_PGTABLE_LEVELS = 4 + #elif CONFIG_PGTABLE_LEVELS == 4 -#include <asm-generic/5level-fixup.h> +#include <asm-generic/pgtable-nop4d.h> #endif @@ -1013,7 +1013,7 @@ index bbeb6a5a6ba6..b8a9f26f3790 100644 + p4dp = p4d_offset(pgdp, addr); + pudp = pud_offset(p4dp, addr); pmdp = pmd_offset(pudp, addr); - if ((pte_t *)pmdp = ptep) { + if ((pte_t *)pmdp == ptep) { *pgsize = PMD_SIZE; @@ -217,12 +219,14 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz) @@ -1242,8 +1242,8 @@ index 128f70852bf3..ad4be3e8e0c1 100644 + p4dp = p4d_offset(pgdp, addr); + p4d = READ_ONCE(*p4dp); if (CONFIG_PGTABLE_LEVELS > 3 && -- !(pgd_none(pgd) || pgd_page_paddr(pgd) = __pa_symbol(bm_pud))) { -+ !(p4d_none(p4d) || p4d_page_paddr(p4d) = __pa_symbol(bm_pud))) { +- !(pgd_none(pgd) || pgd_page_paddr(pgd) == __pa_symbol(bm_pud))) { ++ !(p4d_none(p4d) || p4d_page_paddr(p4d) == __pa_symbol(bm_pud))) { /* * We only end up here if the kernel mapping and the fixmap * share the top level pgd entry, which should only happen on @@ -1699,3 +1699,9 @@ index 19c961ac4e3c..3d250fa3d2b9 100644 -- 2.24.0 + + +_______________________________________________ +linux-arm-kernel mailing list +linux-arm-kernel@lists.infradead.org +http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/a/content_digest b/N7/content_digest index 1502f85..4273a85 100644 --- a/a/content_digest +++ b/N7/content_digest @@ -1,7 +1,7 @@ "ref\020200216081843.28670-1-rppt@kernel.org\0" "From\0Mike Rapoport <rppt@kernel.org>\0" "Subject\0[PATCH v2 01/13] arm/arm64: add support for folded p4d page tables\0" - "Date\0Sun, 16 Feb 2020 08:18:31 +0000\0" + "Date\0Sun, 16 Feb 2020 10:18:31 +0200\0" "To\0linux-kernel@vger.kernel.org\0" "Cc\0Rich Felker <dalias@libc.org>" linux-ia64@vger.kernel.org @@ -21,9 +21,11 @@ Ley Foon Tan <ley.foon.tan@intel.com> Mike Rapoport <rppt@linux.ibm.com> Catalin Marinas <catalin.marinas@arm.com> + Julien Thierry <julien.thierry.kdev@gmail.com> uclinux-h8-devel@lists.sourceforge.jp Fenghua Yu <fenghua.yu@intel.com> Arnd Bergmann <arnd@arndb.de> + Suzuki K Poulose <suzuki.poulose@arm.com> kvm-ppc@vger.kernel.org Stefan Kristiansson <stefan.kristiansson@saunalahti.fi> openrisc@lists.librecores.org @@ -33,6 +35,7 @@ Christophe Leroy <christophe.leroy@c-s.fr> Tony Luck <tony.luck@intel.com> Yoshinori Sato <ysato@users.sourceforge.jp> + James Morse <james.morse@arm.com> Michael Ellerman <mpe@ellerman.id.au> nios2-dev@lists.rocketboards.org Andrew Morton <akpm@linux-foundation.org> @@ -730,13 +733,13 @@ "@@ -44,13 +45,11 @@ typedef struct { pteval_t pgprot; } pgprot_t;\n" " #define __pgprot(x)\t((pgprot_t) { (x) } )\n" " \n" - " #if CONFIG_PGTABLE_LEVELS = 2\n" + " #if CONFIG_PGTABLE_LEVELS == 2\n" "-#define __ARCH_USE_5LEVEL_HACK\n" " #include <asm-generic/pgtable-nopmd.h>\n" - " #elif CONFIG_PGTABLE_LEVELS = 3\n" + " #elif CONFIG_PGTABLE_LEVELS == 3\n" "-#define __ARCH_USE_5LEVEL_HACK\n" " #include <asm-generic/pgtable-nopud.h>\n" - " #elif CONFIG_PGTABLE_LEVELS = 4\n" + " #elif CONFIG_PGTABLE_LEVELS == 4\n" "-#include <asm-generic/5level-fixup.h>\n" "+#include <asm-generic/pgtable-nop4d.h>\n" " #endif\n" @@ -1055,7 +1058,7 @@ "+\tp4dp = p4d_offset(pgdp, addr);\n" "+\tpudp = pud_offset(p4dp, addr);\n" " \tpmdp = pmd_offset(pudp, addr);\n" - " \tif ((pte_t *)pmdp = ptep) {\n" + " \tif ((pte_t *)pmdp == ptep) {\n" " \t\t*pgsize = PMD_SIZE;\n" "@@ -217,12 +219,14 @@ pte_t *huge_pte_alloc(struct mm_struct *mm,\n" " \t\t unsigned long addr, unsigned long sz)\n" @@ -1284,8 +1287,8 @@ "+\tp4dp = p4d_offset(pgdp, addr);\n" "+\tp4d = READ_ONCE(*p4dp);\n" " \tif (CONFIG_PGTABLE_LEVELS > 3 &&\n" - "-\t !(pgd_none(pgd) || pgd_page_paddr(pgd) = __pa_symbol(bm_pud))) {\n" - "+\t !(p4d_none(p4d) || p4d_page_paddr(p4d) = __pa_symbol(bm_pud))) {\n" + "-\t !(pgd_none(pgd) || pgd_page_paddr(pgd) == __pa_symbol(bm_pud))) {\n" + "+\t !(p4d_none(p4d) || p4d_page_paddr(p4d) == __pa_symbol(bm_pud))) {\n" " \t\t/*\n" " \t\t * We only end up here if the kernel mapping and the fixmap\n" " \t\t * share the top level pgd entry, which should only happen on\n" @@ -1740,6 +1743,12 @@ " }\n" " \n" "-- \n" - 2.24.0 + "2.24.0\n" + "\n" + "\n" + "_______________________________________________\n" + "linux-arm-kernel mailing list\n" + "linux-arm-kernel@lists.infradead.org\n" + http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -336709c3a0c69b97a87b5920e21645a986767f20445684601ae8b376a745289f +bc2bf0b392d65194343419174a0d11eac41ec34b1de5bfc232c299ed73c3a533
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.