Skip to content

Commit 64d8b9e

Browse files
soleentorvalds
authored andcommitted
mm/page_table_check: use unsigned long for page counters and cleanup
For consistency, use "unsigned long" for all page counters. Also, reduce code duplication by calling __page_table_check_*_clear() from __page_table_check_*_set() functions. Link: https://lkml.kernel.org/r/20220131203249.2832273-3-pasha.tatashin@soleen.com Signed-off-by: Pasha Tatashin <pasha.tatashin@soleen.com> Reviewed-by: Wei Xu <weixugc@google.com> Acked-by: David Rientjes <rientjes@google.com> Cc: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> Cc: Anshuman Khandual <anshuman.khandual@arm.com> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: Greg Thelen <gthelen@google.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Hugh Dickins <hughd@google.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Jiri Slaby <jirislaby@kernel.org> Cc: Mike Rapoport <rppt@kernel.org> Cc: Muchun Song <songmuchun@bytedance.com> Cc: Paul Turner <pjt@google.com> Cc: Will Deacon <will@kernel.org> Cc: Zi Yan <ziy@nvidia.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent fb5222a commit 64d8b9e

File tree

1 file changed

+7
-28
lines changed

1 file changed

+7
-28
lines changed

mm/page_table_check.c

Lines changed: 7 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ static void page_table_check_clear(struct mm_struct *mm, unsigned long addr,
8686
{
8787
struct page_ext *page_ext;
8888
struct page *page;
89+
unsigned long i;
8990
bool anon;
90-
int i;
9191

9292
if (!pfn_valid(pfn))
9393
return;
@@ -121,8 +121,8 @@ static void page_table_check_set(struct mm_struct *mm, unsigned long addr,
121121
{
122122
struct page_ext *page_ext;
123123
struct page *page;
124+
unsigned long i;
124125
bool anon;
125-
int i;
126126

127127
if (!pfn_valid(pfn))
128128
return;
@@ -152,10 +152,10 @@ static void page_table_check_set(struct mm_struct *mm, unsigned long addr,
152152
void __page_table_check_zero(struct page *page, unsigned int order)
153153
{
154154
struct page_ext *page_ext = lookup_page_ext(page);
155-
int i;
155+
unsigned long i;
156156

157157
BUG_ON(!page_ext);
158-
for (i = 0; i < (1 << order); i++) {
158+
for (i = 0; i < (1ul << order); i++) {
159159
struct page_table_check *ptc = get_page_table_check(page_ext);
160160

161161
BUG_ON(atomic_read(&ptc->anon_map_count));
@@ -206,17 +206,10 @@ EXPORT_SYMBOL(__page_table_check_pud_clear);
206206
void __page_table_check_pte_set(struct mm_struct *mm, unsigned long addr,
207207
pte_t *ptep, pte_t pte)
208208
{
209-
pte_t old_pte;
210-
211209
if (&init_mm == mm)
212210
return;
213211

214-
old_pte = *ptep;
215-
if (pte_user_accessible_page(old_pte)) {
216-
page_table_check_clear(mm, addr, pte_pfn(old_pte),
217-
PAGE_SIZE >> PAGE_SHIFT);
218-
}
219-
212+
__page_table_check_pte_clear(mm, addr, *ptep);
220213
if (pte_user_accessible_page(pte)) {
221214
page_table_check_set(mm, addr, pte_pfn(pte),
222215
PAGE_SIZE >> PAGE_SHIFT,
@@ -228,17 +221,10 @@ EXPORT_SYMBOL(__page_table_check_pte_set);
228221
void __page_table_check_pmd_set(struct mm_struct *mm, unsigned long addr,
229222
pmd_t *pmdp, pmd_t pmd)
230223
{
231-
pmd_t old_pmd;
232-
233224
if (&init_mm == mm)
234225
return;
235226

236-
old_pmd = *pmdp;
237-
if (pmd_user_accessible_page(old_pmd)) {
238-
page_table_check_clear(mm, addr, pmd_pfn(old_pmd),
239-
PMD_PAGE_SIZE >> PAGE_SHIFT);
240-
}
241-
227+
__page_table_check_pmd_clear(mm, addr, *pmdp);
242228
if (pmd_user_accessible_page(pmd)) {
243229
page_table_check_set(mm, addr, pmd_pfn(pmd),
244230
PMD_PAGE_SIZE >> PAGE_SHIFT,
@@ -250,17 +236,10 @@ EXPORT_SYMBOL(__page_table_check_pmd_set);
250236
void __page_table_check_pud_set(struct mm_struct *mm, unsigned long addr,
251237
pud_t *pudp, pud_t pud)
252238
{
253-
pud_t old_pud;
254-
255239
if (&init_mm == mm)
256240
return;
257241

258-
old_pud = *pudp;
259-
if (pud_user_accessible_page(old_pud)) {
260-
page_table_check_clear(mm, addr, pud_pfn(old_pud),
261-
PUD_PAGE_SIZE >> PAGE_SHIFT);
262-
}
263-
242+
__page_table_check_pud_clear(mm, addr, *pudp);
264243
if (pud_user_accessible_page(pud)) {
265244
page_table_check_set(mm, addr, pud_pfn(pud),
266245
PUD_PAGE_SIZE >> PAGE_SHIFT,

0 commit comments

Comments
 (0)