qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ksm: convert ksm_mm_slot.link to ksm_mm_slot.hash 

JIRA: https://issues.redhat.com/browse/RHEL-1848

commit 79b09941563737fad52a6b5ce9b9f0e1abf01bec
Author: Qi Zheng <zhengqi.arch@bytedance.com>
Date:   Wed Aug 31 11:19:50 2022 +0800

    ksm: convert ksm_mm_slot.link to ksm_mm_slot.hash

    In order to use common struct mm_slot, convert ksm_mm_slot.link to
    ksm_mm_slot.hash in advance, no functional change.

    Link: https://lkml.kernel.org/r/20220831031951.43152-7-zhengqi.arch@bytedance.com
    Signed-off-by: Qi Zheng <zhengqi.arch@bytedance.com>
    Cc: Johannes Weiner <hannes@cmpxchg.org>
    Cc: Matthew Wilcox <willy@infradead.org>
    Cc: Mike Rapoport <rppt@kernel.org>
    Cc: Minchan Kim <minchan@kernel.org>
    Cc: Vlastimil Babka <vbabka@suse.cz>
    Cc: Yang Shi <shy828301@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

Signed-off-by: Chris von Recklinghausen <crecklin@redhat.com>
This commit is contained in:
Chris von Recklinghausen 2023-10-20 06:13:50 -04:00
parent 72c561173b
commit c8338d3acb
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mm/ksm.c
View File

@ -113,13 +113,13 @@
/** /**
* struct ksm_mm_slot - ksm information per mm that is being scanned * struct ksm_mm_slot - ksm information per mm that is being scanned
* @link: link to the mm_slots hash list * @hash: link to the mm_slots hash list
* @mm_node: link into the mm_slots list, rooted in ksm_mm_head * @mm_node: link into the mm_slots list, rooted in ksm_mm_head
* @rmap_list: head for this mm_slot's singly-linked list of rmap_items * @rmap_list: head for this mm_slot's singly-linked list of rmap_items
* @mm: the mm that this information is valid for * @mm: the mm that this information is valid for
*/ */
struct ksm_mm_slot { struct ksm_mm_slot {
struct hlist_node link; struct hlist_node hash;
struct list_head mm_node; struct list_head mm_node;
struct ksm_rmap_item *rmap_list; struct ksm_rmap_item *rmap_list;
struct mm_struct *mm; struct mm_struct *mm;
@ -424,7 +424,7 @@ static struct ksm_mm_slot *get_mm_slot(struct mm_struct *mm)
{ {
struct ksm_mm_slot *slot; struct ksm_mm_slot *slot;
hash_for_each_possible(mm_slots_hash, slot, link, (unsigned long)mm) hash_for_each_possible(mm_slots_hash, slot, hash, (unsigned long)mm)
if (slot->mm == mm) if (slot->mm == mm)
return slot; return slot;
@ -435,7 +435,7 @@ static void insert_to_mm_slots_hash(struct mm_struct *mm,
struct ksm_mm_slot *mm_slot) struct ksm_mm_slot *mm_slot)
{ {
mm_slot->mm = mm; mm_slot->mm = mm;
hash_add(mm_slots_hash, &mm_slot->link, (unsigned long)mm); hash_add(mm_slots_hash, &mm_slot->hash, (unsigned long)mm);
} }
/* /*
@ -1006,7 +1006,7 @@ static int unmerge_and_remove_all_rmap_items(void)
ksm_scan.mm_slot = list_entry(mm_slot->mm_node.next, ksm_scan.mm_slot = list_entry(mm_slot->mm_node.next,
struct ksm_mm_slot, mm_node); struct ksm_mm_slot, mm_node);
if (ksm_test_exit(mm)) { if (ksm_test_exit(mm)) {
hash_del(&mm_slot->link); hash_del(&mm_slot->hash);
list_del(&mm_slot->mm_node); list_del(&mm_slot->mm_node);
spin_unlock(&ksm_mmlist_lock); spin_unlock(&ksm_mmlist_lock);
@ -2372,7 +2372,7 @@ next_page:
* or when all VM_MERGEABLE areas have been unmapped (and * or when all VM_MERGEABLE areas have been unmapped (and
* mmap_lock then protects against race with MADV_MERGEABLE). * mmap_lock then protects against race with MADV_MERGEABLE).
*/ */
hash_del(&slot->link); hash_del(&slot->hash);
list_del(&slot->mm_node); list_del(&slot->mm_node);
spin_unlock(&ksm_mmlist_lock); spin_unlock(&ksm_mmlist_lock);
@ -2566,7 +2566,7 @@ void __ksm_exit(struct mm_struct *mm)
mm_slot = get_mm_slot(mm); mm_slot = get_mm_slot(mm);
if (mm_slot && ksm_scan.mm_slot != mm_slot) { if (mm_slot && ksm_scan.mm_slot != mm_slot) {
if (!mm_slot->rmap_list) { if (!mm_slot->rmap_list) {
hash_del(&mm_slot->link); hash_del(&mm_slot->hash);
list_del(&mm_slot->mm_node); list_del(&mm_slot->mm_node);
easy_to_free = 1; easy_to_free = 1;
} else { } else {