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 34054C30653 for ; Tue, 25 Jun 2024 07:07:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B75736B02CB; Tue, 25 Jun 2024 03:07:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B1FB76B0321; Tue, 25 Jun 2024 03:07:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 94AE66B02CB; Tue, 25 Jun 2024 03:07:43 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 73F9A6B02C9 for ; Tue, 25 Jun 2024 03:07:43 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 1E1E54175F for ; Tue, 25 Jun 2024 07:07:43 +0000 (UTC) X-FDA: 82268530806.03.8E92267 Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) by imf01.hostedemail.com (Postfix) with ESMTP id 1D9C340016 for ; Tue, 25 Jun 2024 07:07:40 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=suse.com header.s=google header.b=WYl2IjEi; spf=pass (imf01.hostedemail.com: domain of mhocko@suse.com designates 209.85.218.43 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=1719299246; 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=/R0V+eWwqaASepMhn2+Ez8y9ZYspqA/o2g8lqAxiVCQ=; b=55dK4Hq5toseHZ3a4Ln/9vDiGw0DNs2lxHU9sRGK3Z511r8IHFDLcWLCJh/zat6ZzaFa/6 NBCcLek8jPuTESTPx/aYinsVtCC2hTv93nHKf1Cg2XKObrL8/K8ZZU+fxzkwrtRpTXl1/f KJ78cpv37W5uhyNh/rGFqtcRQCfC58I= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1719299246; a=rsa-sha256; cv=none; b=ytzIrKCcv8v5738EhygEbZjGbz8yrEHr7QAfeSiocu52IEuXHeXSG1I/ukHBJ0TQD1Cafm 4Cs1jDXbONyfygV+FM0KRKBCVM938IpVoQoZKulLDAdtXFaJ+7nXgGnAaRpTVbk4DaZE1Q QfluTaKJxLH5O0CVMVRWPL49/JM8xss= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=suse.com header.s=google header.b=WYl2IjEi; spf=pass (imf01.hostedemail.com: domain of mhocko@suse.com designates 209.85.218.43 as permitted sender) smtp.mailfrom=mhocko@suse.com; dmarc=pass (policy=quarantine) header.from=suse.com Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-a7194ce90afso307330566b.2 for ; Tue, 25 Jun 2024 00:07:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1719299259; x=1719904059; 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=/R0V+eWwqaASepMhn2+Ez8y9ZYspqA/o2g8lqAxiVCQ=; b=WYl2IjEil63+htwdB+l4ys85N3TvFG0Sh1e0j/WPpB5JctMhCsZDE3RExkiF9hpeTV aBKJ3V3gWjiXzVvLPBhAR98PpCMJEJp7nMG+3bcBXDg3COSIKO5NC6y3VJ1ur9SoZF7G vqaIHbIwW/5GdbiKmcc11vTPqepghPoNxN4sj0PZGSrhA2XZ4+GZa+30jBHR9AA1RnbR 7a02avSPsXST47UX5F2Aml0MRGXNQ4lZBOITOL40ohEtmeYPWSOttJvPhScBzUs9pBm3 qd6/WFyfTv6E7ZI/4reJnJVqXagMSTnflWMW3O9SsrU1e9S+yRp3lhSdLDzIjuMVGefL jC7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719299259; x=1719904059; 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=/R0V+eWwqaASepMhn2+Ez8y9ZYspqA/o2g8lqAxiVCQ=; b=mmO6Cok+kpAp+3/a576G1PdxWTvGjjU03DYCfTvruKXfMP1BnHj2ULXVsIyax/ajOI 0isL270WH2wNdnTtiVPMZFkRipodHUD4u44omcfmCdFRd7cs1B2jQU8CaXkdNL9xdu/W ihmg37WOGVw+LmuHPdlthRK+Vtj6j7foyVVFTriaQndMhE3UIvq4CNQbVP2Bxa2a2wFV NzVotllMyJZA1iSFxj3lmoJCQyZt+PWJPY5ycjgH57TtfC/H6yTLOOTRvR9iM7Lz7XoS aeLrDR4d6jrSnkzcElYIsqRBsG+C3waS+LM2kF4GJ0kDU4VY/2/uiiK4+I397usBz2f3 NAIA== X-Forwarded-Encrypted: i=1; AJvYcCVygZ1pCt1g8JwbYBgeHpJTbLVzRMoW6hq/Oh3qNY1h0NaChguJKkQDCgwdzF/4LdyBz9hAPxjoKePPdEtMjaQm5sY= X-Gm-Message-State: AOJu0YytNSQWGtkrHt5mtgaqMNLBddEyHSlBdH/Meo6NYhPEcX+ItAHG +BbhRz8LU7W8Ajb/biOz7UdBB5R0wxSBTSFXeowoLyPxTe5jZRFdan8ZHph6/p4= X-Google-Smtp-Source: AGHT+IFc//gmedhEDbGQAgTUfiuzQY8eRC6RP8S5oW2aencflGku5g/e8Wiz0KlIcuoUBNhnAoSo6Q== X-Received: by 2002:a17:906:4904:b0:a72:5bbf:efc8 with SMTP id a640c23a62f3a-a725bbff18amr215737366b.62.1719299259422; Tue, 25 Jun 2024 00:07:39 -0700 (PDT) Received: from localhost (109-81-95-13.rct.o2.cz. [109.81.95.13]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a725efd0e18sm116473666b.195.2024.06.25.00.07.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jun 2024 00:07:39 -0700 (PDT) Date: Tue, 25 Jun 2024 09:07:38 +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 05/14] mm: memcg: rename charge move-related functions Message-ID: References: <20240625005906.106920-1-roman.gushchin@linux.dev> <20240625005906.106920-6-roman.gushchin@linux.dev> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240625005906.106920-6-roman.gushchin@linux.dev> X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 1D9C340016 X-Stat-Signature: qwq7raxkb8r3u8obejg7gkksj7j7pae5 X-HE-Tag: 1719299260-679976 X-HE-Meta: U2FsdGVkX195C4t5tDLTWDBbNrj9MYUwffcC3Bs7EQ034LmtCFx/83HzImYlod+QA+rEnnh1UbnV0tKml94brM0hQ7q/2IkhdceZyB6+JuTICUPfYMGeop40eFQQtffkGcjJXz9Xj7hDXfx3sx1Tiv6ifhQwO3J/OqIg3yH+y9ca+tmpznUmcVosg5hpW29vGsJPQDhalywzUq+CKBz3MUYce8ZjnaHgh+8/xlmzY6w3RoWVuC/xPlxDgBtS+MKWjfrgFfD8xDyMUhsTEKcwU4b7XMv1iSq2i2D/lm1KNnStqIX5G5eqXiBAPQQh8KsO2kjLCw5TvS3g9z/1M/HENmYtojp2dq+iGUv6NA51r8P0wbEDmeunnodkBLBiYYyv4z+HXCJZHJVrUrWO7F0WJERlCu/Gb0eH0uy1mjWmtka+IEu2/BiZpLSN6OzRcEefe9mOmRR6n2FKWf4XY+Oc3KTgJzbiKSkU0AeLsRSCnneOmvMRRWjVH6mSKfvxv2Gu3aeKDBrgDQbtcdICfD/NejZ6HrDT5vqvlQSG26vdV9D/gQpMos/tyYjPaWop4JPl3LfYIoHb5tuXTPJ2ExWvo8IR3UFQ2vFLLnBevxQXFA4hX/K53oMTeK6XJBX4tGhiBhUkV3IsE/Vd4bApzBgw0s965NFesCn/Ie0lHCsd5qt/KYACVivOlyG/LgBuO4sQyHRcbgI+TgP+WCzj6dZ2fCKdLWOC+TWtPxmXEQL7jgvUNulLbLTiXibs3RlXqVbbZYWBob7fEthSn6qZvULT02d8X6QNcXNpHueVHcWNgtdViOKCn+QwN7R6T80qgUFugfMl/VF7sUcnfOwxbF2X5hlU6/h9NkholzMTtESsYDSDP9mOaJi2AdvvA1FQtS/9ERyComyAHq16JiCqtgAz8LzWCk4+kmtzQtTM3ADSVXyONgucbJ92Syvkb37oapX39pMx8+YFNBdY1h6S8HH 4WRcxcCC +9JM0G4NqhdzmajobXb+MwSWExIbU+at0GlK999aT5xGvr2uo5sq9mOUkuJWrXt4oza0xY4sl653kjIc88P83WdEqIJe8mq97r7NVpYj0QtKuPrzBclIznsiJm0jGtzgpMt8YWS5TpzVrxMzy/78stOy76cu0eJ1ah56eec+Lb71lz2fYuSLAzebe8NRvO+cREYAaEfdOTCRYJrMCuW4rnP66AsXXxZ/73944KwbqoWYAnAMY7E55jU6HuVJ6wm8p1Zm9sdBsoehzlv3mWOu3lz0/cnsEI20Ayhqa5cxq4Mqt0fi4V74XsVyybjMiRRzQ8rIcQUD4CLKrrJtw2lBpnQcw6Q== 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:58:57, Roman Gushchin wrote: > Rename exported function related to the charge move to have > the memcg1_ prefix. > > Signed-off-by: Roman Gushchin Acked-by: Michal Hocko > --- > mm/memcontrol-v1.c | 14 +++++++------- > mm/memcontrol-v1.h | 8 ++++---- > mm/memcontrol.c | 8 ++++---- > 3 files changed, 15 insertions(+), 15 deletions(-) > > diff --git a/mm/memcontrol-v1.c b/mm/memcontrol-v1.c > index f4c8bec5ae1b..c25e038ac874 100644 > --- a/mm/memcontrol-v1.c > +++ b/mm/memcontrol-v1.c > @@ -384,7 +384,7 @@ static bool mem_cgroup_under_move(struct mem_cgroup *memcg) > return ret; > } > > -bool mem_cgroup_wait_acct_move(struct mem_cgroup *memcg) > +bool memcg1_wait_acct_move(struct mem_cgroup *memcg) > { > if (mc.moving_task && current != mc.moving_task) { > if (mem_cgroup_under_move(memcg)) { > @@ -1056,7 +1056,7 @@ static void mem_cgroup_clear_mc(void) > mmput(mm); > } > > -int mem_cgroup_can_attach(struct cgroup_taskset *tset) > +int memcg1_can_attach(struct cgroup_taskset *tset) > { > struct cgroup_subsys_state *css; > struct mem_cgroup *memcg = NULL; /* unneeded init to make gcc happy */ > @@ -1126,7 +1126,7 @@ int mem_cgroup_can_attach(struct cgroup_taskset *tset) > return ret; > } > > -void mem_cgroup_cancel_attach(struct cgroup_taskset *tset) > +void memcg1_cancel_attach(struct cgroup_taskset *tset) > { > if (mc.to) > mem_cgroup_clear_mc(); > @@ -1285,7 +1285,7 @@ static void mem_cgroup_move_charge(void) > atomic_dec(&mc.from->moving_account); > } > > -void mem_cgroup_move_task(void) > +void memcg1_move_task(void) > { > if (mc.to) { > mem_cgroup_move_charge(); > @@ -1294,14 +1294,14 @@ void mem_cgroup_move_task(void) > } > > #else /* !CONFIG_MMU */ > -static int mem_cgroup_can_attach(struct cgroup_taskset *tset) > +int memcg1_can_attach(struct cgroup_taskset *tset) > { > return 0; > } > -static void mem_cgroup_cancel_attach(struct cgroup_taskset *tset) > +void memcg1_cancel_attach(struct cgroup_taskset *tset) > { > } > -static void mem_cgroup_move_task(void) > +void memcg1_move_task(void) > { > } > #endif > diff --git a/mm/memcontrol-v1.h b/mm/memcontrol-v1.h > index 55e7c4f90c39..d377c0be9880 100644 > --- a/mm/memcontrol-v1.h > +++ b/mm/memcontrol-v1.h > @@ -29,11 +29,11 @@ static inline int try_charge(struct mem_cgroup *memcg, gfp_t gfp_mask, > 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); > > -bool mem_cgroup_wait_acct_move(struct mem_cgroup *memcg); > +bool memcg1_wait_acct_move(struct mem_cgroup *memcg); > struct cgroup_taskset; > -int mem_cgroup_can_attach(struct cgroup_taskset *tset); > -void mem_cgroup_cancel_attach(struct cgroup_taskset *tset); > -void mem_cgroup_move_task(void); > +int memcg1_can_attach(struct cgroup_taskset *tset); > +void memcg1_cancel_attach(struct cgroup_taskset *tset); > +void memcg1_move_task(void); > > struct cftype; > u64 mem_cgroup_move_charge_read(struct cgroup_subsys_state *css, > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 3332c89cae2e..da2c0fa0de1b 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -2582,7 +2582,7 @@ int try_charge_memcg(struct mem_cgroup *memcg, gfp_t gfp_mask, > * At task move, charge accounts can be doubly counted. So, it's > * better to wait until the end of task_move if something is going on. > */ > - if (mem_cgroup_wait_acct_move(mem_over_limit)) > + if (memcg1_wait_acct_move(mem_over_limit)) > goto retry; > > if (nr_retries--) > @@ -6030,12 +6030,12 @@ struct cgroup_subsys memory_cgrp_subsys = { > .css_free = mem_cgroup_css_free, > .css_reset = mem_cgroup_css_reset, > .css_rstat_flush = mem_cgroup_css_rstat_flush, > - .can_attach = mem_cgroup_can_attach, > + .can_attach = memcg1_can_attach, > #if defined(CONFIG_LRU_GEN) || defined(CONFIG_MEMCG_KMEM) > .attach = mem_cgroup_attach, > #endif > - .cancel_attach = mem_cgroup_cancel_attach, > - .post_attach = mem_cgroup_move_task, > + .cancel_attach = memcg1_cancel_attach, > + .post_attach = memcg1_move_task, > #ifdef CONFIG_MEMCG_KMEM > .fork = mem_cgroup_fork, > .exit = mem_cgroup_exit, > -- > 2.45.2 > -- Michal Hocko SUSE Labs