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 00E74C35FF3 for ; Tue, 18 Mar 2025 00:58:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 169D6280002; Mon, 17 Mar 2025 20:58:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1197C280001; Mon, 17 Mar 2025 20:58:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F2255280002; Mon, 17 Mar 2025 20:58:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id D4758280001 for ; Mon, 17 Mar 2025 20:58:44 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id BFB891A0791 for ; Tue, 18 Mar 2025 00:58:44 +0000 (UTC) X-FDA: 83232861768.05.F48982F Received: from out-181.mta0.migadu.com (out-181.mta0.migadu.com [91.218.175.181]) by imf30.hostedemail.com (Postfix) with ESMTP id ED87C80003 for ; Tue, 18 Mar 2025 00:58:42 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=R9V8cBJw; spf=pass (imf30.hostedemail.com: domain of roman.gushchin@linux.dev designates 91.218.175.181 as permitted sender) smtp.mailfrom=roman.gushchin@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1742259523; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=cP0s4VETbk8t0bBy6Octd+t99xFNYIjMSoL8GoR+Dok=; b=DoWBeOIXX+2ysBpd+ZCm+6VtxKQc/Kovr06FnfJLy2UTKN95yykIo8pt3dE2jyWE740Y+6 MVdifsjuplbX+D4QN37gNPDKhc0Mo0hUhKFKmOHByH9ybioi/VRnJ+/Qo+LMwv38C7cEjr ZgtyDSL72MNmuHFshpG6q3yaPWcbYpc= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=R9V8cBJw; spf=pass (imf30.hostedemail.com: domain of roman.gushchin@linux.dev designates 91.218.175.181 as permitted sender) smtp.mailfrom=roman.gushchin@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742259523; a=rsa-sha256; cv=none; b=KqWnG8UOOa8EyYGI1aTbk6jub5R9H/GYwJGQThaULF3FntU7PIrM0MVqXUAxh1U9dXBGQc oawRljrtMAvMqYu/T6Qe2AFk9yArWQ9Zggkd/3oJaeF9qlgdusSLAi48tLUax+PJjwseTR XRYDZnih78nvtV7s1mYZRBkDxcF1v/c= Date: Tue, 18 Mar 2025 00:58:36 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1742259520; h=from:from:reply-to:subject:subject: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=cP0s4VETbk8t0bBy6Octd+t99xFNYIjMSoL8GoR+Dok=; b=R9V8cBJwgDwVeOohEDJts4r7UTTfSFY5leoQ5bxE0kKt+0VAIZi5jhZnm8DQ8z4aoYgrw8 OvmiGMSDV9FWurOe6F9T/1NRxnEeIaIhXFn7vuDKGZgOziWCzjLZM+f7aDuVh8EJOXxXMf 2pKYnc0v/9XqK+Nusf9BRDY/h0XgdjM= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Roman Gushchin To: Shakeel Butt Cc: Andrew Morton , Johannes Weiner , Michal Hocko , Muchun Song , Vlastimil Babka , Sebastian Andrzej Siewior , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Meta kernel team Subject: Re: [PATCH 4/9] memcg: manually inline __refill_stock Message-ID: References: <20250315174930.1769599-1-shakeel.butt@linux.dev> <20250315174930.1769599-5-shakeel.butt@linux.dev> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250315174930.1769599-5-shakeel.butt@linux.dev> X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: ED87C80003 X-Stat-Signature: oquc4zt86ktbknnpbiuezccwb7mbdkte X-HE-Tag: 1742259522-193671 X-HE-Meta: U2FsdGVkX193SkIIAs0mmE6zaQkSiXw9/gHMG0LBgpWQWcLcmi+kZ8mMcfCMLlhTISL8JXQUtM/CABkbp16ecsXX4OWOrxJyNrbo1hhf6rUQMGKj0+hY56y+jlcMUdnWEsq8Zua0KNCGhvJEqvmxVnnpk5OyoWXf+kAbdhwTB6M1aQAnVHbvyNRrp1YPNvejFZMJeIv1qzf9TgsbWBy2+LQEtSTOopMeVGDXT6qs2qP1e8wtX40Cnh1GRGCPa4WtshhcKKdz62lwYDi3KTuOhVEssWuxBvuv0VtS004ZzXOkfbjQLTmcEiiEe8bSI9q7PfzNg1/yc2ctvpIksLd9f3uQHoz77goph6X73ErQjacR6PVqyulZ49g0g2DpY8neg/jjmDIdN/af6Df5P9w5hvGGuWUAmLP6MDxZL7+fMJOPVMhQZ3H/iPLaclVnfXCmNOcwT4cw+NzTyQVQpeVB2n1CxrkrLzCz/AORB0sLUuHpKBH4FV0ObEagpvSokAAXu2DvflxYsEsuSoNNg4vR+MTKyEhSWhG/zcQF8QLfVw5ChCBHaxKLRnFkHm/fnoPHwc90MaERC5zLGsztha3+UMqnJYNhAe3lULRbKmMxur72rlqqtG3RurPQ7Lqe6jI2gm+byuS+g3yxEEk8AU3NxyXMWSAR1q1ElGyllk16KCDL9uegHRjbcwx1n4fHBI8mjSa3NYpI9zD1vNLx03SC0EzenAaj6bFcCTFNbM8cwpehCQsLbZPA9UxUInfwP6gGxaL15P75byDPn9qdFLOi0J2kCYVP4APz5W+6JRSWdBL3KOVgFzcYyErjYvPZ9FXltmPYD5vzJS9+lDQu37WjtYD6ZWpGE6BnmjB4Gu1xr98lt8G4yu8egR08ODdhQ80SixtsqfAH/oQkHkU6rMCDL6RpIsN27/FVX3poa/HYw9juMcT08I6CsW6xWZDGFzvNLH7gdDAiTKwqIifVANt kmixcDJU Esrqm+vh6XzlEiaNdO3pCX4HpF/0ITwKxqmKY4eONu1mT2clwTqF0l2Hkm3ua94yp78HZLzwWvQsgkFr8f2/DwRw51BTDSAceOwMCUIMMx1gIukqka3E9xbCJLcN5b2Urgqvg/kDxgk+CgX8zR9WztZILRBxBacWptjnkTpfUfy0F5R9DrwgMnzTc9i7UuO+zh4t6SvO/X4kNn8s4+x+I70EyZLe62uHTgoYAkxnwVLiYcUZCb/nqUgSmbE0DjWrSFwgURxAvAOSnTiE= 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 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)); + 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