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_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 9F146C432BE for ; Mon, 2 Aug 2021 06:49:23 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3AE6461050 for ; Mon, 2 Aug 2021 06:49:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 3AE6461050 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id D08C16B0033; Mon, 2 Aug 2021 02:49:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CB9A66B0036; Mon, 2 Aug 2021 02:49:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BA7146B005D; Mon, 2 Aug 2021 02:49:22 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0040.hostedemail.com [216.40.44.40]) by kanga.kvack.org (Postfix) with ESMTP id 9EDF66B0033 for ; Mon, 2 Aug 2021 02:49:22 -0400 (EDT) Received: from smtpin27.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 4B1901AB60 for ; Mon, 2 Aug 2021 06:49:22 +0000 (UTC) X-FDA: 78429214164.27.38BFD7B Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by imf12.hostedemail.com (Postfix) with ESMTP id C0AFA1001E02 for ; Mon, 2 Aug 2021 06:49:21 +0000 (UTC) Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out2.suse.de (Postfix) with ESMTP id A13871FF2C; Mon, 2 Aug 2021 06:49:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1627886960; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=q7PGCIa5dKr+zd9QXo1w6BYL7jP8T2ubQzOp7fxIYBo=; b=HU962FsCvbDVraAaI8paM+qVfe5IewCn44+dP/CX81ZlPfpNkBA8DsBLvPSoYPFZoqjIiN xNW7R0UwCkOFg8/qZuytNpEVqMkSnSw/rnXR4hQuuwbd3VXQhH/3XeLGwPZFQH5L/4+NIz E1gqlLeGGJ84o7CSyorpMjlhAUSJQC0= Received: from suse.cz (unknown [10.100.201.86]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by relay2.suse.de (Postfix) with ESMTPS id 73312A3B85; Mon, 2 Aug 2021 06:49:20 +0000 (UTC) Date: Mon, 2 Aug 2021 08:49:04 +0200 From: Michal Hocko To: Miaohe Lin Cc: Roman Gushchin , hannes@cmpxchg.org, vdavydov.dev@gmail.com, akpm@linux-foundation.org, shakeelb@google.com, willy@infradead.org, alexs@kernel.org, richard.weiyang@gmail.com, songmuchun@bytedance.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org Subject: Re: [PATCH 2/5] mm, memcg: narrow the scope of percpu_charge_mutex Message-ID: References: <20210729125755.16871-1-linmiaohe@huawei.com> <20210729125755.16871-3-linmiaohe@huawei.com> <4a3c23c4-054c-2896-29c5-8cf9a4deee98@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <4a3c23c4-054c-2896-29c5-8cf9a4deee98@huawei.com> X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: C0AFA1001E02 Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=suse.com header.s=susede1 header.b=HU962FsC; dmarc=pass (policy=quarantine) header.from=suse.com; spf=pass (imf12.hostedemail.com: domain of mhocko@suse.com designates 195.135.220.29 as permitted sender) smtp.mailfrom=mhocko@suse.com X-Stat-Signature: 7x74dqitce4pj3xyphizt5ddy5zkkcy8 X-HE-Tag: 1627886961-264644 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: On Sat 31-07-21 10:29:52, Miaohe Lin wrote: > On 2021/7/30 14:50, Michal Hocko wrote: > > On Thu 29-07-21 20:06:45, Roman Gushchin wrote: > >> On Thu, Jul 29, 2021 at 08:57:52PM +0800, Miaohe Lin wrote: > >>> Since percpu_charge_mutex is only used inside drain_all_stock(), we= can > >>> narrow the scope of percpu_charge_mutex by moving it here. > >>> > >>> Signed-off-by: Miaohe Lin > >>> --- > >>> mm/memcontrol.c | 2 +- > >>> 1 file changed, 1 insertion(+), 1 deletion(-) > >>> > >>> diff --git a/mm/memcontrol.c b/mm/memcontrol.c > >>> index 6580c2381a3e..a03e24e57cd9 100644 > >>> --- a/mm/memcontrol.c > >>> +++ b/mm/memcontrol.c > >>> @@ -2050,7 +2050,6 @@ struct memcg_stock_pcp { > >>> #define FLUSHING_CACHED_CHARGE 0 > >>> }; > >>> static DEFINE_PER_CPU(struct memcg_stock_pcp, memcg_stock); > >>> -static DEFINE_MUTEX(percpu_charge_mutex); > >>> =20 > >>> #ifdef CONFIG_MEMCG_KMEM > >>> static void drain_obj_stock(struct obj_stock *stock); > >>> @@ -2209,6 +2208,7 @@ static void refill_stock(struct mem_cgroup *m= emcg, unsigned int nr_pages) > >>> */ > >>> static void drain_all_stock(struct mem_cgroup *root_memcg) > >>> { > >>> + static DEFINE_MUTEX(percpu_charge_mutex); > >>> int cpu, curcpu; > >> > >> It's considered a good practice to protect data instead of code path= s. After > >> the proposed change it becomes obvious that the opposite is done her= e: the mutex > >> is used to prevent a simultaneous execution of the code of the drain= _all_stock() > >> function. > >=20 > > The purpose of the lock was indeed to orchestrate callers more than a= ny > > data structure consistency. > > =20 > >> Actually we don't need a mutex here: nobody ever sleeps on it. So I'= d replace > >> it with a simple atomic variable or even a single bitfield. Then the= change will > >> be better justified, IMO. > >=20 > > Yes, mutex can be replaced by an atomic in a follow up patch. > >=20 >=20 > Thanks for both of you. It's a really good suggestion. What do you mean= is something like below=EF=BC=9F >=20 > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 616d1a72ece3..508a96e80980 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -2208,11 +2208,11 @@ static void refill_stock(struct mem_cgroup *mem= cg, unsigned int nr_pages) > */ > static void drain_all_stock(struct mem_cgroup *root_memcg) > { > - static DEFINE_MUTEX(percpu_charge_mutex); > int cpu, curcpu; > + static atomic_t drain_all_stocks =3D ATOMIC_INIT(-1); > /* If someone's already draining, avoid adding running more wor= kers. */ > - if (!mutex_trylock(&percpu_charge_mutex)) > + if (!atomic_inc_not_zero(&drain_all_stocks)) > return; > /* > * Notify other cpus that system-wide "drain" is running > @@ -2244,7 +2244,7 @@ static void drain_all_stock(struct mem_cgroup *ro= ot_memcg) > } > } > put_cpu(); > - mutex_unlock(&percpu_charge_mutex); > + atomic_dec(&drain_all_stocks); Yes this would work. I would just s@drain_all_stocks@drainers@ or something similar to better express the intention. > } >=20 > static int memcg_hotplug_cpu_dead(unsigned int cpu) --=20 Michal Hocko SUSE Labs