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 3/6] x86/mm: Make page_size_mask unsigned int clearly
Date: Thu, 5 Dec 2019 10:14:00 +0800 [thread overview]
Message-ID: <20191205021403.25606-4-richardw.yang@linux.intel.com> (raw)
In-Reply-To: <20191205021403.25606-1-richardw.yang@linux.intel.com>
page_size_mask is defined as unsigned, so it would be more proper to use
1U to assign and compare this value.
Signed-off-by: Wei Yang <richardw.yang@linux.intel.com>
---
arch/x86/mm/init.c | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index 4fa5fd641865..0eb5edb63fa2 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -165,12 +165,12 @@ int after_bootmem __ro_after_init;
early_param_on_off("gbpages", "nogbpages", direct_gbpages, CONFIG_X86_DIRECT_GBPAGES);
struct map_range {
- unsigned long start;
- unsigned long end;
- unsigned page_size_mask;
+ unsigned long start;
+ unsigned long end;
+ unsigned int page_size_mask;
};
-static int page_size_mask;
+static unsigned int page_size_mask __ro_after_init;
static void __init probe_page_size_mask(void)
{
@@ -180,7 +180,7 @@ static void __init probe_page_size_mask(void)
* large pages into small in interrupt context, etc.
*/
if (boot_cpu_has(X86_FEATURE_PSE) && !debug_pagealloc_enabled())
- page_size_mask |= 1 << PG_LEVEL_2M;
+ page_size_mask |= 1U << PG_LEVEL_2M;
else
direct_gbpages = 0;
@@ -204,7 +204,7 @@ static void __init probe_page_size_mask(void)
/* Enable 1 GB linear kernel mappings if available: */
if (direct_gbpages && boot_cpu_has(X86_FEATURE_GBPAGES)) {
printk(KERN_INFO "Using GB pages for direct mapping\n");
- page_size_mask |= 1 << PG_LEVEL_1G;
+ page_size_mask |= 1U << PG_LEVEL_1G;
} else {
direct_gbpages = 0;
}
@@ -284,8 +284,8 @@ static void __ref adjust_range_page_size_mask(struct map_range *mr,
int i;
for (i = 0; i < nr_range; i++) {
- if ((page_size_mask & (1<<PG_LEVEL_2M)) &&
- !(mr[i].page_size_mask & (1<<PG_LEVEL_2M))) {
+ if ((page_size_mask & (1U<<PG_LEVEL_2M)) &&
+ !(mr[i].page_size_mask & (1U<<PG_LEVEL_2M))) {
unsigned long start = round_down(mr[i].start, PMD_SIZE);
unsigned long end = round_up(mr[i].end, PMD_SIZE);
@@ -295,15 +295,15 @@ static void __ref adjust_range_page_size_mask(struct map_range *mr,
#endif
if (memblock_is_region_memory(start, end - start))
- mr[i].page_size_mask |= 1<<PG_LEVEL_2M;
+ mr[i].page_size_mask |= 1U<<PG_LEVEL_2M;
}
- if ((page_size_mask & (1<<PG_LEVEL_1G)) &&
- !(mr[i].page_size_mask & (1<<PG_LEVEL_1G))) {
+ if ((page_size_mask & (1U<<PG_LEVEL_1G)) &&
+ !(mr[i].page_size_mask & (1U<<PG_LEVEL_1G))) {
unsigned long start = round_down(mr[i].start, PUD_SIZE);
unsigned long end = round_up(mr[i].end, PUD_SIZE);
if (memblock_is_region_memory(start, end - start))
- mr[i].page_size_mask |= 1<<PG_LEVEL_1G;
+ mr[i].page_size_mask |= 1U<<PG_LEVEL_1G;
}
}
}
@@ -315,7 +315,7 @@ static const char *page_size_string(struct map_range *mr)
static const char str_4m[] = "4M";
static const char str_4k[] = "4k";
- if (mr->page_size_mask & (1<<PG_LEVEL_1G))
+ if (mr->page_size_mask & (1U<<PG_LEVEL_1G))
return str_1g;
/*
* 32-bit without PAE has a 4M large page size.
@@ -324,10 +324,10 @@ static const char *page_size_string(struct map_range *mr)
*/
if (IS_ENABLED(CONFIG_X86_32) &&
!IS_ENABLED(CONFIG_X86_PAE) &&
- mr->page_size_mask & (1<<PG_LEVEL_2M))
+ mr->page_size_mask & (1U<<PG_LEVEL_2M))
return str_4m;
- if (mr->page_size_mask & (1<<PG_LEVEL_2M))
+ if (mr->page_size_mask & (1U<<PG_LEVEL_2M))
return str_2m;
return str_4k;
@@ -378,7 +378,7 @@ static int __meminit split_mem_range(struct map_range *mr,
if (start_pfn < end_pfn) {
nr_range = save_mr(mr, nr_range, start_pfn, end_pfn,
- page_size_mask & (1<<PG_LEVEL_2M));
+ page_size_mask & (1U<<PG_LEVEL_2M));
pfn = end_pfn;
}
@@ -389,7 +389,7 @@ static int __meminit split_mem_range(struct map_range *mr,
if (start_pfn < end_pfn) {
nr_range = save_mr(mr, nr_range, start_pfn, end_pfn,
page_size_mask &
- ((1<<PG_LEVEL_2M)|(1<<PG_LEVEL_1G)));
+ ((1U<<PG_LEVEL_2M)|(1U<<PG_LEVEL_1G)));
pfn = end_pfn;
}
@@ -398,7 +398,7 @@ static int __meminit split_mem_range(struct map_range *mr,
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,
- page_size_mask & (1<<PG_LEVEL_2M));
+ page_size_mask & (1U<<PG_LEVEL_2M));
pfn = end_pfn;
}
#endif
--
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 ` Wei Yang [this message]
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 ` [Patch v2 5/6] x86/mm: Use address directly in split_mem_range() Wei Yang
2019-12-07 3:36 ` 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-4-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;
as well as URLs for NNTP newsgroup(s).