mm: Refactor vm_mixed_ok() for more maintainable
Subsystems (2)
PATCH 1/1 mm: Refactor vm_mixed_ok() for more maintainable
Restructure the function without altering its logic:
- Check the VM_MIXEDMAP flag first as a fast path.
- Consolidate the zero page handling logic into a single, dedicated block.
These changes improve code organization and maintainability.
--- mm/memory.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
mm/memory.c +7 -4
@@ -2706,14 +2706,17 @@ EXPORT_SYMBOL(vmf_insert_pfn);static bool vm_mixed_ok (struct vm_area_struct *vma,unsigned long pfn,bool mkwrite) { -if (unlikely (is_zero_pfn (pfn)) && - (mkwrite || !vm_mixed_zeropage_allowed (vma))) -return false;/* these checks mirror the abort conditions in vm_normal_page */ if (vma->vm_flags &VM_MIXEDMAP )return true; -if (is_zero_pfn (pfn)) +if (unlikely (is_zero_pfn (pfn))) { +/* Zero pages can only be mapped read-only and if VMA +* allows them. +*/ +if (mkwrite || !vm_mixed_zeropage_allowed (vma)) +return false;return true; + }return false; }
Signature · 1 line
2.20.1
Quoted 8 lines · Zhen Ni
Restructure the function without altering its logic:
- Check theVM_MIXEDMAPflag first as a fast path.
- Consolidate the zero page handling logic into a single, dedicated block.These changes improve code organization and maintainability.
Signed-off-by Zhen Ni <[email protected]>
The below is just incorrect and you're making the function _harder_ to read not easier.
Quoted 9 lines
--- mm/memory.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)mm/memory.c +0
-0
mm/memory.c EXPORT_SYMBOL(vmf_insert_pfn); · line 2711
Quoted 9 lines
mm/memory.c +0
-3@@ -2706,14 +2706,17 @@ EXPORT_SYMBOL(vmf_insert_pfn);static bool vm_mixed_ok (struct vm_area_struct *vma,unsigned long pfn,bool mkwrite) { -if (unlikely (is_zero_pfn (pfn)) && - (mkwrite || !vm_mixed_zeropage_allowed (vma))) -return false;/* these checks mirror the abort conditions in vm_normal_page */ if (vma->vm_flags &VM_MIXEDMAP )return true;
You're changing the logic now? This is incorrect? If the conditions you removed are true but also vma->vm_flags & VM_MIXEDMAP is true you now return true rather than false?
mm/memory.c EXPORT_SYMBOL(vmf_insert_pfn); · line 2715
Quoted 5 lines
mm/memory.c +4
-1-if (is_zero_pfn (pfn)) +if (unlikely (is_zero_pfn (pfn))) { +/* Zero pages can only be mapped read-only and if VMA +* allows them. +*/
We don't start comments with /* xxxx, we do:
/*
* Zero pages ...
*/
mm/memory.c EXPORT_SYMBOL(vmf_insert_pfn); · line 2717
Quoted 2 lines
mm/memory.c +2
-0+if (mkwrite || !vm_mixed_zeropage_allowed (vma)) +return false;
Yeah this is just wrong. Plus you're now inserting an additional level of indentation?
Quoted 9 lines
mm/memory.c +1
-1return true; + }return false; } --2.20.1
Quoted 45 lines · Lorenzo Stoakes
Quoted 8 lines · Zhen Ni
Restructure the function without altering its logic:
- Check theVM_MIXEDMAPflag first as a fast path.
- Consolidate the zero page handling logic into a single, dedicated block.These changes improve code organization and maintainability.
Signed-off-by Zhen Ni <[email protected]>The below is just incorrect and you're making the function _harder_ to read not easier.
Quoted 4 lines
--- mm/memory.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)You're changing the logic now? This is incorrect? If the conditions you removed are true but also
vma->vm_flags&VM_MIXEDMAPis true you now return true rather than false?mm/memory.c EXPORT_SYMBOL(vmf_insert_pfn); · line 2715
Quoted 5 lines
mm/memory.c +4
-1-if (is_zero_pfn (pfn)) +if (unlikely (is_zero_pfn (pfn))) { +/* Zero pages can only be mapped read-only and if VMA +* allows them. +*/ We don't start comments with /* xxxx, we do:
/*
* Zero pages ...
*/mm/memory.c EXPORT_SYMBOL(vmf_insert_pfn); · line 2717
Quoted 2 lines
mm/memory.c +2
-0+if (mkwrite || !vm_mixed_zeropage_allowed (vma)) +return false;Yeah this is just wrong. Plus you're now inserting an additional level of indentation?
Quoted 5 lines
return true;
mm/memory.c +1
-0+ }return false; }
Quoted 5 lines
Quoted 4 lines
--
2.20.1
Hi,
Thank you for the thorough review and for pointing out the critical logicerror I introduced.
You are absolutely right - my refactoring incorrectly changed the function behavior when both VM_MIXEDMAP is set and we have a zero page with mkwrite or mixed mapping restrictions. I apologize for this oversight.
I will drop this patch since:
1. The refactoring introduced a functional regression
2. As you noted, the original code is actually more readable
3. The change doesn't provide meaningful maintainability improvement
Best regards,
Zhen