From mboxrd@z Thu Jan 1 00:00:00 1970 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 AA3F1C3DA6F for ; Thu, 24 Aug 2023 03:49:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 42978680001; Wed, 23 Aug 2023 23:49:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3DABF8E0011; Wed, 23 Aug 2023 23:49:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 27C00680001; Wed, 23 Aug 2023 23:49:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 170858E0011 for ; Wed, 23 Aug 2023 23:49:55 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id D182BC011D for ; Thu, 24 Aug 2023 03:49:54 +0000 (UTC) X-FDA: 81157619508.01.7D7B28E Received: from mail-oi1-f174.google.com (mail-oi1-f174.google.com [209.85.167.174]) by imf13.hostedemail.com (Postfix) with ESMTP id 1E8E620008 for ; Thu, 24 Aug 2023 03:49:52 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=RZIGD3XI; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf13.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.167.174 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=1692848993; 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=B6aUUwbyOkHscZNyA7A7465dhx8LWjbNO2ZyHEt0HP8=; b=UboxNrjrXazkEGDWzRLlnIQqoc3mJ7umttXhjyZ/TACdxQ9PihJe31rAQVjhs1aApu5ifD t0oDvmLK2OO5jlaO8miW8Ys+ebd4mOSYj6xslkjl+npk6tvU1+0eYsT8or7tM0Rns/dmKZ Omws103Vj4P3qofIHAYQLnlTsAmBYfo= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=RZIGD3XI; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf13.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.167.174 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692848993; a=rsa-sha256; cv=none; b=SmFEaOs6hMn3bi2eEBKn4wBn7WFIG/ZtD8VKtcA9wXK0EFnfGOUVrKCplVqbCBdo+K7oxM FA9qE3RTLx+cDf4hfQ/6iXxUj2pYAJ4A7hmUVLwIeNK1/q6pw/Ikg0Qy7ZmhA7x76Op9KS Io6BO6pwjp3UGzmKe/HV3TbJ2jtlorM= Received: by mail-oi1-f174.google.com with SMTP id 5614622812f47-3a84c94f8ebso490849b6e.1 for ; Wed, 23 Aug 2023 20:49:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1692848992; x=1693453792; 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=B6aUUwbyOkHscZNyA7A7465dhx8LWjbNO2ZyHEt0HP8=; b=RZIGD3XIyyCZko58S15TEuM+V4uZ9q/nJiTp+ASHyEqDdnHKI2VFdiaK1aK7MoBgqf wdxtyAAvH4GiFgfBTLw1NPiwv/vkKcXTVcQTbLW54mHyckLvZuEctVxqt8DDdrPpaslE Ol7Ntjo6pp6tJCg9DKAxClGqr/9qupnwU3ZjiWqQNPlUqASiZztTSjrB3UsJA1JbVEUv CXL0qdpDcTzF+QC8NW0RGvQLHkAS2pUVF65iSlUw78Ld72cAZJ/of4Q3IJraeFXBOiTB /Td9mKt9yiMQ3tJOlkOUGNssP0ntVYTqf9BGOz/QEowzwJow3yewwXQKQe65AdqCGZsY zwfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692848992; x=1693453792; 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=B6aUUwbyOkHscZNyA7A7465dhx8LWjbNO2ZyHEt0HP8=; b=eQDoCbisDD6hEQ/FEN9iq8qQeqvoLBnk4TEq6M/BJynXbpzcolk08H3s1P319Cm7/k WZ+VHYXzHD2cB+jhcLze7CBXLQnHgk8zxyqUvlyTTHbFp2RUAGvfkLdpQGp6iwtqZN6G bSlaT3ErNaEdTrUV3lafsQMzFR4NvQdA/ZL1RkqhHh3eh5idH8uQsGIjLmqyf+5Np6sj UCVGZapFJOLwXycYblw5gYLJ2WqHnuHPDazFe6J4LJOdKJKnxs0dY7lu57fkEDgmUdbK kKENyztmDGL2Ykg2zOXqUqcCAqnfyv4p1h64whk/0wrgU84ZauzzeixuDr7begbFJzAG pTGA== X-Gm-Message-State: AOJu0YyN4Ci+h+vFojCg1Qg40YiDxUG/7f+U7IcnrxyKPe7oMrE4Gn74 ch7VUtE29opO2SOoWZM9ZcwXUA== X-Google-Smtp-Source: AGHT+IHd58HOT5xsJFcKqSa59ChLI854M/dKR1Ww2SFEZwh4duvj6hOPZTfKws4370umVNWgT0imeQ== X-Received: by 2002:a05:6808:21a0:b0:3a3:37dd:e052 with SMTP id be32-20020a05680821a000b003a337dde052mr16581058oib.5.1692848992336; Wed, 23 Aug 2023 20:49:52 -0700 (PDT) Received: from C02DW0BEMD6R.bytedance.net ([203.208.167.146]) by smtp.gmail.com with ESMTPSA id t6-20020a63b246000000b005579f12a238sm10533157pgo.86.2023.08.23.20.49.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Aug 2023 20:49:51 -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 v5 41/45] mm: shrinker: rename {prealloc|unregister}_memcg_shrinker() to shrinker_memcg_{alloc|remove}() Date: Thu, 24 Aug 2023 11:43:00 +0800 Message-Id: <20230824034304.37411-42-zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20230824034304.37411-1-zhengqi.arch@bytedance.com> References: <20230824034304.37411-1-zhengqi.arch@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 1E8E620008 X-Stat-Signature: dj454z6j34sgbh1j3af3731qwcz34ih7 X-HE-Tag: 1692848992-794213 X-HE-Meta: U2FsdGVkX1+HH0i3pg5nAWaYp58FxQWu4UhBXN7R3+9pVyHQsptK5AWG1JsPNRXmOKZ3WA/O7Kyy+0KTlZkgPOZ/GbPWSfrCpyZQg5KRg1HvKudDUNyCZ0XeQ9U9uEVKij3Y/Nu1wcygmrZkoe4g2bUDTu2M+gS8q5ghuzIExXWdpAZZ8jGFAOtZcTgB8ytlQFRH/fW2+L2FYlWseZF1rgXOc0FYdnbCk3/mG7u7H+waVmmb21264+XDtaNz6AduZXRaAfqLPV00PjUTnuX64PQ8HJCGuvCZ/4N5F3ZYn45qH9tAgE+lwqRQF+DB13kw95GacK4z2Wn871iWOoemrG0xgRBMZtP9T/h4S9/cpQ6+vgPgcUifuY8mIvq8FJVqLEgFxs90zl/x0PY1Vq21/CqKwi3vwHK3iNhtejheCgdcqe7Ix5LFt3gu1ngF35YAh99dyDTERFPgjSafe1Ddn1qBw8F7RMdKUmn9Od1VyBf7Z7H76ek7NBpUtNRziBQuvHRsy9gjg6IkEpyTR5AnnpPkzzjDdqGXbeYaHc6yweJdVHyj0MvNzq8c3yhBdyV4bV0r5wGLjl2ootgViy+fQMl45hdYEw4T/luIqE4FbiFXcxGcb1p4HEy7Fw2bgOK6kgbg5YmXIslQmEY5cV9HzSsqHTjijvvyISescNEHyg+22uQZuPhNfbBcV2UWwyWe0RgaYhxfaqfwtDdLHWpOltDQWujXM/k63b3lLSdlNIt6QF1okM/1REye8psp1XvotVIRSNexZgBzNb14fGGm75zhe8vFQ7c3T3FiLGZmaCahbNsd+AOiCz9vmiM40rOi/PWl5Ihcj9ezVWbEmfzlTRJ5aWskZE6l9AN2UfmnrUP7Np7GFGHJaGr2B792IljYmcgvEjYU/wHcZqVsa0kz2c/B+eDAJrRKScj+ALKM2xiblwkic8IdjB/lj64/HD6YwUNoemzFJ/ejX0AYFPX Mx2x47uA 19mulX8NNSgqBLGVxVgqMaWtWXQt4PnC1TKW4l48tCzPKjf8bqDX7L2WOXN41Vxzy2C6iYH6ls7U8KKgtEVOkMhhOy80PYzHiu5zsKul2c6bB+HdmbGOv2STnkzB3E1y4vEXqXx9gtBIQH0u+LhpmKTzMTRzOVtxCrHuhHLy4nT8sttxo4s/RJ3oMwjecmBzJjY8hdj+Vtb6jGXOm+FHZC7EvW4dlVGo/3UqRR8urT1oDIaSm5bJXTC78Zb3YLoRScWJ4tEj0yMPwL4p/pW8RXpi/5GgIg3N8DO/mIa29HGl7xOD3KGQh2EWiNQrFvfoYCXN1H8mNArGJDJTkE1ctnhzUNTsGfPk6c4/tUWoNuqTis0ALzM4VPVyPY9Y3D4JC8UVXpFRjeKbbSEWlBolZsK7CARleeTGVok4V+FVcvNZnAGqMfMqjAhCgNFD0pF3ym+02JK++YOYTMCbYOOMkpJbMnw== 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: With the new shrinker APIs, there is no action such as prealloc, so rename {prealloc|unregister}_memcg_shrinker() to shrinker_memcg_{alloc|remove}(), which corresponds to the idr_{alloc|remove}() inside the function. Signed-off-by: Qi Zheng --- mm/shrinker.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mm/shrinker.c b/mm/shrinker.c index 8fb94cda86ef..578599c9e12e 100644 --- a/mm/shrinker.c +++ b/mm/shrinker.c @@ -209,7 +209,7 @@ void set_shrinker_bit(struct mem_cgroup *memcg, int nid, int shrinker_id) static DEFINE_IDR(shrinker_idr); -static int prealloc_memcg_shrinker(struct shrinker *shrinker) +static int shrinker_memcg_alloc(struct shrinker *shrinker) { int id, ret = -ENOMEM; @@ -235,7 +235,7 @@ static int prealloc_memcg_shrinker(struct shrinker *shrinker) return ret; } -static void unregister_memcg_shrinker(struct shrinker *shrinker) +static void shrinker_memcg_remove(struct shrinker *shrinker) { int id = shrinker->id; @@ -297,12 +297,12 @@ void reparent_shrinker_deferred(struct mem_cgroup *memcg) up_read(&shrinker_rwsem); } #else -static int prealloc_memcg_shrinker(struct shrinker *shrinker) +static int shrinker_memcg_alloc(struct shrinker *shrinker) { return -ENOSYS; } -static void unregister_memcg_shrinker(struct shrinker *shrinker) +static void shrinker_memcg_remove(struct shrinker *shrinker) { } @@ -627,7 +627,7 @@ struct shrinker *shrinker_alloc(unsigned int flags, const char *fmt, ...) shrinker->flags = flags | SHRINKER_ALLOCATED; if (flags & SHRINKER_MEMCG_AWARE) { - err = prealloc_memcg_shrinker(shrinker); + err = shrinker_memcg_alloc(shrinker); if (err == -ENOSYS) shrinker->flags &= ~SHRINKER_MEMCG_AWARE; else if (err == 0) @@ -695,7 +695,7 @@ void shrinker_free(struct shrinker *shrinker) } if (shrinker->flags & SHRINKER_MEMCG_AWARE) - unregister_memcg_shrinker(shrinker); + shrinker_memcg_remove(shrinker); up_write(&shrinker_rwsem); if (debugfs_entry) -- 2.30.2