ksm: abstract the function try_to_get_old_rmap_item
PATCH v4 1/6 ksm: abstract the function try_to_get_old_rmap_item
From: xu xin <[email protected]>
A new function try_to_get_old_rmap_item is abstracted from get_next_rmap_item. This function will be reused by the subsequent patches about counting ksm_zero_pages.
The patch improves the readability and reusability of KSM code.
Signed-off-by xu xin <[email protected]>
Cc David Hildenbrand <[email protected]>
Cc Claudio Imbrenda <[email protected]>
Cc Xuexin Jiang <[email protected]>
Reviewed-by Xiaokai Ran <[email protected]>
Reviewed-by Yang Yang <[email protected]>
--- mm/ksm.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-)
mm/ksm.c +19 -6
@@ -2214,23 +2214,36 @@ static void cmp_and_merge_page(struct page *page, struct ksm_rmap_item *rmap_ite } } -static struct ksm_rmap_item *get_next_rmap_item (struct ksm_mm_slot *mm_slot, -struct ksm_rmap_item **rmap_list, -unsigned long addr) +static struct ksm_rmap_item *try_to_get_old_rmap_item (unsigned long addr, +struct ksm_rmap_item **rmap_list) { -struct ksm_rmap_item *rmap_item; -while (*rmap_list) { - rmap_item = *rmap_list; +struct ksm_rmap_item *rmap_item = *rmap_list;if ((rmap_item->address &PAGE_MASK ) == addr)return rmap_item;if (rmap_item->address > addr)break ; *rmap_list = rmap_item->rmap_list; +/* Running here indicates it's vma has been UNMERGEABLE */ remove_rmap_item_from_tree (rmap_item);free_rmap_item (rmap_item); } +return NULL ; +} + +static struct ksm_rmap_item *get_next_rmap_item (struct ksm_mm_slot *mm_slot, +struct ksm_rmap_item **rmap_list, +unsigned long addr) +{ +struct ksm_rmap_item *rmap_item; + +/* lookup if we have a old rmap_item matching the addr*/ + rmap_item =try_to_get_old_rmap_item (addr, rmap_list); +if (rmap_item) +return rmap_item; + +/* Need to allocate a new rmap_item */ rmap_item =alloc_rmap_item ();if (rmap_item) {/* It has already been zeroed */
Signature · 1 line
2.15.2