From: Wei Yang <richardw.yang@linux.intel.com>
To: x86@kernel.org, linux-kernel@vger.kernel.org
Cc: richard.weiyang@gmail.com, dave.hansen@linux.intel.com,
luto@kernel.org, peterz@infradead.or, tglx@linutronix.de,
Wei Yang <richardw.yang@linux.intel.com>
Subject: [Patch v2 5/6] x86/mm: Use address directly in split_mem_range()
Date: Thu, 5 Dec 2019 10:14:02 +0800 [thread overview]
Message-ID: <20191205021403.25606-6-richardw.yang@linux.intel.com> (raw)
In-Reply-To: <20191205021403.25606-1-richardw.yang@linux.intel.com>
This is not necessary to convert address to pfn to split range. And
finally, convert back to address and store it to map_range.
Signed-off-by: Wei Yang <richardw.yang@linux.intel.com>
---
arch/x86/mm/init.c | 73 +++++++++++++++++++++++-----------------------
1 file changed, 36 insertions(+), 37 deletions(-)
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index ded58a31c679..5fe3f645f02c 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -259,14 +259,14 @@ static void setup_pcid(void)
#endif
static int __meminit save_mr(struct map_range *mr, int nr_range,
- unsigned long start_pfn, unsigned long end_pfn,
+ unsigned long start, unsigned long end,
unsigned long page_size_mask)
{
if (start_pfn < end_pfn) {
if (nr_range >= NR_RANGE_MR)
panic("run out of range for init_memory_mapping\n");
- mr[nr_range].start = start_pfn<<PAGE_SHIFT;
- mr[nr_range].end = end_pfn<<PAGE_SHIFT;
+ mr[nr_range].start = start_pfn;
+ mr[nr_range].end = end_pfn;
mr[nr_range].page_size_mask = page_size_mask;
nr_range++;
}
@@ -328,14 +328,13 @@ static int __meminit split_mem_range(struct map_range *mr,
unsigned long start,
unsigned long end)
{
- unsigned long start_pfn, end_pfn, limit_pfn;
- unsigned long pfn;
+ unsigned long addr, limit;
int i, nr_range = 0;
- limit_pfn = PFN_DOWN(end);
+ limit = end;
/* head if not big page alignment ? */
- pfn = start_pfn = PFN_DOWN(start);
+ addr = start;
#ifdef CONFIG_X86_32
/*
* Don't use a large page for the first 2/4MB of memory
@@ -343,61 +342,61 @@ static int __meminit split_mem_range(struct map_range *mr,
* and overlapping MTRRs into large pages can cause
* slowdowns.
*/
- if (pfn == 0)
- end_pfn = PFN_DOWN(PMD_SIZE);
+ if (addr == 0)
+ end = PMD_SIZE;
else
- end_pfn = round_up(pfn, PFN_DOWN(PMD_SIZE));
+ end = round_up(addr, PMD_SIZE);
#else /* CONFIG_X86_64 */
- end_pfn = round_up(pfn, PFN_DOWN(PMD_SIZE));
+ end = round_up(addr, PMD_SIZE);
#endif
- if (end_pfn > limit_pfn)
- end_pfn = limit_pfn;
- if (start_pfn < end_pfn) {
- nr_range = save_mr(mr, nr_range, start_pfn, end_pfn, 0);
- pfn = end_pfn;
+ if (end > limit)
+ end = limit;
+ if (start < end) {
+ nr_range = save_mr(mr, nr_range, start, end, 0);
+ addr = end;
}
/* big page (2M) range */
- start_pfn = round_up(pfn, PFN_DOWN(PMD_SIZE));
+ start = round_up(addr, PMD_SIZE);
#ifdef CONFIG_X86_32
- end_pfn = round_down(limit_pfn, PFN_DOWN(PMD_SIZE));
+ end = round_down(limit, PMD_SIZE);
#else /* CONFIG_X86_64 */
- end_pfn = round_up(pfn, PFN_DOWN(PUD_SIZE));
- if (end_pfn > round_down(limit_pfn, PFN_DOWN(PMD_SIZE)))
- end_pfn = round_down(limit_pfn, PFN_DOWN(PMD_SIZE));
+ end = round_up(addr, PUD_SIZE);
+ if (end > round_down(limit, PMD_SIZE))
+ end = round_down(limit, PMD_SIZE);
#endif
- if (start_pfn < end_pfn) {
- nr_range = save_mr(mr, nr_range, start_pfn, end_pfn,
+ if (start < end) {
+ nr_range = save_mr(mr, nr_range, start, end,
page_size_mask & (1U<<PG_LEVEL_2M));
- pfn = end_pfn;
+ addr = end;
}
#ifdef CONFIG_X86_64
/* big page (1G) range */
- start_pfn = round_up(pfn, PFN_DOWN(PUD_SIZE));
- end_pfn = round_down(limit_pfn, PFN_DOWN(PUD_SIZE));
- if (start_pfn < end_pfn) {
- nr_range = save_mr(mr, nr_range, start_pfn, end_pfn,
+ start = round_up(addr, PUD_SIZE);
+ end = round_down(limit, PUD_SIZE);
+ if (start < end) {
+ nr_range = save_mr(mr, nr_range, start, end,
page_size_mask &
((1U<<PG_LEVEL_2M)|(1U<<PG_LEVEL_1G)));
- pfn = end_pfn;
+ addr = end;
}
/* tail is not big page (1G) alignment */
- start_pfn = round_up(pfn, PFN_DOWN(PMD_SIZE));
- end_pfn = round_down(limit_pfn, PFN_DOWN(PMD_SIZE));
- if (start_pfn < end_pfn) {
- nr_range = save_mr(mr, nr_range, start_pfn, end_pfn,
+ start = round_up(addr, PMD_SIZE);
+ end = round_down(limit, PMD_SIZE);
+ if (start < end) {
+ nr_range = save_mr(mr, nr_range, start, end,
page_size_mask & (1U<<PG_LEVEL_2M));
- pfn = end_pfn;
+ addr = end;
}
#endif
/* tail is not big page (2M) alignment */
- start_pfn = pfn;
- end_pfn = limit_pfn;
- nr_range = save_mr(mr, nr_range, start_pfn, end_pfn, 0);
+ start = addr;
+ end = limit;
+ nr_range = save_mr(mr, nr_range, start, end, 0);
if (!after_bootmem)
adjust_range_page_size_mask(mr, nr_range);
--
2.17.1
next prev parent reply other threads:[~2019-12-05 2:15 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-05 2:13 [Patch v2 0/6] Refactor split_mem_range with proper helper and loop Wei Yang
2019-12-05 2:13 ` [Patch v2 1/6] x86/mm: Remove second argument of split_mem_range() Wei Yang
2019-12-05 2:13 ` [Patch v2 2/6] x86/mm: Add attribute __ro_after_init to after_bootmem Wei Yang
2019-12-05 2:14 ` [Patch v2 3/6] x86/mm: Make page_size_mask unsigned int clearly Wei Yang
2019-12-05 2:14 ` [Patch v2 4/6] x86/mm: Refine debug print string retrieval function Wei Yang
2019-12-05 9:13 ` Peter Zijlstra
2019-12-06 1:51 ` Wei Yang
2019-12-06 10:27 ` Peter Zijlstra
2019-12-06 15:17 ` Wei Yang
2019-12-05 2:14 ` Wei Yang [this message]
2019-12-07 3:36 ` [Patch v2 5/6] x86/mm: Use address directly in split_mem_range() kbuild test robot
2019-12-07 7:17 ` Wei Yang
2019-12-05 2:14 ` [Patch v2 6/6] x86/mm: Refactor split_mem_range with proper helper and loop Wei Yang
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=20191205021403.25606-6-richardw.yang@linux.intel.com \
--to=richardw.yang@linux.intel.com \
--cc=dave.hansen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=peterz@infradead.or \
--cc=richard.weiyang@gmail.com \
--cc=tglx@linutronix.de \
--cc=x86@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