Commit aa232204 authored by Kemeng Shi's avatar Kemeng Shi Committed by Andrew Morton

mm/page_table_check: remove unused parameter in [__]page_table_check_pte_clear

Remove unused addr in page_table_check_pte_clear and
__page_table_check_pte_clear.

Link: https://lkml.kernel.org/r/20230713172636.1705415-4-shikemeng@huaweicloud.comSigned-off-by: default avatarKemeng Shi <shikemeng@huaweicloud.com>
Cc: Pavel Tatashin <pasha.tatashin@soleen.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 2f933eaf
...@@ -928,7 +928,7 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, ...@@ -928,7 +928,7 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm,
{ {
pte_t pte = __pte(xchg_relaxed(&pte_val(*ptep), 0)); pte_t pte = __pte(xchg_relaxed(&pte_val(*ptep), 0));
page_table_check_pte_clear(mm, address, pte); page_table_check_pte_clear(mm, pte);
return pte; return pte;
} }
......
...@@ -529,7 +529,7 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, ...@@ -529,7 +529,7 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm,
{ {
pte_t pte = __pte(atomic_long_xchg((atomic_long_t *)ptep, 0)); pte_t pte = __pte(atomic_long_xchg((atomic_long_t *)ptep, 0));
page_table_check_pte_clear(mm, address, pte); page_table_check_pte_clear(mm, pte);
return pte; return pte;
} }
......
...@@ -1068,7 +1068,7 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, ...@@ -1068,7 +1068,7 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr,
pte_t *ptep) pte_t *ptep)
{ {
pte_t pte = native_ptep_get_and_clear(ptep); pte_t pte = native_ptep_get_and_clear(ptep);
page_table_check_pte_clear(mm, addr, pte); page_table_check_pte_clear(mm, pte);
return pte; return pte;
} }
...@@ -1084,7 +1084,7 @@ static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm, ...@@ -1084,7 +1084,7 @@ static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm,
* care about updates and native needs no locking * care about updates and native needs no locking
*/ */
pte = native_local_ptep_get_and_clear(ptep); pte = native_local_ptep_get_and_clear(ptep);
page_table_check_pte_clear(mm, addr, pte); page_table_check_pte_clear(mm, pte);
} else { } else {
pte = ptep_get_and_clear(mm, addr, ptep); pte = ptep_get_and_clear(mm, addr, ptep);
} }
......
...@@ -14,8 +14,7 @@ extern struct static_key_true page_table_check_disabled; ...@@ -14,8 +14,7 @@ extern struct static_key_true page_table_check_disabled;
extern struct page_ext_operations page_table_check_ops; extern struct page_ext_operations page_table_check_ops;
void __page_table_check_zero(struct page *page, unsigned int order); void __page_table_check_zero(struct page *page, unsigned int order);
void __page_table_check_pte_clear(struct mm_struct *mm, unsigned long addr, void __page_table_check_pte_clear(struct mm_struct *mm, pte_t pte);
pte_t pte);
void __page_table_check_pmd_clear(struct mm_struct *mm, unsigned long addr, void __page_table_check_pmd_clear(struct mm_struct *mm, unsigned long addr,
pmd_t pmd); pmd_t pmd);
void __page_table_check_pud_clear(struct mm_struct *mm, unsigned long addr, void __page_table_check_pud_clear(struct mm_struct *mm, unsigned long addr,
...@@ -46,13 +45,12 @@ static inline void page_table_check_free(struct page *page, unsigned int order) ...@@ -46,13 +45,12 @@ static inline void page_table_check_free(struct page *page, unsigned int order)
__page_table_check_zero(page, order); __page_table_check_zero(page, order);
} }
static inline void page_table_check_pte_clear(struct mm_struct *mm, static inline void page_table_check_pte_clear(struct mm_struct *mm, pte_t pte)
unsigned long addr, pte_t pte)
{ {
if (static_branch_likely(&page_table_check_disabled)) if (static_branch_likely(&page_table_check_disabled))
return; return;
__page_table_check_pte_clear(mm, addr, pte); __page_table_check_pte_clear(mm, pte);
} }
static inline void page_table_check_pmd_clear(struct mm_struct *mm, static inline void page_table_check_pmd_clear(struct mm_struct *mm,
...@@ -123,8 +121,7 @@ static inline void page_table_check_free(struct page *page, unsigned int order) ...@@ -123,8 +121,7 @@ static inline void page_table_check_free(struct page *page, unsigned int order)
{ {
} }
static inline void page_table_check_pte_clear(struct mm_struct *mm, static inline void page_table_check_pte_clear(struct mm_struct *mm, pte_t pte)
unsigned long addr, pte_t pte)
{ {
} }
......
...@@ -322,7 +322,7 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, ...@@ -322,7 +322,7 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm,
{ {
pte_t pte = ptep_get(ptep); pte_t pte = ptep_get(ptep);
pte_clear(mm, address, ptep); pte_clear(mm, address, ptep);
page_table_check_pte_clear(mm, address, pte); page_table_check_pte_clear(mm, pte);
return pte; return pte;
} }
#endif #endif
......
...@@ -149,8 +149,7 @@ void __page_table_check_zero(struct page *page, unsigned int order) ...@@ -149,8 +149,7 @@ void __page_table_check_zero(struct page *page, unsigned int order)
page_ext_put(page_ext); page_ext_put(page_ext);
} }
void __page_table_check_pte_clear(struct mm_struct *mm, unsigned long addr, void __page_table_check_pte_clear(struct mm_struct *mm, pte_t pte)
pte_t pte)
{ {
if (&init_mm == mm) if (&init_mm == mm)
return; return;
...@@ -191,7 +190,7 @@ void __page_table_check_pte_set(struct mm_struct *mm, unsigned long addr, ...@@ -191,7 +190,7 @@ void __page_table_check_pte_set(struct mm_struct *mm, unsigned long addr,
if (&init_mm == mm) if (&init_mm == mm)
return; return;
__page_table_check_pte_clear(mm, addr, ptep_get(ptep)); __page_table_check_pte_clear(mm, ptep_get(ptep));
if (pte_user_accessible_page(pte)) { if (pte_user_accessible_page(pte)) {
page_table_check_set(pte_pfn(pte), PAGE_SIZE >> PAGE_SHIFT, page_table_check_set(pte_pfn(pte), PAGE_SIZE >> PAGE_SHIFT,
pte_write(pte)); pte_write(pte));
...@@ -241,7 +240,7 @@ void __page_table_check_pte_clear_range(struct mm_struct *mm, ...@@ -241,7 +240,7 @@ void __page_table_check_pte_clear_range(struct mm_struct *mm,
if (WARN_ON(!ptep)) if (WARN_ON(!ptep))
return; return;
for (i = 0; i < PTRS_PER_PTE; i++) { for (i = 0; i < PTRS_PER_PTE; i++) {
__page_table_check_pte_clear(mm, addr, ptep_get(ptep)); __page_table_check_pte_clear(mm, ptep_get(ptep));
addr += PAGE_SIZE; addr += PAGE_SIZE;
ptep++; ptep++;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment