From: Anshuman Khandual <anshuman.khandual@arm.com> To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: "Anshuman Khandual" <anshuman.khandual@arm.com>, "Catalin Marinas" <catalin.marinas@arm.com>, "Will Deacon" <will@kernel.org>, "Ard Biesheuvel" <ardb@kernel.org>, "Mark Rutland" <mark.rutland@arm.com>, "James Morse" <james.morse@arm.com>, "Robin Murphy" <robin.murphy@arm.com>, "Jérôme Glisse" <jglisse@redhat.com>, "Dan Williams" <dan.j.williams@intel.com>, "David Hildenbrand" <david@redhat.com>, "Mike Rapoport" <rppt@linux.ibm.com>, "Veronika Kabatova" <vkabatov@redhat.com> Subject: [PATCH V3 2/2] arm64/mm: Reorganize pfn_valid() Date: Fri, 5 Mar 2021 10:54:58 +0530 [thread overview] Message-ID: <1614921898-4099-3-git-send-email-anshuman.khandual@arm.com> (raw) In-Reply-To: <1614921898-4099-1-git-send-email-anshuman.khandual@arm.com> There are multiple instances of pfn_to_section_nr() and __pfn_to_section() when CONFIG_SPARSEMEM is enabled. This can be optimized if memory section is fetched earlier. This replaces the open coded PFN and ADDR conversion with PFN_PHYS() and PHYS_PFN() helpers. While there, also add a comment. This does not cause any functional change. Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will@kernel.org> Cc: Ard Biesheuvel <ardb@kernel.org> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Reviewed-by: David Hildenbrand <david@redhat.com> Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com> --- arch/arm64/mm/init.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 5920c527845a..3685e12aba9b 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -219,16 +219,26 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max) int pfn_valid(unsigned long pfn) { - phys_addr_t addr = pfn << PAGE_SHIFT; + phys_addr_t addr = PFN_PHYS(pfn); - if ((addr >> PAGE_SHIFT) != pfn) + /* + * Ensure the upper PAGE_SHIFT bits are clear in the + * pfn. Else it might lead to false positives when + * some of the upper bits are set, but the lower bits + * match a valid pfn. + */ + if (PHYS_PFN(addr) != pfn) return 0; #ifdef CONFIG_SPARSEMEM +{ + struct mem_section *ms; + if (pfn_to_section_nr(pfn) >= NR_MEM_SECTIONS) return 0; - if (!valid_section(__pfn_to_section(pfn))) + ms = __pfn_to_section(pfn); + if (!valid_section(ms)) return 0; /* @@ -240,8 +250,9 @@ int pfn_valid(unsigned long pfn) * memory sections covering all of hotplug memory including * both normal and ZONE_DEVICE based. */ - if (!early_section(__pfn_to_section(pfn))) - return pfn_section_valid(__pfn_to_section(pfn), pfn); + if (!early_section(ms)) + return pfn_section_valid(ms, pfn); +} #endif return memblock_is_map_memory(addr); } -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Anshuman Khandual <anshuman.khandual@arm.com> To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: "Anshuman Khandual" <anshuman.khandual@arm.com>, "Catalin Marinas" <catalin.marinas@arm.com>, "Will Deacon" <will@kernel.org>, "Ard Biesheuvel" <ardb@kernel.org>, "Mark Rutland" <mark.rutland@arm.com>, "James Morse" <james.morse@arm.com>, "Robin Murphy" <robin.murphy@arm.com>, "Jérôme Glisse" <jglisse@redhat.com>, "Dan Williams" <dan.j.williams@intel.com>, "David Hildenbrand" <david@redhat.com>, "Mike Rapoport" <rppt@linux.ibm.com>, "Veronika Kabatova" <vkabatov@redhat.com> Subject: [PATCH V3 2/2] arm64/mm: Reorganize pfn_valid() Date: Fri, 5 Mar 2021 10:54:58 +0530 [thread overview] Message-ID: <1614921898-4099-3-git-send-email-anshuman.khandual@arm.com> (raw) In-Reply-To: <1614921898-4099-1-git-send-email-anshuman.khandual@arm.com> There are multiple instances of pfn_to_section_nr() and __pfn_to_section() when CONFIG_SPARSEMEM is enabled. This can be optimized if memory section is fetched earlier. This replaces the open coded PFN and ADDR conversion with PFN_PHYS() and PHYS_PFN() helpers. While there, also add a comment. This does not cause any functional change. Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will@kernel.org> Cc: Ard Biesheuvel <ardb@kernel.org> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Reviewed-by: David Hildenbrand <david@redhat.com> Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com> --- arch/arm64/mm/init.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 5920c527845a..3685e12aba9b 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -219,16 +219,26 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max) int pfn_valid(unsigned long pfn) { - phys_addr_t addr = pfn << PAGE_SHIFT; + phys_addr_t addr = PFN_PHYS(pfn); - if ((addr >> PAGE_SHIFT) != pfn) + /* + * Ensure the upper PAGE_SHIFT bits are clear in the + * pfn. Else it might lead to false positives when + * some of the upper bits are set, but the lower bits + * match a valid pfn. + */ + if (PHYS_PFN(addr) != pfn) return 0; #ifdef CONFIG_SPARSEMEM +{ + struct mem_section *ms; + if (pfn_to_section_nr(pfn) >= NR_MEM_SECTIONS) return 0; - if (!valid_section(__pfn_to_section(pfn))) + ms = __pfn_to_section(pfn); + if (!valid_section(ms)) return 0; /* @@ -240,8 +250,9 @@ int pfn_valid(unsigned long pfn) * memory sections covering all of hotplug memory including * both normal and ZONE_DEVICE based. */ - if (!early_section(__pfn_to_section(pfn))) - return pfn_section_valid(__pfn_to_section(pfn), pfn); + if (!early_section(ms)) + return pfn_section_valid(ms, pfn); +} #endif return memblock_is_map_memory(addr); } -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-03-05 5:24 UTC|newest] Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-03-05 5:24 [PATCH V3 0/2] arm64/mm: Fix pfn_valid() for ZONE_DEVICE based memory Anshuman Khandual 2021-03-05 5:24 ` Anshuman Khandual 2021-03-05 5:24 ` [PATCH V3 1/2] " Anshuman Khandual 2021-03-05 5:24 ` Anshuman Khandual 2021-03-05 18:13 ` Catalin Marinas 2021-03-05 18:13 ` Catalin Marinas 2021-03-05 18:24 ` David Hildenbrand 2021-03-05 18:24 ` David Hildenbrand 2021-03-08 11:29 ` Catalin Marinas 2021-03-08 11:29 ` Catalin Marinas 2021-03-08 17:59 ` Catalin Marinas 2021-03-08 17:59 ` Catalin Marinas 2021-03-05 5:24 ` Anshuman Khandual [this message] 2021-03-05 5:24 ` [PATCH V3 2/2] arm64/mm: Reorganize pfn_valid() Anshuman Khandual 2021-03-08 18:00 ` Catalin Marinas 2021-03-08 18:00 ` Catalin Marinas 2021-03-05 5:38 ` [PATCH V3 0/2] arm64/mm: Fix pfn_valid() for ZONE_DEVICE based memory Anshuman Khandual 2021-03-05 5:38 ` Anshuman Khandual 2021-03-05 12:28 ` Veronika Kabatova 2021-03-05 12:28 ` Veronika Kabatova 2021-03-05 18:16 ` Veronika Kabatova 2021-03-05 18:16 ` Veronika Kabatova 2021-03-05 18:22 ` Catalin Marinas 2021-03-05 18:22 ` Catalin Marinas 2021-03-08 19:16 ` Will Deacon 2021-03-08 19:16 ` Will Deacon
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1614921898-4099-3-git-send-email-anshuman.khandual@arm.com \ --to=anshuman.khandual@arm.com \ --cc=ardb@kernel.org \ --cc=catalin.marinas@arm.com \ --cc=dan.j.williams@intel.com \ --cc=david@redhat.com \ --cc=james.morse@arm.com \ --cc=jglisse@redhat.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=mark.rutland@arm.com \ --cc=robin.murphy@arm.com \ --cc=rppt@linux.ibm.com \ --cc=vkabatov@redhat.com \ --cc=will@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.