mm_slot: following fixup for usage of mm_slot_entry()
v2 cover mm_slot: following fixup for usage of mm_slot_entry()
We got some late review commits during review of "mm_slot: fix the usage of mm_slot_entry()" in [1].
The v2 is merged into mm-stable, here are following fixup based on current mm-stable with last commit 1367da7eb875 ("mm: swap: check for stable address space before operating on the VMA").
Since there is no code change from latest review in [1], I preserve the RB and Ack-by.
[1]: https://lkml.kernel.org/r/[email protected]
Wei Yang (2):
mm/ksm: cleanup mm_slot_entry() invocation
mm/khugepaged: use KMEM_CACHE()
mm/khugepaged.c | 5 +---- mm/ksm.c | 27 ++++++++++++++------------- 2 files changed, 15 insertions(+), 17 deletions(-)
Signature · 1 line
2.34.1
PATCH v2 1/2 mm/ksm: cleanup mm_slot_entry() invocation
We got some late review commits during review of commit 08498be43ee6 ("mm/ksm: get mm_slot by mm_slot_entry() when slot is !NULL"). Let's reduce the indentation level and make the code easier to follow by using gotos to a new label.
--- mm/ksm.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-)
mm/ksm.c +14 -13
@@ -2921,7 +2921,7 @@ int __ksm_enter(struct mm_struct *mm)void __ksm_exit (struct mm_struct *mm) { -struct ksm_mm_slot *mm_slot; +struct ksm_mm_slot *mm_slot =NULL ;struct mm_slot *slot;int easy_to_free =0 ;
@@ -2936,19 +2936,20 @@ void __ksm_exit(struct mm_struct *mm)spin_lock (&ksm_mmlist_lock); slot =mm_slot_lookup (mm_slots_hash, mm); -if (slot) { - mm_slot = mm_slot_entry(slot, struct ksm_mm_slot, slot); -if (ksm_scan.mm_slot != mm_slot) { -if (!mm_slot->rmap_list) { -hash_del (&slot->hash); -list_del (&slot->mm_node); - easy_to_free =1 ; - }else { -list_move (&slot->mm_node, - &ksm_scan.mm_slot->slot.mm_node); - } - } +if (!slot) + goto unlock; + mm_slot = mm_slot_entry(slot, struct ksm_mm_slot, slot); +if (ksm_scan.mm_slot == mm_slot) + goto unlock; +if (!mm_slot->rmap_list) { +hash_del (&slot->hash); +list_del (&slot->mm_node); + easy_to_free =1 ; + }else { +list_move (&slot->mm_node, + &ksm_scan.mm_slot->slot.mm_node); } +unlock:spin_unlock (&ksm_mmlist_lock);if (easy_to_free) {
Signature · 1 line
2.34.1
PATCH v2 2/2 mm/khugepaged: use KMEM_CACHE()
In reply to Wei YangWe got some late review commits during review of commit b4c9ffb54b32 ("mm/khugepaged: remove definition of struct khugepaged_mm_slot"). No need to keep the old cache name "khugepaged_mm_slot", let's simply use KMEM_CACHE().
--- mm/khugepaged.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
mm/khugepaged.c +1 -4
@@ -376,10 +376,7 @@ int hugepage_madvise(struct vm_area_struct *vma,int __init khugepaged_init (void ) { - mm_slot_cache =kmem_cache_create ("khugepaged_mm_slot" , -sizeof (struct mm_slot ), - __alignof__(struct mm_slot ), -0 ,NULL ); + mm_slot_cache =KMEM_CACHE (mm_slot,0 );if (!mm_slot_cache)return -ENOMEM ;
Signature · 1 line
2.34.1