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 DD7A5C02188 for ; Mon, 27 Jan 2025 12:50:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6A6E4280147; Mon, 27 Jan 2025 07:50:58 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 657F128013F; Mon, 27 Jan 2025 07:50:58 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 51EFB280147; Mon, 27 Jan 2025 07:50:58 -0500 (EST) 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 2D7B928013F for ; Mon, 27 Jan 2025 07:50:58 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 9F900B12D2 for ; Mon, 27 Jan 2025 12:50:49 +0000 (UTC) X-FDA: 83053216218.15.3C41556 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by imf25.hostedemail.com (Postfix) with ESMTP id A9EF7A0002 for ; Mon, 27 Jan 2025 12:50:47 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=suse.com header.s=google header.b=RIRiXJge; spf=pass (imf25.hostedemail.com: domain of mhocko@suse.com designates 209.85.128.54 as permitted sender) smtp.mailfrom=mhocko@suse.com; dmarc=pass (policy=quarantine) header.from=suse.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1737982247; 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=cokFZPoIQmX9RBxxgHEXC/b+MepK83mN2x94MEbPICU=; b=L0gOK0iYy/4FNz8FTrN8OTPFn32+lo3rXKCFZpV/y0dehlQcwEUOdUKEgZkkvEzmpcb9ln zYkx0s1TN2dwcs54qoXBSTLlTwFbpbSEJa53UwinVF26gleOHtrYMffo4sNtClrNKfTuTd 42D96iJV4u02jm8oeVYjFHi/G2KuWQs= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=suse.com header.s=google header.b=RIRiXJge; spf=pass (imf25.hostedemail.com: domain of mhocko@suse.com designates 209.85.128.54 as permitted sender) smtp.mailfrom=mhocko@suse.com; dmarc=pass (policy=quarantine) header.from=suse.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1737982247; a=rsa-sha256; cv=none; b=qzSovaEeTtlLuu906edh17BZvcyslhVsqHWIfq2snvcpJdnLce1Qu79f6fk5KLO5kAKank GBya9XaS3L9r0qdXrz18HDP4qcBqkUpxmwCb3HU1dkDpqQg6ACImYeaV1TFH2xpsaXqioj d67YfIIaB8nuhqZ/fgcBBxFt6cQ7L+g= Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-4361e89b6daso28301045e9.3 for ; Mon, 27 Jan 2025 04:50:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1737982246; x=1738587046; darn=kvack.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=cokFZPoIQmX9RBxxgHEXC/b+MepK83mN2x94MEbPICU=; b=RIRiXJgeZOlpUBQt3Zm+aVEIzIGPMckfarF+guPoXp0rmQAp/GcGwOV4F1eeg4+rhh OjtOZuXKWhvKL8hhdRQWi0W2t9eO7vcvAbfbzks9FVrHOAalG6U6sKFTjFswkheAIaeQ YFgFxp677ioh1SXdE3rg/Khgs0mJ58RS9Vr7lqQ5e4+WJS7qW3vbJVXuZfaQMOM8O5Bd MfauKMOodtn1uVqtU9ZFpFvjOKUKprfPwwqCuvBG85kjZRfRWt4p5hbmRcxcVzXdwfmi gey5v+kmmB3O6I7icbZQCR/gYPDJNMTKD2ngZT/9XTiX9OGh3LkonAPvrpedc7j/Xh72 f60A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737982246; x=1738587046; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=cokFZPoIQmX9RBxxgHEXC/b+MepK83mN2x94MEbPICU=; b=d9Fh65ujhee73DJ62GdOL4YS7QDSiMZbnkrSq3ata3GbxG/6KEH2AItVirvtgzqCyB 9dm7JDdJWOnMw7pSh13tXfwgTnMG8zFUgh94vOYQSl4xrtAT9Ipfib43tPRPryQToGNI QwlkpDoV9on9Cq2j9lUXyHRKk4R6jLbRiiI+lcrSr3yvVCaofcJ3IfcPInloeN9YlWZD QI0/GsnchLJh3K6TS7DCcF95bl/ItPnAwpjHZnBB6+OmRJF+Pu7PvyVYjcl7eeZVTzSX hPhLaQMnn7a5JXR+sBGlAKlbwKBJfv1cMbvtHTbJsC+hKNiasZCMPQMAfjmJBHZQH7vR +JMw== X-Forwarded-Encrypted: i=1; AJvYcCW7c0RcfOHEmdPOQtVGRQTZqkv6zhctPOjaGQc4pLgw3L8cVzodnoi994ZzBl8HKzAokjdmmGB+0Q==@kvack.org X-Gm-Message-State: AOJu0YwDk3S3JSJjZunSELHVDUciUZnNxQQZFpGHXoiS3++UOkMncJCu s+/Oe5bi/S9jsDKnq+o/5dx2mwDDjVDMo2dI/v5DSUwrgxYZxo6oXOB9DJuYuic= X-Gm-Gg: ASbGnct/xe9wLqdT8QQgzwKRAc7oKzKTfmYrOJy6QOWKDC+I0WfgxTMz0zHc/dFigZN +kK6ZYbIvHrm4lJe18pC/0me1sxI8q+O0EQ5CP0zoM1h+gmE2sTT7nGfbGkvIJIJ3uqgK/2AjhX P9kJjwze0FwU580Q/ji9MU9d8wWMvhKvpigV0wIm9EHowhIH8c2hhkiLUiiLFqMb16L2AsybQ2B do4e0Gy2K2C7j/+6QxOYD3gpot5x8fjZODG+h6J+bvKvtXV64xHqtzkAmK/eXvnOB6qmzqvw9jJ EfxtPSpCdX706Bw= X-Google-Smtp-Source: AGHT+IEsomHPSy4KNCMWfxo6O3PT1jcbenn9lQBeEG79bYkvI1dUoL17Y07xyLnwhpkYqu+7hMebow== X-Received: by 2002:a05:600c:28c:b0:436:5fc9:309d with SMTP id 5b1f17b1804b1-4389ec8a8d0mr395834775e9.30.1737982246230; Mon, 27 Jan 2025 04:50:46 -0800 (PST) Received: from localhost (109-81-84-37.rct.o2.cz. [109.81.84.37]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-438bd50184dsm129003935e9.10.2025.01.27.04.50.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jan 2025 04:50:45 -0800 (PST) Date: Mon, 27 Jan 2025 13:50:44 +0100 From: Michal Hocko To: Johannes Weiner Cc: Andrew Morton , Roman Gushchin , Shakeel Butt , Muchun Song , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 1/2] mm: memcontrol: unshare v2-only charge API bits again Message-ID: References: <20250124043859.18808-1-hannes@cmpxchg.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250124043859.18808-1-hannes@cmpxchg.org> X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: A9EF7A0002 X-Stat-Signature: kpj449snyyn3ggmdmnkwfhaa67rkn1ws X-Rspam-User: X-HE-Tag: 1737982247-892343 X-HE-Meta: U2FsdGVkX1/YRP8YZRJx/2TX+74s/wd6qe/XRj30kmV6XiTXIdhIVhyRQ7zbQdsXH/ozAOxvCcfQ70BnTcNg+32A9LzYkO19AcdhUCnXXrlCzX4h5LsyZU/yS3VnWKLzwZ1Ib631aNhs8yq4bc6LJrP4IQt5YeEkKF0PjBwJ+LX0BGLqftiOp2UMAo2ZRB7dqHLZkqomhfaso+1lMz5wwydrFC5cDt5eExpa5aaBugni36nffRSCUpeSGlA9XJKF3o2McjzsWXoDqDBbOYlkoZyD9oiN+I0JqfJWypGedlXuX9Xoojm4vq7ti75J08/Vya7lBn6b2EY5clxj3A9AirNz4YqUIKmroC4qulXgaqjLp4PfZ+wcJlLln2KJ5IeojGoUvipjsNSqT4DC2R25Gy2VL44UFp/5eLEOPKg9ZkNhNM3zivaj+TKn9PYUfGvHMI3AHRrhrShXCJlD9a2eeyYPXJzR/hBT8Drv4P8PvP50Lknk+b+25+QZG6KhANNUcQaN/yDyI7KLDtGdja3CVe4P/crt7ihtza6lWhgNpuY8Plu1LF/oEs2embFHiA/OTVLYBU0Ojmf6jDRmUSwcyl6SBTh/Z+p/cMsl/8+PoaB9O3dWMZfKue9xLbNFuq8PKqJdfut5Uu6I7Q9cn/VavCOTCcFCinNW8CfWv/HuEz8DBDsq6+OJwpAGx92houoOymr/jGyTD/D3jGx3v3qmp5dl59WQqaePxV52sCaC5oSXMNyh2AdYWubRRqH1U4XlKpKD7NRfHFpZ5C4AFBRJr7VwLRXkJHxW5h9UKeEHdsciBH0OygRfeL6v9kKqmeNpeY1GwVsTGdfK/8qNRU0ZA1KhOjp2snb8SrgTJwqcPBCXtrHNdTV1RiHtGVNjyBfBXEv/Wqkpennse8N2lPvDGIG3GIhwHCnmzNKu/+Uot2Ek8L/CnKiBQIlL/S+RK5aY9kb3pa50mivTyv2TBkg g8qMwwC3 DcDzyf0xaBYZOZIm1aFIu+VNhH4bGDl5LzRLLwd9ta/xKa7P1JvOaetiqY9x7yvCmWH6fHzIzRnL1wYy1ln9xIAkzEfFauyGYXKACvhSqS9do8q8PqDJyGMwhg/tTx375UYVEwX0fLmkwT5shwcuokWlB4lKdn+/gSHSBexGQaaC+fC5exxPvn90PEQfwiduaZq96mWsv+37sb9n2VlhVXu0SDYV4Vb6RskfbC2qCBejvpsR3vk6VDcR8MLUvKyCfzzfoCdPO5gMQ0X0En2lmHxiQB62oPsl4VkctW+b3/oRlvFQwS7FxDzqjwYcqc6gawG7VvBlu9gMtwnYa+wwWo39fSzr8BQ372AePJlOuGPR1ukjcedE8nAvR45dTki/rt/PJuZJTaqhkO6qE/4TQbevV/iZBanbVDVyFM7DUAVbM1kTnhWvFPDHfVqyYVKj9cQdZFBJ/AIg4tFSlAxbxFRbT9HymRp80IDSC 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 Thu 23-01-25 23:38:58, Johannes Weiner wrote: > 6b611388b626 ("memcg-v1: remove charge move code") removed the > remaining v1 callers. > > Signed-off-by: Johannes Weiner Acked-by: Michal Hocko Thanks! > --- > mm/memcontrol-v1.h | 15 --------------- > mm/memcontrol.c | 17 +++++++++++++---- > 2 files changed, 13 insertions(+), 19 deletions(-) > > diff --git a/mm/memcontrol-v1.h b/mm/memcontrol-v1.h > index 144d71b65907..6dd7eaf96856 100644 > --- a/mm/memcontrol-v1.h > +++ b/mm/memcontrol-v1.h > @@ -7,21 +7,6 @@ > > /* Cgroup v1 and v2 common declarations */ > > -int try_charge_memcg(struct mem_cgroup *memcg, gfp_t gfp_mask, > - unsigned int nr_pages); > - > -static inline int try_charge(struct mem_cgroup *memcg, gfp_t gfp_mask, > - unsigned int nr_pages) > -{ > - if (mem_cgroup_is_root(memcg)) > - return 0; > - > - return try_charge_memcg(memcg, gfp_mask, nr_pages); > -} > - > -void mem_cgroup_id_get_many(struct mem_cgroup *memcg, unsigned int n); > -void mem_cgroup_id_put_many(struct mem_cgroup *memcg, unsigned int n); > - > /* > * Iteration constructs for visiting all cgroups (under a tree). If > * loops are exited prematurely (break), mem_cgroup_iter_break() must > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 46f8b372d212..818143b81760 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -2198,8 +2198,8 @@ void mem_cgroup_handle_over_high(gfp_t gfp_mask) > css_put(&memcg->css); > } > > -int try_charge_memcg(struct mem_cgroup *memcg, gfp_t gfp_mask, > - unsigned int nr_pages) > +static int try_charge_memcg(struct mem_cgroup *memcg, gfp_t gfp_mask, > + unsigned int nr_pages) > { > unsigned int batch = max(MEMCG_CHARGE_BATCH, nr_pages); > int nr_retries = MAX_RECLAIM_RETRIES; > @@ -2388,6 +2388,15 @@ int try_charge_memcg(struct mem_cgroup *memcg, gfp_t gfp_mask, > return 0; > } > > +static inline int try_charge(struct mem_cgroup *memcg, gfp_t gfp_mask, > + unsigned int nr_pages) > +{ > + if (mem_cgroup_is_root(memcg)) > + return 0; > + > + return try_charge_memcg(memcg, gfp_mask, nr_pages); > +} > + > static void commit_charge(struct folio *folio, struct mem_cgroup *memcg) > { > VM_BUG_ON_FOLIO(folio_memcg_charged(folio), folio); > @@ -3368,13 +3377,13 @@ static void mem_cgroup_id_remove(struct mem_cgroup *memcg) > } > } > > -void __maybe_unused mem_cgroup_id_get_many(struct mem_cgroup *memcg, > +static void __maybe_unused mem_cgroup_id_get_many(struct mem_cgroup *memcg, > unsigned int n) > { > refcount_add(n, &memcg->id.ref); > } > > -void mem_cgroup_id_put_many(struct mem_cgroup *memcg, unsigned int n) > +static void mem_cgroup_id_put_many(struct mem_cgroup *memcg, unsigned int n) > { > if (refcount_sub_and_test(n, &memcg->id.ref)) { > mem_cgroup_id_remove(memcg); > -- > 2.48.1 -- Michal Hocko SUSE Labs