mm: Coccinelle-driven cleanups across memory management code
Subsystems (5)
v2 cover mm: Coccinelle-driven cleanups across memory management code
This patch series contains three minor cleanups identified by Coccinelle scripts under scripts/coccinelle/misc/:
* Replace manual ternary expression with the min() macro in pagewalk.c and change return expression for clarity.
* Use the %pe printk format specifier for PTR_ERR() reporting in vmscan.c and zswap.c
Found using:
make coccicheck MODE=report M=mm/
changes in v2:
- Patch 1/3: update return value as per review comments.
- patch 2/3 and 3/3: Add Acked-by and Reviewed-by tags.
link to v1: https://lore.kernel.org/all/[email protected]/
Sahil Chandna (3):
mm: pagewalk: simplify hugepage boundary calculation using min() mm/vmscan: use %pe to print error pointers
mm/zswap: use %pe to print error pointers
mm/pagewalk.c | 3 +-- mm/vmscan.c | 4 ++-- mm/zswap.c | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-)
Signature · 1 line
2.50.1
PATCH v2 1/3 mm: pagewalk: simplify hugepage boundary calculation using min()
Use the kernel-provided min() macro to compute the minimum value instead of an explicit ternary expression. This improves readability and matches common kernel style. Also change the return hugepage boundary expression by using bitmask for better clarity.
This was flagged by Coccinelle (misc/minmax.cocci) as an opportunity to use min().
Found by: make coccicheck MODE=report M=mm/
No functional change intended.
---
changes since v1:
- Updated boundary calculation of huge page range for better clarity.
- No Functional changes intended.
link to v1: https://lore.kernel.org/all/ff24b3c573b766b187b55a38497fbad0a319b9f8.1763227530.git.chandna.sahil@gmail.com/
--- mm/pagewalk.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
mm/pagewalk.c +1 -2
@@ -312,8 +312,7 @@ static int walk_pgd_range(unsigned long addr, unsigned long end,static unsigned long hugetlb_entry_end (struct hstate *h,unsigned long addr,unsigned long end) { -unsigned long boundary = (addr &huge_page_mask (h)) +huge_page_size (h); -return boundary < end ? boundary : end; +return min ((addr | ~huge_page_mask (h)) +1 , end); } static int walk_hugetlb_range(unsigned long addr, unsigned long end,
Signature · 1 line
2.50.1
PATCH v2 2/3 mm/vmscan: use %pe to print error pointers
In reply to Sahil ChandnaUse the %pe printk format specifier to report error pointers directly instead of printing PTR_ERR() as a long value. This improves clarity, produces more readable error messages.
This instance was flagged by the Coccinelle script (misc/ptr_err_to_pe.cocci) as an opportunity to adopt %pe.
Found by: make coccicheck MODE=report M=mm/
No functional change intended
--- mm/vmscan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
mm/vmscan.c +2 -2
@@ -7500,8 +7500,8 @@ void __meminit kswapd_run(int nid) pgdat->kswapd =kthread_create_on_node (kswapd, pgdat, nid,"kswapd%d" , nid);if (IS_ERR (pgdat->kswapd)) {/* failure at boot is fatal */ -pr_err ("Failed to start kswapd on node %d,ret=%ld\n" , - nid,PTR_ERR (pgdat->kswapd)); +pr_err ("Failed to start kswapd on node %d,ret=%pe\n" , + nid, pgdat->kswapd);BUG_ON (system_state <SYSTEM_RUNNING ); pgdat->kswapd =NULL ; }else {
Signature · 1 line
2.50.1
PATCH v2 3/3 mm/zswap: use %pe to print error pointers
In reply to Sahil ChandnaUse the %pe printk format specifier to report error pointers directly instead of printing PTR_ERR() as a long value. This improves clarity, produces more readable error messages.
This instance was flagged by the Coccinelle script (misc/ptr_err_to_pe.cocci) as an opportunity to adopt %pe.
Found by: make coccicheck MODE=report M=mm/
No functional change intended.
--- mm/zswap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
mm/zswap.c +2 -2
@@ -749,8 +749,8 @@ static int zswap_cpu_comp_prepare(unsigned int cpu, struct hlist_node *node) acomp =crypto_alloc_acomp_node (pool->tfm_name,0 ,0 ,cpu_to_node (cpu));if (IS_ERR (acomp)) { -pr_err ("could not alloc crypto acomp %s : %ld\n" , - pool->tfm_name,PTR_ERR (acomp)); +pr_err ("could not alloc crypto acomp %s : %pe\n" , + pool->tfm_name, acomp); ret =PTR_ERR (acomp); goto fail; }
Signature · 1 line
2.50.1
David Hildenbrand (Red Hat)
maintainerRe: [PATCH v2 1/3] mm: pagewalk: simplify hugepage boundary calculation using min()
In reply to Sahil ChandnaQuoted 28 lines · Sahil Chandna
Use the kernel-provided
min()macro to compute the minimum value instead of an explicit ternary expression. This improves readability and matches common kernel style. Also change the return hugepage boundary expression by using bitmask for better clarity.This was flagged by Coccinelle (
misc/minmax.cocci) as an opportunity to usemin().Found by: make coccicheck MODE=report M=mm/
No functional change intended.Suggested-by Matthew Wilcox <[email protected]>Suggested-by David Laight <[email protected]>Signed-off-by Sahil Chandna <[email protected]>---
changes since v1:
- Updated boundary calculation of huge page range for better clarity.
- No Functional changes intended.
link to v1: https://lore.kernel.org/all/ff24b3c573b766b187b55a38497fbad0a319b9f8.1763227530.git.chandna.sahil@gmail.com/--- mm/pagewalk.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)mm/pagewalk.c +0
-0
mm/pagewalk.c static int walk_pgd_range(unsigned long addr, unsigned long end, · line 315
Quoted 6 lines
mm/pagewalk.c +1
-2@@ -312,8 +312,7 @@ static int walk_pgd_range(unsigned long addr, unsigned long end,static unsigned long hugetlb_entry_end (struct hstate *h,unsigned long addr,unsigned long end) { -unsigned long boundary = (addr &huge_page_mask (h)) +huge_page_size (h); -return boundary < end ? boundary : end; +return min ((addr | ~huge_page_mask (h)) +1 , end);
I know Willy suggested that, but I wonder if we could simplify that to something a bit easier to digest:
return min(ALIGN(addr, huge_page_size(h)), end);
At least I can make sense of that a bit faster.
(I don't think we're interested in micro-optimizations in this code here in particular :) )
Signature · 3 lines
Cheers David
Re: [PATCH v2 2/3] mm/vmscan: use %pe to print error pointers
In reply to Sahil ChandnaQuoted 7 lines · Sahil Chandna
Use the %pe printk format specifier to report error pointers directly instead of printing
PTR_ERR()as a long value. This improves clarity, produces more readable error messages.This instance was flagged by the Coccinelle script (
misc/ptr_err_to_pe.cocci) as an opportunity to adopt %pe.
Quoted 6 lines
Found by: make coccicheck MODE=report M=mm/
No functional change intendedReviewed-by SeongJae Park <[email protected]>Signed-off-by Sahil Chandna <[email protected]>---
Signature · 3 lines
Cheers David
Re: [PATCH v2 3/3] mm/zswap: use %pe to print error pointers
In reply to Sahil ChandnaQuoted 7 lines · Sahil Chandna
Use the %pe printk format specifier to report error pointers directly instead of printing
PTR_ERR()as a long value. This improves clarity, produces more readable error messages.This instance was flagged by the Coccinelle script (
misc/ptr_err_to_pe.cocci) as an opportunity to adopt %pe.
Quoted 8 lines
Found by: make coccicheck MODE=report M=mm/
No functional change intended.Acked-by Yosry Ahmed <[email protected]>Acked-by Nhat Pham <[email protected]>Reviewed-by SeongJae Park <[email protected]>Signed-off-by Sahil Chandna <[email protected]>---
Signature · 3 lines
Cheers David