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>
Subject: [PATCH V2 2/2] arm64/mm: Reorganize pfn_valid()
Date: Tue, 2 Feb 2021 09:41:54 +0530 [thread overview]
Message-ID: <1612239114-28428-3-git-send-email-anshuman.khandual@arm.com> (raw)
In-Reply-To: <1612239114-28428-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
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
---
arch/arm64/mm/init.c | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index 1141075e4d53..5d8fd5360a68 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -219,16 +219,25 @@ 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 = __pfn_to_section(pfn);
+
if (pfn_to_section_nr(pfn) >= NR_MEM_SECTIONS)
return 0;
- if (!valid_section(__pfn_to_section(pfn)))
+ if (!valid_section(ms))
return 0;
/*
@@ -240,8 +249,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
next prev parent reply other threads:[~2021-02-02 4:12 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-02 4:11 [PATCH V2 0/2] arm64/mm: Fix pfn_valid() for ZONE_DEVICE based memory Anshuman Khandual
2021-02-02 4:11 ` [PATCH V2 1/2] " Anshuman Khandual
2021-02-02 12:32 ` Will Deacon
2021-02-02 12:35 ` Will Deacon
2021-02-02 12:39 ` David Hildenbrand
2021-02-02 12:51 ` Will Deacon
2021-02-02 12:56 ` David Hildenbrand
2021-02-03 3:50 ` Anshuman Khandual
2021-02-05 18:55 ` Will Deacon
2021-02-11 11:53 ` Will Deacon
2021-02-11 12:10 ` Anshuman Khandual
2021-02-11 12:21 ` Will Deacon
2021-02-11 12:35 ` David Hildenbrand
2021-03-03 19:04 ` Catalin Marinas
2021-03-03 19:24 ` David Hildenbrand
2021-03-03 21:24 ` Will Deacon
2021-03-04 3:31 ` Anshuman Khandual
2021-03-04 8:12 ` David Hildenbrand
2021-03-04 9:36 ` Will Deacon
2021-03-05 4:22 ` Anshuman Khandual
2021-02-02 4:11 ` Anshuman Khandual [this message]
2021-02-02 8:26 ` [PATCH V2 2/2] arm64/mm: Reorganize pfn_valid() David Hildenbrand
2021-02-05 18:52 ` [PATCH V2 0/2] arm64/mm: Fix pfn_valid() for ZONE_DEVICE based memory 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=1612239114-28428-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=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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).