diff for duplicates of <20200414153455.21744-4-rppt@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 06762c9..dd3850a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -90,13 +90,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 @@ -415,7 +415,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) @@ -644,8 +644,8 @@ index a374e4f51a62..c4c2e36b80ab 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 @@ -1101,3 +1101,8 @@ index e3b9ee268823..48d4288c5f1b 100644 -- 2.25.1 + +_______________________________________________ +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 2152b7b..7444374 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020200414153455.21744-1-rppt@kernel.org\0" "From\0Mike Rapoport <rppt@kernel.org>\0" "Subject\0[PATCH v4 03/14] arm64: add support for folded p4d page tables\0" - "Date\0Tue, 14 Apr 2020 15:34:44 +0000\0" + "Date\0Tue, 14 Apr 2020 18:34:44 +0300\0" "To\0Andrew Morton <akpm@linux-foundation.org>\0" "Cc\0Rich Felker <dalias@libc.org>" linux-ia64@vger.kernel.org @@ -132,13 +132,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" @@ -457,7 +457,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" @@ -686,8 +686,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" @@ -1142,6 +1142,11 @@ " }\n" " \n" "-- \n" - 2.25.1 + "2.25.1\n" + "\n" + "_______________________________________________\n" + "kvmarm mailing list\n" + "kvmarm@lists.cs.columbia.edu\n" + https://lists.cs.columbia.edu/mailman/listinfo/kvmarm -7df6278ee7f0cb2d1fba01685f35af860d777ab93275eef8a7aa1f00d4d3c276 +867ba7183a4c7548765f3fcd014a1e3720ea6ce6790365d6384dfcd3ef129a7f
diff --git a/a/1.txt b/N2/1.txt index 06762c9..9cbfb18 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -90,13 +90,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 @@ -415,7 +415,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) @@ -644,8 +644,8 @@ index a374e4f51a62..c4c2e36b80ab 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 2152b7b..221f0ca 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,7 @@ "ref\020200414153455.21744-1-rppt@kernel.org\0" "From\0Mike Rapoport <rppt@kernel.org>\0" "Subject\0[PATCH v4 03/14] arm64: add support for folded p4d page tables\0" - "Date\0Tue, 14 Apr 2020 15:34:44 +0000\0" + "Date\0Tue, 14 Apr 2020 18:34:44 +0300\0" "To\0Andrew Morton <akpm@linux-foundation.org>\0" "Cc\0Rich Felker <dalias@libc.org>" linux-ia64@vger.kernel.org @@ -28,16 +28,7 @@ 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> - linux-kernel@vger.kernel.org - Michael Ellerman <mpe@ellerman.id.au> - nios2-dev@lists.rocketboards.org - linuxppc-dev@lists.ozlabs.org - " Mike Rapoport <rppt@kernel.org>\0" + " Guan Xuetao <gxt@p>\0" "\00:1\0" "b\0" "From: Mike Rapoport <rppt@linux.ibm.com>\n" @@ -132,13 +123,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" @@ -457,7 +448,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" @@ -686,8 +677,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" @@ -1144,4 +1135,4 @@ "-- \n" 2.25.1 -7df6278ee7f0cb2d1fba01685f35af860d777ab93275eef8a7aa1f00d4d3c276 +74a3cb6f4e35e806ca945a2afabb28148d695be4c776f0f02caa018f0f0410b7
diff --git a/a/1.txt b/N3/1.txt index 06762c9..9cbfb18 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -90,13 +90,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 @@ -415,7 +415,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) @@ -644,8 +644,8 @@ index a374e4f51a62..c4c2e36b80ab 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 2152b7b..b9f559b 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,43 +1,8 @@ "ref\020200414153455.21744-1-rppt@kernel.org\0" "From\0Mike Rapoport <rppt@kernel.org>\0" - "Subject\0[PATCH v4 03/14] arm64: add support for folded p4d page tables\0" - "Date\0Tue, 14 Apr 2020 15:34:44 +0000\0" - "To\0Andrew Morton <akpm@linux-foundation.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> - linux-kernel@vger.kernel.org - Michael Ellerman <mpe@ellerman.id.au> - nios2-dev@lists.rocketboards.org - linuxppc-dev@lists.ozlabs.org - " Mike Rapoport <rppt@kernel.org>\0" + "Subject\0[OpenRISC] [PATCH v4 03/14] arm64: add support for folded p4d page tables\0" + "Date\0Tue, 14 Apr 2020 18:34:44 +0300\0" + "To\0openrisc@lists.librecores.org\0" "\00:1\0" "b\0" "From: Mike Rapoport <rppt@linux.ibm.com>\n" @@ -132,13 +97,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" @@ -457,7 +422,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" @@ -686,8 +651,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" @@ -1144,4 +1109,4 @@ "-- \n" 2.25.1 -7df6278ee7f0cb2d1fba01685f35af860d777ab93275eef8a7aa1f00d4d3c276 +351e3b39c164148fcd9d94ad24c03b3e7ee0fa862951fe5ede9b2b5968987975
diff --git a/a/1.txt b/N4/1.txt index 06762c9..9cbfb18 100644 --- a/a/1.txt +++ b/N4/1.txt @@ -90,13 +90,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 @@ -415,7 +415,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) @@ -644,8 +644,8 @@ index a374e4f51a62..c4c2e36b80ab 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 2152b7b..6729922 100644 --- a/a/content_digest +++ b/N4/content_digest @@ -1,13 +1,12 @@ "ref\020200414153455.21744-1-rppt@kernel.org\0" "From\0Mike Rapoport <rppt@kernel.org>\0" "Subject\0[PATCH v4 03/14] arm64: add support for folded p4d page tables\0" - "Date\0Tue, 14 Apr 2020 15:34:44 +0000\0" + "Date\0Tue, 14 Apr 2020 18:34:44 +0300\0" "To\0Andrew Morton <akpm@linux-foundation.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,20 +20,21 @@ 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> linux-kernel@vger.kernel.org - Michael Ellerman <mpe@ellerman.id.au> + James Morse <james.morse@arm.com> nios2-dev@lists.rocketboards.org linuxppc-dev@lists.ozlabs.org " Mike Rapoport <rppt@kernel.org>\0" @@ -132,13 +132,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" @@ -457,7 +457,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" @@ -686,8 +686,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" @@ -1144,4 +1144,4 @@ "-- \n" 2.25.1 -7df6278ee7f0cb2d1fba01685f35af860d777ab93275eef8a7aa1f00d4d3c276 +5eb4588f5f18c9f2f437e7dfbbfb026fe56e9aa40b2e22a99cd4bc0b167385de
diff --git a/a/1.txt b/N5/1.txt index 06762c9..a504e7a 100644 --- a/a/1.txt +++ b/N5/1.txt @@ -90,13 +90,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 @@ -415,7 +415,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) @@ -644,8 +644,8 @@ index a374e4f51a62..c4c2e36b80ab 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 @@ -1101,3 +1101,9 @@ index e3b9ee268823..48d4288c5f1b 100644 -- 2.25.1 + + +_______________________________________________ +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/N5/content_digest index 2152b7b..e337dbb 100644 --- a/a/content_digest +++ b/N5/content_digest @@ -1,7 +1,7 @@ "ref\020200414153455.21744-1-rppt@kernel.org\0" "From\0Mike Rapoport <rppt@kernel.org>\0" "Subject\0[PATCH v4 03/14] arm64: add support for folded p4d page tables\0" - "Date\0Tue, 14 Apr 2020 15:34:44 +0000\0" + "Date\0Tue, 14 Apr 2020 18:34:44 +0300\0" "To\0Andrew Morton <akpm@linux-foundation.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 @@ -34,6 +36,7 @@ Tony Luck <tony.luck@intel.com> Yoshinori Sato <ysato@users.sourceforge.jp> linux-kernel@vger.kernel.org + James Morse <james.morse@arm.com> Michael Ellerman <mpe@ellerman.id.au> nios2-dev@lists.rocketboards.org linuxppc-dev@lists.ozlabs.org @@ -132,13 +135,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" @@ -457,7 +460,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" @@ -686,8 +689,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" @@ -1142,6 +1145,12 @@ " }\n" " \n" "-- \n" - 2.25.1 + "2.25.1\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 -7df6278ee7f0cb2d1fba01685f35af860d777ab93275eef8a7aa1f00d4d3c276 +28f6ac9fc87d3fa7707f21209868a9f986f9b77b3273bd7e1cc55bcfc63474c7
diff --git a/a/1.txt b/N6/1.txt index 06762c9..9cbfb18 100644 --- a/a/1.txt +++ b/N6/1.txt @@ -90,13 +90,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 @@ -415,7 +415,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) @@ -644,8 +644,8 @@ index a374e4f51a62..c4c2e36b80ab 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 2152b7b..554e2ed 100644 --- a/a/content_digest +++ b/N6/content_digest @@ -1,43 +1,46 @@ "ref\020200414153455.21744-1-rppt@kernel.org\0" "From\0Mike Rapoport <rppt@kernel.org>\0" "Subject\0[PATCH v4 03/14] arm64: add support for folded p4d page tables\0" - "Date\0Tue, 14 Apr 2020 15:34:44 +0000\0" + "Date\0Tue, 14 Apr 2020 18:34:44 +0300\0" "To\0Andrew Morton <akpm@linux-foundation.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\0Arnd 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> + 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-kernel@vger.kernel.org - Michael Ellerman <mpe@ellerman.id.au> - nios2-dev@lists.rocketboards.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" @@ -132,13 +135,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" @@ -457,7 +460,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" @@ -686,8 +689,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" @@ -1144,4 +1147,4 @@ "-- \n" 2.25.1 -7df6278ee7f0cb2d1fba01685f35af860d777ab93275eef8a7aa1f00d4d3c276 +5761109325e9a0ad6298c01a412f21a566b5fbb5ede702b091022643149761cf
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.