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 BBF5BEE57DF for ; Mon, 11 Sep 2023 09:51:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4A76D6B026B; Mon, 11 Sep 2023 05:51:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 458446B026C; Mon, 11 Sep 2023 05:51:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 320146B026D; Mon, 11 Sep 2023 05:51:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 213BF6B026B for ; Mon, 11 Sep 2023 05:51:25 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id E6FBC140920 for ; Mon, 11 Sep 2023 09:51:24 +0000 (UTC) X-FDA: 81223848888.16.D2FA528 Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by imf01.hostedemail.com (Postfix) with ESMTP id 2D91040006 for ; Mon, 11 Sep 2023 09:51:22 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=QVsT1bLA; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf01.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.215.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=1694425883; 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=uv0TBZQkv9+j+cj13JOsDOVxquETdMy4ZuA8JAVbwFY=; b=1h5ZhId7aCCvU79ko0vQlSbbUufNrkR/9djXEIe0h+0Vurjal1FWTKOL7fBrvAeabUj/Cd btioQasBrqRZc7hU/xXd9rYsXZqSQo1u+TeQqaYqHMeOuzdWask1dzI1tM9piL59b3EKJ7 EV3RI4dEn32/PyvRh2JrfW1DjffrDxE= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=QVsT1bLA; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf01.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.215.173 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1694425883; a=rsa-sha256; cv=none; b=3A9xMz8pS8/716P6M2WTeZl/WYD5jTjbk86YBgRsIZgJPQWwhMYjFYtgZYXEXwv4f1H1Ej ikK8B6XhLgu/J+4Apaud+GQmjeuZvSncPQUDTB6xNuGr6JlkrPGcqFdZeek5nw1iVO1E3B 5nuX5kN1ScEy2OXNHmti7jk7lBU+0SM= Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-56f8334f15eso230609a12.1 for ; Mon, 11 Sep 2023 02:51:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1694425882; x=1695030682; 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=uv0TBZQkv9+j+cj13JOsDOVxquETdMy4ZuA8JAVbwFY=; b=QVsT1bLArsqVzOxk3Hf4Ig0H6y4klcLex+23rIAVO4IThWwznW8/lkMUf8R5tLEyJz ZyaRopN2zCzbfrXdRfbVL8TjthFVdmpijNhVQHatEu8TGm8XxJvt4KoTSx3QP8uCbB0L hl4NTDKEfC6+sKaVOHJgB4kCZc49FGFZyu0CaR0eXXYyDAnKDqSlIU0ckliodDKoJiEO tn3kkQ5MlRNudmIOD63JTVRpPHiHhGofpKdXmlXjgoaohZ3uelbs4L53bCu93m8jkdrE qokNVOS0qM8jV60W4WXj9xTirAMyj0vKito/gipj4XbIW7+Q8l8eySDDmcVlfb7IgLZR tcNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694425882; x=1695030682; 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=uv0TBZQkv9+j+cj13JOsDOVxquETdMy4ZuA8JAVbwFY=; b=H8SSC1IE1cydj/Vm7wIwSH+eaGG6E2SXCwymIzhKGQOvuOkMWIrPtavy1qYy9kAs0p 8mRrRJrNu+4nRVfEiXMkc/XbtaR0FJqS4M8H06WXF70KNgACjM8tizB8cELPtzxJ2DqA 39KoVLwXHkv6nlaS3c8EgOBfmGuCLHarDthHqIZnN6zDWNpT5zr5qCnLupPovd0GoxJs Qw5h0+A80ewDxCVtuv9Eu0HAbN3nT7R92DUbwJYKO0VdkfDaxEFHJqntlN0jO05tZnAc UBUWx63WzpvvIUkF8RnoOnlhFKf+Y31AOyomsq40IrkW92mJ+bczE++RAmwBS0WXynsU p51g== X-Gm-Message-State: AOJu0YxrNy/0odKa+CimrEEHbtrMOIWJHcAR6pZuoUIKmPLMQtFV8QoS LHswABL6bFyF471H09Lo8QFTdzwQSCtTFqu6WEY= X-Google-Smtp-Source: AGHT+IGKTvJsG+anhHgOhq4RXbEUzLj3hzjixmIPwpl+H2L5Yrr+lM0cdITBVAyo+CVp3tsEVeU2xg== X-Received: by 2002:a05:6a20:a10c:b0:13f:9233:58d with SMTP id q12-20020a056a20a10c00b0013f9233058dmr11709606pzk.2.1694425882074; Mon, 11 Sep 2023 02:51:22 -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.51.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Sep 2023 02:51:21 -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 41/45] mm: shrinker: rename {prealloc|unregister}_memcg_shrinker() to shrinker_memcg_{alloc|remove}() Date: Mon, 11 Sep 2023 17:44:40 +0800 Message-Id: <20230911094444.68966-42-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 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 2D91040006 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: p45qph17d1jzrf44fo57351zahupx4q4 X-HE-Tag: 1694425882-684119 X-HE-Meta: U2FsdGVkX1/Fix7L0/fvOV9uqVKwT9K3WAMAmkE7YkXczyromahc0GSzZFiuzMay4nBC6bldxwykvp555T5kp0YHg/oypS4/JAdLwnDr3mnDipWlgEfypl3HnMaQ/DCtmqibngP+L+8OjYIQNMhbjhOq7uy8jZ5DXmOCFHC5jXp9xEtdh2sPJB63v8EW/guSAC8JR0Wbofg0TrGsX7Rrg8toTuyqMqkackFVucvc540ODvFCvYuA514jbhFwJe2wcTK/9Y61r5GQvHDmxfXkG4unLQTM4XA2QL4CqqtL53vDg9H70gBF+KdIYBWBCFGYuotgDPA3FaI7DoKxqLXWM7zbvmO8QvEVJTXgRUwhJLxV28gh/yK6Jmpr26wIZpN26IqDaYYuBWQe/fNAqIoSz1EQcCK2YOGoEXaILYUil4PXXJB7pDdSShWYnTIMUVsOsp9eItApukHz0EAfP/MKL33h9g7I5dnu6ZAUP/GDs/PkGavow30LIZ+NTA6LOfduH+6/gi7bGV1lBlqAmdsLguerYGo3wNW91cnokzyHyBCrnM890RMgpeLEfveidKJ5pTvtEWVTDgEYYKxl+YuL5kaTRMgLcym8VIgaHQzf1WR+EGuPfZe6ro+cbidfyb8Ys+Mb0gzEsnxVD28aea/sQdKCl3I9UbdNYLwg9UjUpk7b3h8FG3yPXDCotrxCvxW0XTH9TRoplBA288l4iVnq3TIjwp32ISx9CTy4t+ZqOUzvPZU7LQpehTdPEd7zgtE/VHrCM+6YdCEiIhs+W1WN2McOn9aPNzXFJF84or+RAI6j1V7PCfGKzfccL9GAeghzIdQAJtYnH5tCbURF0OHVQ16SwDA5jIGWJQXS6N1Fd05g9O1Tt4gRovh1Ig1ho1u2y5s3plTDbX+jOE+1Uc1fA1RRhuuCo+pDeNHxYkw6qFB1TgOOQM7Yt6joC86ci8kcOxwcmbT59PWaXCL102Q 2qpLzHLt 2FNKOHJHHYdxzNnyNzzPCCneLgZLbi8Wz7uylpuxCjLVx/7TkgX2qIzeGEb9iB8x/2psQqZBOmD1YgsWcAQIwnKN0nkN4vICbMy/yFsIaVrZ2rzCyUKQAhf7N/OQntzpIsPi5LIn2XRuUQdvA9JAVjbY9EPm3otK6YX+/gBdyPWDF5R+v1y5K9PPiCTlrrVWJGihrKfJp2sDlh5FiQqABm9ebU7Q5fmA1RkTcsDG1fpbrfz21dKfCmk1G+13z1DjWx2xb638nbDjCuVPjN71tTnSb7zo2sQiZCd9WsV2HR9wBCBtCGEfn2ivZCILHOaR/u1IL42y576pt+dRVqmtdlGm5fIilGjZI6sDaPiNTizuaS3nutx4b4EHqYsYGnzeJ7THGCjGtQzEiFHaLlEYBjHj3hhVzYbyVzS2gZPLkP+4QeBcUuG9nr3PVYjJzrIm77EOGcKZdstV6cmf6iZb90Cmsbg== 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 6723a8f4228c..0b9a43ce2d6f 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) { } @@ -628,7 +628,7 @@ struct shrinker *shrinker_alloc(unsigned int flags, const char *fmt, ...) shrinker->seeks = DEFAULT_SEEKS; 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) @@ -696,7 +696,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