From patchwork Mon Sep 11 09:44:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 13379055 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 2C78FEE57DF for ; Mon, 11 Sep 2023 09:45:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C6AB16B0198; Mon, 11 Sep 2023 05:45:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C1AF56B0199; Mon, 11 Sep 2023 05:45:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ABBBD6B019A; Mon, 11 Sep 2023 05:45:17 -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 97DA76B0198 for ; Mon, 11 Sep 2023 05:45:17 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 6CEEB14091A for ; Mon, 11 Sep 2023 09:45:17 +0000 (UTC) X-FDA: 81223833474.13.1032B4A Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by imf26.hostedemail.com (Postfix) with ESMTP id 91A4D140019 for ; Mon, 11 Sep 2023 09:45:15 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=SvirpOO0; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf26.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.210.173 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1694425515; 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=ORW0XZa1kdIcIaxWvFs44fwaNLWoHRo/PB9DFB9bcwM=; b=dfoiNir2yGP84Cn97YNpB+re3Php+n4/oiNUa8xKT31mxVgEvLRbsHs9eqIBMX/PeicHVH 2mmjCVsCnhyzskex+DNoBs7+UKI2agUWcQ7ocrolBr6jvDVdaN9u31piy8g5vcgnxA+b0H hFOhaUJE6FMvAwlkHFexJv2VccAAFCg= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=SvirpOO0; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf26.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.210.173 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1694425515; a=rsa-sha256; cv=none; b=WdaV2UzZ7SlKzcnGDZE3OCIqThtBFeuDaZc0hRN8LcFXTBS5futcGOEDoAoSLNtOs2MsLd wnO9g7vwezSxE8U8NpkOYzn/5o6qxP3BVzn/+98Ustu7Z+yOxi58ONyxIwhetKPW0hwRxX LlRcJCfqIaJwgkMd82gmNBp3waH/ZrQ= Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-68cc1b70e05so1080911b3a.1 for ; Mon, 11 Sep 2023 02:45:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1694425514; x=1695030314; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ORW0XZa1kdIcIaxWvFs44fwaNLWoHRo/PB9DFB9bcwM=; b=SvirpOO0XaTgPOFtnxAGrJPG/klkgx4V9SWV+DbmOwbjn9wnJ4yDA+XbhmHNgxBTky uO3Jx/McMKbzzsTmmO/2I87lbtRCYm4aI7D4Q888p2/gZrWUHMjtggRsQq5H/yVgaws3 SpvegXS1eOfuEYL7cOOJ57tJ0UY0O7kkFvkXF3NUsuo+uOtVqguJ5y+VAwX6xeUtTk05 x34OW0+5SeJKSfnoFaccSBjqRUo4rIZvVhJ3mnHXcljpqRXErg2tKi+xal7kuFfY/8dp ycfBUggTVIRRt8erOp6ncnZTe1lybintF941cvYZLsLkdkI6qu7ecV+1NOyoupELY5NR zevg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694425514; x=1695030314; 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:message-id:reply-to; bh=ORW0XZa1kdIcIaxWvFs44fwaNLWoHRo/PB9DFB9bcwM=; b=AnfHt4fcoA0cJec/excOYbCLQrBuDLv70aYhUo5yheB6dsSdhGB3anTfMhEsxHiIF2 NnUPTDq+cH7ey92u7N1M8PAx89fyVyAS9JMd7tiwmLaVcp+eVGIpwoE7EpnUkcow3Zg6 +EHbdBIG/YbSAIIjTGxMXmqKA0O/UU1TUk7pkpGCoQqIIt5Rym0Hr64xDJ6cCOme8HlX n3NKREgEEa9UUkULNX0/S6pimEYYXpY1uk/mb7GRBSFCek01j2z/Qp6EIH3A2i94Snpy 5tKlwW/2qe92fSh/xiEy7SgpDkLkRG+NedQVGlZUSOXQ4GmNsYpx4Tz6pVu9J4+ut7ZQ UHWg== X-Gm-Message-State: AOJu0YzcH5WH1PgYZh4RvOBQSJLM1AJ+rGZEi+kcNpmo2s2mWGFRRYzB gYLBj9enOTLt8UQ1hSXzATYLsQ== X-Google-Smtp-Source: AGHT+IGWvi6MsHJLwd4gCfiQXvrOfPsJ8uQybdIBEiKfHwB8vL0KtWY2tJHiN25CKbq01B6PFU+waw== X-Received: by 2002:a05:6a20:3d24:b0:133:6e3d:68cd with SMTP id y36-20020a056a203d2400b001336e3d68cdmr12844869pzi.3.1694425514413; Mon, 11 Sep 2023 02:45:14 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([203.208.167.146]) by smtp.gmail.com with ESMTPSA id az7-20020a170902a58700b001bdc2fdcf7esm5988188plb.129.2023.09.11.02.45.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Sep 2023 02:45:14 -0700 (PDT) From: Qi Zheng To: akpm@linux-foundation.org, david@fromorbit.com, tkhai@ya.ru, vbabka@suse.cz, roman.gushchin@linux.dev, djwong@kernel.org, brauner@kernel.org, paulmck@kernel.org, tytso@mit.edu, steven.price@arm.com, cel@kernel.org, senozhatsky@chromium.org, yujie.liu@intel.com, gregkh@linuxfoundation.org, muchun.song@linux.dev Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, Qi Zheng Subject: [PATCH v6 01/45] mm: shrinker: add infrastructure for dynamically allocating shrinker Date: Mon, 11 Sep 2023 17:44:00 +0800 Message-Id: <20230911094444.68966-2-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20230911094444.68966-1-zhengqi.arch@bytedance.com> References: <20230911094444.68966-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: z885583a5mu5mxzwgmenc67oc9n5pu49 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 91A4D140019 X-HE-Tag: 1694425515-143357 X-HE-Meta: U2FsdGVkX18GZNnh0GzQuoM7rIsDZXJs+Bzs4tQmugVzF2u1m8dFOu9nWswRX533X0EyTBPQMNzYYd09E6mtuS6/M7nuZ/1uNRXHlUakW4tFHDbnK+ChcBSHB5Wr0cQoQ64ZHgjYzqfPUE6V1iqFUA5/RCkOLnJZZ/sBqFiiZ+HLXHJMGFXMN/kQHb538h8SSu0nJbVLb5ELiT5zooXgPzY7G/XHSlqo2TDclrnFDkhLAI7aS8SxeuinRJclSJ7K3CnizHzYFpMjcYwlMqd2bl5tG3osKfnTcw2IExVfuc4ot/9fJZ7EtMDQhXDhDJzOVlhraStHaj+uiwbF/jnexha+CGO7YWsFTvWw9tnASgaYEwWYmRBE6Qw/+YcqMANzjwf0P4DMI5mw0t8GCeeQDt7iA3gC46bp1CnE6u1sYegpGMJEJVLReQeZ/lMZ6B5KXNLoOCEnAtXvRZdIWqWJjdpkilsMJdxKDrrbYCwxyBtSxXQYOHpjw/8k7jNmcKUISIlshmdWtFMmy2g1lsnj2I6CB8xhnlK+NoPlzmcH6yfqC2BCFMn/3IsRtIV6TDbZqmNEyyWHwuOuBOltWdAS+WqCvHL286cqTfWu8SK4VtKYo25inxck4ker7tYHkz/c5M2Sw17hey4n37k9LQehBOLBOGMDZvhU57m+ws6vq4fKtcK9GyIxeSkVcWySzdrafrjz5pgHswN1wv/y4nl5WipcJu3H153eUtxpI6zLK6gJk587GZrZ5fkcI9u+crBO1ljmYs3tF5m3dDp+yI1SwgMGi7pC9QFLm4UMZfhndnWPub+K8+9hqtkaHLEQmCyiS4CSCB7ss1oHuloJWYHFakk/nYR+SCe7InWV0BlvXwwa7haWDStHzb5Xosb78PBLEHzM+exaK5p8qnWqkV6cU5VT2WS46ydh37XoJ1sVjK0BbqfvVmCtb5HvucTKxkCitA9619gJgPvb0BilYeZ ehIMV6iD H/WAYsM42CtpSD+7zDwgr8hg4Cf06oHMb4pwDiiyAdCNKG8+pYaGBFBAqgowtxKF3GRnLvL0i3eJMhNQIQ1Wrvt1o64UEB4EyDyxvoRqJEh5aV6ntAA32PwdXTJ6N0flFFxQN4Q+D7ttn4DyKSoN67itp2eP+whDnxlm59B2jwtKsWc92kaLh3sa5qJZf7K2+T5ejqXcOOUBV5PZjPkMktyXJfQSu3vJA8+P+mBqJBOi3zzP8r1U4YMo17jM6gfkyBIh/vcrO63zYnKOxBIGsBPrdD40J+/swOS0X9ifgskh1h/WwoUcF7SZdF7IRLPvCMFPbM6lLl3q62A7LOB064whXl4TyhM1OvxC61HEpQymWViVntZ9hvUd4cb04fH/xhxPo5Iqx3q41fgbCvshGSgdv/nSFCQ5X5mzo 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: Currently, the shrinker instances can be divided into the following three types: a) global shrinker instance statically defined in the kernel, such as workingset_shadow_shrinker. b) global shrinker instance statically defined in the kernel modules, such as mmu_shrinker in x86. c) shrinker instance embedded in other structures. For case a, the memory of shrinker instance is never freed. For case b, the memory of shrinker instance will be freed after synchronize_rcu() when the module is unloaded. For case c, the memory of shrinker instance will be freed along with the structure it is embedded in. In preparation for implementing lockless slab shrink, we need to dynamically allocate those shrinker instances in case c, then the memory can be dynamically freed alone by calling kfree_rcu(). So this commit adds the following new APIs for dynamically allocating shrinker, and add a private_data field to struct shrinker to record and get the original embedded structure. 1. shrinker_alloc() Used to allocate shrinker instance itself and related memory, it will return a pointer to the shrinker instance on success and NULL on failure. 2. shrinker_register() Used to register the shrinker instance, which is same as the current register_shrinker_prepared(). 3. shrinker_free() Used to unregister (if needed) and free the shrinker instance. In order to simplify shrinker-related APIs and make shrinker more independent of other kernel mechanisms, subsequent submissions will use the above API to convert all shrinkers (including case a and b) to dynamically allocated, and then remove all existing APIs. This will also have another advantage mentioned by Dave Chinner: ``` The other advantage of this is that it will break all the existing out of tree code and third party modules using the old API and will no longer work with a kernel using lockless slab shrinkers. They need to break (both at the source and binary levels) to stop bad things from happening due to using unconverted shrinkers in the new setup. ``` Signed-off-by: Qi Zheng Signed-off-by: Qi Zheng Reviewed-by: Muchun Song --- include/linux/shrinker.h | 7 +++ mm/internal.h | 11 +++++ mm/shrinker.c | 102 +++++++++++++++++++++++++++++++++++++++ mm/shrinker_debug.c | 17 ++++++- 4 files changed, 135 insertions(+), 2 deletions(-) diff --git a/include/linux/shrinker.h b/include/linux/shrinker.h index 6b5843c3b827..3f3fd9974ce5 100644 --- a/include/linux/shrinker.h +++ b/include/linux/shrinker.h @@ -70,6 +70,8 @@ struct shrinker { int seeks; /* seeks to recreate an obj */ unsigned flags; + void *private_data; + /* These are for internal use */ struct list_head list; #ifdef CONFIG_MEMCG @@ -95,6 +97,11 @@ struct shrinker { * non-MEMCG_AWARE shrinker should not have this flag set. */ #define SHRINKER_NONSLAB (1 << 3) +#define SHRINKER_ALLOCATED (1 << 4) + +struct shrinker *shrinker_alloc(unsigned int flags, const char *fmt, ...); +void shrinker_register(struct shrinker *shrinker); +void shrinker_free(struct shrinker *shrinker); extern int __printf(2, 3) prealloc_shrinker(struct shrinker *shrinker, const char *fmt, ...); diff --git a/mm/internal.h b/mm/internal.h index 0471d6326d01..5587cae20ebf 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1161,6 +1161,9 @@ unsigned long shrink_slab(gfp_t gfp_mask, int nid, struct mem_cgroup *memcg, #ifdef CONFIG_SHRINKER_DEBUG extern int shrinker_debugfs_add(struct shrinker *shrinker); +extern int shrinker_debugfs_name_alloc(struct shrinker *shrinker, + const char *fmt, va_list ap); +extern void shrinker_debugfs_name_free(struct shrinker *shrinker); extern struct dentry *shrinker_debugfs_detach(struct shrinker *shrinker, int *debugfs_id); extern void shrinker_debugfs_remove(struct dentry *debugfs_entry, @@ -1170,6 +1173,14 @@ static inline int shrinker_debugfs_add(struct shrinker *shrinker) { return 0; } +static inline int shrinker_debugfs_name_alloc(struct shrinker *shrinker, + const char *fmt, va_list ap) +{ + return 0; +} +static inline void shrinker_debugfs_name_free(struct shrinker *shrinker) +{ +} static inline struct dentry *shrinker_debugfs_detach(struct shrinker *shrinker, int *debugfs_id) { diff --git a/mm/shrinker.c b/mm/shrinker.c index a16cd448b924..201211a67827 100644 --- a/mm/shrinker.c +++ b/mm/shrinker.c @@ -550,6 +550,108 @@ unsigned long shrink_slab(gfp_t gfp_mask, int nid, struct mem_cgroup *memcg, return freed; } +struct shrinker *shrinker_alloc(unsigned int flags, const char *fmt, ...) +{ + struct shrinker *shrinker; + unsigned int size; + va_list ap; + int err; + + shrinker = kzalloc(sizeof(struct shrinker), GFP_KERNEL); + if (!shrinker) + return NULL; + + va_start(ap, fmt); + err = shrinker_debugfs_name_alloc(shrinker, fmt, ap); + va_end(ap); + if (err) + goto err_name; + + shrinker->flags = flags | SHRINKER_ALLOCATED; + shrinker->seeks = DEFAULT_SEEKS; + + if (flags & SHRINKER_MEMCG_AWARE) { + err = prealloc_memcg_shrinker(shrinker); + if (err == -ENOSYS) + shrinker->flags &= ~SHRINKER_MEMCG_AWARE; + else if (err == 0) + goto done; + else + goto err_flags; + } + + /* + * The nr_deferred is available on per memcg level for memcg aware + * shrinkers, so only allocate nr_deferred in the following cases: + * - non memcg aware shrinkers + * - !CONFIG_MEMCG + * - memcg is disabled by kernel command line + */ + size = sizeof(*shrinker->nr_deferred); + if (flags & SHRINKER_NUMA_AWARE) + size *= nr_node_ids; + + shrinker->nr_deferred = kzalloc(size, GFP_KERNEL); + if (!shrinker->nr_deferred) + goto err_flags; + +done: + return shrinker; + +err_flags: + shrinker_debugfs_name_free(shrinker); +err_name: + kfree(shrinker); + return NULL; +} +EXPORT_SYMBOL_GPL(shrinker_alloc); + +void shrinker_register(struct shrinker *shrinker) +{ + if (unlikely(!(shrinker->flags & SHRINKER_ALLOCATED))) { + pr_warn("Must use shrinker_alloc() to dynamically allocate the shrinker"); + return; + } + + down_write(&shrinker_rwsem); + list_add_tail(&shrinker->list, &shrinker_list); + shrinker->flags |= SHRINKER_REGISTERED; + shrinker_debugfs_add(shrinker); + up_write(&shrinker_rwsem); +} +EXPORT_SYMBOL_GPL(shrinker_register); + +void shrinker_free(struct shrinker *shrinker) +{ + struct dentry *debugfs_entry = NULL; + int debugfs_id; + + if (!shrinker) + return; + + down_write(&shrinker_rwsem); + if (shrinker->flags & SHRINKER_REGISTERED) { + list_del(&shrinker->list); + debugfs_entry = shrinker_debugfs_detach(shrinker, &debugfs_id); + shrinker->flags &= ~SHRINKER_REGISTERED; + } else { + shrinker_debugfs_name_free(shrinker); + } + + if (shrinker->flags & SHRINKER_MEMCG_AWARE) + unregister_memcg_shrinker(shrinker); + up_write(&shrinker_rwsem); + + if (debugfs_entry) + shrinker_debugfs_remove(debugfs_entry, debugfs_id); + + kfree(shrinker->nr_deferred); + shrinker->nr_deferred = NULL; + + kfree(shrinker); +} +EXPORT_SYMBOL_GPL(shrinker_free); + /* * Add a shrinker callback to be called from the vm. */ diff --git a/mm/shrinker_debug.c b/mm/shrinker_debug.c index e4ce509f619e..38452f539f40 100644 --- a/mm/shrinker_debug.c +++ b/mm/shrinker_debug.c @@ -193,6 +193,20 @@ int shrinker_debugfs_add(struct shrinker *shrinker) return 0; } +int shrinker_debugfs_name_alloc(struct shrinker *shrinker, const char *fmt, + va_list ap) +{ + shrinker->name = kvasprintf_const(GFP_KERNEL, fmt, ap); + + return shrinker->name ? 0 : -ENOMEM; +} + +void shrinker_debugfs_name_free(struct shrinker *shrinker) +{ + kfree_const(shrinker->name); + shrinker->name = NULL; +} + int shrinker_debugfs_rename(struct shrinker *shrinker, const char *fmt, ...) { struct dentry *entry; @@ -241,8 +255,7 @@ struct dentry *shrinker_debugfs_detach(struct shrinker *shrinker, lockdep_assert_held(&shrinker_rwsem); - kfree_const(shrinker->name); - shrinker->name = NULL; + shrinker_debugfs_name_free(shrinker); *debugfs_id = entry ? shrinker->debugfs_id : -1; shrinker->debugfs_entry = NULL;