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 6DCBAC2BBCA for ; Tue, 25 Jun 2024 07:08:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F199A6B0333; Tue, 25 Jun 2024 03:08:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EC9F46B0334; Tue, 25 Jun 2024 03:08:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D6A446B0335; Tue, 25 Jun 2024 03:08:49 -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 B3DF96B0333 for ; Tue, 25 Jun 2024 03:08:49 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 7749141725 for ; Tue, 25 Jun 2024 07:08:49 +0000 (UTC) X-FDA: 82268533578.07.62E5029 Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) by imf26.hostedemail.com (Postfix) with ESMTP id A000A140012 for ; Tue, 25 Jun 2024 07:08:47 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=suse.com header.s=google header.b=Aufbtdmj; dmarc=pass (policy=quarantine) header.from=suse.com; spf=pass (imf26.hostedemail.com: domain of mhocko@suse.com designates 209.85.208.48 as permitted sender) smtp.mailfrom=mhocko@suse.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1719299311; 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=A/r8Fui7XgizOYipYXhnp7Nwq9UOlmXXqKU464DYZ+I=; b=RXs8oAW+jfeA/8CzO+gZ6MIfuLyJgV6uGXcVE15TM+EKgxXVnzB7BtI+5952cGunAGY3WK 6AiGbQgB+9aHxLfTifS2slfIHytlyXp/cHMoSBv3dNoHaTpIyCTxx3Wt6QCt+FoanbGQGN Jcs/AqwrJZIM01C3bNItSJG4z7IqFk0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1719299311; a=rsa-sha256; cv=none; b=6A80mT/C5fS1Yfbk65JoW26jVUsvbxV0wiNj4t2tWp7777mBOspPsxWDRERnV+tmLm9Zeq YRXgB7QX5Gt/9J63W6Gh5AA/9kbu1hYxS1JCsrojdzakCA/e7LFMptmUjmex+CkORUwUbo VLhsStjV5+bbJhEMnUEPlecSfCTqoR4= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=suse.com header.s=google header.b=Aufbtdmj; dmarc=pass (policy=quarantine) header.from=suse.com; spf=pass (imf26.hostedemail.com: domain of mhocko@suse.com designates 209.85.208.48 as permitted sender) smtp.mailfrom=mhocko@suse.com Received: by mail-ed1-f48.google.com with SMTP id 4fb4d7f45d1cf-57ccd1111b0so2877477a12.3 for ; Tue, 25 Jun 2024 00:08:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1719299326; x=1719904126; 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=A/r8Fui7XgizOYipYXhnp7Nwq9UOlmXXqKU464DYZ+I=; b=Aufbtdmjxi9DXuxV3ogExz/8GsULzVbOn0rg8zRdgwUN6A3ILP/lV++U+hzhAOA2FT ysCUXhsi1s71a1pvojEhvlOhhtUJVHNu1HbqWDa118T0K3+TZy4o5xo+RTsS4HJQSzRy 5vrzbYLKvO0viRUTelPQwy5mjT3KqiPebBr+IBddR7DsbonTyB5OdAHja1+fnnNze+By Vg1rIMmWDyPyTkKPUTbrlB9Y/qi9LboSCH5Mpt3DuAN0EjDsLL4pXLpSk3i9NOIufAun Z0i+uWprumghW4lVmycTniD2D7TtzaZSK8xVt/+3aTQU3wm//FrV/TuOH9eiinbwYZR7 TMUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719299326; x=1719904126; 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=A/r8Fui7XgizOYipYXhnp7Nwq9UOlmXXqKU464DYZ+I=; b=j7+Bl70PHste3ibrR4jhdLkenufIkJVo3WhFXFStRasi+Gv1XGrEEjF1KcJqxDlx8o Tl7V7GjqpoHKHq7ucrxedDhjXwne7XPcsbTW93PS3DdO/cjSLOVOdcftaS1FlU0HycU7 vHCb498fCrAffkhjv+5/c8yirh5v3+jFwuHFVw0fFoXDMYNQ6ZltEWlGc68koy3sa9rk 8Ybj+oU8iWicp1O0BhLBbQ+oO5jiiw3T7DaxDqWA24lMFTHIjUbIn2Qd0Y1NO+eIlcjI MoVuun5DEaBxFOJqyvvUTNeB9fcAziKwOFWTjbku+u48sxqzvlIR+TXNHmvD/7ZkNTpr RmQg== X-Forwarded-Encrypted: i=1; AJvYcCX7w4gTOWQTQRA3A0EKGHyf+PSbTdCb3UR5z7+uGeTTV7CRZ8U9z01S25vTh0xx+y3PmI6A5OWpur+pt0ffniKL1vg= X-Gm-Message-State: AOJu0YwuIng4q2f6+Ug7CzWGc2BPRW2W9PJYOjXGWGszaVaENwlgNR2/ jng2I6MeruFqfwbe1oJUA7qHMnX6xzqaoYPKNrMf1zMsK91WJ9rCoPJxtB26eIw= X-Google-Smtp-Source: AGHT+IH9BIEIK9v/StFIWF0TDQwnIYeHsAbrGB05TNVA/FWNDxYSlTGuWTk+xbxhEgb5v1SiTtfZeA== X-Received: by 2002:a50:a6d8:0:b0:57c:fd20:352d with SMTP id 4fb4d7f45d1cf-57d4bde08cdmr5885682a12.36.1719299326146; Tue, 25 Jun 2024 00:08:46 -0700 (PDT) Received: from localhost (109-81-95-13.rct.o2.cz. [109.81.95.13]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-57d30562cabsm5500971a12.81.2024.06.25.00.08.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jun 2024 00:08:45 -0700 (PDT) Date: Tue, 25 Jun 2024 09:08:45 +0200 From: Michal Hocko To: Roman Gushchin Cc: Andrew Morton , Johannes Weiner , Shakeel Butt , Muchun Song , linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, linux-mm@kvack.org Subject: Re: [PATCH v2 09/14] mm: memcg: rename memcg_oom_recover() Message-ID: References: <20240625005906.106920-1-roman.gushchin@linux.dev> <20240625005906.106920-10-roman.gushchin@linux.dev> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240625005906.106920-10-roman.gushchin@linux.dev> X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: A000A140012 X-Stat-Signature: f4z76tmm3qqygmjnphf53gjam176h4jc X-Rspam-User: X-HE-Tag: 1719299327-288779 X-HE-Meta: U2FsdGVkX1+2iXid8VVKUjF9nLOvJ5F9HWTUUF1gpRPXFC+tnGgQu6s6b2/eZE3Gg+9XIboHA//KI6RPvVa4p+EupYCm5xrN/ebqVpChQdmv7HZYUrc9sC0JxJNawZxyGuo/745rqk+Fm/4aDP4gOPUlLZ5m4G66P3xtrcM+hiV6qKncXZOKV+pzylfj5oI79klw7A7AAOF9hNJawFHxgoDTyvKx/7G4P3HblAOPW96AvzKESlCw4HCHea8hP8pmthLLPCw3BxPFnRFnFK7N1I6FBqJ4axBI7MLfhi9J7zCGsE1m4hUHpnNONUheG0fhrxY3nfresU8D2DBnI8/3xWh4HtS5KCXP2c//cT1znxCo6rfDnpNVkBJEkA4nmfUBAfjgM0iYWY4n3EFrptz0ubwIXFSvt9dpOMbc/tsdJX3jttKbFMIRcAb2nWK0Iqb3nvsx9Z7vRRNBFhh/W8Rvld/YUUMberRdL/ROlPNxHfJ4p+sCyl9VjVnRpiCZLjT7NudHIZJ97AhIWrqZYLSI2Hw99g9oTIvYskww2AVPau1ZKbcfh3UQJ/4+fg984xu9FK09VBe+0JJ4N/0hM+DvE3iiGg01OaaBrn/AX6qVs+5wOehl54GpCOnGD79kK15/WlkWbqU+4OqmEcUkjp5wmwFLI8LjHdzdU2nRz0Xe3v9f1tOgfOzZZMddmy8340I56EIUTL+CTzeexwMT8fuU0Y2A2myjPDqikyl0yO8xjD/Ww6FSgaopV7dl82PWqHR9iAVU+O2niRbO6fbwPqwQbogFKUjsigF19D9M6kN9bnGO4VHifXtqQ5jsutkEEjlvyuoqiB4JNHCgKbU+agkPYQeeynrT0bqgA117yf0ZOA90h9eYa0jtbQvfU4nVOzn3bm3btcGZTo7QJMo4rEb4gMIMVxP78VPUSgARywaQ2/tSLCiLEQ8yoM6eH5YyqbxyxyZrI2is0WKanX7ARwH KCbMRcvb lErzPkQo/KjC/aodT6AwT+wun+ghMnyNvRe/7XpItU3ac4K9jyhue1yTSKWCsSffcLaU7EsfU/VaWVO64kr7wIeZudM1nAn3VYJP2FxAYvT9K+Qv9KhRS8IVFNuwM0p75ssGOC6dnA6GI91Lb3vkeX5l/tcCkxcLMgjNfshYvTcM9SO1c4ycnr0FR7F9QuHouSZ1dWFABUV+jSsEQXOv2ZTUA9g4eZAgsF3LbL1VC9X3+xmhczRuNhIHhxY+v/D/MSajiTBNI8e1JhGYtNRxTNOdTyLh5PHgQHKXjZkASslwOBBH0wRvja49lWv6zxCSxf/PHQXDFb2ZCA1CbA4tHyoW6rVTkss1n3C6n1lG0UTGk+Aem8AlkbIJhIb/0V4u0vYkoi6VhODhoQNQ= 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 Mon 24-06-24 17:59:01, Roman Gushchin wrote: > Rename memcg_oom_recover() into memcg1_oom_recover() for consistency > with other memory cgroup v1-related functions. > > Move the declaration in mm/memcontrol-v1.h to be nearby other > memcg v1 oom handling functions. > > Signed-off-by: Roman Gushchin Acked-by: Michal Hocko > --- > mm/memcontrol-v1.c | 6 +++--- > mm/memcontrol-v1.h | 2 +- > mm/memcontrol.c | 6 +++--- > 3 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/mm/memcontrol-v1.c b/mm/memcontrol-v1.c > index 253d49d5fb12..1d5608ee1606 100644 > --- a/mm/memcontrol-v1.c > +++ b/mm/memcontrol-v1.c > @@ -1090,8 +1090,8 @@ static void __mem_cgroup_clear_mc(void) > > mc.moved_swap = 0; > } > - memcg_oom_recover(from); > - memcg_oom_recover(to); > + memcg1_oom_recover(from); > + memcg1_oom_recover(to); > wake_up_all(&mc.waitq); > } > > @@ -2067,7 +2067,7 @@ static int memcg_oom_wake_function(wait_queue_entry_t *wait, > return autoremove_wake_function(wait, mode, sync, arg); > } > > -void memcg_oom_recover(struct mem_cgroup *memcg) > +void memcg1_oom_recover(struct mem_cgroup *memcg) > { > /* > * For the following lockless ->under_oom test, the only required > diff --git a/mm/memcontrol-v1.h b/mm/memcontrol-v1.h > index 3de956b2422f..972c493a8ae3 100644 > --- a/mm/memcontrol-v1.h > +++ b/mm/memcontrol-v1.h > @@ -13,7 +13,6 @@ static inline void memcg1_soft_limit_reset(struct mem_cgroup *memcg) > > void mem_cgroup_charge_statistics(struct mem_cgroup *memcg, int nr_pages); > void memcg1_check_events(struct mem_cgroup *memcg, int nid); > -void memcg_oom_recover(struct mem_cgroup *memcg); > int try_charge_memcg(struct mem_cgroup *memcg, gfp_t gfp_mask, > unsigned int nr_pages); > > @@ -92,5 +91,6 @@ ssize_t memcg_write_event_control(struct kernfs_open_file *of, > > bool memcg1_oom_prepare(struct mem_cgroup *memcg, bool *locked); > void memcg1_oom_finish(struct mem_cgroup *memcg, bool locked); > +void memcg1_oom_recover(struct mem_cgroup *memcg); > > #endif /* __MM_MEMCONTROL_V1_H */ > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 8abd364ac837..37e0af5b26f3 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -3167,7 +3167,7 @@ static int mem_cgroup_resize_max(struct mem_cgroup *memcg, > } while (true); > > if (!ret && enlarge) > - memcg_oom_recover(memcg); > + memcg1_oom_recover(memcg); > > return ret; > } > @@ -3752,7 +3752,7 @@ static int mem_cgroup_oom_control_write(struct cgroup_subsys_state *css, > > WRITE_ONCE(memcg->oom_kill_disable, val); > if (!val) > - memcg_oom_recover(memcg); > + memcg1_oom_recover(memcg); > > return 0; > } > @@ -5479,7 +5479,7 @@ static void uncharge_batch(const struct uncharge_gather *ug) > page_counter_uncharge(&ug->memcg->memsw, ug->nr_memory); > if (ug->nr_kmem) > memcg_account_kmem(ug->memcg, -ug->nr_kmem); > - memcg_oom_recover(ug->memcg); > + memcg1_oom_recover(ug->memcg); > } > > local_irq_save(flags); > -- > 2.45.2 > -- Michal Hocko SUSE Labs