From patchwork Thu Jul 27 08:04:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 13329379 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 C63C0C0015E for ; Thu, 27 Jul 2023 08:14:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 663588D000B; Thu, 27 Jul 2023 04:14:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5EAC78D0001; Thu, 27 Jul 2023 04:14:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 465768D000B; Thu, 27 Jul 2023 04:14:37 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 32F868D0001 for ; Thu, 27 Jul 2023 04:14:37 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id EB0B64050F for ; Thu, 27 Jul 2023 08:14:36 +0000 (UTC) X-FDA: 81056680152.21.34C7B84 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by imf26.hostedemail.com (Postfix) with ESMTP id 176E9140007 for ; Thu, 27 Jul 2023 08:14:34 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=MBKqtR+m; 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=1690445675; 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=G6s8y0Dka4KE4srOwy3I0FSAaIGrcYmvE6JrVZfCpDs=; b=GQHFPtlk0wHT50y05JBmSC7kRvc2CU650wW0/T6uYhhvfChYxp9qPlpkt4wncZ6zTkpfKW +GKzNO+6V+9W37QZI6KEMe6jT8cwlE77z+N+Lc3245S7GttOaLktedujefcJl6Edwl3PMv t3GnGJe88YmUIlc4BLmo5Sgvk3lX/1k= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=MBKqtR+m; 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=1690445675; a=rsa-sha256; cv=none; b=qUugM5b2TmEZjTQVtXTtogPRen+U2hMqbvKq3RiXjO21FGRa+rkX2iAqtLB/s/DiXsUHmB SaHk3phXAdZ/Kay00ffZh5+wIjHqtu4iEjGjT88BctQniiNAUYRAWK7PGLvnubZ5foIO1t orVtLY4AtPwpLQrNb7SrGXPxSJJx2qo= Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-682eef7d752so205030b3a.0 for ; Thu, 27 Jul 2023 01:14:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1690445674; x=1691050474; 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=G6s8y0Dka4KE4srOwy3I0FSAaIGrcYmvE6JrVZfCpDs=; b=MBKqtR+m6tRDLwGbmGnhkuL4q0cqlWsjDeU7ZVRwaOZMOF0riGkcJrkyInKFI0pYis mWaNeHtwDzmym2/d2f7OIfkckgap6Prz7ne5Q+65Q9kFa2z8w6TXtQPQCrjIFsYVVR2m PRIs97KnddHeo2KzvpuxuJU//NWKLj0FPiuARmlExd2GlY1ot6WyHoUBUu1qPjJUPpT3 ZsG43k1Oz59Ii0r86zAALutb1Gd6A6cdhWxvrkZ21MO6UtDcxtLUaksPoYyR3li5MX3H RGe7M6IrmRvaAAMZm9ToAYQ8mPB0OkHGFsJVWBGXFBUa+qGlQpcM3sB1mv4YN0cfvLiI gBbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690445674; x=1691050474; 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=G6s8y0Dka4KE4srOwy3I0FSAaIGrcYmvE6JrVZfCpDs=; b=k+WVbblT6rHpxvf1wDC5JQ1TK2jxfEMedc9KiVGm80iGprrrkc/7ToAauEV6G3Gk+/ PTojCZIG4AooSINBLmj9BMAZEBOxpPXFY2z39KbxgLsPVeTrqraKFu5jZgPrAgemb0Y1 oifPyj5MfDGKzQa3kQjPmSlV6k0TjpbEzJR4fcj2pqRji/68olpO0pidjGfkhbhHGdUq C14r+2rEvJOS3hPrrxVg/+YUTb9HUAj7yfYiMUzbVyslu7T1CJ4NalpdVDrcsHrm83a4 HBY6M2/msgwIaXXb0BCokJZPDfdAh5XGhfTxXfMFWFEo5iaCaHbWMjiFxEYLgFNCr4L3 72hQ== X-Gm-Message-State: ABy/qLZ8CXCAiFPgUUaQ+WDh5QGv+5U8uu4J1jjFqrQLSwZWc8c+gneo xsQ3msNh5Q8n4yLnWEAS9wc9zQ== X-Google-Smtp-Source: APBJJlHZc+tyEor0irWiukNNv0+VJsTfo/jEPBj29UYMUTILxfRG5SoeWB7BzCnWVmRXaEQSTc0xVA== X-Received: by 2002:a05:6a00:4a0e:b0:677:3439:874a with SMTP id do14-20020a056a004a0e00b006773439874amr5210105pfb.3.1690445673911; Thu, 27 Jul 2023 01:14:33 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([203.208.167.147]) by smtp.gmail.com with ESMTPSA id j8-20020aa78d08000000b006828e49c04csm885872pfe.75.2023.07.27.01.14.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jul 2023 01:14:33 -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, x86@kernel.org, kvm@vger.kernel.org, xen-devel@lists.xenproject.org, linux-erofs@lists.ozlabs.org, linux-f2fs-devel@lists.sourceforge.net, cluster-devel@redhat.com, linux-nfs@vger.kernel.org, linux-mtd@lists.infradead.org, rcu@vger.kernel.org, netdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, dm-devel@redhat.com, linux-raid@vger.kernel.org, linux-bcache@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, linux-btrfs@vger.kernel.org, Qi Zheng , Muchun Song Subject: [PATCH v3 43/49] mm: shrinker: remove old APIs Date: Thu, 27 Jul 2023 16:04:56 +0800 Message-Id: <20230727080502.77895-44-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20230727080502.77895-1-zhengqi.arch@bytedance.com> References: <20230727080502.77895-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 176E9140007 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: jie7zkh8fsqn6ou78jgimsg3epfx9cjb X-HE-Tag: 1690445674-694273 X-HE-Meta: U2FsdGVkX1/t8RueVertOYqvKRnIW6I4QdQ4wVIzeA85r4ldvwGYa/mKZMTN2ecGs2Z6HKvBgBGFAz3VEnCXhhd78H/GTfSNNR0mNPJr/BOpqcQVPrxs6q5q1d9AajD+Q0J9gqpZmABdZ9vgxmVSMa/HXjKDa8qt3PasI1LM7zLvnEZz1qv6hqrczdxCpxTgLliJ6NSe/WZ2OM2JgbIBhjvgqjzo9iO5UwpwJ2Xz3yLs8NMrVUQbc0tcYUV7rh/gR3Q9yW8V3fnoqiVRObuXwj09FRof5v4U9p4q4JSrWSrdNi+4DL9NQ+mKGmLRYnw3YUK4buPvuhxgHIBAp813elweFGRFitO+hkf0wneyCR3JnErq+XfIdC4liCFHZKxMPBTmNrp95VvNb1eKkNq09xceZgmEV6iNSm2mkMSVB16o8INa4fjBW6hPiMVbOvJT4c0t+3opq+o1YUS1hYW4Pqkf6ZtFxBKOsoM13d8s30vUF6zzqqRhkI6OM1mqjB0BFZad6H4nq9iJcm8U4p1X21yoqqo6RM2AmnKcEoHH3CgpJ2mug8/CHcVdJuavDFW/Ogir9Jck9s1pbr3AYPPPe3W4DG47yprkUoD8dKEUYvsVhx//DVcJsEeF3rcRnphr8ATZW10/njNXiKHFBtxBy85bYbxk1tE9nTd6+PpgC+A7f/DwLtYylLeiHFNYF/oU1D+UqUSFFhBdSIjx/YgLHXZCnaUz9UHslYWwqDKQ+GifJlNjuhX5axSbGriIwdIIreaz0N1OIezs4LNwASH1S6kw7sxvgTEiZB+3v7gz1DwF4NMB8DOoQf+V0yUqU0N5uWWFro4iW3c6xKQQcyrtO2PCVvifYMNEHX+9w0e39CJ61jO942j7C6GwKbXHKTkrOZCTHZI+2p4iZX2/EGgtfYKL4oWQm5M6y95f9TH1+ITqYT7AyAmIM6wYI9tPqWPvAcHGyLRUcVsDKCbC6mR 0i8ZmMIF 2W8xa3KeUVGiYnMn186jaDh0uBOsE+felt8mJ3yVnYdhEcHJJJKdMeg9B7SnaivzZwRJyXbtFVMHvi48XqwOHTmA7e8mO9uXTFixYVMAbTRLrE/NFIHy7ZMPYx4dUZgCo3C+MP4TbxCcNmpbszXo/b8sGmGNZjBeaA4WVjm1MqVfDsgPPgNj/cpCPJ49k9DIt4EQRmgB0FZ+W1IUPVGK/8JHmRY8OFm+Upst4HEG0KmrcExXzlG9f3SWivlw3q5A+9jcsmMTg0TQXv0ItPZfwliCA22E+GkHXMUf2V128h2W8Cwb1yc7HQxvRqGHoHJW9ZK/A8tU8vzxyhyTbJBq56/S2ySPoGc5RK8xu49saoi4TjSE/lcnnL9FY+c/yltsm5jDjI47DfIjOLUAHgzFt1H/cMqNMmylCIyQM 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: Now no users are using the old APIs, just remove them. Signed-off-by: Qi Zheng Reviewed-by: Muchun Song --- include/linux/shrinker.h | 7 -- mm/shrinker.c | 143 --------------------------------------- 2 files changed, 150 deletions(-) diff --git a/include/linux/shrinker.h b/include/linux/shrinker.h index cc23ff0aee20..c55c07c3f0cb 100644 --- a/include/linux/shrinker.h +++ b/include/linux/shrinker.h @@ -103,13 +103,6 @@ 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, ...); -extern void register_shrinker_prepared(struct shrinker *shrinker); -extern int __printf(2, 3) register_shrinker(struct shrinker *shrinker, - const char *fmt, ...); -extern void unregister_shrinker(struct shrinker *shrinker); -extern void free_prealloced_shrinker(struct shrinker *shrinker); extern void synchronize_shrinkers(void); #ifdef CONFIG_SHRINKER_DEBUG diff --git a/mm/shrinker.c b/mm/shrinker.c index 43a375f954f3..3ab301ff122d 100644 --- a/mm/shrinker.c +++ b/mm/shrinker.c @@ -651,149 +651,6 @@ void shrinker_free(struct shrinker *shrinker) } EXPORT_SYMBOL_GPL(shrinker_free); -/* - * Add a shrinker callback to be called from the vm. - */ -static int __prealloc_shrinker(struct shrinker *shrinker) -{ - unsigned int size; - int err; - - if (shrinker->flags & SHRINKER_MEMCG_AWARE) { - err = prealloc_memcg_shrinker(shrinker); - if (err != -ENOSYS) - return err; - - shrinker->flags &= ~SHRINKER_MEMCG_AWARE; - } - - size = sizeof(*shrinker->nr_deferred); - if (shrinker->flags & SHRINKER_NUMA_AWARE) - size *= nr_node_ids; - - shrinker->nr_deferred = kzalloc(size, GFP_KERNEL); - if (!shrinker->nr_deferred) - return -ENOMEM; - - return 0; -} - -#ifdef CONFIG_SHRINKER_DEBUG -int prealloc_shrinker(struct shrinker *shrinker, const char *fmt, ...) -{ - va_list ap; - int err; - - va_start(ap, fmt); - shrinker->name = kvasprintf_const(GFP_KERNEL, fmt, ap); - va_end(ap); - if (!shrinker->name) - return -ENOMEM; - - err = __prealloc_shrinker(shrinker); - if (err) { - kfree_const(shrinker->name); - shrinker->name = NULL; - } - - return err; -} -#else -int prealloc_shrinker(struct shrinker *shrinker, const char *fmt, ...) -{ - return __prealloc_shrinker(shrinker); -} -#endif - -void free_prealloced_shrinker(struct shrinker *shrinker) -{ -#ifdef CONFIG_SHRINKER_DEBUG - kfree_const(shrinker->name); - shrinker->name = NULL; -#endif - if (shrinker->flags & SHRINKER_MEMCG_AWARE) { - down_write(&shrinker_rwsem); - unregister_memcg_shrinker(shrinker); - up_write(&shrinker_rwsem); - return; - } - - kfree(shrinker->nr_deferred); - shrinker->nr_deferred = NULL; -} - -void register_shrinker_prepared(struct shrinker *shrinker) -{ - down_write(&shrinker_rwsem); - list_add_tail(&shrinker->list, &shrinker_list); - shrinker->flags |= SHRINKER_REGISTERED; - shrinker_debugfs_add(shrinker); - up_write(&shrinker_rwsem); -} - -static int __register_shrinker(struct shrinker *shrinker) -{ - int err = __prealloc_shrinker(shrinker); - - if (err) - return err; - register_shrinker_prepared(shrinker); - return 0; -} - -#ifdef CONFIG_SHRINKER_DEBUG -int register_shrinker(struct shrinker *shrinker, const char *fmt, ...) -{ - va_list ap; - int err; - - va_start(ap, fmt); - shrinker->name = kvasprintf_const(GFP_KERNEL, fmt, ap); - va_end(ap); - if (!shrinker->name) - return -ENOMEM; - - err = __register_shrinker(shrinker); - if (err) { - kfree_const(shrinker->name); - shrinker->name = NULL; - } - return err; -} -#else -int register_shrinker(struct shrinker *shrinker, const char *fmt, ...) -{ - return __register_shrinker(shrinker); -} -#endif -EXPORT_SYMBOL(register_shrinker); - -/* - * Remove one - */ -void unregister_shrinker(struct shrinker *shrinker) -{ - struct dentry *debugfs_entry; - int debugfs_id; - - if (!(shrinker->flags & SHRINKER_REGISTERED)) - return; - - down_write(&shrinker_rwsem); - list_del(&shrinker->list); - shrinker->flags &= ~SHRINKER_REGISTERED; - if (shrinker->flags & SHRINKER_MEMCG_AWARE) - unregister_memcg_shrinker(shrinker); - debugfs_entry = shrinker_debugfs_detach(shrinker, &debugfs_id); - up_write(&shrinker_rwsem); - - shrinker_debugfs_remove(debugfs_entry, debugfs_id); - - kfree(shrinker->nr_deferred); - shrinker->nr_deferred = NULL; -} -EXPORT_SYMBOL(unregister_shrinker); - /** * synchronize_shrinkers - Wait for all running shrinkers to complete. *