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 43099C35FF8 for ; Tue, 18 Mar 2025 07:59:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8BF45280006; Tue, 18 Mar 2025 03:59:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 86E3D280004; Tue, 18 Mar 2025 03:59:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 73745280006; Tue, 18 Mar 2025 03:59:03 -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 551F5280004 for ; Tue, 18 Mar 2025 03:59:03 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 38569A693A for ; Tue, 18 Mar 2025 07:59:03 +0000 (UTC) X-FDA: 83233920966.24.A71B16B Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by imf24.hostedemail.com (Postfix) with ESMTP id BE14E18000A for ; Tue, 18 Mar 2025 07:59:00 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=M2gfY0Us; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=GdaaZzNn; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=M2gfY0Us; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=GdaaZzNn; dmarc=none; spf=pass (imf24.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=vbabka@suse.cz ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742284741; a=rsa-sha256; cv=none; b=Uf3qNGUEDyCA1QqKJINIh0M/OiY7eeGi3OAgIeA0oNC8V7fMRFL3BjHb3YStBivvuoeTjs At5f+TU6t/iGPYduEgxjD4VdDtNpf7tOQbyowjkm7RHG7er3tfAXUkitr+56ixKxpnVvGU 4AqEH2fi5m/RHcyOOk5cNFBTSWHMu4Q= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=M2gfY0Us; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=GdaaZzNn; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=M2gfY0Us; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=GdaaZzNn; dmarc=none; spf=pass (imf24.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=vbabka@suse.cz ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1742284741; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=LhvAj9f0vslq+dqnUVL7oqgaJNKSRMMwm6koO2lL4Fg=; b=YcDcI45/vwkKAnnRbRNxn3ghfaI3XqWIb2749htZZ5m9YldAfHLzFeLOQ2fUGeLsnriU6f CgumMLr0qDHZtbXv0IGvXYIBklVw4JivvTBY7VE8BEKeCHwCjmKBhLgGfbOToJOYB5x88u dCWEYu//uTJmnamQPivOED9tvKt85NU= Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 2D1D921D85; Tue, 18 Mar 2025 07:58:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1742284739; 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=LhvAj9f0vslq+dqnUVL7oqgaJNKSRMMwm6koO2lL4Fg=; b=M2gfY0UsTD9UDg4vW6BrxWNDO6z32BccQJCWkQm7dsignIGrZhdsTB866ayR94XuGeMBfR Ud7oUD+RgFX1G7j1FLLp/XcX8j/QKoms353Bfbto8Pb1XqKgwp3pjT2YWTajkwTie0rCG2 zVTwgBfULjigfu+rGLjwo2kfA2TGo1s= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1742284739; 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=LhvAj9f0vslq+dqnUVL7oqgaJNKSRMMwm6koO2lL4Fg=; b=GdaaZzNnmSyDXA6SRNZ9yMgodM1FCvWfXSfn+aQBLj2V2W83Nqd94l65d92qU5MHoaL/lL uWb5f9Xa/8NZk1Aw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1742284739; 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=LhvAj9f0vslq+dqnUVL7oqgaJNKSRMMwm6koO2lL4Fg=; b=M2gfY0UsTD9UDg4vW6BrxWNDO6z32BccQJCWkQm7dsignIGrZhdsTB866ayR94XuGeMBfR Ud7oUD+RgFX1G7j1FLLp/XcX8j/QKoms353Bfbto8Pb1XqKgwp3pjT2YWTajkwTie0rCG2 zVTwgBfULjigfu+rGLjwo2kfA2TGo1s= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1742284739; 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=LhvAj9f0vslq+dqnUVL7oqgaJNKSRMMwm6koO2lL4Fg=; b=GdaaZzNnmSyDXA6SRNZ9yMgodM1FCvWfXSfn+aQBLj2V2W83Nqd94l65d92qU5MHoaL/lL uWb5f9Xa/8NZk1Aw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 0ECE11379A; Tue, 18 Mar 2025 07:58:59 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id GpKrAsMn2WeEBQAAD6G6ig (envelope-from ); Tue, 18 Mar 2025 07:58:59 +0000 Message-ID: <5429e6f1-a050-4f2b-b83c-aba824636bb8@suse.cz> Date: Tue, 18 Mar 2025 08:58:58 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 4/9] memcg: manually inline __refill_stock Content-Language: en-US To: Roman Gushchin , Shakeel Butt Cc: Andrew Morton , Johannes Weiner , Michal Hocko , Muchun Song , Sebastian Andrzej Siewior , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Meta kernel team References: <20250315174930.1769599-1-shakeel.butt@linux.dev> <20250315174930.1769599-5-shakeel.butt@linux.dev> From: Vlastimil Babka In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Queue-Id: BE14E18000A X-Stat-Signature: rx8pmyezf8isiusyaj9zca87o1wbdpto X-Rspamd-Server: rspam06 X-HE-Tag: 1742284740-105394 X-HE-Meta: U2FsdGVkX18VHdrX8B4B3ejrXcDayUnFWtAG5ImN1QFbnGoJcDOQCNKOplLHwgHINtR42LD0Ytyz1FVD/CONYH/BQ5V8fGVHkIVU0zVtvw8A5lSSZitOIA4FjSCAKkRqjhzsoxdrubW5LzyeKn+lWWKkPPtdILdpT6dLwmINf+GTEUDQbmDmqK2Qd5snn1CPL/MirLdey+hEtnb551rxnHhB5DnIfOlG9WCb13RcPrIx9D75UzL+6BQIbixBaq8nnUZI/IhiUIWSYKHRFg/MR+vdAAvH9xqiie+vpTRVBaKmmOG7kDMOkb5UD4pyQf3btMikWUKe0AuLGIuCURwXiiVzL9mw3VnjVSLR1YlylrTvjAC2OHZwPR9qaAuG7O1kAC/Ymz5xanh42S4VYLrWvOpjEpr6G1ST2AAkWtT1YVwj8+AxQMdB/qVjb7lfG0CF6MfHXxtAbDTkqyExXMDPXHpEV1jgeOkGKM6N76tF7zTwLEApnhRVqTEw/gzFt6Nek57r+iSqXEW4yC3iDSgzG/tildwpy4YjlowKkWyIbH0VhOteha9uCuQ3kjfP9n2BRMlShKrzsgtLyGL62daKrycdEI3Bh9cD+2JxFrv5Uv0kdQAHSAVkqmjpJnMWyGJLUSb78Jgir4CabiTenCB9oziQ7yJkPKKg2IFcstEYKfTyYf0klpgZo9/XOcwZwVwlzkPVX9/YHzxKW4LXKysu5KIjbFGsdGUrKDMTRwETgCOi97J21gZxRivadMl+LgJkslIdpONG3QrO+QktMaPaxTMX+w39SoJHzHmmOEu10x0VlghWW86H32U466Eh7XrK9bmHh5T2mJaE7eDe9Q4UmA1ISzEPLxA8w+pzB3b2mLGuVD17oQErGkArI6lcwJHBfCCbJt2EhXTVVyVAa/xEuezmimAshnqyX3OKpPJy273U07AxkGSyjdAwMZr6ufWJI0qeetsA4Cdb55IQK3n V+R6w/gp Pu+ueWgLI9wT9qwfpsLhRLTnnn603ARbNtyBs5WMqwX2btkT9Pev9dBvg/xyqQwdjCdcjKDFlwlh9YfXfiSId9KYlkU/NJGOHak65A/fceSECnLSV1SM3nmTKbEWZ6yJ7RZiU2cyytPC5y7ehO+a/SC1C/4xdGBuAfsi9dKvO6cYLC+dLQFWWIMsovYhenmhoCsrgrUA39dMhz2Cr46jliFNOe+7aVI5Jd804HzaWYa9RM3jCfCIAgcSPwOBE04qafindSADp51G3YwToESvssS9lt2OtULQmRdAQxnD26ejhybQUD7DEd12m2lvpw/MMhQjDlVjI9Hkv/nQ= 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: List-Subscribe: List-Unsubscribe: On 3/18/25 01:58, Roman Gushchin wrote: > On Sat, Mar 15, 2025 at 10:49:25AM -0700, Shakeel Butt wrote: >> There are no more multiple callers of __refill_stock(), so simply inline >> it to refill_stock(). >> >> Signed-off-by: Shakeel Butt >> Acked-by: Vlastimil Babka >> --- >> mm/memcontrol.c | 32 ++++++++++++-------------------- >> 1 file changed, 12 insertions(+), 20 deletions(-) >> >> diff --git a/mm/memcontrol.c b/mm/memcontrol.c >> index b54e3a1d23bd..7054b0ebd207 100644 >> --- a/mm/memcontrol.c >> +++ b/mm/memcontrol.c >> @@ -1865,14 +1865,21 @@ static void drain_local_stock(struct work_struct *dummy) >> obj_cgroup_put(old); >> } >> >> -/* >> - * 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) >> +/* Should never be called with root_mem_cgroup. */ > > How about adding something like this? > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 768d6b15dbfa..5c26002f2168 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -1881,6 +1881,8 @@ static void refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages) > { > unsigned long flags; > > + VM_WARN_ON_ONCE(mem_cgroup_is_root(memcg)); Already in patch 1 though? But I agree. > + > local_lock_irqsave(&memcg_stock.stock_lock, flags); > __refill_stock(memcg, nr_pages); > local_unlock_irqrestore(&memcg_stock.stock_lock, flags); > > > Other than that, > Reviewed-by: Roman Gushchin