diff for duplicates of <20200226091315.GA11803@hump> diff --git a/a/1.txt b/N1/1.txt index 5ff5d2e..fcff5f7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -91,8 +91,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); @@ -319,11 +319,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) @@ -590,7 +590,7 @@ index dd1bea45325c..fc3d0b0460b0 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 +116,7 @@ static int __map_kernel_page(unsigned long ea, unsigned long pa, @@ -610,7 +610,7 @@ index dd1bea45325c..fc3d0b0460b0 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 +177,7 @@ void radix__change_memory_range(unsigned long start, unsigned long end, { unsigned long idx; @@ -701,7 +701,7 @@ index 33b3461d91e8..54f5994d4cbb 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; @@ -718,7 +718,7 @@ index 33b3461d91e8..54f5994d4cbb 100644 + pu = pud_alloc(mm, p4, addr); if (!pu) return NULL; - if (pshift = PUD_SHIFT) + if (pshift == PUD_SHIFT) @@ -166,10 +168,10 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz #else if (pshift >= PGDIR_SHIFT) { @@ -1215,3 +1215,8 @@ index 0ec9640335bb..3e29128c58cc 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 0510623..81709f8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,7 +4,7 @@ "ref\020200218105440.GA1698@hump\0" "From\0Mike Rapoport <rppt@kernel.org>\0" "Subject\0Re: [PATCH v2 07/13] powerpc: add support for folded p4d page tables\0" - "Date\0Wed, 26 Feb 2020 09:13:15 +0000\0" + "Date\0Wed, 26 Feb 2020 11:13:15 +0200\0" "To\0Christophe Leroy <christophe.leroy@c-s.fr>\0" "Cc\0Rich Felker <dalias@libc.org>" linux-ia64@vger.kernel.org @@ -135,8 +135,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" @@ -363,11 +363,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" @@ -634,7 +634,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 +116,7 @@ static int __map_kernel_page(unsigned long ea, unsigned long pa,\n" @@ -654,7 +654,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 +177,7 @@ void radix__change_memory_range(unsigned long start, unsigned long end,\n" " {\n" " \tunsigned long idx;\n" @@ -745,7 +745,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" @@ -762,7 +762,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" "@@ -166,10 +168,10 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz\n" " #else\n" " \tif (pshift >= PGDIR_SHIFT) {\n" @@ -1258,6 +1258,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 -08c8b6001d712fd5b8372625c39c8686c2115ef931e7b257958592867c9ce565 +1d25f8ae50534e85c4b3bf1a4831966bc188778790cd0dda02260e13b37e5f56
diff --git a/a/1.txt b/N2/1.txt index 5ff5d2e..165660c 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -91,8 +91,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); @@ -319,11 +319,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) @@ -590,7 +590,7 @@ index dd1bea45325c..fc3d0b0460b0 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 +116,7 @@ static int __map_kernel_page(unsigned long ea, unsigned long pa, @@ -610,7 +610,7 @@ index dd1bea45325c..fc3d0b0460b0 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 +177,7 @@ void radix__change_memory_range(unsigned long start, unsigned long end, { unsigned long idx; @@ -701,7 +701,7 @@ index 33b3461d91e8..54f5994d4cbb 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; @@ -718,7 +718,7 @@ index 33b3461d91e8..54f5994d4cbb 100644 + pu = pud_alloc(mm, p4, addr); if (!pu) return NULL; - if (pshift = PUD_SHIFT) + if (pshift == PUD_SHIFT) @@ -166,10 +168,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 0510623..125359f 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -4,42 +4,28 @@ "ref\020200218105440.GA1698@hump\0" "From\0Mike Rapoport <rppt@kernel.org>\0" "Subject\0Re: [PATCH v2 07/13] powerpc: add support for folded p4d page tables\0" - "Date\0Wed, 26 Feb 2020 09:13:15 +0000\0" + "Date\0Wed, 26 Feb 2020 11:13:15 +0200\0" "To\0Christophe Leroy <christophe.leroy@c-s.fr>\0" - "Cc\0Rich Felker <dalias@libc.org>" - linux-ia64@vger.kernel.org - Geert Uytterhoeven <geert+renesas@glider.be> - linux-sh@vger.kernel.org + "Cc\0linux-kernel@vger.kernel.org" + Andrew 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 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 - Tony Luck <tony.luck@intel.com> - Yoshinori Sato <ysato@users.sourceforge.jp> - linux-kernel@vger.kernel.org + 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\0" + Paul Mackerras <paulus@samba.org> + Rich Felker <dalias@libc.org> + Russell King <linux@armlinux.org.uk> + Stafford Horne <shorne@gmail.com> + " Stefan Kristiansson <stefan.kristian>\0" "\00:1\0" "b\0" "On Tue, Feb 18, 2020 at 12:54:40PM +0200, Mike Rapoport wrote:\n" @@ -135,8 +121,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" @@ -363,11 +349,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" @@ -634,7 +620,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 +116,7 @@ static int __map_kernel_page(unsigned long ea, unsigned long pa,\n" @@ -654,7 +640,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 +177,7 @@ void radix__change_memory_range(unsigned long start, unsigned long end,\n" " {\n" " \tunsigned long idx;\n" @@ -745,7 +731,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" @@ -762,7 +748,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" "@@ -166,10 +168,10 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz\n" " #else\n" " \tif (pshift >= PGDIR_SHIFT) {\n" @@ -1260,4 +1246,4 @@ "-- \n" 2.24.0 -08c8b6001d712fd5b8372625c39c8686c2115ef931e7b257958592867c9ce565 +ce42310b8ce5ce1c12e10dfef6d5a64427f742d55bbc791979063dafffc22f07
diff --git a/a/1.txt b/N3/1.txt index 5ff5d2e..165660c 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -91,8 +91,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); @@ -319,11 +319,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) @@ -590,7 +590,7 @@ index dd1bea45325c..fc3d0b0460b0 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 +116,7 @@ static int __map_kernel_page(unsigned long ea, unsigned long pa, @@ -610,7 +610,7 @@ index dd1bea45325c..fc3d0b0460b0 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 +177,7 @@ void radix__change_memory_range(unsigned long start, unsigned long end, { unsigned long idx; @@ -701,7 +701,7 @@ index 33b3461d91e8..54f5994d4cbb 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; @@ -718,7 +718,7 @@ index 33b3461d91e8..54f5994d4cbb 100644 + pu = pud_alloc(mm, p4, addr); if (!pu) return NULL; - if (pshift = PUD_SHIFT) + if (pshift == PUD_SHIFT) @@ -166,10 +168,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 0510623..9813f63 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -4,42 +4,45 @@ "ref\020200218105440.GA1698@hump\0" "From\0Mike Rapoport <rppt@kernel.org>\0" "Subject\0Re: [PATCH v2 07/13] powerpc: add support for folded p4d page tables\0" - "Date\0Wed, 26 Feb 2020 09:13:15 +0000\0" + "Date\0Wed, 26 Feb 2020 11:13:15 +0200\0" "To\0Christophe Leroy <christophe.leroy@c-s.fr>\0" - "Cc\0Rich Felker <dalias@libc.org>" - linux-ia64@vger.kernel.org - Geert Uytterhoeven <geert+renesas@glider.be> - linux-sh@vger.kernel.org + "Cc\0linux-kernel@vger.kernel.org" + Andrew 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 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 + 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> - linux-kernel@vger.kernel.org - Michael Ellerman <mpe@ellerman.id.au> + 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 + linux-sh@vger.kernel.org nios2-dev@lists.rocketboards.org - Andrew Morton <akpm@linux-foundation.org> - " linuxppc-dev@lists.ozlabs.org\0" + openrisc@lists.librecores.org + uclinux-h8-devel@lists.sourceforge.jp + " Mike Rapoport <rppt@linux.ibm.com>\0" "\00:1\0" "b\0" "On Tue, Feb 18, 2020 at 12:54:40PM +0200, Mike Rapoport wrote:\n" @@ -135,8 +138,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" @@ -363,11 +366,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" @@ -634,7 +637,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 +116,7 @@ static int __map_kernel_page(unsigned long ea, unsigned long pa,\n" @@ -654,7 +657,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 +177,7 @@ void radix__change_memory_range(unsigned long start, unsigned long end,\n" " {\n" " \tunsigned long idx;\n" @@ -745,7 +748,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" @@ -762,7 +765,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" "@@ -166,10 +168,10 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz\n" " #else\n" " \tif (pshift >= PGDIR_SHIFT) {\n" @@ -1260,4 +1263,4 @@ "-- \n" 2.24.0 -08c8b6001d712fd5b8372625c39c8686c2115ef931e7b257958592867c9ce565 +34ffa0c06ddd6969709d3995d983fe0e03d1b1b2332a4fe6bde4a8f6f22947dc
diff --git a/a/1.txt b/N4/1.txt index 5ff5d2e..165660c 100644 --- a/a/1.txt +++ b/N4/1.txt @@ -91,8 +91,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); @@ -319,11 +319,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) @@ -590,7 +590,7 @@ index dd1bea45325c..fc3d0b0460b0 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 +116,7 @@ static int __map_kernel_page(unsigned long ea, unsigned long pa, @@ -610,7 +610,7 @@ index dd1bea45325c..fc3d0b0460b0 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 +177,7 @@ void radix__change_memory_range(unsigned long start, unsigned long end, { unsigned long idx; @@ -701,7 +701,7 @@ index 33b3461d91e8..54f5994d4cbb 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; @@ -718,7 +718,7 @@ index 33b3461d91e8..54f5994d4cbb 100644 + pu = pud_alloc(mm, p4, addr); if (!pu) return NULL; - if (pshift = PUD_SHIFT) + if (pshift == PUD_SHIFT) @@ -166,10 +168,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 0510623..b742fd9 100644 --- a/a/content_digest +++ b/N4/content_digest @@ -3,43 +3,9 @@ "ref\0c79b363c-a111-389a-5752-51cf85fa8c44@c-s.fr\0" "ref\020200218105440.GA1698@hump\0" "From\0Mike Rapoport <rppt@kernel.org>\0" - "Subject\0Re: [PATCH v2 07/13] powerpc: add support for folded p4d page tables\0" - "Date\0Wed, 26 Feb 2020 09:13:15 +0000\0" - "To\0Christophe Leroy <christophe.leroy@c-s.fr>\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 - 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 - Andrew Morton <akpm@linux-foundation.org> - " linuxppc-dev@lists.ozlabs.org\0" + "Subject\0[OpenRISC] [PATCH v2 07/13] powerpc: add support for folded p4d page tables\0" + "Date\0Wed, 26 Feb 2020 11:13:15 +0200\0" + "To\0openrisc@lists.librecores.org\0" "\00:1\0" "b\0" "On Tue, Feb 18, 2020 at 12:54:40PM +0200, Mike Rapoport wrote:\n" @@ -135,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" @@ -363,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" @@ -634,7 +600,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 +116,7 @@ static int __map_kernel_page(unsigned long ea, unsigned long pa,\n" @@ -654,7 +620,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 +177,7 @@ void radix__change_memory_range(unsigned long start, unsigned long end,\n" " {\n" " \tunsigned long idx;\n" @@ -745,7 +711,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" @@ -762,7 +728,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" "@@ -166,10 +168,10 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz\n" " #else\n" " \tif (pshift >= PGDIR_SHIFT) {\n" @@ -1260,4 +1226,4 @@ "-- \n" 2.24.0 -08c8b6001d712fd5b8372625c39c8686c2115ef931e7b257958592867c9ce565 +584a8dfc5cef8d228910acb4be582e09d6f83696adbcb88c68e51241e7f7a7b0
diff --git a/a/1.txt b/N5/1.txt index 5ff5d2e..165660c 100644 --- a/a/1.txt +++ b/N5/1.txt @@ -91,8 +91,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); @@ -319,11 +319,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) @@ -590,7 +590,7 @@ index dd1bea45325c..fc3d0b0460b0 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 +116,7 @@ static int __map_kernel_page(unsigned long ea, unsigned long pa, @@ -610,7 +610,7 @@ index dd1bea45325c..fc3d0b0460b0 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 +177,7 @@ void radix__change_memory_range(unsigned long start, unsigned long end, { unsigned long idx; @@ -701,7 +701,7 @@ index 33b3461d91e8..54f5994d4cbb 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; @@ -718,7 +718,7 @@ index 33b3461d91e8..54f5994d4cbb 100644 + pu = pud_alloc(mm, p4, addr); if (!pu) return NULL; - if (pshift = PUD_SHIFT) + if (pshift == PUD_SHIFT) @@ -166,10 +168,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 0510623..ab48ba2 100644 --- a/a/content_digest +++ b/N5/content_digest @@ -4,13 +4,12 @@ "ref\020200218105440.GA1698@hump\0" "From\0Mike Rapoport <rppt@kernel.org>\0" "Subject\0Re: [PATCH v2 07/13] powerpc: add support for folded p4d page tables\0" - "Date\0Wed, 26 Feb 2020 09:13:15 +0000\0" + "Date\0Wed, 26 Feb 2020 11:13:15 +0200\0" "To\0Christophe Leroy <christophe.leroy@c-s.fr>\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 @@ -24,9 +23,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 @@ -36,7 +37,7 @@ 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 Andrew Morton <akpm@linux-foundation.org> " linuxppc-dev@lists.ozlabs.org\0" @@ -135,8 +136,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" @@ -363,11 +364,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" @@ -634,7 +635,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 +116,7 @@ static int __map_kernel_page(unsigned long ea, unsigned long pa,\n" @@ -654,7 +655,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 +177,7 @@ void radix__change_memory_range(unsigned long start, unsigned long end,\n" " {\n" " \tunsigned long idx;\n" @@ -745,7 +746,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" @@ -762,7 +763,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" "@@ -166,10 +168,10 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz\n" " #else\n" " \tif (pshift >= PGDIR_SHIFT) {\n" @@ -1260,4 +1261,4 @@ "-- \n" 2.24.0 -08c8b6001d712fd5b8372625c39c8686c2115ef931e7b257958592867c9ce565 +d78b4803f4fd2b00d494941c2b05a670c61c25cad3c900e329049b3055cab4f8
diff --git a/a/1.txt b/N6/1.txt index 5ff5d2e..f41d4c9 100644 --- a/a/1.txt +++ b/N6/1.txt @@ -91,8 +91,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); @@ -319,11 +319,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) @@ -590,7 +590,7 @@ index dd1bea45325c..fc3d0b0460b0 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 +116,7 @@ static int __map_kernel_page(unsigned long ea, unsigned long pa, @@ -610,7 +610,7 @@ index dd1bea45325c..fc3d0b0460b0 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 +177,7 @@ void radix__change_memory_range(unsigned long start, unsigned long end, { unsigned long idx; @@ -701,7 +701,7 @@ index 33b3461d91e8..54f5994d4cbb 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; @@ -718,7 +718,7 @@ index 33b3461d91e8..54f5994d4cbb 100644 + pu = pud_alloc(mm, p4, addr); if (!pu) return NULL; - if (pshift = PUD_SHIFT) + if (pshift == PUD_SHIFT) @@ -166,10 +168,10 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz #else if (pshift >= PGDIR_SHIFT) { @@ -1215,3 +1215,9 @@ index 0ec9640335bb..3e29128c58cc 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/N6/content_digest index 0510623..74d4264 100644 --- a/a/content_digest +++ b/N6/content_digest @@ -4,7 +4,7 @@ "ref\020200218105440.GA1698@hump\0" "From\0Mike Rapoport <rppt@kernel.org>\0" "Subject\0Re: [PATCH v2 07/13] powerpc: add support for folded p4d page tables\0" - "Date\0Wed, 26 Feb 2020 09:13:15 +0000\0" + "Date\0Wed, 26 Feb 2020 11:13:15 +0200\0" "To\0Christophe Leroy <christophe.leroy@c-s.fr>\0" "Cc\0Rich Felker <dalias@libc.org>" linux-ia64@vger.kernel.org @@ -24,9 +24,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 @@ -36,6 +38,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 Andrew Morton <akpm@linux-foundation.org> @@ -135,8 +138,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" @@ -363,11 +366,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" @@ -634,7 +637,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 +116,7 @@ static int __map_kernel_page(unsigned long ea, unsigned long pa,\n" @@ -654,7 +657,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 +177,7 @@ void radix__change_memory_range(unsigned long start, unsigned long end,\n" " {\n" " \tunsigned long idx;\n" @@ -745,7 +748,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" @@ -762,7 +765,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" "@@ -166,10 +168,10 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz\n" " #else\n" " \tif (pshift >= PGDIR_SHIFT) {\n" @@ -1258,6 +1261,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 -08c8b6001d712fd5b8372625c39c8686c2115ef931e7b257958592867c9ce565 +f32a98169e35c3e4ad7ac6bfdf21c4c713e3aceebd726b20ad1ca377534dfcdf
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.