mm/swapfile:__swap_duplicate: drop redundant WRITE_ONCE on swap_map for err cases
Subsystems (2)
PATCH v2 1/1 mm/swapfile:__swap_duplicate: drop redundant WRITE_ONCE on swap_map for err cases
From: Barry Song <[email protected]>
The code is quite hard to read, we are still writing swap_map after errors happen. Though the written value is as before,
has_cache = count & SWAP_HAS_CACHE;
count &= ~SWAP_HAS_CACHE;
[snipped]
WRITE_ONCE(p->swap_map[offset], count | has_cache);
It would be better to entirely drop the WRITE_ONCE for both performance and readability.
---
-v2: drop goto according to Andrew, Thanks!
mm/swapfile.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
mm/swapfile.c +2 -1
@@ -3320,7 +3320,8 @@ static int __swap_duplicate(swp_entry_t entry, unsigned char usage) }else err = -ENOENT ;/* unused swap entry */ -WRITE_ONCE (p->swap_map[offset], count | has_cache); +if (!err) +WRITE_ONCE (p->swap_map[offset], count | has_cache); unlock_out:unlock_cluster_or_swap_info (p, ci);
Signature · 1 line
2.34.1
Quoted 25 lines · Barry Song
From: Barry Song <[email protected]>
The code is quite hard to read, we are still writing
swap_mapafter errors happen. Though the written value is as before,has_cache = count & SWAP_HAS_CACHE; count &= ~SWAP_HAS_CACHE; [snipped] WRITE_ONCE(p->swap_map[offset], count | has_cache);It would be better to entirely drop the
WRITE_ONCEfor both performance and readability.Signed-off-by Barry Song <[email protected]>---
-v2: drop goto according to Andrew, Thanks!mm/swapfile.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)mm/swapfile.c +0
-0
mm/swapfile.c static int __swap_duplicate(swp_entry_t entry, unsigned char usage) · line 3327
Quoted 9 lines
mm/swapfile.c +2
-1@@ -3320,7 +3320,8 @@ static int __swap_duplicate(swp_entry_t entry, unsigned char usage) }else err = -ENOENT ;/* unused swap entry */ -WRITE_ONCE (p->swap_map[offset], count | has_cache); +if (!err) +WRITE_ONCE (p->swap_map[offset], count | has_cache); unlock_out:unlock_cluster_or_swap_info (p, ci);
Maybe too late, but LGTM
Signature · 3 lines
Cheers, David / dhildenb
Quoted 34 lines · David Hildenbrand
Quoted 32 lines · Barry Song
From: Barry Song <[email protected]>
The code is quite hard to read, we are still writing
swap_mapafter errors happen. Though the written value is as before,has_cache = count & SWAP_HAS_CACHE; count &= ~SWAP_HAS_CACHE; [snipped] WRITE_ONCE(p->swap_map[offset], count | has_cache);It would be better to entirely drop the
WRITE_ONCEfor both performance and readability.Signed-off-by Barry Song <[email protected]>---
-v2: drop goto according to Andrew, Thanks!mm/swapfile.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)mm/swapfile.c +2
-1@@ -3320,7 +3320,8 @@ static int __swap_duplicate(swp_entry_t entry, unsigned char usage) }else err = -ENOENT ;/* unused swap entry */ -WRITE_ONCE (p->swap_map[offset], count | has_cache); +if (!err) +WRITE_ONCE (p->swap_map[offset], count | has_cache);
Quoted 6 lines
mm/swapfile.c static int __swap_duplicate(swp_entry_t entry, unsigned char usage) · line 3327
Quoted 2 lines
mm/swapfile.c +0
-0unlock_out:unlock_cluster_or_swap_info (p, ci);Maybe too late, but LGTM
Reviewed-by David Hildenbrand <[email protected]>
David, thanks! Though it is probably too late as this one has been in mm-stable for a long time.
Quoted 5 lines
--
Cheers,David / dhildenb
Thanks
Barry