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 7B399C433FE for ; Mon, 21 Feb 2022 14:30:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D2A0A8D0002; Mon, 21 Feb 2022 09:30:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CD9AE8D0001; Mon, 21 Feb 2022 09:30:16 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BA2C98D0002; Mon, 21 Feb 2022 09:30:16 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0154.hostedemail.com [216.40.44.154]) by kanga.kvack.org (Postfix) with ESMTP id ADE8D8D0001 for ; Mon, 21 Feb 2022 09:30:16 -0500 (EST) Received: from smtpin10.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 6CD1018128B14 for ; Mon, 21 Feb 2022 14:30:16 +0000 (UTC) X-FDA: 79167022032.10.4C1A95E Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by imf08.hostedemail.com (Postfix) with ESMTP id DAD54160006 for ; Mon, 21 Feb 2022 14:30:15 +0000 (UTC) Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out1.suse.de (Postfix) with ESMTP id CD65A2111A; Mon, 21 Feb 2022 14:30:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1645453814; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Xm5m5YiRWNUhvkICSeUY+DU1RylDk3jyPhrK51qcDfU=; b=RI+5ECT2uxILC9RTBymw2xV51hIRlXaYMtIXbM3ktUPQUicUDNCR7d1vERywSgHfdUd7n0 AgTDm8Lc6+1ZeJhJV2fPialDUPlHZB8eyDXBj1QUcnHZ55bTgR/fFlDb4lZ4oMWZTnlyWq 545ns6J9/mvk9C8peXnTcNCen1lZz90= 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 9D011A3B87; Mon, 21 Feb 2022 14:30:14 +0000 (UTC) Date: Mon, 21 Feb 2022 15:30:14 +0100 From: Michal Hocko To: Sebastian Andrzej Siewior Cc: cgroups@vger.kernel.org, linux-mm@kvack.org, Andrew Morton , Johannes Weiner , Michal =?iso-8859-1?Q?Koutn=FD?= , Peter Zijlstra , Thomas Gleixner , Vladimir Davydov , Waiman Long Subject: Re: [PATCH v3 4/5] mm/memcg: Opencode the inner part of obj_cgroup_uncharge_pages() in drain_obj_stock() Message-ID: References: <20220217094802.3644569-1-bigeasy@linutronix.de> <20220217094802.3644569-5-bigeasy@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220217094802.3644569-5-bigeasy@linutronix.de> X-Rspamd-Queue-Id: DAD54160006 X-Stat-Signature: ngycixrnpfpp9d3nh73bmau6e79bto49 Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=suse.com header.s=susede1 header.b=RI+5ECT2; dmarc=pass (policy=quarantine) header.from=suse.com; spf=pass (imf08.hostedemail.com: domain of mhocko@suse.com designates 195.135.220.28 as permitted sender) smtp.mailfrom=mhocko@suse.com X-Rspam-User: X-Rspamd-Server: rspam11 X-HE-Tag: 1645453815-725935 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 Thu 17-02-22 10:48:01, Sebastian Andrzej Siewior wrote: > From: Johannes Weiner > > Provide the inner part of refill_stock() as __refill_stock() without > disabling interrupts. This eases the integration of local_lock_t where > recursive locking must be avoided. > Open code obj_cgroup_uncharge_pages() in drain_obj_stock() and use > __refill_stock(). The caller of drain_obj_stock() already disables > interrupts. > > [bigeasy: Patch body around Johannes' diff ] > > Signed-off-by: Johannes Weiner > Signed-off-by: Sebastian Andrzej Siewior Acked-by: Michal Hocko Thanks! > --- > mm/memcontrol.c | 24 ++++++++++++++++++------ > 1 file changed, 18 insertions(+), 6 deletions(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 36ab3660f2c6d..a3225501cce36 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -2224,12 +2224,9 @@ static void drain_local_stock(struct work_struct *dummy) > * Cache charges(val) to local per_cpu area. > * This will be consumed by consume_stock() function, later. > */ > -static void refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages) > +static void __refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages) > { > struct memcg_stock_pcp *stock; > - unsigned long flags; > - > - local_irq_save(flags); > > stock = this_cpu_ptr(&memcg_stock); > if (stock->cached != memcg) { /* reset if necessary */ > @@ -2241,7 +2238,14 @@ static void refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages) > > if (stock->nr_pages > MEMCG_CHARGE_BATCH) > drain_stock(stock); > +} > > +static void refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages) > +{ > + unsigned long flags; > + > + local_irq_save(flags); > + __refill_stock(memcg, nr_pages); > local_irq_restore(flags); > } > > @@ -3158,8 +3162,16 @@ static void drain_obj_stock(struct memcg_stock_pcp *stock) > unsigned int nr_pages = stock->nr_bytes >> PAGE_SHIFT; > unsigned int nr_bytes = stock->nr_bytes & (PAGE_SIZE - 1); > > - if (nr_pages) > - obj_cgroup_uncharge_pages(old, nr_pages); > + if (nr_pages) { > + struct mem_cgroup *memcg; > + > + memcg = get_mem_cgroup_from_objcg(old); > + > + memcg_account_kmem(memcg, -nr_pages); > + __refill_stock(memcg, nr_pages); > + > + css_put(&memcg->css); > + } > > /* > * The leftover is flushed to the centralized per-memcg value. > -- > 2.34.1 -- Michal Hocko SUSE Labs