diff for duplicates of <20200216081843.28670-8-rppt@kernel.org> diff --git a/a/1.txt b/N1/1.txt index f43fed5..204138e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -59,8 +59,8 @@ index 2781ebf6add4..876d1528c2cf 100644 -static inline int hash__pgd_bad(pgd_t pgd) +static inline int hash__p4d_bad(p4d_t p4d) { -- return (pgd_val(pgd) = 0); -+ return (p4d_val(p4d) = 0); +- return (pgd_val(pgd) == 0); ++ return (p4d_val(p4d) == 0); } #ifdef CONFIG_STRICT_KERNEL_RWX extern void hash__mark_rodata_ro(void); @@ -284,11 +284,11 @@ index c40ec32b8194..81b1c54e3cf1 100644 */ -#define pgd_none(pgd) (!pgd_val(pgd)) --#define pgd_bad(pgd) (pgd_val(pgd) = 0) +-#define pgd_bad(pgd) (pgd_val(pgd) == 0) -#define pgd_present(pgd) (pgd_val(pgd) != 0) -#define pgd_page_vaddr(pgd) (pgd_val(pgd) & ~PGD_MASKED_BITS) +#define p4d_none(p4d) (!p4d_val(p4d)) -+#define p4d_bad(p4d) (p4d_val(p4d) = 0) ++#define p4d_bad(p4d) (p4d_val(p4d) == 0) +#define p4d_present(p4d) (p4d_val(p4d) != 0) +#define p4d_page_vaddr(p4d) (p4d_val(p4d) & ~P4D_MASKED_BITS) @@ -591,7 +591,7 @@ index dd1bea45325c..11762556fe4d 100644 } - pudp = pud_offset(pgdp, ea); + pudp = pud_offset(p4dp, ea); - if (map_page_size = PUD_SIZE) { + if (map_page_size == PUD_SIZE) { ptep = (pte_t *)pudp; goto set_the_pte; @@ -114,6 +121,7 @@ static int __map_kernel_page(unsigned long ea, unsigned long pa, @@ -611,7 +611,7 @@ index dd1bea45325c..11762556fe4d 100644 + pudp = pud_alloc(&init_mm, p4dp, ea); if (!pudp) return -ENOMEM; - if (map_page_size = PUD_SIZE) { + if (map_page_size == PUD_SIZE) { @@ -173,6 +182,7 @@ void radix__change_memory_range(unsigned long start, unsigned long end, { unsigned long idx; @@ -673,7 +673,7 @@ index 73d4873fc7f8..43d463f20fc3 100644 + p4 = p4d_offset(pg, addr); #ifdef CONFIG_PPC_BOOK3S_64 - if (pshift = PGDIR_SHIFT) + if (pshift == PGDIR_SHIFT) /* 16GB huge page */ - return (pte_t *) pg; + return (pte_t *) p4; @@ -690,7 +690,7 @@ index 73d4873fc7f8..43d463f20fc3 100644 + pu = pud_alloc(mm, p4, addr); if (!pu) return NULL; - if (pshift = PUD_SHIFT) + if (pshift == PUD_SHIFT) @@ -159,10 +161,10 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz #else if (pshift >= PGDIR_SHIFT) { @@ -1155,3 +1155,8 @@ index e8c84d265602..c7bd1145b268 100644 printf("No valid PUD\n"); -- 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 adaee47..f344341 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 07/13] powerpc: add support for folded p4d page tables\0" - "Date\0Sun, 16 Feb 2020 08:18:37 +0000\0" + "Date\0Sun, 16 Feb 2020 10:18:37 +0200\0" "To\0linux-kernel@vger.kernel.org\0" "Cc\0Rich Felker <dalias@libc.org>" linux-ia64@vger.kernel.org @@ -101,8 +101,8 @@ "-static inline int hash__pgd_bad(pgd_t pgd)\n" "+static inline int hash__p4d_bad(p4d_t p4d)\n" " {\n" - "-\treturn (pgd_val(pgd) = 0);\n" - "+\treturn (p4d_val(p4d) = 0);\n" + "-\treturn (pgd_val(pgd) == 0);\n" + "+\treturn (p4d_val(p4d) == 0);\n" " }\n" " #ifdef CONFIG_STRICT_KERNEL_RWX\n" " extern void hash__mark_rodata_ro(void);\n" @@ -326,11 +326,11 @@ " */\n" " \n" "-#define pgd_none(pgd)\t\t(!pgd_val(pgd))\n" - "-#define pgd_bad(pgd)\t\t(pgd_val(pgd) = 0)\n" + "-#define pgd_bad(pgd)\t\t(pgd_val(pgd) == 0)\n" "-#define pgd_present(pgd)\t(pgd_val(pgd) != 0)\n" "-#define pgd_page_vaddr(pgd)\t(pgd_val(pgd) & ~PGD_MASKED_BITS)\n" "+#define p4d_none(p4d)\t\t(!p4d_val(p4d))\n" - "+#define p4d_bad(p4d)\t\t(p4d_val(p4d) = 0)\n" + "+#define p4d_bad(p4d)\t\t(p4d_val(p4d) == 0)\n" "+#define p4d_present(p4d)\t(p4d_val(p4d) != 0)\n" "+#define p4d_page_vaddr(p4d)\t(p4d_val(p4d) & ~P4D_MASKED_BITS)\n" " \n" @@ -633,7 +633,7 @@ " \t}\n" "-\tpudp = pud_offset(pgdp, ea);\n" "+\tpudp = pud_offset(p4dp, ea);\n" - " \tif (map_page_size = PUD_SIZE) {\n" + " \tif (map_page_size == PUD_SIZE) {\n" " \t\tptep = (pte_t *)pudp;\n" " \t\tgoto set_the_pte;\n" "@@ -114,6 +121,7 @@ static int __map_kernel_page(unsigned long ea, unsigned long pa,\n" @@ -653,7 +653,7 @@ "+\tpudp = pud_alloc(&init_mm, p4dp, ea);\n" " \tif (!pudp)\n" " \t\treturn -ENOMEM;\n" - " \tif (map_page_size = PUD_SIZE) {\n" + " \tif (map_page_size == PUD_SIZE) {\n" "@@ -173,6 +182,7 @@ void radix__change_memory_range(unsigned long start, unsigned long end,\n" " {\n" " \tunsigned long idx;\n" @@ -715,7 +715,7 @@ "+\tp4 = p4d_offset(pg, addr);\n" " \n" " #ifdef CONFIG_PPC_BOOK3S_64\n" - " \tif (pshift = PGDIR_SHIFT)\n" + " \tif (pshift == PGDIR_SHIFT)\n" " \t\t/* 16GB huge page */\n" "-\t\treturn (pte_t *) pg;\n" "+\t\treturn (pte_t *) p4;\n" @@ -732,7 +732,7 @@ "+\t\tpu = pud_alloc(mm, p4, addr);\n" " \t\tif (!pu)\n" " \t\t\treturn NULL;\n" - " \t\tif (pshift = PUD_SHIFT)\n" + " \t\tif (pshift == PUD_SHIFT)\n" "@@ -159,10 +161,10 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz\n" " #else\n" " \tif (pshift >= PGDIR_SHIFT) {\n" @@ -1196,6 +1196,11 @@ " \tif (pud_none(*pudp)) {\n" " \t\tprintf(\"No valid PUD\\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 -98d25a4d4363e4deee577b5e32cbd88ae30aedbe89b4952eaad9420f0f283b1b +c9f624697d28712d0b1a1ca301e4a44a250c6f727fe63fb748e700ae866ac064
diff --git a/a/1.txt b/N2/1.txt index f43fed5..fd1989d 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -59,8 +59,8 @@ index 2781ebf6add4..876d1528c2cf 100644 -static inline int hash__pgd_bad(pgd_t pgd) +static inline int hash__p4d_bad(p4d_t p4d) { -- return (pgd_val(pgd) = 0); -+ return (p4d_val(p4d) = 0); +- return (pgd_val(pgd) == 0); ++ return (p4d_val(p4d) == 0); } #ifdef CONFIG_STRICT_KERNEL_RWX extern void hash__mark_rodata_ro(void); @@ -284,11 +284,11 @@ index c40ec32b8194..81b1c54e3cf1 100644 */ -#define pgd_none(pgd) (!pgd_val(pgd)) --#define pgd_bad(pgd) (pgd_val(pgd) = 0) +-#define pgd_bad(pgd) (pgd_val(pgd) == 0) -#define pgd_present(pgd) (pgd_val(pgd) != 0) -#define pgd_page_vaddr(pgd) (pgd_val(pgd) & ~PGD_MASKED_BITS) +#define p4d_none(p4d) (!p4d_val(p4d)) -+#define p4d_bad(p4d) (p4d_val(p4d) = 0) ++#define p4d_bad(p4d) (p4d_val(p4d) == 0) +#define p4d_present(p4d) (p4d_val(p4d) != 0) +#define p4d_page_vaddr(p4d) (p4d_val(p4d) & ~P4D_MASKED_BITS) @@ -591,7 +591,7 @@ index dd1bea45325c..11762556fe4d 100644 } - pudp = pud_offset(pgdp, ea); + pudp = pud_offset(p4dp, ea); - if (map_page_size = PUD_SIZE) { + if (map_page_size == PUD_SIZE) { ptep = (pte_t *)pudp; goto set_the_pte; @@ -114,6 +121,7 @@ static int __map_kernel_page(unsigned long ea, unsigned long pa, @@ -611,7 +611,7 @@ index dd1bea45325c..11762556fe4d 100644 + pudp = pud_alloc(&init_mm, p4dp, ea); if (!pudp) return -ENOMEM; - if (map_page_size = PUD_SIZE) { + if (map_page_size == PUD_SIZE) { @@ -173,6 +182,7 @@ void radix__change_memory_range(unsigned long start, unsigned long end, { unsigned long idx; @@ -673,7 +673,7 @@ index 73d4873fc7f8..43d463f20fc3 100644 + p4 = p4d_offset(pg, addr); #ifdef CONFIG_PPC_BOOK3S_64 - if (pshift = PGDIR_SHIFT) + if (pshift == PGDIR_SHIFT) /* 16GB huge page */ - return (pte_t *) pg; + return (pte_t *) p4; @@ -690,7 +690,7 @@ index 73d4873fc7f8..43d463f20fc3 100644 + pu = pud_alloc(mm, p4, addr); if (!pu) return NULL; - if (pshift = PUD_SHIFT) + if (pshift == PUD_SHIFT) @@ -159,10 +161,10 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz #else if (pshift >= PGDIR_SHIFT) { diff --git a/a/content_digest b/N2/content_digest index adaee47..18d1366 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 07/13] powerpc: add support for folded p4d page tables\0" - "Date\0Sun, 16 Feb 2020 08:18:37 +0000\0" + "Date\0Sun, 16 Feb 2020 10:18:37 +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" @@ -101,8 +85,8 @@ "-static inline int hash__pgd_bad(pgd_t pgd)\n" "+static inline int hash__p4d_bad(p4d_t p4d)\n" " {\n" - "-\treturn (pgd_val(pgd) = 0);\n" - "+\treturn (p4d_val(p4d) = 0);\n" + "-\treturn (pgd_val(pgd) == 0);\n" + "+\treturn (p4d_val(p4d) == 0);\n" " }\n" " #ifdef CONFIG_STRICT_KERNEL_RWX\n" " extern void hash__mark_rodata_ro(void);\n" @@ -326,11 +310,11 @@ " */\n" " \n" "-#define pgd_none(pgd)\t\t(!pgd_val(pgd))\n" - "-#define pgd_bad(pgd)\t\t(pgd_val(pgd) = 0)\n" + "-#define pgd_bad(pgd)\t\t(pgd_val(pgd) == 0)\n" "-#define pgd_present(pgd)\t(pgd_val(pgd) != 0)\n" "-#define pgd_page_vaddr(pgd)\t(pgd_val(pgd) & ~PGD_MASKED_BITS)\n" "+#define p4d_none(p4d)\t\t(!p4d_val(p4d))\n" - "+#define p4d_bad(p4d)\t\t(p4d_val(p4d) = 0)\n" + "+#define p4d_bad(p4d)\t\t(p4d_val(p4d) == 0)\n" "+#define p4d_present(p4d)\t(p4d_val(p4d) != 0)\n" "+#define p4d_page_vaddr(p4d)\t(p4d_val(p4d) & ~P4D_MASKED_BITS)\n" " \n" @@ -633,7 +617,7 @@ " \t}\n" "-\tpudp = pud_offset(pgdp, ea);\n" "+\tpudp = pud_offset(p4dp, ea);\n" - " \tif (map_page_size = PUD_SIZE) {\n" + " \tif (map_page_size == PUD_SIZE) {\n" " \t\tptep = (pte_t *)pudp;\n" " \t\tgoto set_the_pte;\n" "@@ -114,6 +121,7 @@ static int __map_kernel_page(unsigned long ea, unsigned long pa,\n" @@ -653,7 +637,7 @@ "+\tpudp = pud_alloc(&init_mm, p4dp, ea);\n" " \tif (!pudp)\n" " \t\treturn -ENOMEM;\n" - " \tif (map_page_size = PUD_SIZE) {\n" + " \tif (map_page_size == PUD_SIZE) {\n" "@@ -173,6 +182,7 @@ void radix__change_memory_range(unsigned long start, unsigned long end,\n" " {\n" " \tunsigned long idx;\n" @@ -715,7 +699,7 @@ "+\tp4 = p4d_offset(pg, addr);\n" " \n" " #ifdef CONFIG_PPC_BOOK3S_64\n" - " \tif (pshift = PGDIR_SHIFT)\n" + " \tif (pshift == PGDIR_SHIFT)\n" " \t\t/* 16GB huge page */\n" "-\t\treturn (pte_t *) pg;\n" "+\t\treturn (pte_t *) p4;\n" @@ -732,7 +716,7 @@ "+\t\tpu = pud_alloc(mm, p4, addr);\n" " \t\tif (!pu)\n" " \t\t\treturn NULL;\n" - " \t\tif (pshift = PUD_SHIFT)\n" + " \t\tif (pshift == PUD_SHIFT)\n" "@@ -159,10 +161,10 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz\n" " #else\n" " \tif (pshift >= PGDIR_SHIFT) {\n" @@ -1198,4 +1182,4 @@ "-- \n" 2.24.0 -98d25a4d4363e4deee577b5e32cbd88ae30aedbe89b4952eaad9420f0f283b1b +7cc259df6540a87d9d254bfac3b97efbde703f8f11e34e39fff3df0fa61de524
diff --git a/a/1.txt b/N3/1.txt index f43fed5..fd1989d 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -59,8 +59,8 @@ index 2781ebf6add4..876d1528c2cf 100644 -static inline int hash__pgd_bad(pgd_t pgd) +static inline int hash__p4d_bad(p4d_t p4d) { -- return (pgd_val(pgd) = 0); -+ return (p4d_val(p4d) = 0); +- return (pgd_val(pgd) == 0); ++ return (p4d_val(p4d) == 0); } #ifdef CONFIG_STRICT_KERNEL_RWX extern void hash__mark_rodata_ro(void); @@ -284,11 +284,11 @@ index c40ec32b8194..81b1c54e3cf1 100644 */ -#define pgd_none(pgd) (!pgd_val(pgd)) --#define pgd_bad(pgd) (pgd_val(pgd) = 0) +-#define pgd_bad(pgd) (pgd_val(pgd) == 0) -#define pgd_present(pgd) (pgd_val(pgd) != 0) -#define pgd_page_vaddr(pgd) (pgd_val(pgd) & ~PGD_MASKED_BITS) +#define p4d_none(p4d) (!p4d_val(p4d)) -+#define p4d_bad(p4d) (p4d_val(p4d) = 0) ++#define p4d_bad(p4d) (p4d_val(p4d) == 0) +#define p4d_present(p4d) (p4d_val(p4d) != 0) +#define p4d_page_vaddr(p4d) (p4d_val(p4d) & ~P4D_MASKED_BITS) @@ -591,7 +591,7 @@ index dd1bea45325c..11762556fe4d 100644 } - pudp = pud_offset(pgdp, ea); + pudp = pud_offset(p4dp, ea); - if (map_page_size = PUD_SIZE) { + if (map_page_size == PUD_SIZE) { ptep = (pte_t *)pudp; goto set_the_pte; @@ -114,6 +121,7 @@ static int __map_kernel_page(unsigned long ea, unsigned long pa, @@ -611,7 +611,7 @@ index dd1bea45325c..11762556fe4d 100644 + pudp = pud_alloc(&init_mm, p4dp, ea); if (!pudp) return -ENOMEM; - if (map_page_size = PUD_SIZE) { + if (map_page_size == PUD_SIZE) { @@ -173,6 +182,7 @@ void radix__change_memory_range(unsigned long start, unsigned long end, { unsigned long idx; @@ -673,7 +673,7 @@ index 73d4873fc7f8..43d463f20fc3 100644 + p4 = p4d_offset(pg, addr); #ifdef CONFIG_PPC_BOOK3S_64 - if (pshift = PGDIR_SHIFT) + if (pshift == PGDIR_SHIFT) /* 16GB huge page */ - return (pte_t *) pg; + return (pte_t *) p4; @@ -690,7 +690,7 @@ index 73d4873fc7f8..43d463f20fc3 100644 + pu = pud_alloc(mm, p4, addr); if (!pu) return NULL; - if (pshift = PUD_SHIFT) + if (pshift == PUD_SHIFT) @@ -159,10 +161,10 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz #else if (pshift >= PGDIR_SHIFT) { diff --git a/a/content_digest b/N3/content_digest index adaee47..ea46332 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 07/13] powerpc: add support for folded p4d page tables\0" - "Date\0Sun, 16 Feb 2020 08:18:37 +0000\0" + "Date\0Sun, 16 Feb 2020 10:18:37 +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" @@ -101,8 +104,8 @@ "-static inline int hash__pgd_bad(pgd_t pgd)\n" "+static inline int hash__p4d_bad(p4d_t p4d)\n" " {\n" - "-\treturn (pgd_val(pgd) = 0);\n" - "+\treturn (p4d_val(p4d) = 0);\n" + "-\treturn (pgd_val(pgd) == 0);\n" + "+\treturn (p4d_val(p4d) == 0);\n" " }\n" " #ifdef CONFIG_STRICT_KERNEL_RWX\n" " extern void hash__mark_rodata_ro(void);\n" @@ -326,11 +329,11 @@ " */\n" " \n" "-#define pgd_none(pgd)\t\t(!pgd_val(pgd))\n" - "-#define pgd_bad(pgd)\t\t(pgd_val(pgd) = 0)\n" + "-#define pgd_bad(pgd)\t\t(pgd_val(pgd) == 0)\n" "-#define pgd_present(pgd)\t(pgd_val(pgd) != 0)\n" "-#define pgd_page_vaddr(pgd)\t(pgd_val(pgd) & ~PGD_MASKED_BITS)\n" "+#define p4d_none(p4d)\t\t(!p4d_val(p4d))\n" - "+#define p4d_bad(p4d)\t\t(p4d_val(p4d) = 0)\n" + "+#define p4d_bad(p4d)\t\t(p4d_val(p4d) == 0)\n" "+#define p4d_present(p4d)\t(p4d_val(p4d) != 0)\n" "+#define p4d_page_vaddr(p4d)\t(p4d_val(p4d) & ~P4D_MASKED_BITS)\n" " \n" @@ -633,7 +636,7 @@ " \t}\n" "-\tpudp = pud_offset(pgdp, ea);\n" "+\tpudp = pud_offset(p4dp, ea);\n" - " \tif (map_page_size = PUD_SIZE) {\n" + " \tif (map_page_size == PUD_SIZE) {\n" " \t\tptep = (pte_t *)pudp;\n" " \t\tgoto set_the_pte;\n" "@@ -114,6 +121,7 @@ static int __map_kernel_page(unsigned long ea, unsigned long pa,\n" @@ -653,7 +656,7 @@ "+\tpudp = pud_alloc(&init_mm, p4dp, ea);\n" " \tif (!pudp)\n" " \t\treturn -ENOMEM;\n" - " \tif (map_page_size = PUD_SIZE) {\n" + " \tif (map_page_size == PUD_SIZE) {\n" "@@ -173,6 +182,7 @@ void radix__change_memory_range(unsigned long start, unsigned long end,\n" " {\n" " \tunsigned long idx;\n" @@ -715,7 +718,7 @@ "+\tp4 = p4d_offset(pg, addr);\n" " \n" " #ifdef CONFIG_PPC_BOOK3S_64\n" - " \tif (pshift = PGDIR_SHIFT)\n" + " \tif (pshift == PGDIR_SHIFT)\n" " \t\t/* 16GB huge page */\n" "-\t\treturn (pte_t *) pg;\n" "+\t\treturn (pte_t *) p4;\n" @@ -732,7 +735,7 @@ "+\t\tpu = pud_alloc(mm, p4, addr);\n" " \t\tif (!pu)\n" " \t\t\treturn NULL;\n" - " \t\tif (pshift = PUD_SHIFT)\n" + " \t\tif (pshift == PUD_SHIFT)\n" "@@ -159,10 +161,10 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz\n" " #else\n" " \tif (pshift >= PGDIR_SHIFT) {\n" @@ -1198,4 +1201,4 @@ "-- \n" 2.24.0 -98d25a4d4363e4deee577b5e32cbd88ae30aedbe89b4952eaad9420f0f283b1b +6c04eb1939559aee084d4cd220c9f7e953f4311697b067026441c073224b42ab
diff --git a/a/1.txt b/N4/1.txt index f43fed5..fd1989d 100644 --- a/a/1.txt +++ b/N4/1.txt @@ -59,8 +59,8 @@ index 2781ebf6add4..876d1528c2cf 100644 -static inline int hash__pgd_bad(pgd_t pgd) +static inline int hash__p4d_bad(p4d_t p4d) { -- return (pgd_val(pgd) = 0); -+ return (p4d_val(p4d) = 0); +- return (pgd_val(pgd) == 0); ++ return (p4d_val(p4d) == 0); } #ifdef CONFIG_STRICT_KERNEL_RWX extern void hash__mark_rodata_ro(void); @@ -284,11 +284,11 @@ index c40ec32b8194..81b1c54e3cf1 100644 */ -#define pgd_none(pgd) (!pgd_val(pgd)) --#define pgd_bad(pgd) (pgd_val(pgd) = 0) +-#define pgd_bad(pgd) (pgd_val(pgd) == 0) -#define pgd_present(pgd) (pgd_val(pgd) != 0) -#define pgd_page_vaddr(pgd) (pgd_val(pgd) & ~PGD_MASKED_BITS) +#define p4d_none(p4d) (!p4d_val(p4d)) -+#define p4d_bad(p4d) (p4d_val(p4d) = 0) ++#define p4d_bad(p4d) (p4d_val(p4d) == 0) +#define p4d_present(p4d) (p4d_val(p4d) != 0) +#define p4d_page_vaddr(p4d) (p4d_val(p4d) & ~P4D_MASKED_BITS) @@ -591,7 +591,7 @@ index dd1bea45325c..11762556fe4d 100644 } - pudp = pud_offset(pgdp, ea); + pudp = pud_offset(p4dp, ea); - if (map_page_size = PUD_SIZE) { + if (map_page_size == PUD_SIZE) { ptep = (pte_t *)pudp; goto set_the_pte; @@ -114,6 +121,7 @@ static int __map_kernel_page(unsigned long ea, unsigned long pa, @@ -611,7 +611,7 @@ index dd1bea45325c..11762556fe4d 100644 + pudp = pud_alloc(&init_mm, p4dp, ea); if (!pudp) return -ENOMEM; - if (map_page_size = PUD_SIZE) { + if (map_page_size == PUD_SIZE) { @@ -173,6 +182,7 @@ void radix__change_memory_range(unsigned long start, unsigned long end, { unsigned long idx; @@ -673,7 +673,7 @@ index 73d4873fc7f8..43d463f20fc3 100644 + p4 = p4d_offset(pg, addr); #ifdef CONFIG_PPC_BOOK3S_64 - if (pshift = PGDIR_SHIFT) + if (pshift == PGDIR_SHIFT) /* 16GB huge page */ - return (pte_t *) pg; + return (pte_t *) p4; @@ -690,7 +690,7 @@ index 73d4873fc7f8..43d463f20fc3 100644 + pu = pud_alloc(mm, p4, addr); if (!pu) return NULL; - if (pshift = PUD_SHIFT) + if (pshift == PUD_SHIFT) @@ -159,10 +161,10 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz #else if (pshift >= PGDIR_SHIFT) { diff --git a/a/content_digest b/N4/content_digest index adaee47..1fc60bc 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 07/13] powerpc: add support for folded p4d page tables\0" - "Date\0Sun, 16 Feb 2020 08:18:37 +0000\0" + "Date\0Sun, 16 Feb 2020 10:18:37 +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" @@ -101,8 +86,8 @@ "-static inline int hash__pgd_bad(pgd_t pgd)\n" "+static inline int hash__p4d_bad(p4d_t p4d)\n" " {\n" - "-\treturn (pgd_val(pgd) = 0);\n" - "+\treturn (p4d_val(p4d) = 0);\n" + "-\treturn (pgd_val(pgd) == 0);\n" + "+\treturn (p4d_val(p4d) == 0);\n" " }\n" " #ifdef CONFIG_STRICT_KERNEL_RWX\n" " extern void hash__mark_rodata_ro(void);\n" @@ -326,11 +311,11 @@ " */\n" " \n" "-#define pgd_none(pgd)\t\t(!pgd_val(pgd))\n" - "-#define pgd_bad(pgd)\t\t(pgd_val(pgd) = 0)\n" + "-#define pgd_bad(pgd)\t\t(pgd_val(pgd) == 0)\n" "-#define pgd_present(pgd)\t(pgd_val(pgd) != 0)\n" "-#define pgd_page_vaddr(pgd)\t(pgd_val(pgd) & ~PGD_MASKED_BITS)\n" "+#define p4d_none(p4d)\t\t(!p4d_val(p4d))\n" - "+#define p4d_bad(p4d)\t\t(p4d_val(p4d) = 0)\n" + "+#define p4d_bad(p4d)\t\t(p4d_val(p4d) == 0)\n" "+#define p4d_present(p4d)\t(p4d_val(p4d) != 0)\n" "+#define p4d_page_vaddr(p4d)\t(p4d_val(p4d) & ~P4D_MASKED_BITS)\n" " \n" @@ -633,7 +618,7 @@ " \t}\n" "-\tpudp = pud_offset(pgdp, ea);\n" "+\tpudp = pud_offset(p4dp, ea);\n" - " \tif (map_page_size = PUD_SIZE) {\n" + " \tif (map_page_size == PUD_SIZE) {\n" " \t\tptep = (pte_t *)pudp;\n" " \t\tgoto set_the_pte;\n" "@@ -114,6 +121,7 @@ static int __map_kernel_page(unsigned long ea, unsigned long pa,\n" @@ -653,7 +638,7 @@ "+\tpudp = pud_alloc(&init_mm, p4dp, ea);\n" " \tif (!pudp)\n" " \t\treturn -ENOMEM;\n" - " \tif (map_page_size = PUD_SIZE) {\n" + " \tif (map_page_size == PUD_SIZE) {\n" "@@ -173,6 +182,7 @@ void radix__change_memory_range(unsigned long start, unsigned long end,\n" " {\n" " \tunsigned long idx;\n" @@ -715,7 +700,7 @@ "+\tp4 = p4d_offset(pg, addr);\n" " \n" " #ifdef CONFIG_PPC_BOOK3S_64\n" - " \tif (pshift = PGDIR_SHIFT)\n" + " \tif (pshift == PGDIR_SHIFT)\n" " \t\t/* 16GB huge page */\n" "-\t\treturn (pte_t *) pg;\n" "+\t\treturn (pte_t *) p4;\n" @@ -732,7 +717,7 @@ "+\t\tpu = pud_alloc(mm, p4, addr);\n" " \t\tif (!pu)\n" " \t\t\treturn NULL;\n" - " \t\tif (pshift = PUD_SHIFT)\n" + " \t\tif (pshift == PUD_SHIFT)\n" "@@ -159,10 +161,10 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz\n" " #else\n" " \tif (pshift >= PGDIR_SHIFT) {\n" @@ -1198,4 +1183,4 @@ "-- \n" 2.24.0 -98d25a4d4363e4deee577b5e32cbd88ae30aedbe89b4952eaad9420f0f283b1b +0fb7d4b36083653f90ec7ccc7f6978b1cce8cae14d435058b9176934a33ab0fd
diff --git a/a/1.txt b/N5/1.txt index f43fed5..fd1989d 100644 --- a/a/1.txt +++ b/N5/1.txt @@ -59,8 +59,8 @@ index 2781ebf6add4..876d1528c2cf 100644 -static inline int hash__pgd_bad(pgd_t pgd) +static inline int hash__p4d_bad(p4d_t p4d) { -- return (pgd_val(pgd) = 0); -+ return (p4d_val(p4d) = 0); +- return (pgd_val(pgd) == 0); ++ return (p4d_val(p4d) == 0); } #ifdef CONFIG_STRICT_KERNEL_RWX extern void hash__mark_rodata_ro(void); @@ -284,11 +284,11 @@ index c40ec32b8194..81b1c54e3cf1 100644 */ -#define pgd_none(pgd) (!pgd_val(pgd)) --#define pgd_bad(pgd) (pgd_val(pgd) = 0) +-#define pgd_bad(pgd) (pgd_val(pgd) == 0) -#define pgd_present(pgd) (pgd_val(pgd) != 0) -#define pgd_page_vaddr(pgd) (pgd_val(pgd) & ~PGD_MASKED_BITS) +#define p4d_none(p4d) (!p4d_val(p4d)) -+#define p4d_bad(p4d) (p4d_val(p4d) = 0) ++#define p4d_bad(p4d) (p4d_val(p4d) == 0) +#define p4d_present(p4d) (p4d_val(p4d) != 0) +#define p4d_page_vaddr(p4d) (p4d_val(p4d) & ~P4D_MASKED_BITS) @@ -591,7 +591,7 @@ index dd1bea45325c..11762556fe4d 100644 } - pudp = pud_offset(pgdp, ea); + pudp = pud_offset(p4dp, ea); - if (map_page_size = PUD_SIZE) { + if (map_page_size == PUD_SIZE) { ptep = (pte_t *)pudp; goto set_the_pte; @@ -114,6 +121,7 @@ static int __map_kernel_page(unsigned long ea, unsigned long pa, @@ -611,7 +611,7 @@ index dd1bea45325c..11762556fe4d 100644 + pudp = pud_alloc(&init_mm, p4dp, ea); if (!pudp) return -ENOMEM; - if (map_page_size = PUD_SIZE) { + if (map_page_size == PUD_SIZE) { @@ -173,6 +182,7 @@ void radix__change_memory_range(unsigned long start, unsigned long end, { unsigned long idx; @@ -673,7 +673,7 @@ index 73d4873fc7f8..43d463f20fc3 100644 + p4 = p4d_offset(pg, addr); #ifdef CONFIG_PPC_BOOK3S_64 - if (pshift = PGDIR_SHIFT) + if (pshift == PGDIR_SHIFT) /* 16GB huge page */ - return (pte_t *) pg; + return (pte_t *) p4; @@ -690,7 +690,7 @@ index 73d4873fc7f8..43d463f20fc3 100644 + pu = pud_alloc(mm, p4, addr); if (!pu) return NULL; - if (pshift = PUD_SHIFT) + if (pshift == PUD_SHIFT) @@ -159,10 +161,10 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz #else if (pshift >= PGDIR_SHIFT) { diff --git a/a/content_digest b/N5/content_digest index adaee47..f5ecc08 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 07/13] powerpc: add support for folded p4d page tables\0" - "Date\0Sun, 16 Feb 2020 08:18:37 +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 07/13] powerpc: add support for folded p4d page tables\0" + "Date\0Sun, 16 Feb 2020 10:18:37 +0200\0" + "To\0openrisc@lists.librecores.org\0" "\00:1\0" "b\0" "From: Mike Rapoport <rppt@linux.ibm.com>\n" @@ -101,8 +66,8 @@ "-static inline int hash__pgd_bad(pgd_t pgd)\n" "+static inline int hash__p4d_bad(p4d_t p4d)\n" " {\n" - "-\treturn (pgd_val(pgd) = 0);\n" - "+\treturn (p4d_val(p4d) = 0);\n" + "-\treturn (pgd_val(pgd) == 0);\n" + "+\treturn (p4d_val(p4d) == 0);\n" " }\n" " #ifdef CONFIG_STRICT_KERNEL_RWX\n" " extern void hash__mark_rodata_ro(void);\n" @@ -326,11 +291,11 @@ " */\n" " \n" "-#define pgd_none(pgd)\t\t(!pgd_val(pgd))\n" - "-#define pgd_bad(pgd)\t\t(pgd_val(pgd) = 0)\n" + "-#define pgd_bad(pgd)\t\t(pgd_val(pgd) == 0)\n" "-#define pgd_present(pgd)\t(pgd_val(pgd) != 0)\n" "-#define pgd_page_vaddr(pgd)\t(pgd_val(pgd) & ~PGD_MASKED_BITS)\n" "+#define p4d_none(p4d)\t\t(!p4d_val(p4d))\n" - "+#define p4d_bad(p4d)\t\t(p4d_val(p4d) = 0)\n" + "+#define p4d_bad(p4d)\t\t(p4d_val(p4d) == 0)\n" "+#define p4d_present(p4d)\t(p4d_val(p4d) != 0)\n" "+#define p4d_page_vaddr(p4d)\t(p4d_val(p4d) & ~P4D_MASKED_BITS)\n" " \n" @@ -633,7 +598,7 @@ " \t}\n" "-\tpudp = pud_offset(pgdp, ea);\n" "+\tpudp = pud_offset(p4dp, ea);\n" - " \tif (map_page_size = PUD_SIZE) {\n" + " \tif (map_page_size == PUD_SIZE) {\n" " \t\tptep = (pte_t *)pudp;\n" " \t\tgoto set_the_pte;\n" "@@ -114,6 +121,7 @@ static int __map_kernel_page(unsigned long ea, unsigned long pa,\n" @@ -653,7 +618,7 @@ "+\tpudp = pud_alloc(&init_mm, p4dp, ea);\n" " \tif (!pudp)\n" " \t\treturn -ENOMEM;\n" - " \tif (map_page_size = PUD_SIZE) {\n" + " \tif (map_page_size == PUD_SIZE) {\n" "@@ -173,6 +182,7 @@ void radix__change_memory_range(unsigned long start, unsigned long end,\n" " {\n" " \tunsigned long idx;\n" @@ -715,7 +680,7 @@ "+\tp4 = p4d_offset(pg, addr);\n" " \n" " #ifdef CONFIG_PPC_BOOK3S_64\n" - " \tif (pshift = PGDIR_SHIFT)\n" + " \tif (pshift == PGDIR_SHIFT)\n" " \t\t/* 16GB huge page */\n" "-\t\treturn (pte_t *) pg;\n" "+\t\treturn (pte_t *) p4;\n" @@ -732,7 +697,7 @@ "+\t\tpu = pud_alloc(mm, p4, addr);\n" " \t\tif (!pu)\n" " \t\t\treturn NULL;\n" - " \t\tif (pshift = PUD_SHIFT)\n" + " \t\tif (pshift == PUD_SHIFT)\n" "@@ -159,10 +161,10 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz\n" " #else\n" " \tif (pshift >= PGDIR_SHIFT) {\n" @@ -1198,4 +1163,4 @@ "-- \n" 2.24.0 -98d25a4d4363e4deee577b5e32cbd88ae30aedbe89b4952eaad9420f0f283b1b +fd75191e7561b309d1d5165474356dd80bfc6a953e246f3f528d4c6097d46872
diff --git a/a/1.txt b/N6/1.txt index f43fed5..fd1989d 100644 --- a/a/1.txt +++ b/N6/1.txt @@ -59,8 +59,8 @@ index 2781ebf6add4..876d1528c2cf 100644 -static inline int hash__pgd_bad(pgd_t pgd) +static inline int hash__p4d_bad(p4d_t p4d) { -- return (pgd_val(pgd) = 0); -+ return (p4d_val(p4d) = 0); +- return (pgd_val(pgd) == 0); ++ return (p4d_val(p4d) == 0); } #ifdef CONFIG_STRICT_KERNEL_RWX extern void hash__mark_rodata_ro(void); @@ -284,11 +284,11 @@ index c40ec32b8194..81b1c54e3cf1 100644 */ -#define pgd_none(pgd) (!pgd_val(pgd)) --#define pgd_bad(pgd) (pgd_val(pgd) = 0) +-#define pgd_bad(pgd) (pgd_val(pgd) == 0) -#define pgd_present(pgd) (pgd_val(pgd) != 0) -#define pgd_page_vaddr(pgd) (pgd_val(pgd) & ~PGD_MASKED_BITS) +#define p4d_none(p4d) (!p4d_val(p4d)) -+#define p4d_bad(p4d) (p4d_val(p4d) = 0) ++#define p4d_bad(p4d) (p4d_val(p4d) == 0) +#define p4d_present(p4d) (p4d_val(p4d) != 0) +#define p4d_page_vaddr(p4d) (p4d_val(p4d) & ~P4D_MASKED_BITS) @@ -591,7 +591,7 @@ index dd1bea45325c..11762556fe4d 100644 } - pudp = pud_offset(pgdp, ea); + pudp = pud_offset(p4dp, ea); - if (map_page_size = PUD_SIZE) { + if (map_page_size == PUD_SIZE) { ptep = (pte_t *)pudp; goto set_the_pte; @@ -114,6 +121,7 @@ static int __map_kernel_page(unsigned long ea, unsigned long pa, @@ -611,7 +611,7 @@ index dd1bea45325c..11762556fe4d 100644 + pudp = pud_alloc(&init_mm, p4dp, ea); if (!pudp) return -ENOMEM; - if (map_page_size = PUD_SIZE) { + if (map_page_size == PUD_SIZE) { @@ -173,6 +182,7 @@ void radix__change_memory_range(unsigned long start, unsigned long end, { unsigned long idx; @@ -673,7 +673,7 @@ index 73d4873fc7f8..43d463f20fc3 100644 + p4 = p4d_offset(pg, addr); #ifdef CONFIG_PPC_BOOK3S_64 - if (pshift = PGDIR_SHIFT) + if (pshift == PGDIR_SHIFT) /* 16GB huge page */ - return (pte_t *) pg; + return (pte_t *) p4; @@ -690,7 +690,7 @@ index 73d4873fc7f8..43d463f20fc3 100644 + pu = pud_alloc(mm, p4, addr); if (!pu) return NULL; - if (pshift = PUD_SHIFT) + if (pshift == PUD_SHIFT) @@ -159,10 +161,10 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz #else if (pshift >= PGDIR_SHIFT) { diff --git a/a/content_digest b/N6/content_digest index adaee47..ec4d3a2 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 07/13] powerpc: add support for folded p4d page tables\0" - "Date\0Sun, 16 Feb 2020 08:18:37 +0000\0" + "Date\0Sun, 16 Feb 2020 10:18:37 +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 @@ -101,8 +101,8 @@ "-static inline int hash__pgd_bad(pgd_t pgd)\n" "+static inline int hash__p4d_bad(p4d_t p4d)\n" " {\n" - "-\treturn (pgd_val(pgd) = 0);\n" - "+\treturn (p4d_val(p4d) = 0);\n" + "-\treturn (pgd_val(pgd) == 0);\n" + "+\treturn (p4d_val(p4d) == 0);\n" " }\n" " #ifdef CONFIG_STRICT_KERNEL_RWX\n" " extern void hash__mark_rodata_ro(void);\n" @@ -326,11 +326,11 @@ " */\n" " \n" "-#define pgd_none(pgd)\t\t(!pgd_val(pgd))\n" - "-#define pgd_bad(pgd)\t\t(pgd_val(pgd) = 0)\n" + "-#define pgd_bad(pgd)\t\t(pgd_val(pgd) == 0)\n" "-#define pgd_present(pgd)\t(pgd_val(pgd) != 0)\n" "-#define pgd_page_vaddr(pgd)\t(pgd_val(pgd) & ~PGD_MASKED_BITS)\n" "+#define p4d_none(p4d)\t\t(!p4d_val(p4d))\n" - "+#define p4d_bad(p4d)\t\t(p4d_val(p4d) = 0)\n" + "+#define p4d_bad(p4d)\t\t(p4d_val(p4d) == 0)\n" "+#define p4d_present(p4d)\t(p4d_val(p4d) != 0)\n" "+#define p4d_page_vaddr(p4d)\t(p4d_val(p4d) & ~P4D_MASKED_BITS)\n" " \n" @@ -633,7 +633,7 @@ " \t}\n" "-\tpudp = pud_offset(pgdp, ea);\n" "+\tpudp = pud_offset(p4dp, ea);\n" - " \tif (map_page_size = PUD_SIZE) {\n" + " \tif (map_page_size == PUD_SIZE) {\n" " \t\tptep = (pte_t *)pudp;\n" " \t\tgoto set_the_pte;\n" "@@ -114,6 +121,7 @@ static int __map_kernel_page(unsigned long ea, unsigned long pa,\n" @@ -653,7 +653,7 @@ "+\tpudp = pud_alloc(&init_mm, p4dp, ea);\n" " \tif (!pudp)\n" " \t\treturn -ENOMEM;\n" - " \tif (map_page_size = PUD_SIZE) {\n" + " \tif (map_page_size == PUD_SIZE) {\n" "@@ -173,6 +182,7 @@ void radix__change_memory_range(unsigned long start, unsigned long end,\n" " {\n" " \tunsigned long idx;\n" @@ -715,7 +715,7 @@ "+\tp4 = p4d_offset(pg, addr);\n" " \n" " #ifdef CONFIG_PPC_BOOK3S_64\n" - " \tif (pshift = PGDIR_SHIFT)\n" + " \tif (pshift == PGDIR_SHIFT)\n" " \t\t/* 16GB huge page */\n" "-\t\treturn (pte_t *) pg;\n" "+\t\treturn (pte_t *) p4;\n" @@ -732,7 +732,7 @@ "+\t\tpu = pud_alloc(mm, p4, addr);\n" " \t\tif (!pu)\n" " \t\t\treturn NULL;\n" - " \t\tif (pshift = PUD_SHIFT)\n" + " \t\tif (pshift == PUD_SHIFT)\n" "@@ -159,10 +161,10 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz\n" " #else\n" " \tif (pshift >= PGDIR_SHIFT) {\n" @@ -1198,4 +1198,4 @@ "-- \n" 2.24.0 -98d25a4d4363e4deee577b5e32cbd88ae30aedbe89b4952eaad9420f0f283b1b +6d9f9cf8c2560562da79af33e4fda670adbcefff30be0ce0c1c114cd5270c23f
diff --git a/a/1.txt b/N7/1.txt index f43fed5..4cebf33 100644 --- a/a/1.txt +++ b/N7/1.txt @@ -59,8 +59,8 @@ index 2781ebf6add4..876d1528c2cf 100644 -static inline int hash__pgd_bad(pgd_t pgd) +static inline int hash__p4d_bad(p4d_t p4d) { -- return (pgd_val(pgd) = 0); -+ return (p4d_val(p4d) = 0); +- return (pgd_val(pgd) == 0); ++ return (p4d_val(p4d) == 0); } #ifdef CONFIG_STRICT_KERNEL_RWX extern void hash__mark_rodata_ro(void); @@ -284,11 +284,11 @@ index c40ec32b8194..81b1c54e3cf1 100644 */ -#define pgd_none(pgd) (!pgd_val(pgd)) --#define pgd_bad(pgd) (pgd_val(pgd) = 0) +-#define pgd_bad(pgd) (pgd_val(pgd) == 0) -#define pgd_present(pgd) (pgd_val(pgd) != 0) -#define pgd_page_vaddr(pgd) (pgd_val(pgd) & ~PGD_MASKED_BITS) +#define p4d_none(p4d) (!p4d_val(p4d)) -+#define p4d_bad(p4d) (p4d_val(p4d) = 0) ++#define p4d_bad(p4d) (p4d_val(p4d) == 0) +#define p4d_present(p4d) (p4d_val(p4d) != 0) +#define p4d_page_vaddr(p4d) (p4d_val(p4d) & ~P4D_MASKED_BITS) @@ -591,7 +591,7 @@ index dd1bea45325c..11762556fe4d 100644 } - pudp = pud_offset(pgdp, ea); + pudp = pud_offset(p4dp, ea); - if (map_page_size = PUD_SIZE) { + if (map_page_size == PUD_SIZE) { ptep = (pte_t *)pudp; goto set_the_pte; @@ -114,6 +121,7 @@ static int __map_kernel_page(unsigned long ea, unsigned long pa, @@ -611,7 +611,7 @@ index dd1bea45325c..11762556fe4d 100644 + pudp = pud_alloc(&init_mm, p4dp, ea); if (!pudp) return -ENOMEM; - if (map_page_size = PUD_SIZE) { + if (map_page_size == PUD_SIZE) { @@ -173,6 +182,7 @@ void radix__change_memory_range(unsigned long start, unsigned long end, { unsigned long idx; @@ -673,7 +673,7 @@ index 73d4873fc7f8..43d463f20fc3 100644 + p4 = p4d_offset(pg, addr); #ifdef CONFIG_PPC_BOOK3S_64 - if (pshift = PGDIR_SHIFT) + if (pshift == PGDIR_SHIFT) /* 16GB huge page */ - return (pte_t *) pg; + return (pte_t *) p4; @@ -690,7 +690,7 @@ index 73d4873fc7f8..43d463f20fc3 100644 + pu = pud_alloc(mm, p4, addr); if (!pu) return NULL; - if (pshift = PUD_SHIFT) + if (pshift == PUD_SHIFT) @@ -159,10 +161,10 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz #else if (pshift >= PGDIR_SHIFT) { @@ -1155,3 +1155,9 @@ index e8c84d265602..c7bd1145b268 100644 printf("No valid PUD\n"); -- 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 adaee47..8a508b0 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 07/13] powerpc: add support for folded p4d page tables\0" - "Date\0Sun, 16 Feb 2020 08:18:37 +0000\0" + "Date\0Sun, 16 Feb 2020 10:18:37 +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> @@ -101,8 +104,8 @@ "-static inline int hash__pgd_bad(pgd_t pgd)\n" "+static inline int hash__p4d_bad(p4d_t p4d)\n" " {\n" - "-\treturn (pgd_val(pgd) = 0);\n" - "+\treturn (p4d_val(p4d) = 0);\n" + "-\treturn (pgd_val(pgd) == 0);\n" + "+\treturn (p4d_val(p4d) == 0);\n" " }\n" " #ifdef CONFIG_STRICT_KERNEL_RWX\n" " extern void hash__mark_rodata_ro(void);\n" @@ -326,11 +329,11 @@ " */\n" " \n" "-#define pgd_none(pgd)\t\t(!pgd_val(pgd))\n" - "-#define pgd_bad(pgd)\t\t(pgd_val(pgd) = 0)\n" + "-#define pgd_bad(pgd)\t\t(pgd_val(pgd) == 0)\n" "-#define pgd_present(pgd)\t(pgd_val(pgd) != 0)\n" "-#define pgd_page_vaddr(pgd)\t(pgd_val(pgd) & ~PGD_MASKED_BITS)\n" "+#define p4d_none(p4d)\t\t(!p4d_val(p4d))\n" - "+#define p4d_bad(p4d)\t\t(p4d_val(p4d) = 0)\n" + "+#define p4d_bad(p4d)\t\t(p4d_val(p4d) == 0)\n" "+#define p4d_present(p4d)\t(p4d_val(p4d) != 0)\n" "+#define p4d_page_vaddr(p4d)\t(p4d_val(p4d) & ~P4D_MASKED_BITS)\n" " \n" @@ -633,7 +636,7 @@ " \t}\n" "-\tpudp = pud_offset(pgdp, ea);\n" "+\tpudp = pud_offset(p4dp, ea);\n" - " \tif (map_page_size = PUD_SIZE) {\n" + " \tif (map_page_size == PUD_SIZE) {\n" " \t\tptep = (pte_t *)pudp;\n" " \t\tgoto set_the_pte;\n" "@@ -114,6 +121,7 @@ static int __map_kernel_page(unsigned long ea, unsigned long pa,\n" @@ -653,7 +656,7 @@ "+\tpudp = pud_alloc(&init_mm, p4dp, ea);\n" " \tif (!pudp)\n" " \t\treturn -ENOMEM;\n" - " \tif (map_page_size = PUD_SIZE) {\n" + " \tif (map_page_size == PUD_SIZE) {\n" "@@ -173,6 +182,7 @@ void radix__change_memory_range(unsigned long start, unsigned long end,\n" " {\n" " \tunsigned long idx;\n" @@ -715,7 +718,7 @@ "+\tp4 = p4d_offset(pg, addr);\n" " \n" " #ifdef CONFIG_PPC_BOOK3S_64\n" - " \tif (pshift = PGDIR_SHIFT)\n" + " \tif (pshift == PGDIR_SHIFT)\n" " \t\t/* 16GB huge page */\n" "-\t\treturn (pte_t *) pg;\n" "+\t\treturn (pte_t *) p4;\n" @@ -732,7 +735,7 @@ "+\t\tpu = pud_alloc(mm, p4, addr);\n" " \t\tif (!pu)\n" " \t\t\treturn NULL;\n" - " \t\tif (pshift = PUD_SHIFT)\n" + " \t\tif (pshift == PUD_SHIFT)\n" "@@ -159,10 +161,10 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz\n" " #else\n" " \tif (pshift >= PGDIR_SHIFT) {\n" @@ -1196,6 +1199,12 @@ " \tif (pud_none(*pudp)) {\n" " \t\tprintf(\"No valid PUD\\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 -98d25a4d4363e4deee577b5e32cbd88ae30aedbe89b4952eaad9420f0f283b1b +8840e15a89e6e8efba22eda40e897bfc8f221309ecec376c83dba2f20d3e1e80
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.