From nobody Thu Apr 9 12:41:42 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 44F6BECAAD8 for ; Wed, 31 Aug 2022 03:21:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229819AbiHaDVE (ORCPT ); Tue, 30 Aug 2022 23:21:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59580 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232127AbiHaDUa (ORCPT ); Tue, 30 Aug 2022 23:20:30 -0400 Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A9D41DA4F for ; Tue, 30 Aug 2022 20:20:13 -0700 (PDT) Received: by mail-pf1-x435.google.com with SMTP id c66so2947407pfc.10 for ; Tue, 30 Aug 2022 20:20:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=im3YqRL2Rng/LKklgBeywc8L3p9g3oy/mXuP77cK8zU=; b=RD4nDOqLlkuwwB2t022lPA2anuLlf/CAS8a53Uv3i/r5QGL9l4YCtb8ZIiMBG7hbJC guoomosMxuYuN8jO6yVhowNvNsVavr98McnRWRcR5PVm8BYcH/KDGlV03enHRsETKqdN RXQKdUc/lvnulb44PzME6KYSESUO3mj/jRRKKZ+hOecySABPTqTrzlN6ah9eCr7yRUbS rjjh7Pmwpe0t+OMAT8XqcZDkDWbhDpmfXa2MFKhcLexZBRe76Jmz51AIvWELchSaNWUV LVgK/Y0PlNXGer69Rht7WgMzdbG9dlBLhwiFMBj/HMyH7wQN3BH5WnmbOS4U1Ucpon68 uxrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=im3YqRL2Rng/LKklgBeywc8L3p9g3oy/mXuP77cK8zU=; b=t9Wp1QLVcCz4dD3MHcEcRwyD8y1CIAB8HZKfWpaGWt3wSbjVmG9u2BTbcWOJ68I1v5 Ez5OLYezrrOZ8aT9rwb1FL5pLk8aAuUUj6dVsjEgcPaSudz4HMAik/7jPz6chPh7HRqU ogjV/h4/9qvYQjATRJBEOEZ7QJNPx0qPEXb9nGPAKxLecfocN64h5N9dERKe9lb0O2Cw qydnURSInx46D+IzBjgviPDgE0pjvhs9+iBcqdsrDNNZQd0GrjvwIASwBJswRh4+Ua7l kV6nH3gFA7L2L4xbXRGuXEJwNo8DEZf/HH7ygynGv7+gyrvusIWqB0ZGrpyR8mufn1J9 SP+g== X-Gm-Message-State: ACgBeo3pwHVmurdXFo5TH/Hs94F9hR2WqGA/Anc53jxtgr+31ouxGsuA zaf3dwBngW7pmfLjGbRmxcVMUA== X-Google-Smtp-Source: AA6agR6oR5JRUz8+cD5CEEtVrrOhgd1Fo8O/zVTIvVDMVu9FdFzHaITegImRSaKYL7R1u+K2Ofk0/A== X-Received: by 2002:a65:6417:0:b0:42b:2f13:8477 with SMTP id a23-20020a656417000000b0042b2f138477mr20270294pgv.329.1661916012858; Tue, 30 Aug 2022 20:20:12 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([139.177.225.245]) by smtp.gmail.com with ESMTPSA id i13-20020a170902c94d00b0015e8d4eb1d5sm8633535pla.31.2022.08.30.20.20.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 20:20:12 -0700 (PDT) From: Qi Zheng To: akpm@linux-foundation.org, shy828301@gmail.com, willy@infradead.org, vbabka@suse.cz, hannes@cmpxchg.org, minchan@kernel.org, rppt@kernel.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Qi Zheng Subject: [PATCH v2 1/7] mm: introduce common struct mm_slot Date: Wed, 31 Aug 2022 11:19:45 +0800 Message-Id: <20220831031951.43152-2-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20220831031951.43152-1-zhengqi.arch@bytedance.com> References: <20220831031951.43152-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" At present, both THP and KSM module have similar structures mm_slot for organizing and recording the information required for scanning mm, and each defines the following exactly the same operation functions: - alloc_mm_slot - free_mm_slot - get_mm_slot - insert_to_mm_slots_hash In order to de-duplicate these codes, this patch introduces a common struct mm_slot, and subsequent patches will let THP and KSM to use it. Signed-off-by: Qi Zheng --- mm/mm_slot.h | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 mm/mm_slot.h diff --git a/mm/mm_slot.h b/mm/mm_slot.h new file mode 100644 index 000000000000..83f18ed1c4bd --- /dev/null +++ b/mm/mm_slot.h @@ -0,0 +1,55 @@ +// SPDX-License-Identifier: GPL-2.0 + +#ifndef _LINUX_MM_SLOT_H +#define _LINUX_MM_SLOT_H + +#include +#include + +/* + * struct mm_slot - hash lookup from mm to mm_slot + * @hash: link to the mm_slots hash list + * @mm_node: link into the mm_slots list + * @mm: the mm that this information is valid for + */ +struct mm_slot { + struct hlist_node hash; + struct list_head mm_node; + struct mm_struct *mm; +}; + +#define mm_slot_entry(ptr, type, member) \ + container_of(ptr, type, member) + +static inline void *mm_slot_alloc(struct kmem_cache *cache) +{ + if (!cache) /* initialization failed */ + return NULL; + return kmem_cache_zalloc(cache, GFP_KERNEL); +} + +static inline void mm_slot_free(struct kmem_cache *cache, void *objp) +{ + kmem_cache_free(cache, objp); +} + +#define mm_slot_lookup(_hashtable, _mm) \ +({ \ + struct mm_slot *tmp_slot, *mm_slot =3D NULL; \ + \ + hash_for_each_possible(_hashtable, tmp_slot, hash, (unsigned long)_mm) \ + if (_mm =3D=3D tmp_slot->mm) { \ + mm_slot =3D tmp_slot; \ + break; \ + } \ + \ + mm_slot; \ +}) + +#define mm_slot_insert(_hashtable, _mm, _mm_slot) \ +({ \ + _mm_slot->mm =3D _mm; \ + hash_add(_hashtable, &_mm_slot->hash, (unsigned long)_mm); \ +}) + +#endif /* _LINUX_MM_SLOT_H */ --=20 2.20.1 From nobody Thu Apr 9 12:41:42 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 81A89ECAAD8 for ; Wed, 31 Aug 2022 03:21:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232234AbiHaDVL (ORCPT ); Tue, 30 Aug 2022 23:21:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59810 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232281AbiHaDUd (ORCPT ); Tue, 30 Aug 2022 23:20:33 -0400 Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7262F2FFF6 for ; Tue, 30 Aug 2022 20:20:19 -0700 (PDT) Received: by mail-pj1-x1031.google.com with SMTP id h11-20020a17090a470b00b001fbc5ba5224so13764731pjg.2 for ; Tue, 30 Aug 2022 20:20:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=f6rQgw8USChv8oA+nAwqR6F2V5pWKOCQTtX51ximUyU=; b=Jt71XTo0ZlGofe5ovfd68QMBd8ExztA/4UOo5WwvaEOU3Xtd6o0Wqm3KZVUreaULEG 9koGq03fI74L6+20WWygZRZW2FdIiFGHzLKDTfoQt/4jVIN8F+2kwbg/b7ABHu1ZkBJ7 b94igBpmmBWhETJ+R/F3xWei+whbuH8YRwJIpk/CMKNmo9vAsWOtrT4ZBTw/KfUbvN2l /b+zrOJhHtUInoou0qtMurMleEg7e820kLYYpxjQ7ThCOPxtzzIZ384SPOKM/Lk9mU9l BFy6wOTGf1RrSkFizHBKQwPdQZG5ZpInfgx2QuhlYrkWYVExcT0DbZUNjZXXr8oTUVsb fTzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=f6rQgw8USChv8oA+nAwqR6F2V5pWKOCQTtX51ximUyU=; b=hUklynubwq21VkzPGPWfYQxHnuVvGqF4TeEKzqviLKEHtBN8/X9g4u1Kcxr6baUgKr jV1CFCRJ3F/EV4ItnUthj92790fSKmPIqkpD2MJwwpqpINS5gkRGa0jKFwKAA6O9nzq4 XBYPYSMlZq1fM8Lu9y6xxIwDasbrlHfo/o3u531jL7UhzXnzBF5K1lA1ZuxohS0aOFVi Zmfe0spHNrBMndtg9GQJ0+Ft87PBroPS/ss1yU6LlTl5+KOOBG1Og44GQlolglCQo7zh PhfeFHTyh8+SV34e4z/nKnrlZfk6geBsTMWCkoAjL8/yf/VhQmWmwgzhfvJQjJPzrO9a p9BQ== X-Gm-Message-State: ACgBeo02KlH89bjlEFBxd/vL7+uyKaiDpajML94Hzq2WI8LSy7piyrgX 7ZQvs8fLX7yom3BgRqKn76CVCg== X-Google-Smtp-Source: AA6agR5bHfmikkHIIhDlWRWZ0Q14KKxmcCqsG3gc8oih9F6xWSMI7e2q6hWo4RFi7gmkBImue6w5ZA== X-Received: by 2002:a17:90b:38cf:b0:1fb:783c:e0f with SMTP id nn15-20020a17090b38cf00b001fb783c0e0fmr1193594pjb.204.1661916018725; Tue, 30 Aug 2022 20:20:18 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([139.177.225.245]) by smtp.gmail.com with ESMTPSA id i13-20020a170902c94d00b0015e8d4eb1d5sm8633535pla.31.2022.08.30.20.20.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 20:20:18 -0700 (PDT) From: Qi Zheng To: akpm@linux-foundation.org, shy828301@gmail.com, willy@infradead.org, vbabka@suse.cz, hannes@cmpxchg.org, minchan@kernel.org, rppt@kernel.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Qi Zheng Subject: [PATCH v2 2/7] mm: thp: convert to use common struct mm_slot Date: Wed, 31 Aug 2022 11:19:46 +0800 Message-Id: <20220831031951.43152-3-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20220831031951.43152-1-zhengqi.arch@bytedance.com> References: <20220831031951.43152-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Rename private struct mm_slot to struct khugepaged_mm_slot and convert to use common struct mm_slot with no functional change. Signed-off-by: Qi Zheng --- mm/khugepaged.c | 121 ++++++++++++++++++++---------------------------- 1 file changed, 51 insertions(+), 70 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index d8e388106322..2d74cf01f694 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -23,6 +23,7 @@ #include #include #include "internal.h" +#include "mm_slot.h" =20 enum scan_result { SCAN_FAIL, @@ -104,17 +105,13 @@ struct collapse_control { }; =20 /** - * struct mm_slot - hash lookup from mm to mm_slot - * @hash: hash collision list - * @mm_node: khugepaged scan list headed in khugepaged_scan.mm_head - * @mm: the mm that this information is valid for + * struct khugepaged_mm_slot - khugepaged information per mm that is being= scanned + * @slot: hash lookup from mm to mm_slot * @nr_pte_mapped_thp: number of pte mapped THP * @pte_mapped_thp: address array corresponding pte mapped THP */ -struct mm_slot { - struct hlist_node hash; - struct list_head mm_node; - struct mm_struct *mm; +struct khugepaged_mm_slot { + struct mm_slot slot; =20 /* pte-mapped THP in this mm */ int nr_pte_mapped_thp; @@ -131,7 +128,7 @@ struct mm_slot { */ struct khugepaged_scan { struct list_head mm_head; - struct mm_slot *mm_slot; + struct khugepaged_mm_slot *mm_slot; unsigned long address; }; =20 @@ -395,8 +392,9 @@ int hugepage_madvise(struct vm_area_struct *vma, int __init khugepaged_init(void) { mm_slot_cache =3D kmem_cache_create("khugepaged_mm_slot", - sizeof(struct mm_slot), - __alignof__(struct mm_slot), 0, NULL); + sizeof(struct khugepaged_mm_slot), + __alignof__(struct khugepaged_mm_slot), + 0, NULL); if (!mm_slot_cache) return -ENOMEM; =20 @@ -413,36 +411,6 @@ void __init khugepaged_destroy(void) kmem_cache_destroy(mm_slot_cache); } =20 -static inline struct mm_slot *alloc_mm_slot(void) -{ - if (!mm_slot_cache) /* initialization failed */ - return NULL; - return kmem_cache_zalloc(mm_slot_cache, GFP_KERNEL); -} - -static inline void free_mm_slot(struct mm_slot *mm_slot) -{ - kmem_cache_free(mm_slot_cache, mm_slot); -} - -static struct mm_slot *get_mm_slot(struct mm_struct *mm) -{ - struct mm_slot *mm_slot; - - hash_for_each_possible(mm_slots_hash, mm_slot, hash, (unsigned long)mm) - if (mm =3D=3D mm_slot->mm) - return mm_slot; - - return NULL; -} - -static void insert_to_mm_slots_hash(struct mm_struct *mm, - struct mm_slot *mm_slot) -{ - mm_slot->mm =3D mm; - hash_add(mm_slots_hash, &mm_slot->hash, (long)mm); -} - static inline int hpage_collapse_test_exit(struct mm_struct *mm) { return atomic_read(&mm->mm_users) =3D=3D 0; @@ -450,28 +418,31 @@ static inline int hpage_collapse_test_exit(struct mm_= struct *mm) =20 void __khugepaged_enter(struct mm_struct *mm) { - struct mm_slot *mm_slot; + struct khugepaged_mm_slot *mm_slot; + struct mm_slot *slot; int wakeup; =20 - mm_slot =3D alloc_mm_slot(); + mm_slot =3D mm_slot_alloc(mm_slot_cache); if (!mm_slot) return; =20 + slot =3D &mm_slot->slot; + /* __khugepaged_exit() must not run from under us */ VM_BUG_ON_MM(hpage_collapse_test_exit(mm), mm); if (unlikely(test_and_set_bit(MMF_VM_HUGEPAGE, &mm->flags))) { - free_mm_slot(mm_slot); + mm_slot_free(mm_slot_cache, mm_slot); return; } =20 spin_lock(&khugepaged_mm_lock); - insert_to_mm_slots_hash(mm, mm_slot); + mm_slot_insert(mm_slots_hash, mm, slot); /* * Insert just behind the scanning cursor, to let the area settle * down a little. */ wakeup =3D list_empty(&khugepaged_scan.mm_head); - list_add_tail(&mm_slot->mm_node, &khugepaged_scan.mm_head); + list_add_tail(&slot->mm_node, &khugepaged_scan.mm_head); spin_unlock(&khugepaged_mm_lock); =20 mmgrab(mm); @@ -491,21 +462,23 @@ void khugepaged_enter_vma(struct vm_area_struct *vma, =20 void __khugepaged_exit(struct mm_struct *mm) { - struct mm_slot *mm_slot; + struct khugepaged_mm_slot *mm_slot; + struct mm_slot *slot; int free =3D 0; =20 spin_lock(&khugepaged_mm_lock); - mm_slot =3D get_mm_slot(mm); + slot =3D mm_slot_lookup(mm_slots_hash, mm); + mm_slot =3D mm_slot_entry(slot, struct khugepaged_mm_slot, slot); if (mm_slot && khugepaged_scan.mm_slot !=3D mm_slot) { - hash_del(&mm_slot->hash); - list_del(&mm_slot->mm_node); + hash_del(&slot->hash); + list_del(&slot->mm_node); free =3D 1; } spin_unlock(&khugepaged_mm_lock); =20 if (free) { clear_bit(MMF_VM_HUGEPAGE, &mm->flags); - free_mm_slot(mm_slot); + mm_slot_free(mm_slot_cache, mm_slot); mmdrop(mm); } else if (mm_slot) { /* @@ -1321,16 +1294,17 @@ static int hpage_collapse_scan_pmd(struct mm_struct= *mm, return result; } =20 -static void collect_mm_slot(struct mm_slot *mm_slot) +static void collect_mm_slot(struct khugepaged_mm_slot *mm_slot) { - struct mm_struct *mm =3D mm_slot->mm; + struct mm_slot *slot =3D &mm_slot->slot; + struct mm_struct *mm =3D slot->mm; =20 lockdep_assert_held(&khugepaged_mm_lock); =20 if (hpage_collapse_test_exit(mm)) { /* free mm_slot */ - hash_del(&mm_slot->hash); - list_del(&mm_slot->mm_node); + hash_del(&slot->hash); + list_del(&slot->mm_node); =20 /* * Not strictly needed because the mm exited already. @@ -1339,7 +1313,7 @@ static void collect_mm_slot(struct mm_slot *mm_slot) */ =20 /* khugepaged_mm_lock actually not necessary for the below */ - free_mm_slot(mm_slot); + mm_slot_free(mm_slot_cache, mm_slot); mmdrop(mm); } } @@ -1352,12 +1326,14 @@ static void collect_mm_slot(struct mm_slot *mm_slot) static void khugepaged_add_pte_mapped_thp(struct mm_struct *mm, unsigned long addr) { - struct mm_slot *mm_slot; + struct khugepaged_mm_slot *mm_slot; + struct mm_slot *slot; =20 VM_BUG_ON(addr & ~HPAGE_PMD_MASK); =20 spin_lock(&khugepaged_mm_lock); - mm_slot =3D get_mm_slot(mm); + slot =3D mm_slot_lookup(mm_slots_hash, mm); + mm_slot =3D mm_slot_entry(slot, struct khugepaged_mm_slot, slot); if (likely(mm_slot && mm_slot->nr_pte_mapped_thp < MAX_PTE_MAPPED_THP)) mm_slot->pte_mapped_thp[mm_slot->nr_pte_mapped_thp++] =3D addr; spin_unlock(&khugepaged_mm_lock); @@ -1489,9 +1465,10 @@ void collapse_pte_mapped_thp(struct mm_struct *mm, u= nsigned long addr) goto drop_hpage; } =20 -static void khugepaged_collapse_pte_mapped_thps(struct mm_slot *mm_slot) +static void khugepaged_collapse_pte_mapped_thps(struct khugepaged_mm_slot = *mm_slot) { - struct mm_struct *mm =3D mm_slot->mm; + struct mm_slot *slot =3D &mm_slot->slot; + struct mm_struct *mm =3D slot->mm; int i; =20 if (likely(mm_slot->nr_pte_mapped_thp =3D=3D 0)) @@ -2054,7 +2031,8 @@ static unsigned int khugepaged_scan_mm_slot(unsigned = int pages, int *result, __acquires(&khugepaged_mm_lock) { struct vma_iterator vmi; - struct mm_slot *mm_slot; + struct khugepaged_mm_slot *mm_slot; + struct mm_slot *slot; struct mm_struct *mm; struct vm_area_struct *vma; int progress =3D 0; @@ -2064,18 +2042,20 @@ static unsigned int khugepaged_scan_mm_slot(unsigne= d int pages, int *result, lockdep_assert_held(&khugepaged_mm_lock); *result =3D SCAN_FAIL; =20 - if (khugepaged_scan.mm_slot) + if (khugepaged_scan.mm_slot) { mm_slot =3D khugepaged_scan.mm_slot; - else { - mm_slot =3D list_entry(khugepaged_scan.mm_head.next, + slot =3D &mm_slot->slot; + } else { + slot =3D list_entry(khugepaged_scan.mm_head.next, struct mm_slot, mm_node); + mm_slot =3D mm_slot_entry(slot, struct khugepaged_mm_slot, slot); khugepaged_scan.address =3D 0; khugepaged_scan.mm_slot =3D mm_slot; } spin_unlock(&khugepaged_mm_lock); khugepaged_collapse_pte_mapped_thps(mm_slot); =20 - mm =3D mm_slot->mm; + mm =3D slot->mm; /* * Don't wait for semaphore (to avoid long wait times). Just move to * the next mm on the list. @@ -2171,10 +2151,11 @@ static unsigned int khugepaged_scan_mm_slot(unsigne= d int pages, int *result, * khugepaged runs here, khugepaged_exit will find * mm_slot not pointing to the exiting mm. */ - if (mm_slot->mm_node.next !=3D &khugepaged_scan.mm_head) { - khugepaged_scan.mm_slot =3D list_entry( - mm_slot->mm_node.next, - struct mm_slot, mm_node); + if (slot->mm_node.next !=3D &khugepaged_scan.mm_head) { + slot =3D list_entry(slot->mm_node.next, + struct mm_slot, mm_node); + khugepaged_scan.mm_slot =3D + mm_slot_entry(slot, struct khugepaged_mm_slot, slot); khugepaged_scan.address =3D 0; } else { khugepaged_scan.mm_slot =3D NULL; @@ -2269,7 +2250,7 @@ static void khugepaged_wait_work(void) =20 static int khugepaged(void *none) { - struct mm_slot *mm_slot; + struct khugepaged_mm_slot *mm_slot; =20 set_freezable(); set_user_nice(current, MAX_NICE); --=20 2.20.1 From nobody Thu Apr 9 12:41:42 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66CA8ECAAD8 for ; Wed, 31 Aug 2022 03:21:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232343AbiHaDVR (ORCPT ); Tue, 30 Aug 2022 23:21:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60046 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232282AbiHaDUg (ORCPT ); Tue, 30 Aug 2022 23:20:36 -0400 Received: from mail-pg1-x52f.google.com (mail-pg1-x52f.google.com [IPv6:2607:f8b0:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 15F6727177 for ; Tue, 30 Aug 2022 20:20:23 -0700 (PDT) Received: by mail-pg1-x52f.google.com with SMTP id v4so12391784pgi.10 for ; Tue, 30 Aug 2022 20:20:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=x9fs/pcgOChAtJLUDPXp3cv3Ogg9mSNMF+2EQZokRvQ=; b=3EWz+RdAoilxVzBAZIbXaT2y9w/JYKSOiuSsmrx0ab0Rk5p98tjF4aJJrLqO6lxLmI olDtI9r36o23DHUAJS+usg6A2arKZfNQRUIA65hXH3D3o2R/8xjGCW2QWa5MK6z3UZ90 BknGzOP61FsSU+OVGuvg0nCzUbaEMm1ek3r2F66u8egKy3DvD8Fr/CSYWLf4T/lMNng4 TbsWpMafB47RdxPm6vzmiRlPaggUyBG1IOU2R2ootfTB9kH5cfD12UqOcEyJsLVIky7Z U5amLNhO0XgSkmpVeyK72YZwucWP5Udql1VdAKKpsRDuPt0vOY7+ZzZhkpSdx11G5R9P qF+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=x9fs/pcgOChAtJLUDPXp3cv3Ogg9mSNMF+2EQZokRvQ=; b=gXgJM58kVi4Tojs3/CClkiuRPlR1YG7EZTceNRTrPZCe/jw6QodCYgEJPbBO2biiCa j4uF7Mh8GlupvpCtWz7Yjqb4N4ZbYiN/Ws4U/nY374DFc4BWr2ssQA3W8iojkeosvvca 0KAiqanK6Ek3g1Xn4BVyk/cVyoEG2suxBxv6gPrul0bxNsoQf59tOp+g6SSHgCCyLLHz ZzpQT0le33xesCN0M7IwPP4E4/nUzUxEyBfIC+bot6ZUxf3kuuPuHDeACvHRTgzBThPm GPPbzADDzCrt3l6pae5bVhsh4HTGuZwNY0hVSDokcOMPIp//r4R1umTTS3LqUvK4LB5s lh7g== X-Gm-Message-State: ACgBeo2JuYHJ8IDfq4O7xg0q+NhntT74vaRKMxJeZH8ehY8eJJLjtSUv DU9oS0XaPX9+je/ED8GXz4Fg6Q== X-Google-Smtp-Source: AA6agR7R8mNCEwL/D3l+vcBtcrgdDAyd3mWsTq2jAGPWnHMySYMHR3qbt1URZX212VAIIGTEVLmBpw== X-Received: by 2002:a63:84c6:0:b0:42b:e461:348a with SMTP id k189-20020a6384c6000000b0042be461348amr12598809pgd.87.1661916023299; Tue, 30 Aug 2022 20:20:23 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([139.177.225.245]) by smtp.gmail.com with ESMTPSA id i13-20020a170902c94d00b0015e8d4eb1d5sm8633535pla.31.2022.08.30.20.20.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 20:20:22 -0700 (PDT) From: Qi Zheng To: akpm@linux-foundation.org, shy828301@gmail.com, willy@infradead.org, vbabka@suse.cz, hannes@cmpxchg.org, minchan@kernel.org, rppt@kernel.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Qi Zheng Subject: [PATCH v2 3/7] ksm: remove redundant declarations in ksm.h Date: Wed, 31 Aug 2022 11:19:47 +0800 Message-Id: <20220831031951.43152-4-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20220831031951.43152-1-zhengqi.arch@bytedance.com> References: <20220831031951.43152-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Currently, for struct stable_node, no one uses it in both the include/linux/ksm.h file and the file that contains it. For struct mem_cgroup, it's also not used in ksm.h. So they're all redundant, just remove them. Signed-off-by: Qi Zheng --- include/linux/ksm.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/linux/ksm.h b/include/linux/ksm.h index 0b4f17418f64..7e232ba59b86 100644 --- a/include/linux/ksm.h +++ b/include/linux/ksm.h @@ -15,9 +15,6 @@ #include #include =20 -struct stable_node; -struct mem_cgroup; - #ifdef CONFIG_KSM int ksm_madvise(struct vm_area_struct *vma, unsigned long start, unsigned long end, int advice, unsigned long *vm_flags); --=20 2.20.1 From nobody Thu Apr 9 12:41:42 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7551AECAAA1 for ; Wed, 31 Aug 2022 03:21:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232301AbiHaDVf (ORCPT ); Tue, 30 Aug 2022 23:21:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58762 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231279AbiHaDUm (ORCPT ); Tue, 30 Aug 2022 23:20:42 -0400 Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC4264C618 for ; Tue, 30 Aug 2022 20:20:28 -0700 (PDT) Received: by mail-pj1-x1034.google.com with SMTP id t11-20020a17090a510b00b001fac77e9d1fso19832540pjh.5 for ; Tue, 30 Aug 2022 20:20:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=Aa9yqb8lqoZTwAblsaxo7iVAt4Fo5BpnbvdwKRhtu2w=; b=h7WvKt+dUFOBsAYlRo/uJqchGIfXUfUuKWd6zCwlKIFeMb6CJxQfkVgOpK4ayoCP84 s+9IqY2ANy0W/ch18D3lPWZKnnpMY8wz8I3zbhj2/Gh2e5e8e/Unv1bInQSZgKN4zVlW yoeJDM+QlTqwrFQuQbCFy/c1VrF5YnE7aakkjnwlxYyctPIchbtli2hfw7Y3jdA4l/W/ DFYrVb3MQ8eUsIoAFIoV8dznIl15cXTJKdBlLJqs4/3gPT6gIdqnZSHt1x+R7/gbvbFi 045lJL96THdxnyze7WqFqAQjxRFSXHOUJXAEAtaj2b7iDdlh5ypWKXi6FkcBnm091oB8 j3lA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=Aa9yqb8lqoZTwAblsaxo7iVAt4Fo5BpnbvdwKRhtu2w=; b=fcESER7SB9zl1Xf5gbHBR7qpFN4URwwODrGZoEsIZ1/k96jl8mpcCo/2ZZOw175e0Z Cjcoe2yxPnWkc+GnoZC78NNw720ke1uVgTmhLHRthIDGY7x4gRbriEaWBIkdTQl4/LrM xVFsQ1QO648Y6x4B8l+MRoFISLyl5+2rnJTgA6DzaYl5YLCyJkqk7TopFLkJnyzlS37+ 09UK6hn5JwT3fE8L/WJ4VtVFIouKKWVKPv+2MvGSXIhzbujYVxS8OLq5stvThVuDZ7eG W/HFW739/h4nUROLb/ZKEfVJs2ofzVzlZ+sv2KhMhve+4pBRA/EIPl0OnX43qRPbBhQZ GM1A== X-Gm-Message-State: ACgBeo3OQPMsNZjHJPisjpy66XkT+Hfks+PAwbqoLBuKPJtJpaHiYJRL IJRxxY6oQ/k9TixqUmFXT6fZug== X-Google-Smtp-Source: AA6agR7xt56mkesUzkLJqn+xuZ4Qnr9M3/bm6/s2f5r7foTtKA+jk2//H6GVazB4X1hWoBsbWYXCag== X-Received: by 2002:a17:90a:d151:b0:1fa:b2a6:226a with SMTP id t17-20020a17090ad15100b001fab2a6226amr1197842pjw.104.1661916027839; Tue, 30 Aug 2022 20:20:27 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([139.177.225.245]) by smtp.gmail.com with ESMTPSA id i13-20020a170902c94d00b0015e8d4eb1d5sm8633535pla.31.2022.08.30.20.20.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 20:20:27 -0700 (PDT) From: Qi Zheng To: akpm@linux-foundation.org, shy828301@gmail.com, willy@infradead.org, vbabka@suse.cz, hannes@cmpxchg.org, minchan@kernel.org, rppt@kernel.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Qi Zheng Subject: [PATCH v2 4/7] ksm: add the ksm prefix to the names of the ksm private structures Date: Wed, 31 Aug 2022 11:19:48 +0800 Message-Id: <20220831031951.43152-5-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20220831031951.43152-1-zhengqi.arch@bytedance.com> References: <20220831031951.43152-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In order to prevent the name of the private structure of ksm from being the same as the name of the common structure used in subsequent patches, prefix their names with ksm in advance. Signed-off-by: Qi Zheng --- Documentation/mm/ksm.rst | 2 +- mm/ksm.c | 216 +++++++++++++++++++-------------------- 2 files changed, 109 insertions(+), 109 deletions(-) diff --git a/Documentation/mm/ksm.rst b/Documentation/mm/ksm.rst index 9e37add068e6..f83cfbc12f4c 100644 --- a/Documentation/mm/ksm.rst +++ b/Documentation/mm/ksm.rst @@ -26,7 +26,7 @@ tree. =20 If a KSM page is shared between less than ``max_page_sharing`` VMAs, the node of the stable tree that represents such KSM page points to a -list of struct rmap_item and the ``page->mapping`` of the +list of struct ksm_rmap_item and the ``page->mapping`` of the KSM page points to the stable tree node. =20 When the sharing passes this threshold, KSM adds a second dimension to diff --git a/mm/ksm.c b/mm/ksm.c index e34cc21d5556..3937111f9ab8 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -82,7 +82,7 @@ * different KSM page copy of that content * * Internally, the regular nodes, "dups" and "chains" are represented - * using the same struct stable_node structure. + * using the same struct ksm_stable_node structure. * * In addition to the stable tree, KSM uses a second data structure called= the * unstable tree: this tree holds pointers to pages which have been found = to @@ -112,16 +112,16 @@ */ =20 /** - * struct 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 * @mm_list: 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 * @mm: the mm that this information is valid for */ -struct mm_slot { +struct ksm_mm_slot { struct hlist_node link; struct list_head mm_list; - struct rmap_item *rmap_list; + struct ksm_rmap_item *rmap_list; struct mm_struct *mm; }; =20 @@ -135,14 +135,14 @@ struct mm_slot { * There is only the one ksm_scan instance of this cursor structure. */ struct ksm_scan { - struct mm_slot *mm_slot; + struct ksm_mm_slot *mm_slot; unsigned long address; - struct rmap_item **rmap_list; + struct ksm_rmap_item **rmap_list; unsigned long seqnr; }; =20 /** - * struct stable_node - node of the stable rbtree + * struct ksm_stable_node - node of the stable rbtree * @node: rb node of this ksm page in the stable tree * @head: (overlaying parent) &migrate_nodes indicates temporarily on that= list * @hlist_dup: linked into the stable_node->hlist with a stable_node chain @@ -153,7 +153,7 @@ struct ksm_scan { * @rmap_hlist_len: number of rmap_item entries in hlist or STABLE_NODE_CH= AIN * @nid: NUMA node id of stable tree in which linked (may not match kpfn) */ -struct stable_node { +struct ksm_stable_node { union { struct rb_node node; /* when node of stable tree */ struct { /* when listed for migration */ @@ -182,7 +182,7 @@ struct stable_node { }; =20 /** - * struct rmap_item - reverse mapping item for virtual addresses + * struct ksm_rmap_item - reverse mapping item for virtual addresses * @rmap_list: next rmap_item in mm_slot's singly-linked rmap_list * @anon_vma: pointer to anon_vma for this mm,address, when in stable tree * @nid: NUMA node id of unstable tree in which linked (may not match page) @@ -193,8 +193,8 @@ struct stable_node { * @head: pointer to stable_node heading this list in the stable tree * @hlist: link into hlist of rmap_items hanging off that stable_node */ -struct rmap_item { - struct rmap_item *rmap_list; +struct ksm_rmap_item { + struct ksm_rmap_item *rmap_list; union { struct anon_vma *anon_vma; /* when stable */ #ifdef CONFIG_NUMA @@ -207,7 +207,7 @@ struct rmap_item { union { struct rb_node node; /* when node of unstable tree */ struct { /* when listed from stable tree */ - struct stable_node *head; + struct ksm_stable_node *head; struct hlist_node hlist; }; }; @@ -230,7 +230,7 @@ static LIST_HEAD(migrate_nodes); #define MM_SLOTS_HASH_BITS 10 static DEFINE_HASHTABLE(mm_slots_hash, MM_SLOTS_HASH_BITS); =20 -static struct mm_slot ksm_mm_head =3D { +static struct ksm_mm_slot ksm_mm_head =3D { .mm_list =3D LIST_HEAD_INIT(ksm_mm_head.mm_list), }; static struct ksm_scan ksm_scan =3D { @@ -298,21 +298,21 @@ static DECLARE_WAIT_QUEUE_HEAD(ksm_iter_wait); static DEFINE_MUTEX(ksm_thread_mutex); static DEFINE_SPINLOCK(ksm_mmlist_lock); =20 -#define KSM_KMEM_CACHE(__struct, __flags) kmem_cache_create("ksm_"#__struc= t,\ +#define KSM_KMEM_CACHE(__struct, __flags) kmem_cache_create(#__struct,\ sizeof(struct __struct), __alignof__(struct __struct),\ (__flags), NULL) =20 static int __init ksm_slab_init(void) { - rmap_item_cache =3D KSM_KMEM_CACHE(rmap_item, 0); + rmap_item_cache =3D KSM_KMEM_CACHE(ksm_rmap_item, 0); if (!rmap_item_cache) goto out; =20 - stable_node_cache =3D KSM_KMEM_CACHE(stable_node, 0); + stable_node_cache =3D KSM_KMEM_CACHE(ksm_stable_node, 0); if (!stable_node_cache) goto out_free1; =20 - mm_slot_cache =3D KSM_KMEM_CACHE(mm_slot, 0); + mm_slot_cache =3D KSM_KMEM_CACHE(ksm_mm_slot, 0); if (!mm_slot_cache) goto out_free2; =20 @@ -334,18 +334,18 @@ static void __init ksm_slab_free(void) mm_slot_cache =3D NULL; } =20 -static __always_inline bool is_stable_node_chain(struct stable_node *chain) +static __always_inline bool is_stable_node_chain(struct ksm_stable_node *c= hain) { return chain->rmap_hlist_len =3D=3D STABLE_NODE_CHAIN; } =20 -static __always_inline bool is_stable_node_dup(struct stable_node *dup) +static __always_inline bool is_stable_node_dup(struct ksm_stable_node *dup) { return dup->head =3D=3D STABLE_NODE_DUP_HEAD; } =20 -static inline void stable_node_chain_add_dup(struct stable_node *dup, - struct stable_node *chain) +static inline void stable_node_chain_add_dup(struct ksm_stable_node *dup, + struct ksm_stable_node *chain) { VM_BUG_ON(is_stable_node_dup(dup)); dup->head =3D STABLE_NODE_DUP_HEAD; @@ -354,14 +354,14 @@ static inline void stable_node_chain_add_dup(struct s= table_node *dup, ksm_stable_node_dups++; } =20 -static inline void __stable_node_dup_del(struct stable_node *dup) +static inline void __stable_node_dup_del(struct ksm_stable_node *dup) { VM_BUG_ON(!is_stable_node_dup(dup)); hlist_del(&dup->hlist_dup); ksm_stable_node_dups--; } =20 -static inline void stable_node_dup_del(struct stable_node *dup) +static inline void stable_node_dup_del(struct ksm_stable_node *dup) { VM_BUG_ON(is_stable_node_chain(dup)); if (is_stable_node_dup(dup)) @@ -373,9 +373,9 @@ static inline void stable_node_dup_del(struct stable_no= de *dup) #endif } =20 -static inline struct rmap_item *alloc_rmap_item(void) +static inline struct ksm_rmap_item *alloc_rmap_item(void) { - struct rmap_item *rmap_item; + struct ksm_rmap_item *rmap_item; =20 rmap_item =3D kmem_cache_zalloc(rmap_item_cache, GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN); @@ -384,14 +384,14 @@ static inline struct rmap_item *alloc_rmap_item(void) return rmap_item; } =20 -static inline void free_rmap_item(struct rmap_item *rmap_item) +static inline void free_rmap_item(struct ksm_rmap_item *rmap_item) { ksm_rmap_items--; rmap_item->mm =3D NULL; /* debug safety */ kmem_cache_free(rmap_item_cache, rmap_item); } =20 -static inline struct stable_node *alloc_stable_node(void) +static inline struct ksm_stable_node *alloc_stable_node(void) { /* * The allocation can take too long with GFP_KERNEL when memory is under @@ -401,28 +401,28 @@ static inline struct stable_node *alloc_stable_node(v= oid) return kmem_cache_alloc(stable_node_cache, GFP_KERNEL | __GFP_HIGH); } =20 -static inline void free_stable_node(struct stable_node *stable_node) +static inline void free_stable_node(struct ksm_stable_node *stable_node) { VM_BUG_ON(stable_node->rmap_hlist_len && !is_stable_node_chain(stable_node)); kmem_cache_free(stable_node_cache, stable_node); } =20 -static inline struct mm_slot *alloc_mm_slot(void) +static inline struct ksm_mm_slot *alloc_mm_slot(void) { if (!mm_slot_cache) /* initialization failed */ return NULL; return kmem_cache_zalloc(mm_slot_cache, GFP_KERNEL); } =20 -static inline void free_mm_slot(struct mm_slot *mm_slot) +static inline void free_mm_slot(struct ksm_mm_slot *mm_slot) { kmem_cache_free(mm_slot_cache, mm_slot); } =20 -static struct mm_slot *get_mm_slot(struct mm_struct *mm) +static struct ksm_mm_slot *get_mm_slot(struct mm_struct *mm) { - struct mm_slot *slot; + struct ksm_mm_slot *slot; =20 hash_for_each_possible(mm_slots_hash, slot, link, (unsigned long)mm) if (slot->mm =3D=3D mm) @@ -432,7 +432,7 @@ static struct mm_slot *get_mm_slot(struct mm_struct *mm) } =20 static void insert_to_mm_slots_hash(struct mm_struct *mm, - struct mm_slot *mm_slot) + struct ksm_mm_slot *mm_slot) { mm_slot->mm =3D mm; hash_add(mm_slots_hash, &mm_slot->link, (unsigned long)mm); @@ -528,7 +528,7 @@ static struct vm_area_struct *find_mergeable_vma(struct= mm_struct *mm, return vma; } =20 -static void break_cow(struct rmap_item *rmap_item) +static void break_cow(struct ksm_rmap_item *rmap_item) { struct mm_struct *mm =3D rmap_item->mm; unsigned long addr =3D rmap_item->address; @@ -547,7 +547,7 @@ static void break_cow(struct rmap_item *rmap_item) mmap_read_unlock(mm); } =20 -static struct page *get_mergeable_page(struct rmap_item *rmap_item) +static struct page *get_mergeable_page(struct ksm_rmap_item *rmap_item) { struct mm_struct *mm =3D rmap_item->mm; unsigned long addr =3D rmap_item->address; @@ -588,10 +588,10 @@ static inline int get_kpfn_nid(unsigned long kpfn) return ksm_merge_across_nodes ? 0 : NUMA(pfn_to_nid(kpfn)); } =20 -static struct stable_node *alloc_stable_node_chain(struct stable_node *dup, +static struct ksm_stable_node *alloc_stable_node_chain(struct ksm_stable_n= ode *dup, struct rb_root *root) { - struct stable_node *chain =3D alloc_stable_node(); + struct ksm_stable_node *chain =3D alloc_stable_node(); VM_BUG_ON(is_stable_node_chain(dup)); if (likely(chain)) { INIT_HLIST_HEAD(&chain->hlist); @@ -621,7 +621,7 @@ static struct stable_node *alloc_stable_node_chain(stru= ct stable_node *dup, return chain; } =20 -static inline void free_stable_node_chain(struct stable_node *chain, +static inline void free_stable_node_chain(struct ksm_stable_node *chain, struct rb_root *root) { rb_erase(&chain->node, root); @@ -629,9 +629,9 @@ static inline void free_stable_node_chain(struct stable= _node *chain, ksm_stable_node_chains--; } =20 -static void remove_node_from_stable_tree(struct stable_node *stable_node) +static void remove_node_from_stable_tree(struct ksm_stable_node *stable_no= de) { - struct rmap_item *rmap_item; + struct ksm_rmap_item *rmap_item; =20 /* check it's not STABLE_NODE_CHAIN or negative */ BUG_ON(stable_node->rmap_hlist_len < 0); @@ -693,7 +693,7 @@ enum get_ksm_page_flags { * a page to put something that might look like our key in page->mapping. * is on its way to being freed; but it is an anomaly to bear in mind. */ -static struct page *get_ksm_page(struct stable_node *stable_node, +static struct page *get_ksm_page(struct ksm_stable_node *stable_node, enum get_ksm_page_flags flags) { struct page *page; @@ -772,10 +772,10 @@ static struct page *get_ksm_page(struct stable_node *= stable_node, * Removing rmap_item from stable or unstable tree. * This function will clean the information from the stable/unstable tree. */ -static void remove_rmap_item_from_tree(struct rmap_item *rmap_item) +static void remove_rmap_item_from_tree(struct ksm_rmap_item *rmap_item) { if (rmap_item->address & STABLE_FLAG) { - struct stable_node *stable_node; + struct ksm_stable_node *stable_node; struct page *page; =20 stable_node =3D rmap_item->head; @@ -822,10 +822,10 @@ static void remove_rmap_item_from_tree(struct rmap_it= em *rmap_item) cond_resched(); /* we're called from many long loops */ } =20 -static void remove_trailing_rmap_items(struct rmap_item **rmap_list) +static void remove_trailing_rmap_items(struct ksm_rmap_item **rmap_list) { while (*rmap_list) { - struct rmap_item *rmap_item =3D *rmap_list; + struct ksm_rmap_item *rmap_item =3D *rmap_list; *rmap_list =3D rmap_item->rmap_list; remove_rmap_item_from_tree(rmap_item); free_rmap_item(rmap_item); @@ -862,18 +862,18 @@ static int unmerge_ksm_pages(struct vm_area_struct *v= ma, return err; } =20 -static inline struct stable_node *folio_stable_node(struct folio *folio) +static inline struct ksm_stable_node *folio_stable_node(struct folio *foli= o) { return folio_test_ksm(folio) ? folio_raw_mapping(folio) : NULL; } =20 -static inline struct stable_node *page_stable_node(struct page *page) +static inline struct ksm_stable_node *page_stable_node(struct page *page) { return folio_stable_node(page_folio(page)); } =20 static inline void set_page_stable_node(struct page *page, - struct stable_node *stable_node) + struct ksm_stable_node *stable_node) { VM_BUG_ON_PAGE(PageAnon(page) && PageAnonExclusive(page), page); page->mapping =3D (void *)((unsigned long)stable_node | PAGE_MAPPING_KSM); @@ -883,7 +883,7 @@ static inline void set_page_stable_node(struct page *pa= ge, /* * Only called through the sysfs control interface: */ -static int remove_stable_node(struct stable_node *stable_node) +static int remove_stable_node(struct ksm_stable_node *stable_node) { struct page *page; int err; @@ -921,10 +921,10 @@ static int remove_stable_node(struct stable_node *sta= ble_node) return err; } =20 -static int remove_stable_node_chain(struct stable_node *stable_node, +static int remove_stable_node_chain(struct ksm_stable_node *stable_node, struct rb_root *root) { - struct stable_node *dup; + struct ksm_stable_node *dup; struct hlist_node *hlist_safe; =20 if (!is_stable_node_chain(stable_node)) { @@ -948,14 +948,14 @@ static int remove_stable_node_chain(struct stable_nod= e *stable_node, =20 static int remove_all_stable_nodes(void) { - struct stable_node *stable_node, *next; + struct ksm_stable_node *stable_node, *next; int nid; int err =3D 0; =20 for (nid =3D 0; nid < ksm_nr_node_ids; nid++) { while (root_stable_tree[nid].rb_node) { stable_node =3D rb_entry(root_stable_tree[nid].rb_node, - struct stable_node, node); + struct ksm_stable_node, node); if (remove_stable_node_chain(stable_node, root_stable_tree + nid)) { err =3D -EBUSY; @@ -974,14 +974,14 @@ static int remove_all_stable_nodes(void) =20 static int unmerge_and_remove_all_rmap_items(void) { - struct mm_slot *mm_slot; + struct ksm_mm_slot *mm_slot; struct mm_struct *mm; struct vm_area_struct *vma; int err =3D 0; =20 spin_lock(&ksm_mmlist_lock); ksm_scan.mm_slot =3D list_entry(ksm_mm_head.mm_list.next, - struct mm_slot, mm_list); + struct ksm_mm_slot, mm_list); spin_unlock(&ksm_mmlist_lock); =20 for (mm_slot =3D ksm_scan.mm_slot; mm_slot !=3D &ksm_mm_head; @@ -1006,7 +1006,7 @@ static int unmerge_and_remove_all_rmap_items(void) =20 spin_lock(&ksm_mmlist_lock); ksm_scan.mm_slot =3D list_entry(mm_slot->mm_list.next, - struct mm_slot, mm_list); + struct ksm_mm_slot, mm_list); if (ksm_test_exit(mm)) { hash_del(&mm_slot->link); list_del(&mm_slot->mm_list); @@ -1293,7 +1293,7 @@ static int try_to_merge_one_page(struct vm_area_struc= t *vma, * * This function returns 0 if the pages were merged, -EFAULT otherwise. */ -static int try_to_merge_with_ksm_page(struct rmap_item *rmap_item, +static int try_to_merge_with_ksm_page(struct ksm_rmap_item *rmap_item, struct page *page, struct page *kpage) { struct mm_struct *mm =3D rmap_item->mm; @@ -1330,9 +1330,9 @@ static int try_to_merge_with_ksm_page(struct rmap_ite= m *rmap_item, * Note that this function upgrades page to ksm page: if one of the pages * is already a ksm page, try_to_merge_with_ksm_page should be used. */ -static struct page *try_to_merge_two_pages(struct rmap_item *rmap_item, +static struct page *try_to_merge_two_pages(struct ksm_rmap_item *rmap_item, struct page *page, - struct rmap_item *tree_rmap_item, + struct ksm_rmap_item *tree_rmap_item, struct page *tree_page) { int err; @@ -1352,7 +1352,7 @@ static struct page *try_to_merge_two_pages(struct rma= p_item *rmap_item, } =20 static __always_inline -bool __is_page_sharing_candidate(struct stable_node *stable_node, int offs= et) +bool __is_page_sharing_candidate(struct ksm_stable_node *stable_node, int = offset) { VM_BUG_ON(stable_node->rmap_hlist_len < 0); /* @@ -1366,17 +1366,17 @@ bool __is_page_sharing_candidate(struct stable_node= *stable_node, int offset) } =20 static __always_inline -bool is_page_sharing_candidate(struct stable_node *stable_node) +bool is_page_sharing_candidate(struct ksm_stable_node *stable_node) { return __is_page_sharing_candidate(stable_node, 0); } =20 -static struct page *stable_node_dup(struct stable_node **_stable_node_dup, - struct stable_node **_stable_node, +static struct page *stable_node_dup(struct ksm_stable_node **_stable_node_= dup, + struct ksm_stable_node **_stable_node, struct rb_root *root, bool prune_stale_stable_nodes) { - struct stable_node *dup, *found =3D NULL, *stable_node =3D *_stable_node; + struct ksm_stable_node *dup, *found =3D NULL, *stable_node =3D *_stable_n= ode; struct hlist_node *hlist_safe; struct page *_tree_page, *tree_page =3D NULL; int nr =3D 0; @@ -1490,7 +1490,7 @@ static struct page *stable_node_dup(struct stable_nod= e **_stable_node_dup, return tree_page; } =20 -static struct stable_node *stable_node_dup_any(struct stable_node *stable_= node, +static struct ksm_stable_node *stable_node_dup_any(struct ksm_stable_node = *stable_node, struct rb_root *root) { if (!is_stable_node_chain(stable_node)) @@ -1517,12 +1517,12 @@ static struct stable_node *stable_node_dup_any(stru= ct stable_node *stable_node, * function and will be overwritten in all cases, the caller doesn't * need to initialize it. */ -static struct page *__stable_node_chain(struct stable_node **_stable_node_= dup, - struct stable_node **_stable_node, +static struct page *__stable_node_chain(struct ksm_stable_node **_stable_n= ode_dup, + struct ksm_stable_node **_stable_node, struct rb_root *root, bool prune_stale_stable_nodes) { - struct stable_node *stable_node =3D *_stable_node; + struct ksm_stable_node *stable_node =3D *_stable_node; if (!is_stable_node_chain(stable_node)) { if (is_page_sharing_candidate(stable_node)) { *_stable_node_dup =3D stable_node; @@ -1539,18 +1539,18 @@ static struct page *__stable_node_chain(struct stab= le_node **_stable_node_dup, prune_stale_stable_nodes); } =20 -static __always_inline struct page *chain_prune(struct stable_node **s_n_d, - struct stable_node **s_n, +static __always_inline struct page *chain_prune(struct ksm_stable_node **s= _n_d, + struct ksm_stable_node **s_n, struct rb_root *root) { return __stable_node_chain(s_n_d, s_n, root, true); } =20 -static __always_inline struct page *chain(struct stable_node **s_n_d, - struct stable_node *s_n, +static __always_inline struct page *chain(struct ksm_stable_node **s_n_d, + struct ksm_stable_node *s_n, struct rb_root *root) { - struct stable_node *old_stable_node =3D s_n; + struct ksm_stable_node *old_stable_node =3D s_n; struct page *tree_page; =20 tree_page =3D __stable_node_chain(s_n_d, &s_n, root, false); @@ -1574,8 +1574,8 @@ static struct page *stable_tree_search(struct page *p= age) struct rb_root *root; struct rb_node **new; struct rb_node *parent; - struct stable_node *stable_node, *stable_node_dup, *stable_node_any; - struct stable_node *page_node; + struct ksm_stable_node *stable_node, *stable_node_dup, *stable_node_any; + struct ksm_stable_node *page_node; =20 page_node =3D page_stable_node(page); if (page_node && page_node->head !=3D &migrate_nodes) { @@ -1595,7 +1595,7 @@ static struct page *stable_tree_search(struct page *p= age) int ret; =20 cond_resched(); - stable_node =3D rb_entry(*new, struct stable_node, node); + stable_node =3D rb_entry(*new, struct ksm_stable_node, node); stable_node_any =3D NULL; tree_page =3D chain_prune(&stable_node_dup, &stable_node, root); /* @@ -1818,14 +1818,14 @@ static struct page *stable_tree_search(struct page = *page) * This function returns the stable tree node just allocated on success, * NULL otherwise. */ -static struct stable_node *stable_tree_insert(struct page *kpage) +static struct ksm_stable_node *stable_tree_insert(struct page *kpage) { int nid; unsigned long kpfn; struct rb_root *root; struct rb_node **new; struct rb_node *parent; - struct stable_node *stable_node, *stable_node_dup, *stable_node_any; + struct ksm_stable_node *stable_node, *stable_node_dup, *stable_node_any; bool need_chain =3D false; =20 kpfn =3D page_to_pfn(kpage); @@ -1840,7 +1840,7 @@ static struct stable_node *stable_tree_insert(struct = page *kpage) int ret; =20 cond_resched(); - stable_node =3D rb_entry(*new, struct stable_node, node); + stable_node =3D rb_entry(*new, struct ksm_stable_node, node); stable_node_any =3D NULL; tree_page =3D chain(&stable_node_dup, stable_node, root); if (!stable_node_dup) { @@ -1909,7 +1909,7 @@ static struct stable_node *stable_tree_insert(struct = page *kpage) rb_insert_color(&stable_node_dup->node, root); } else { if (!is_stable_node_chain(stable_node)) { - struct stable_node *orig =3D stable_node; + struct ksm_stable_node *orig =3D stable_node; /* chain is missing so create it */ stable_node =3D alloc_stable_node_chain(orig, root); if (!stable_node) { @@ -1938,7 +1938,7 @@ static struct stable_node *stable_tree_insert(struct = page *kpage) * the same walking algorithm in an rbtree. */ static -struct rmap_item *unstable_tree_search_insert(struct rmap_item *rmap_item, +struct ksm_rmap_item *unstable_tree_search_insert(struct ksm_rmap_item *rm= ap_item, struct page *page, struct page **tree_pagep) { @@ -1952,12 +1952,12 @@ struct rmap_item *unstable_tree_search_insert(struc= t rmap_item *rmap_item, new =3D &root->rb_node; =20 while (*new) { - struct rmap_item *tree_rmap_item; + struct ksm_rmap_item *tree_rmap_item; struct page *tree_page; int ret; =20 cond_resched(); - tree_rmap_item =3D rb_entry(*new, struct rmap_item, node); + tree_rmap_item =3D rb_entry(*new, struct ksm_rmap_item, node); tree_page =3D get_mergeable_page(tree_rmap_item); if (!tree_page) return NULL; @@ -2009,8 +2009,8 @@ struct rmap_item *unstable_tree_search_insert(struct = rmap_item *rmap_item, * rmap_items hanging off a given node of the stable tree, all sharing * the same ksm page. */ -static void stable_tree_append(struct rmap_item *rmap_item, - struct stable_node *stable_node, +static void stable_tree_append(struct ksm_rmap_item *rmap_item, + struct ksm_stable_node *stable_node, bool max_page_sharing_bypass) { /* @@ -2052,12 +2052,12 @@ static void stable_tree_append(struct rmap_item *rm= ap_item, * @page: the page that we are searching identical page to. * @rmap_item: the reverse mapping into the virtual address of this page */ -static void cmp_and_merge_page(struct page *page, struct rmap_item *rmap_i= tem) +static void cmp_and_merge_page(struct page *page, struct ksm_rmap_item *rm= ap_item) { struct mm_struct *mm =3D rmap_item->mm; - struct rmap_item *tree_rmap_item; + struct ksm_rmap_item *tree_rmap_item; struct page *tree_page =3D NULL; - struct stable_node *stable_node; + struct ksm_stable_node *stable_node; struct page *kpage; unsigned int checksum; int err; @@ -2213,11 +2213,11 @@ static void cmp_and_merge_page(struct page *page, s= truct rmap_item *rmap_item) } } =20 -static struct rmap_item *get_next_rmap_item(struct mm_slot *mm_slot, - struct rmap_item **rmap_list, +static struct ksm_rmap_item *get_next_rmap_item(struct ksm_mm_slot *mm_slo= t, + struct ksm_rmap_item **rmap_list, unsigned long addr) { - struct rmap_item *rmap_item; + struct ksm_rmap_item *rmap_item; =20 while (*rmap_list) { rmap_item =3D *rmap_list; @@ -2241,12 +2241,12 @@ static struct rmap_item *get_next_rmap_item(struct = mm_slot *mm_slot, return rmap_item; } =20 -static struct rmap_item *scan_get_next_rmap_item(struct page **page) +static struct ksm_rmap_item *scan_get_next_rmap_item(struct page **page) { struct mm_struct *mm; - struct mm_slot *slot; + struct ksm_mm_slot *slot; struct vm_area_struct *vma; - struct rmap_item *rmap_item; + struct ksm_rmap_item *rmap_item; struct vma_iterator vmi; int nid; =20 @@ -2274,7 +2274,7 @@ static struct rmap_item *scan_get_next_rmap_item(stru= ct page **page) * so prune them once before each full scan. */ if (!ksm_merge_across_nodes) { - struct stable_node *stable_node, *next; + struct ksm_stable_node *stable_node, *next; struct page *page; =20 list_for_each_entry_safe(stable_node, next, @@ -2291,7 +2291,7 @@ static struct rmap_item *scan_get_next_rmap_item(stru= ct page **page) root_unstable_tree[nid] =3D RB_ROOT; =20 spin_lock(&ksm_mmlist_lock); - slot =3D list_entry(slot->mm_list.next, struct mm_slot, mm_list); + slot =3D list_entry(slot->mm_list.next, struct ksm_mm_slot, mm_list); ksm_scan.mm_slot =3D slot; spin_unlock(&ksm_mmlist_lock); /* @@ -2365,7 +2365,7 @@ static struct rmap_item *scan_get_next_rmap_item(stru= ct page **page) =20 spin_lock(&ksm_mmlist_lock); ksm_scan.mm_slot =3D list_entry(slot->mm_list.next, - struct mm_slot, mm_list); + struct ksm_mm_slot, mm_list); if (ksm_scan.address =3D=3D 0) { /* * We've completed a full scan of all vmas, holding mmap_lock @@ -2411,7 +2411,7 @@ static struct rmap_item *scan_get_next_rmap_item(stru= ct page **page) */ static void ksm_do_scan(unsigned int scan_npages) { - struct rmap_item *rmap_item; + struct ksm_rmap_item *rmap_item; struct page *page; =20 while (scan_npages-- && likely(!freezing(current))) { @@ -2515,7 +2515,7 @@ EXPORT_SYMBOL_GPL(ksm_madvise); =20 int __ksm_enter(struct mm_struct *mm) { - struct mm_slot *mm_slot; + struct ksm_mm_slot *mm_slot; int needs_wakeup; =20 mm_slot =3D alloc_mm_slot(); @@ -2554,7 +2554,7 @@ int __ksm_enter(struct mm_struct *mm) =20 void __ksm_exit(struct mm_struct *mm) { - struct mm_slot *mm_slot; + struct ksm_mm_slot *mm_slot; int easy_to_free =3D 0; =20 /* @@ -2632,8 +2632,8 @@ struct page *ksm_might_need_to_copy(struct page *page, =20 void rmap_walk_ksm(struct folio *folio, struct rmap_walk_control *rwc) { - struct stable_node *stable_node; - struct rmap_item *rmap_item; + struct ksm_stable_node *stable_node; + struct ksm_rmap_item *rmap_item; int search_new_forks =3D 0; =20 VM_BUG_ON_FOLIO(!folio_test_ksm(folio), folio); @@ -2703,7 +2703,7 @@ void rmap_walk_ksm(struct folio *folio, struct rmap_w= alk_control *rwc) #ifdef CONFIG_MIGRATION void folio_migrate_ksm(struct folio *newfolio, struct folio *folio) { - struct stable_node *stable_node; + struct ksm_stable_node *stable_node; =20 VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio); VM_BUG_ON_FOLIO(!folio_test_locked(newfolio), newfolio); @@ -2736,7 +2736,7 @@ static void wait_while_offlining(void) } } =20 -static bool stable_node_dup_remove_range(struct stable_node *stable_node, +static bool stable_node_dup_remove_range(struct ksm_stable_node *stable_no= de, unsigned long start_pfn, unsigned long end_pfn) { @@ -2752,12 +2752,12 @@ static bool stable_node_dup_remove_range(struct sta= ble_node *stable_node, return false; } =20 -static bool stable_node_chain_remove_range(struct stable_node *stable_node, +static bool stable_node_chain_remove_range(struct ksm_stable_node *stable_= node, unsigned long start_pfn, unsigned long end_pfn, struct rb_root *root) { - struct stable_node *dup; + struct ksm_stable_node *dup; struct hlist_node *hlist_safe; =20 if (!is_stable_node_chain(stable_node)) { @@ -2781,14 +2781,14 @@ static bool stable_node_chain_remove_range(struct s= table_node *stable_node, static void ksm_check_stable_tree(unsigned long start_pfn, unsigned long end_pfn) { - struct stable_node *stable_node, *next; + struct ksm_stable_node *stable_node, *next; struct rb_node *node; int nid; =20 for (nid =3D 0; nid < ksm_nr_node_ids; nid++) { node =3D rb_first(root_stable_tree + nid); while (node) { - stable_node =3D rb_entry(node, struct stable_node, node); + stable_node =3D rb_entry(node, struct ksm_stable_node, node); if (stable_node_chain_remove_range(stable_node, start_pfn, end_pfn, root_stable_tree + --=20 2.20.1 From nobody Thu Apr 9 12:41:42 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28B12ECAAA1 for ; Wed, 31 Aug 2022 03:21:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232317AbiHaDVj (ORCPT ); Tue, 30 Aug 2022 23:21:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57398 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231187AbiHaDUm (ORCPT ); Tue, 30 Aug 2022 23:20:42 -0400 Received: from mail-pl1-x634.google.com (mail-pl1-x634.google.com [IPv6:2607:f8b0:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4434854CAD for ; Tue, 30 Aug 2022 20:20:33 -0700 (PDT) Received: by mail-pl1-x634.google.com with SMTP id p18so12950711plr.8 for ; Tue, 30 Aug 2022 20:20:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=lt2/YaYHr5rJLJwkCdxmg5YZwJpd4IJKxnznGjt9X+s=; b=0N1toz3Fx8xpZdKGsdyOMDfgo8HENQJGt/GN4Dq6KrIB0nFRHfbVwHakUBxIfB83zH OD3SQlKQwLFqQAQvNMZngYz1rHGLtqFpAZnywjpkWRfnzF2m6ZfxhBWgBjoM0Sq2jASR 2Zt850BxiEaXuKGEhE7zh9U0jpehhZmWl4WJH0TouQmFDhjCHNnnunxCD0l336wDAN/M 4Iu0fhbDHOgFEcyCDlueiskgx7uw/wLlKSFo93+IbvGxNS/eJaOB4isEYA+6uS8FQ7ZZ KguwklR7PIDPotwjIN6d+bfyAY9LiYL/hnFBIa36LXV37N/N/pRWK0daTQK+777FYSRa v+eA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=lt2/YaYHr5rJLJwkCdxmg5YZwJpd4IJKxnznGjt9X+s=; b=ixOP0rOg9tAH8CUzijFsfK/1kyI6CnaQSbqGhjheu9ulQadYrynmLj8SEACLMoc0RP PZJ1o3iK4tdXt3Qb7vTko6NyUlMmTN9D+rWUFOD7lTg9sTZIir9Ik665MavJCaorITmQ ws/KVWfrpwJO9txLkmm4DFiM23D0+XCNgZ0nVC752c0tspPaTAyaavGU/xVaZgrjcChY MYHUF0Rz0mm4/8sPDKqunli09xzG0cyu4UquhBo3N6N8LokYYqpxMh1zPtHzSyeegpf6 IrLAZKSiBsFK68hSJqs3y4uZ+yCmumsQybiNmCSCnoFVnxRirIX3MZdLrIFQfotGoCwR YxZA== X-Gm-Message-State: ACgBeo3tY/stJzbsuMIjq13D70Eb1PbUJwkaRBKwgC6NtWrAwUQQcilf G3MGtUcDEJq9RDb/FXQGQ6f2DA== X-Google-Smtp-Source: AA6agR6WVNQbj0YQ9diql3Yc2i0fOPGwhWAQ0rKwIzK2ns4up9w0TNuEUbdHfL3HCAdE6u8Kh98pqA== X-Received: by 2002:a17:90b:1812:b0:1fd:d509:93e5 with SMTP id lw18-20020a17090b181200b001fdd50993e5mr1176557pjb.25.1661916032237; Tue, 30 Aug 2022 20:20:32 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([139.177.225.245]) by smtp.gmail.com with ESMTPSA id i13-20020a170902c94d00b0015e8d4eb1d5sm8633535pla.31.2022.08.30.20.20.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 20:20:31 -0700 (PDT) From: Qi Zheng To: akpm@linux-foundation.org, shy828301@gmail.com, willy@infradead.org, vbabka@suse.cz, hannes@cmpxchg.org, minchan@kernel.org, rppt@kernel.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Qi Zheng Subject: [PATCH v2 5/7] ksm: convert ksm_mm_slot.mm_list to ksm_mm_slot.mm_node Date: Wed, 31 Aug 2022 11:19:49 +0800 Message-Id: <20220831031951.43152-6-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20220831031951.43152-1-zhengqi.arch@bytedance.com> References: <20220831031951.43152-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In order to use common struct mm_slot, convert ksm_mm_slot.mm_list to ksm_mm_slot.mm_node in advance, no functional change. Signed-off-by: Qi Zheng --- mm/ksm.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/mm/ksm.c b/mm/ksm.c index 3937111f9ab8..8c52aa7e0a02 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -114,13 +114,13 @@ /** * struct ksm_mm_slot - ksm information per mm that is being scanned * @link: link to the mm_slots hash list - * @mm_list: 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 * @mm: the mm that this information is valid for */ struct ksm_mm_slot { struct hlist_node link; - struct list_head mm_list; + struct list_head mm_node; struct ksm_rmap_item *rmap_list; struct mm_struct *mm; }; @@ -231,7 +231,7 @@ static LIST_HEAD(migrate_nodes); static DEFINE_HASHTABLE(mm_slots_hash, MM_SLOTS_HASH_BITS); =20 static struct ksm_mm_slot ksm_mm_head =3D { - .mm_list =3D LIST_HEAD_INIT(ksm_mm_head.mm_list), + .mm_node =3D LIST_HEAD_INIT(ksm_mm_head.mm_node), }; static struct ksm_scan ksm_scan =3D { .mm_slot =3D &ksm_mm_head, @@ -980,8 +980,8 @@ static int unmerge_and_remove_all_rmap_items(void) int err =3D 0; =20 spin_lock(&ksm_mmlist_lock); - ksm_scan.mm_slot =3D list_entry(ksm_mm_head.mm_list.next, - struct ksm_mm_slot, mm_list); + ksm_scan.mm_slot =3D list_entry(ksm_mm_head.mm_node.next, + struct ksm_mm_slot, mm_node); spin_unlock(&ksm_mmlist_lock); =20 for (mm_slot =3D ksm_scan.mm_slot; mm_slot !=3D &ksm_mm_head; @@ -1005,11 +1005,11 @@ static int unmerge_and_remove_all_rmap_items(void) mmap_read_unlock(mm); =20 spin_lock(&ksm_mmlist_lock); - ksm_scan.mm_slot =3D list_entry(mm_slot->mm_list.next, - struct ksm_mm_slot, mm_list); + ksm_scan.mm_slot =3D list_entry(mm_slot->mm_node.next, + struct ksm_mm_slot, mm_node); if (ksm_test_exit(mm)) { hash_del(&mm_slot->link); - list_del(&mm_slot->mm_list); + list_del(&mm_slot->mm_node); spin_unlock(&ksm_mmlist_lock); =20 free_mm_slot(mm_slot); @@ -2250,7 +2250,7 @@ static struct ksm_rmap_item *scan_get_next_rmap_item(= struct page **page) struct vma_iterator vmi; int nid; =20 - if (list_empty(&ksm_mm_head.mm_list)) + if (list_empty(&ksm_mm_head.mm_node)) return NULL; =20 slot =3D ksm_scan.mm_slot; @@ -2291,7 +2291,7 @@ static struct ksm_rmap_item *scan_get_next_rmap_item(= struct page **page) root_unstable_tree[nid] =3D RB_ROOT; =20 spin_lock(&ksm_mmlist_lock); - slot =3D list_entry(slot->mm_list.next, struct ksm_mm_slot, mm_list); + slot =3D list_entry(slot->mm_node.next, struct ksm_mm_slot, mm_node); ksm_scan.mm_slot =3D slot; spin_unlock(&ksm_mmlist_lock); /* @@ -2364,8 +2364,8 @@ static struct ksm_rmap_item *scan_get_next_rmap_item(= struct page **page) remove_trailing_rmap_items(ksm_scan.rmap_list); =20 spin_lock(&ksm_mmlist_lock); - ksm_scan.mm_slot =3D list_entry(slot->mm_list.next, - struct ksm_mm_slot, mm_list); + ksm_scan.mm_slot =3D list_entry(slot->mm_node.next, + struct ksm_mm_slot, mm_node); if (ksm_scan.address =3D=3D 0) { /* * We've completed a full scan of all vmas, holding mmap_lock @@ -2377,7 +2377,7 @@ static struct ksm_rmap_item *scan_get_next_rmap_item(= struct page **page) * mmap_lock then protects against race with MADV_MERGEABLE). */ hash_del(&slot->link); - list_del(&slot->mm_list); + list_del(&slot->mm_node); spin_unlock(&ksm_mmlist_lock); =20 free_mm_slot(slot); @@ -2426,7 +2426,7 @@ static void ksm_do_scan(unsigned int scan_npages) =20 static int ksmd_should_run(void) { - return (ksm_run & KSM_RUN_MERGE) && !list_empty(&ksm_mm_head.mm_list); + return (ksm_run & KSM_RUN_MERGE) && !list_empty(&ksm_mm_head.mm_node); } =20 static int ksm_scan_thread(void *nothing) @@ -2523,7 +2523,7 @@ int __ksm_enter(struct mm_struct *mm) return -ENOMEM; =20 /* Check ksm_run too? Would need tighter locking */ - needs_wakeup =3D list_empty(&ksm_mm_head.mm_list); + needs_wakeup =3D list_empty(&ksm_mm_head.mm_node); =20 spin_lock(&ksm_mmlist_lock); insert_to_mm_slots_hash(mm, mm_slot); @@ -2538,9 +2538,9 @@ int __ksm_enter(struct mm_struct *mm) * missed: then we might as well insert at the end of the list. */ if (ksm_run & KSM_RUN_UNMERGE) - list_add_tail(&mm_slot->mm_list, &ksm_mm_head.mm_list); + list_add_tail(&mm_slot->mm_node, &ksm_mm_head.mm_node); else - list_add_tail(&mm_slot->mm_list, &ksm_scan.mm_slot->mm_list); + list_add_tail(&mm_slot->mm_node, &ksm_scan.mm_slot->mm_node); spin_unlock(&ksm_mmlist_lock); =20 set_bit(MMF_VM_MERGEABLE, &mm->flags); @@ -2571,11 +2571,11 @@ void __ksm_exit(struct mm_struct *mm) if (mm_slot && ksm_scan.mm_slot !=3D mm_slot) { if (!mm_slot->rmap_list) { hash_del(&mm_slot->link); - list_del(&mm_slot->mm_list); + list_del(&mm_slot->mm_node); easy_to_free =3D 1; } else { - list_move(&mm_slot->mm_list, - &ksm_scan.mm_slot->mm_list); + list_move(&mm_slot->mm_node, + &ksm_scan.mm_slot->mm_node); } } spin_unlock(&ksm_mmlist_lock); --=20 2.20.1 From nobody Thu Apr 9 12:41:42 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 95144ECAAA1 for ; Wed, 31 Aug 2022 03:21:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232369AbiHaDVp (ORCPT ); Tue, 30 Aug 2022 23:21:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58874 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232302AbiHaDUr (ORCPT ); Tue, 30 Aug 2022 23:20:47 -0400 Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [IPv6:2607:f8b0:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2D41E6746B for ; Tue, 30 Aug 2022 20:20:37 -0700 (PDT) Received: by mail-pf1-x436.google.com with SMTP id 145so12854862pfw.4 for ; Tue, 30 Aug 2022 20:20:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=Al2MAS+95n2CdX2+DzZ9586scn02KUFSxAEU+wkQoAw=; b=qJOddgBlJ6QYyyCedtrzab/fiepTxwXPZUhHtVCwS12VTaTT2yX+tNuPdYbeQmsqeh gw9zRMj5RXYKc9GEb4169ocwRzD/4oUrZhYjmbmTFB82XEmRLmrkBhLTtoTXAyC7lAzg yW6Y0fS9iTsdGdRgVBinWppWyPiq2TgP1O4iwdf3OebRHvSD1br7lIl/5NiYzKFGqfih GqhLkTPpGQTfogbYCVnYaN6P1YjWP1wHKb0mlleAbFlm0M5c8jIZ0FnokMggWMi3N6BZ 0t/+cmMwT22FRNiy9Tr6HB81hwBSHa63aUYbE5dXUBcesSQ5KPvH4qDL/rb4VAM4C4Ws ER9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=Al2MAS+95n2CdX2+DzZ9586scn02KUFSxAEU+wkQoAw=; b=eUuTx2mAZjk5re9STpAAXgIqLxcA81HzqPaPiEz+0e2HBZitrm0a+XACMDeugP93JB 2aOHaTDwdG2KChy+QkVyNflvmeQYMVEfHuvd5mvLV9aW+AL/uHS4zySFtCFBJ6XID0Lu a6ru7kQKymMnt1yeYiebqPuYM3h0pDW6WDequnZ2tywmHqRIJfCh6k6mgu2ETJ1DGZg4 WdyuGfGean9eYZeoOd8F1TTsvo9PxVKb+dm2A2L923mDSNnr5LUh+MXyaBcPUSvqriqL J4v2aO6hfa+g/+c8o5OuMvi28W7fQqCZVdnPvb0qpF00RhtliJMdV1DRI6dns6KqWE5h P9ww== X-Gm-Message-State: ACgBeo0jrDvqaB9NpQEE2V6gNTwx9a1HTlr+z4X1eOv/Rcg/n+GRK8tM t6dXtiEhEIyKhoVXfvhJ9WjA7Q== X-Google-Smtp-Source: AA6agR5hQijp1ihYFHuxOS7SKbB6brdOYfWD5KVgxzapCa+48fl3/7b3bZVzq1jr8Gkh0eEBAfDOyA== X-Received: by 2002:a65:5847:0:b0:42a:df5:1035 with SMTP id s7-20020a655847000000b0042a0df51035mr20339602pgr.248.1661916036655; Tue, 30 Aug 2022 20:20:36 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([139.177.225.245]) by smtp.gmail.com with ESMTPSA id i13-20020a170902c94d00b0015e8d4eb1d5sm8633535pla.31.2022.08.30.20.20.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 20:20:36 -0700 (PDT) From: Qi Zheng To: akpm@linux-foundation.org, shy828301@gmail.com, willy@infradead.org, vbabka@suse.cz, hannes@cmpxchg.org, minchan@kernel.org, rppt@kernel.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Qi Zheng Subject: [PATCH v2 6/7] ksm: convert ksm_mm_slot.link to ksm_mm_slot.hash Date: Wed, 31 Aug 2022 11:19:50 +0800 Message-Id: <20220831031951.43152-7-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20220831031951.43152-1-zhengqi.arch@bytedance.com> References: <20220831031951.43152-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In order to use common struct mm_slot, convert ksm_mm_slot.link to ksm_mm_slot.hash in advance, no functional change. Signed-off-by: Qi Zheng --- mm/ksm.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mm/ksm.c b/mm/ksm.c index 8c52aa7e0a02..667efca75b0d 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -113,13 +113,13 @@ =20 /** * 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 * @rmap_list: head for this mm_slot's singly-linked list of rmap_items * @mm: the mm that this information is valid for */ struct ksm_mm_slot { - struct hlist_node link; + struct hlist_node hash; struct list_head mm_node; struct ksm_rmap_item *rmap_list; 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; =20 - 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 =3D=3D mm) return slot; =20 @@ -435,7 +435,7 @@ static void insert_to_mm_slots_hash(struct mm_struct *m= m, struct ksm_mm_slot *mm_slot) { mm_slot->mm =3D mm; - hash_add(mm_slots_hash, &mm_slot->link, (unsigned long)mm); + hash_add(mm_slots_hash, &mm_slot->hash, (unsigned long)mm); } =20 /* @@ -1008,7 +1008,7 @@ static int unmerge_and_remove_all_rmap_items(void) ksm_scan.mm_slot =3D list_entry(mm_slot->mm_node.next, struct ksm_mm_slot, mm_node); if (ksm_test_exit(mm)) { - hash_del(&mm_slot->link); + hash_del(&mm_slot->hash); list_del(&mm_slot->mm_node); spin_unlock(&ksm_mmlist_lock); =20 @@ -2376,7 +2376,7 @@ static struct ksm_rmap_item *scan_get_next_rmap_item(= struct page **page) * or when all VM_MERGEABLE areas have been unmapped (and * mmap_lock then protects against race with MADV_MERGEABLE). */ - hash_del(&slot->link); + hash_del(&slot->hash); list_del(&slot->mm_node); spin_unlock(&ksm_mmlist_lock); =20 @@ -2570,7 +2570,7 @@ void __ksm_exit(struct mm_struct *mm) mm_slot =3D get_mm_slot(mm); if (mm_slot && ksm_scan.mm_slot !=3D mm_slot) { if (!mm_slot->rmap_list) { - hash_del(&mm_slot->link); + hash_del(&mm_slot->hash); list_del(&mm_slot->mm_node); easy_to_free =3D 1; } else { --=20 2.20.1 From nobody Thu Apr 9 12:41:42 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 39553ECAAA1 for ; Wed, 31 Aug 2022 03:21:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232269AbiHaDVx (ORCPT ); Tue, 30 Aug 2022 23:21:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60892 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232256AbiHaDUr (ORCPT ); Tue, 30 Aug 2022 23:20:47 -0400 Received: from mail-pg1-x52e.google.com (mail-pg1-x52e.google.com [IPv6:2607:f8b0:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED2C512AC1 for ; Tue, 30 Aug 2022 20:20:41 -0700 (PDT) Received: by mail-pg1-x52e.google.com with SMTP id 73so4050315pga.1 for ; Tue, 30 Aug 2022 20:20:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=EoGywsqR3Qxm0ioJNhxU6FuWToutHdJdhmaSFzdi9gE=; b=Ry5R5htbwYmzwnCheXUOYlUheFCUpd3DWn23SISDbh5FFFrNnYShP3CiKtubfjtsJA B2hlp4lxkrtzVD563WhGafC8HqfLzFH7LLQD4DE/DuYnizcNR1ESt7nAe+p5+XEV4GbE KfyDitLGDQCVgBm7xcxi6N9NPZrjLMI2tDYaXxsB8eqjeh1n9X7Cr7eUNjMNsjaN5VvK jMX1d1i8wFYZc8U2535wScxoBWqj0zkDn2bK+uVj3FVPn6m3DDJfJDnPbzwdDmFmOIXO h7E0F1hoV0kAVrGoZQ5NGNJ+lpYM55XtZ0qdQ4aPjJpO49f1xSCFKJtjamhBqoyDuaen 0zfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=EoGywsqR3Qxm0ioJNhxU6FuWToutHdJdhmaSFzdi9gE=; b=QFR0Fh+j/YXJt9SfCLV/E+gVe12WOSnRTU1zn4HTbRoo/Emt6jG/r9MlvD0Ph3YCAD yo7/2ekJuM+Iqljjs0awZMf/op5iB4ZVQjVL/Dit2gplWKI5mBqxculx9jeqhLm/shKp KxYsLIkimb+oVEkm/BdIw3vtTgtw1OqEr8yJuMXP7W6AHxaFBA1tBN+mQX36yqIeEa6o xmxAT8YQS4IG+xgNSEr0KmgpCwYiJbAPdCSDmRLJRY6xmtpwAPy/4EoBsn4Gp4H7EYcw GW2hGUP9/BjsjpeBibnCnuLDV3bHVYme9OOmtRs9Ww/iE/0IvM0LD5W2J8z39NPPGZ6v 9TTg== X-Gm-Message-State: ACgBeo1XuF6WP+iqVI0Wu4/PZ/BJWIrK36WewO308vJmTzWp2Nso4v+u 9oWnhUMD7pkdOXPIJ0wrdomauA== X-Google-Smtp-Source: AA6agR6B5Vc7odb1gh/RNIZE9Im56O0C4zoTP80UqYg7hw2yZis5IUBGN/AQraK+lkJgxuwAmdftbA== X-Received: by 2002:a63:2a49:0:b0:41d:95d8:3d3d with SMTP id q70-20020a632a49000000b0041d95d83d3dmr20305943pgq.43.1661916041243; Tue, 30 Aug 2022 20:20:41 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([139.177.225.245]) by smtp.gmail.com with ESMTPSA id i13-20020a170902c94d00b0015e8d4eb1d5sm8633535pla.31.2022.08.30.20.20.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 20:20:40 -0700 (PDT) From: Qi Zheng To: akpm@linux-foundation.org, shy828301@gmail.com, willy@infradead.org, vbabka@suse.cz, hannes@cmpxchg.org, minchan@kernel.org, rppt@kernel.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Qi Zheng Subject: [PATCH v2 7/7] ksm: convert to use common struct mm_slot Date: Wed, 31 Aug 2022 11:19:51 +0800 Message-Id: <20220831031951.43152-8-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20220831031951.43152-1-zhengqi.arch@bytedance.com> References: <20220831031951.43152-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Convert to use common struct mm_slot, no functional change. Signed-off-by: Qi Zheng --- mm/ksm.c | 132 +++++++++++++++++++++++-------------------------------- 1 file changed, 56 insertions(+), 76 deletions(-) diff --git a/mm/ksm.c b/mm/ksm.c index 667efca75b0d..d8c4819d81eb 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -42,6 +42,7 @@ =20 #include #include "internal.h" +#include "mm_slot.h" =20 #ifdef CONFIG_NUMA #define NUMA(x) (x) @@ -113,16 +114,12 @@ =20 /** * struct ksm_mm_slot - ksm information per mm that is being scanned - * @hash: link to the mm_slots hash list - * @mm_node: link into the mm_slots list, rooted in ksm_mm_head + * @slot: hash lookup from mm to mm_slot * @rmap_list: head for this mm_slot's singly-linked list of rmap_items - * @mm: the mm that this information is valid for */ struct ksm_mm_slot { - struct hlist_node hash; - struct list_head mm_node; + struct mm_slot slot; struct ksm_rmap_item *rmap_list; - struct mm_struct *mm; }; =20 /** @@ -231,7 +228,7 @@ static LIST_HEAD(migrate_nodes); static DEFINE_HASHTABLE(mm_slots_hash, MM_SLOTS_HASH_BITS); =20 static struct ksm_mm_slot ksm_mm_head =3D { - .mm_node =3D LIST_HEAD_INIT(ksm_mm_head.mm_node), + .slot.mm_node =3D LIST_HEAD_INIT(ksm_mm_head.slot.mm_node), }; static struct ksm_scan ksm_scan =3D { .mm_slot =3D &ksm_mm_head, @@ -408,36 +405,6 @@ static inline void free_stable_node(struct ksm_stable_= node *stable_node) kmem_cache_free(stable_node_cache, stable_node); } =20 -static inline struct ksm_mm_slot *alloc_mm_slot(void) -{ - if (!mm_slot_cache) /* initialization failed */ - return NULL; - return kmem_cache_zalloc(mm_slot_cache, GFP_KERNEL); -} - -static inline void free_mm_slot(struct ksm_mm_slot *mm_slot) -{ - kmem_cache_free(mm_slot_cache, mm_slot); -} - -static struct ksm_mm_slot *get_mm_slot(struct mm_struct *mm) -{ - struct ksm_mm_slot *slot; - - hash_for_each_possible(mm_slots_hash, slot, hash, (unsigned long)mm) - if (slot->mm =3D=3D mm) - return slot; - - return NULL; -} - -static void insert_to_mm_slots_hash(struct mm_struct *mm, - struct ksm_mm_slot *mm_slot) -{ - mm_slot->mm =3D mm; - hash_add(mm_slots_hash, &mm_slot->hash, (unsigned long)mm); -} - /* * ksmd, and unmerge_and_remove_all_rmap_items(), must not touch an mm's * page tables after it has passed through ksm_exit() - which, if necessar= y, @@ -975,20 +942,22 @@ static int remove_all_stable_nodes(void) static int unmerge_and_remove_all_rmap_items(void) { struct ksm_mm_slot *mm_slot; + struct mm_slot *slot; struct mm_struct *mm; struct vm_area_struct *vma; int err =3D 0; =20 spin_lock(&ksm_mmlist_lock); - ksm_scan.mm_slot =3D list_entry(ksm_mm_head.mm_node.next, - struct ksm_mm_slot, mm_node); + slot =3D list_entry(ksm_mm_head.slot.mm_node.next, + struct mm_slot, mm_node); + ksm_scan.mm_slot =3D mm_slot_entry(slot, struct ksm_mm_slot, slot); spin_unlock(&ksm_mmlist_lock); =20 for (mm_slot =3D ksm_scan.mm_slot; mm_slot !=3D &ksm_mm_head; mm_slot =3D ksm_scan.mm_slot) { - VMA_ITERATOR(vmi, mm_slot->mm, 0); + VMA_ITERATOR(vmi, mm_slot->slot.mm, 0); =20 - mm =3D mm_slot->mm; + mm =3D mm_slot->slot.mm; mmap_read_lock(mm); for_each_vma(vmi, vma) { if (ksm_test_exit(mm)) @@ -1005,14 +974,15 @@ static int unmerge_and_remove_all_rmap_items(void) mmap_read_unlock(mm); =20 spin_lock(&ksm_mmlist_lock); - ksm_scan.mm_slot =3D list_entry(mm_slot->mm_node.next, - struct ksm_mm_slot, mm_node); + slot =3D list_entry(mm_slot->slot.mm_node.next, + struct mm_slot, mm_node); + ksm_scan.mm_slot =3D mm_slot_entry(slot, struct ksm_mm_slot, slot); if (ksm_test_exit(mm)) { - hash_del(&mm_slot->hash); - list_del(&mm_slot->mm_node); + hash_del(&mm_slot->slot.hash); + list_del(&mm_slot->slot.mm_node); spin_unlock(&ksm_mmlist_lock); =20 - free_mm_slot(mm_slot); + mm_slot_free(mm_slot_cache, mm_slot); clear_bit(MMF_VM_MERGEABLE, &mm->flags); mmdrop(mm); } else @@ -2233,7 +2203,7 @@ static struct ksm_rmap_item *get_next_rmap_item(struc= t ksm_mm_slot *mm_slot, rmap_item =3D alloc_rmap_item(); if (rmap_item) { /* It has already been zeroed */ - rmap_item->mm =3D mm_slot->mm; + rmap_item->mm =3D mm_slot->slot.mm; rmap_item->address =3D addr; rmap_item->rmap_list =3D *rmap_list; *rmap_list =3D rmap_item; @@ -2244,17 +2214,18 @@ static struct ksm_rmap_item *get_next_rmap_item(str= uct ksm_mm_slot *mm_slot, static struct ksm_rmap_item *scan_get_next_rmap_item(struct page **page) { struct mm_struct *mm; - struct ksm_mm_slot *slot; + struct ksm_mm_slot *mm_slot; + struct mm_slot *slot; struct vm_area_struct *vma; struct ksm_rmap_item *rmap_item; struct vma_iterator vmi; int nid; =20 - if (list_empty(&ksm_mm_head.mm_node)) + if (list_empty(&ksm_mm_head.slot.mm_node)) return NULL; =20 - slot =3D ksm_scan.mm_slot; - if (slot =3D=3D &ksm_mm_head) { + mm_slot =3D ksm_scan.mm_slot; + if (mm_slot =3D=3D &ksm_mm_head) { /* * A number of pages can hang around indefinitely on per-cpu * pagevecs, raised page count preventing write_protect_page @@ -2291,20 +2262,23 @@ static struct ksm_rmap_item *scan_get_next_rmap_ite= m(struct page **page) root_unstable_tree[nid] =3D RB_ROOT; =20 spin_lock(&ksm_mmlist_lock); - slot =3D list_entry(slot->mm_node.next, struct ksm_mm_slot, mm_node); - ksm_scan.mm_slot =3D slot; + slot =3D list_entry(mm_slot->slot.mm_node.next, + struct mm_slot, mm_node); + mm_slot =3D mm_slot_entry(slot, struct ksm_mm_slot, slot); + ksm_scan.mm_slot =3D mm_slot; spin_unlock(&ksm_mmlist_lock); /* * Although we tested list_empty() above, a racing __ksm_exit * of the last mm on the list may have removed it since then. */ - if (slot =3D=3D &ksm_mm_head) + if (mm_slot =3D=3D &ksm_mm_head) return NULL; next_mm: ksm_scan.address =3D 0; - ksm_scan.rmap_list =3D &slot->rmap_list; + ksm_scan.rmap_list =3D &mm_slot->rmap_list; } =20 + slot =3D &mm_slot->slot; mm =3D slot->mm; vma_iter_init(&vmi, mm, ksm_scan.address); =20 @@ -2334,7 +2308,7 @@ static struct ksm_rmap_item *scan_get_next_rmap_item(= struct page **page) if (PageAnon(*page)) { flush_anon_page(vma, *page, ksm_scan.address); flush_dcache_page(*page); - rmap_item =3D get_next_rmap_item(slot, + rmap_item =3D get_next_rmap_item(mm_slot, ksm_scan.rmap_list, ksm_scan.address); if (rmap_item) { ksm_scan.rmap_list =3D @@ -2355,7 +2329,7 @@ static struct ksm_rmap_item *scan_get_next_rmap_item(= struct page **page) if (ksm_test_exit(mm)) { no_vmas: ksm_scan.address =3D 0; - ksm_scan.rmap_list =3D &slot->rmap_list; + ksm_scan.rmap_list =3D &mm_slot->rmap_list; } /* * Nuke all the rmap_items that are above this current rmap: @@ -2364,8 +2338,9 @@ static struct ksm_rmap_item *scan_get_next_rmap_item(= struct page **page) remove_trailing_rmap_items(ksm_scan.rmap_list); =20 spin_lock(&ksm_mmlist_lock); - ksm_scan.mm_slot =3D list_entry(slot->mm_node.next, - struct ksm_mm_slot, mm_node); + slot =3D list_entry(mm_slot->slot.mm_node.next, + struct mm_slot, mm_node); + ksm_scan.mm_slot =3D mm_slot_entry(slot, struct ksm_mm_slot, slot); if (ksm_scan.address =3D=3D 0) { /* * We've completed a full scan of all vmas, holding mmap_lock @@ -2376,11 +2351,11 @@ static struct ksm_rmap_item *scan_get_next_rmap_ite= m(struct page **page) * or when all VM_MERGEABLE areas have been unmapped (and * mmap_lock then protects against race with MADV_MERGEABLE). */ - hash_del(&slot->hash); - list_del(&slot->mm_node); + hash_del(&mm_slot->slot.hash); + list_del(&mm_slot->slot.mm_node); spin_unlock(&ksm_mmlist_lock); =20 - free_mm_slot(slot); + mm_slot_free(mm_slot_cache, mm_slot); clear_bit(MMF_VM_MERGEABLE, &mm->flags); mmap_read_unlock(mm); mmdrop(mm); @@ -2397,8 +2372,8 @@ static struct ksm_rmap_item *scan_get_next_rmap_item(= struct page **page) } =20 /* Repeat until we've completed scanning the whole list */ - slot =3D ksm_scan.mm_slot; - if (slot !=3D &ksm_mm_head) + mm_slot =3D ksm_scan.mm_slot; + if (mm_slot !=3D &ksm_mm_head) goto next_mm; =20 ksm_scan.seqnr++; @@ -2426,7 +2401,7 @@ static void ksm_do_scan(unsigned int scan_npages) =20 static int ksmd_should_run(void) { - return (ksm_run & KSM_RUN_MERGE) && !list_empty(&ksm_mm_head.mm_node); + return (ksm_run & KSM_RUN_MERGE) && !list_empty(&ksm_mm_head.slot.mm_node= ); } =20 static int ksm_scan_thread(void *nothing) @@ -2516,17 +2491,20 @@ EXPORT_SYMBOL_GPL(ksm_madvise); int __ksm_enter(struct mm_struct *mm) { struct ksm_mm_slot *mm_slot; + struct mm_slot *slot; int needs_wakeup; =20 - mm_slot =3D alloc_mm_slot(); + mm_slot =3D mm_slot_alloc(mm_slot_cache); if (!mm_slot) return -ENOMEM; =20 + slot =3D &mm_slot->slot; + /* Check ksm_run too? Would need tighter locking */ - needs_wakeup =3D list_empty(&ksm_mm_head.mm_node); + needs_wakeup =3D list_empty(&ksm_mm_head.slot.mm_node); =20 spin_lock(&ksm_mmlist_lock); - insert_to_mm_slots_hash(mm, mm_slot); + mm_slot_insert(mm_slots_hash, mm, slot); /* * When KSM_RUN_MERGE (or KSM_RUN_STOP), * insert just behind the scanning cursor, to let the area settle @@ -2538,9 +2516,9 @@ int __ksm_enter(struct mm_struct *mm) * missed: then we might as well insert at the end of the list. */ if (ksm_run & KSM_RUN_UNMERGE) - list_add_tail(&mm_slot->mm_node, &ksm_mm_head.mm_node); + list_add_tail(&slot->mm_node, &ksm_mm_head.slot.mm_node); else - list_add_tail(&mm_slot->mm_node, &ksm_scan.mm_slot->mm_node); + list_add_tail(&slot->mm_node, &ksm_scan.mm_slot->slot.mm_node); spin_unlock(&ksm_mmlist_lock); =20 set_bit(MMF_VM_MERGEABLE, &mm->flags); @@ -2555,6 +2533,7 @@ int __ksm_enter(struct mm_struct *mm) void __ksm_exit(struct mm_struct *mm) { struct ksm_mm_slot *mm_slot; + struct mm_slot *slot; int easy_to_free =3D 0; =20 /* @@ -2567,21 +2546,22 @@ void __ksm_exit(struct mm_struct *mm) */ =20 spin_lock(&ksm_mmlist_lock); - mm_slot =3D get_mm_slot(mm); + slot =3D mm_slot_lookup(mm_slots_hash, mm); + mm_slot =3D mm_slot_entry(slot, struct ksm_mm_slot, slot); if (mm_slot && ksm_scan.mm_slot !=3D mm_slot) { if (!mm_slot->rmap_list) { - hash_del(&mm_slot->hash); - list_del(&mm_slot->mm_node); + hash_del(&slot->hash); + list_del(&slot->mm_node); easy_to_free =3D 1; } else { - list_move(&mm_slot->mm_node, - &ksm_scan.mm_slot->mm_node); + list_move(&slot->mm_node, + &ksm_scan.mm_slot->slot.mm_node); } } spin_unlock(&ksm_mmlist_lock); =20 if (easy_to_free) { - free_mm_slot(mm_slot); + mm_slot_free(mm_slot_cache, mm_slot); clear_bit(MMF_VM_MERGEABLE, &mm->flags); mmdrop(mm); } else if (mm_slot) { --=20 2.20.1