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 X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 76A6CC433E0 for ; Thu, 11 Mar 2021 19:09:14 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id F3A4164EFE for ; Thu, 11 Mar 2021 19:09:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F3A4164EFE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 2E1738D02E8; Thu, 11 Mar 2021 14:09:11 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 27EB08D02B2; Thu, 11 Mar 2021 14:09:11 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 05B7E8D02E8; Thu, 11 Mar 2021 14:09:10 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0181.hostedemail.com [216.40.44.181]) by kanga.kvack.org (Postfix) with ESMTP id CE3528D02B2 for ; Thu, 11 Mar 2021 14:09:10 -0500 (EST) Received: from smtpin18.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 79A768249980 for ; Thu, 11 Mar 2021 19:09:10 +0000 (UTC) X-FDA: 77908531260.18.C593500 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by imf19.hostedemail.com (Postfix) with ESMTP id EDB3B90009ED for ; Thu, 11 Mar 2021 19:09:06 +0000 (UTC) Received: by mail-pl1-f170.google.com with SMTP id a8so4178535plp.13 for ; Thu, 11 Mar 2021 11:09:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=x5MgFJmx+qCDHDBM5m9Z4h2MfyiNvh6Fg7+MEJeG5Hc=; b=hXphMEKp+eXWbBLvMNGFTgWa2pZEr+COjecriAAxFhNEeooa/BbyJ/YAUkkA5wytZg 1AOGSEuDCvR6ZGXii+4K3P587qy73WiAQZneeJ7C0uD7Z0mWY+a/BVm80vwEktHPLVTL h0JA6lJ4dixnOPuJ+vtVuF6X3lHth7AamKG6/i7xTYqmvTrxQhTaXeydTKIhQQ8uyErC cARoNTMaCQIoEqXH/PxRgv7SeHSbS16T9+VEylrr+clF2S7LDC5E05N64ru7HbzhA4pX 0jtq6H5/L4hmEqQHSIWq/c/kIuUfTpqG0Y+azFNdJvwnwW6cfCDMFHKjSJgtsN4MUgSl ZsCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=x5MgFJmx+qCDHDBM5m9Z4h2MfyiNvh6Fg7+MEJeG5Hc=; b=sSEk98vA32Oqrt3SFcV8CVNfZiERNMYZS0oe9NkYezSZiy1KzC9EmtpDJcYHIO9Pk5 Om+eZXG3fYhrr7IlQqUoIF+4chAlaG52Ak4E0Mu17mdQpExuIe8j6/Wzw/EvsWKDoiZR jhf9GUkRICUmvw4K+3eDTjr4GQNh39AuMD27FONZ1yuw/QS31Eo4Rk2G/QVQeWoEUiij QQhlTLwqQU4oaP8mai4zUgjYGrKs9xJk5qRj2oaqXJP7u9SFKM745X1OfV8h61YoQeSL ULCwPmAfW1NMBHzGjVV5Tg8QUPimImMUyQ7ez5euwtU468bvAX56LPWLmsmN5tuf36lM YuWQ== X-Gm-Message-State: AOAM531RSNAIEerQYMN5BubEE8BRs/QV8/tVisZPQUWBFaxqGRNqGirU 1oIsXsjczXZ56rhtvAK8Be0= X-Google-Smtp-Source: ABdhPJxjyKooM+K/uNd8RQ5pj9o2KzidC1fcsHNXVoUBXa8795yLlGRklotc+LNSeYmurtCbsO8ZbQ== X-Received: by 2002:a17:90b:3553:: with SMTP id lt19mr4840931pjb.222.1615489747922; Thu, 11 Mar 2021 11:09:07 -0800 (PST) Received: from localhost.localdomain (c-73-93-239-127.hsd1.ca.comcast.net. [73.93.239.127]) by smtp.gmail.com with ESMTPSA id t12sm2999111pfe.203.2021.03.11.11.09.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Mar 2021 11:09:07 -0800 (PST) From: Yang Shi To: guro@fb.com, ktkhai@virtuozzo.com, vbabka@suse.cz, shakeelb@google.com, david@fromorbit.com, hannes@cmpxchg.org, mhocko@suse.com, akpm@linux-foundation.org Cc: shy828301@gmail.com, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [v10 PATCH 04/13] mm: vmscan: remove memcg_shrinker_map_size Date: Thu, 11 Mar 2021 11:08:36 -0800 Message-Id: <20210311190845.9708-5-shy828301@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210311190845.9708-1-shy828301@gmail.com> References: <20210311190845.9708-1-shy828301@gmail.com> MIME-Version: 1.0 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: EDB3B90009ED X-Stat-Signature: fecfp7zuu18z715iys5nhz88yocadgp6 Received-SPF: none (gmail.com>: No applicable sender policy available) receiver=imf19; identity=mailfrom; envelope-from=""; helo=mail-pl1-f170.google.com; client-ip=209.85.214.170 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1615489746-623925 Content-Transfer-Encoding: quoted-printable 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: Both memcg_shrinker_map_size and shrinker_nr_max is maintained, but actua= lly the map size can be calculated via shrinker_nr_max, so it seems unnecessary t= o keep both. Remove memcg_shrinker_map_size since shrinker_nr_max is also used by iter= ating the bit map. Acked-by: Kirill Tkhai Acked-by: Roman Gushchin Acked-by: Vlastimil Babka Reviewed-by: Shakeel Butt Signed-off-by: Yang Shi --- mm/vmscan.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index b08c8d9055ae..641a0b8b4ea9 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -185,8 +185,12 @@ static LIST_HEAD(shrinker_list); static DECLARE_RWSEM(shrinker_rwsem); =20 #ifdef CONFIG_MEMCG +static int shrinker_nr_max; =20 -static int memcg_shrinker_map_size; +static inline int shrinker_map_size(int nr_items) +{ + return (DIV_ROUND_UP(nr_items, BITS_PER_LONG) * sizeof(unsigned long)); +} =20 static void free_shrinker_map_rcu(struct rcu_head *head) { @@ -248,7 +252,7 @@ int alloc_shrinker_maps(struct mem_cgroup *memcg) return 0; =20 down_write(&shrinker_rwsem); - size =3D memcg_shrinker_map_size; + size =3D shrinker_map_size(shrinker_nr_max); for_each_node(nid) { map =3D kvzalloc_node(sizeof(*map) + size, GFP_KERNEL, nid); if (!map) { @@ -266,12 +270,13 @@ int alloc_shrinker_maps(struct mem_cgroup *memcg) static int expand_shrinker_maps(int new_id) { int size, old_size, ret =3D 0; + int new_nr_max =3D new_id + 1; struct mem_cgroup *memcg; =20 - size =3D DIV_ROUND_UP(new_id + 1, BITS_PER_LONG) * sizeof(unsigned long= ); - old_size =3D memcg_shrinker_map_size; + size =3D shrinker_map_size(new_nr_max); + old_size =3D shrinker_map_size(shrinker_nr_max); if (size <=3D old_size) - return 0; + goto out; =20 if (!root_mem_cgroup) goto out; @@ -290,7 +295,7 @@ static int expand_shrinker_maps(int new_id) } while ((memcg =3D mem_cgroup_iter(NULL, memcg, NULL)) !=3D NULL); out: if (!ret) - memcg_shrinker_map_size =3D size; + shrinker_nr_max =3D new_nr_max; =20 return ret; } @@ -323,7 +328,6 @@ void set_shrinker_bit(struct mem_cgroup *memcg, int n= id, int shrinker_id) #define SHRINKER_REGISTERING ((struct shrinker *)~0UL) =20 static DEFINE_IDR(shrinker_idr); -static int shrinker_nr_max; =20 static int prealloc_memcg_shrinker(struct shrinker *shrinker) { @@ -340,8 +344,6 @@ static int prealloc_memcg_shrinker(struct shrinker *s= hrinker) idr_remove(&shrinker_idr, id); goto unlock; } - - shrinker_nr_max =3D id + 1; } shrinker->id =3D id; ret =3D 0; --=20 2.26.2