From patchwork Sun Apr 28 10:06:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: alexs@kernel.org X-Patchwork-Id: 13645974 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2EAA4C4345F for ; Sun, 28 Apr 2024 10:03:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 635216B007B; Sun, 28 Apr 2024 06:03:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5E5186B0083; Sun, 28 Apr 2024 06:03:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4D3A16B0085; Sun, 28 Apr 2024 06:03:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 30A646B007B for ; Sun, 28 Apr 2024 06:03:10 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id C7F55C0DEE for ; Sun, 28 Apr 2024 10:03:09 +0000 (UTC) X-FDA: 82058502498.21.58E80A3 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf13.hostedemail.com (Postfix) with ESMTP id 249AD20020 for ; Sun, 28 Apr 2024 10:03:07 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=qHZpaHQw; spf=pass (imf13.hostedemail.com: domain of alexs@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=alexs@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1714298588; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=L/6asvpQHQObk8gQ+S6dZg1fuwSibuGKhGx5iJPkUOE=; b=e1RQbHwlCYCQQc+BGN8r8TgQ+RXB1QKjzZhYSm17PQ4DyhgsSpIEk9AzbI2fLxjhhPvEIw uE+ZP0sjZiSb4CCt9Ze+Gt2NhR2UgBJUIWL8YjXqr1v8FIsUuTRJ/w8c+yEFN6Ooce5IBQ jmpSfCNHt+xGfh7FoXJo+eqrMDCXUFs= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=qHZpaHQw; spf=pass (imf13.hostedemail.com: domain of alexs@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=alexs@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714298588; a=rsa-sha256; cv=none; b=NTVxNnqpTTjg5aRABu6lXJPKR6RhP2mDJTg/+XhCgPXFHwWv54dyEMOv5+8XrodJ8eBFTL uTjNQ0dHlAxg07xzlUR7sQhJ4kpKO3xqmRkLgN3Uk7gMWTvLdNnYJbfP8ixEeN5rMUqs2V VdCeBgnAIAr6/o/bhXJFYcfCmxMcWS4= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 0849560A69; Sun, 28 Apr 2024 10:03:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 853CFC113CC; Sun, 28 Apr 2024 10:03:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1714298586; bh=6NaeJS6g/wwJcO+tv0UtdUMqIwpCmkMz82u9EWAXHVM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qHZpaHQw0NiprNOe28G7se+SVJiyPdlJhU8CWRJ2a4QNmIC/hl3c+5CHxEpr5DPsy IZj2AB4522Pf8x6xc4qTo49zUnsbWUAFKEp/EuP5FLntwsfwt2cNsfuNKHOAW3Bfdy C10rwXQTGeCtu/Y5WTkoo5e5iHLgnmGk5ccK/az25EZQK0Y6lc2eXXOGQivBvfe4Ph fVIP8CvUqtTo/RPZV07iQw08sF+mr471F1fuwmFRwfRGTlojYDAs9KVkK+c7VKc6yX CayzVw1bnbhu9cS0jjTBVL3xT16C1Pm5HrB/yBiGAbL5wXlz9NW5saTbpoTVhGHX9Y doazHpmYqihTQ== From: alexs@kernel.org To: Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, willy@infradead.org, izik.eidus@ravellosystems.com Cc: "Alex Shi (tencent)" , David Hildenbrand Subject: [PATCH 3/4] mm/ksm: rename mm_slot_cache to ksm_slot_cache Date: Sun, 28 Apr 2024 18:06:17 +0800 Message-ID: <20240428100619.3332036-3-alexs@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240428100619.3332036-1-alexs@kernel.org> References: <20240428100619.3332036-1-alexs@kernel.org> MIME-Version: 1.0 X-Stat-Signature: dd1fyi1cqn94ceumo68qxc4r8efbtqbz X-Rspamd-Queue-Id: 249AD20020 X-Rspamd-Server: rspam10 X-Rspam-User: X-HE-Tag: 1714298587-165976 X-HE-Meta: U2FsdGVkX18FCdeo2s73TSOdYBSohzSkNvWdZe4/aMbKxOZ+gYgg04w8l8M3ffkNhU1b6Ddturtru1wQFTqBYFLfV8RgFug6p/35SzJPB9gj34j8LkVQpa8wt4wsVZKzIG7WSgJdX5d3yc571lNXqh8mm0b9b3FJJI5+84U7hOliOWrWVOVaYDXUJNZHBwjiB4S6+tJOWAMT4BPf84AGGAiiEbwqWw4iXQbju8/e4mPkP0Sd85509Ut7ar6fpycgiOqP402WxM7rSPbHhHeTcRqFAvv2U26/TMHc3RyPA4eJuVTJZkCv/bON7wuElpJIJjw4/9bRZlWNFtT0KYJQmosGqliMgZdw2aQNqq2qNIqL3vs1NHQ2iD7x0uh/v9zySX/De5HUe98EszfFddsniYbIcXQIQrtFdXuZ891XK8QW/HOzYKzzXt0ZX+9DaRDwG8SbHa7Jc8A8+pf/L1jSFffdJZC2zhsDP2blVl7GQ+S5IkEFYFVhj7ZjhGsuY/9m+3SFDvn1BeXe1yIwh0kfrvPV2zNPmYle9MyJqpP7p/oblT/MY55H1OlsHBNtfiT151+Nli3FnV8t9oC0zZgmC0MqcQCpXQf47i96e1LBXqkJ6gvWJ4WMSJcZMwFIzY4AOAC2Tq/rsnlqfVjIxRvqYRdt4HgO6FvWZpEfB+hYQSK8TQKcrFlK4j/RM1/retvXLfj9+9MoXJmH+kijLqhtkp/5j5kgNtE8ZXLGhKbUKKuQkA0GQnPmkYWxz21ZUnkLAtNKoRVyaFnl+iTCxDDrbw73Sz0uF1Q2GdQzKiGorQmdGKeLGxHZKTzAc20u9SPTajKk9DGkVLSwauWQ2vlE0OWy8OKivIvUbs9QPcIBLlsB3HNQloNplX+uoWMu0dW8IXDtZtbPVUEX0Q5Kq5XP9KgMpZY41NTLrXsoh9gWfvh7G52KBvoEwPx8H3T5Wo8JD/7dN1TGJ+O5u7sUgca TROqbpGM JODXXolv/fVuan6RGHdiwmqItzAT/MpSHK+5lSSKlnsFgCFNzpoetLsLjZELemDysW5xYNZhZBTidXo+q3lOfCc5ltS9gxB7ZZ53G7RgA/VvJO822DiDnHMHmEoufQxNCEkNLw5SXR9zyFrVqhFqecfI6B5/vZt/FvD6GT92Ro0ODqMCk6C3KQJqD/TGGs16a8NJsUwC2miOkc3aM4TaYGVxzlglNhX57rOnT7fe5Zs9E+7Fj6OiD0tNKFQlNK0+D3z6LUQYFrmYAZKBsWxQfFfBVDOFVJ1rHBaBWFFzWHK6cgx2+paimgIcu1Q== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: "Alex Shi (tencent)" To distinguish ksm_mm_slot and mm_slot for better code readability, rename mm_slot_cache as ksm_slot_cache. No function change. Signed-off-by: Alex Shi (tencent) Cc: David Hildenbrand --- mm/ksm.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mm/ksm.c b/mm/ksm.c index 6efa33c48381..22d2132f83a4 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -247,7 +247,7 @@ static struct ksm_scan ksm_scan = { static struct kmem_cache *rmap_item_cache; static struct kmem_cache *stable_node_cache; -static struct kmem_cache *mm_slot_cache; +static struct kmem_cache *ksm_slot_cache; /* Default number of pages to scan per batch */ #define DEFAULT_PAGES_TO_SCAN 100 @@ -502,8 +502,8 @@ static int __init ksm_slab_init(void) if (!stable_node_cache) goto out_free1; - mm_slot_cache = KSM_KMEM_CACHE(ksm_mm_slot, 0); - if (!mm_slot_cache) + ksm_slot_cache = KSM_KMEM_CACHE(ksm_mm_slot, 0); + if (!ksm_slot_cache) goto out_free2; return 0; @@ -518,10 +518,10 @@ static int __init ksm_slab_init(void) static void __init ksm_slab_free(void) { - kmem_cache_destroy(mm_slot_cache); + kmem_cache_destroy(ksm_slot_cache); kmem_cache_destroy(stable_node_cache); kmem_cache_destroy(rmap_item_cache); - mm_slot_cache = NULL; + ksm_slot_cache = NULL; } static __always_inline bool is_stable_node_chain(struct ksm_stable_node *chain) @@ -1244,7 +1244,7 @@ static int unmerge_and_remove_all_rmap_items(void) list_del(&ksm_slot->slot.mm_node); spin_unlock(&ksm_mmlist_lock); - mm_slot_free(mm_slot_cache, ksm_slot); + mm_slot_free(ksm_slot_cache, ksm_slot); clear_bit(MMF_VM_MERGEABLE, &mm->flags); clear_bit(MMF_VM_MERGE_ANY, &mm->flags); mmdrop(mm); @@ -2713,7 +2713,7 @@ static struct ksm_rmap_item *scan_get_next_rmap_item(struct page **page) list_del(&ksm_slot->slot.mm_node); spin_unlock(&ksm_mmlist_lock); - mm_slot_free(mm_slot_cache, ksm_slot); + mm_slot_free(ksm_slot_cache, ksm_slot); clear_bit(MMF_VM_MERGEABLE, &mm->flags); clear_bit(MMF_VM_MERGE_ANY, &mm->flags); mmap_read_unlock(mm); @@ -2972,7 +2972,7 @@ int __ksm_enter(struct mm_struct *mm) struct mm_slot *slot; int needs_wakeup; - ksm_slot = mm_slot_alloc(mm_slot_cache); + ksm_slot = mm_slot_alloc(ksm_slot_cache); if (!ksm_slot) return -ENOMEM; @@ -3040,7 +3040,7 @@ void __ksm_exit(struct mm_struct *mm) spin_unlock(&ksm_mmlist_lock); if (easy_to_free) { - mm_slot_free(mm_slot_cache, ksm_slot); + mm_slot_free(ksm_slot_cache, ksm_slot); clear_bit(MMF_VM_MERGE_ANY, &mm->flags); clear_bit(MMF_VM_MERGEABLE, &mm->flags); mmdrop(mm);