From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 35E5114A0A8 for ; Tue, 25 Jun 2024 07:07:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.47 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719299263; cv=none; b=BwePCggCC66Jku0y9ErusQHQmOcSvbtt0cW56u82ucJ7qqaewukYAtwsCj72knY9BymjTPvpb4kSX5nxyET4ArPSamMNULSHdlFmEpzS6xdV1mME7DsknB0MBvo2oF/fMt0oD51T2HC1TAHiiJGxUmtiTQxUoOS0AcSgfpDVisA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719299263; c=relaxed/simple; bh=4bOL+5Xjq1nEBBLj1FDD4myqDY/JwRv3gbU+lA0lOFs=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=dQQr7JXDleKi62D6XXONaBjQk9AECpx3vDwtpv8fYy4QHtVTkv2Et0rikRnHX+u1nLmB8WM7Q7/JQs/jO0XuZQ1KwY0ZwiDurAMGAyXh/8V0r4W2l61mw4UotqNSfjAiWSGTQ3mVX6Yk/E0NJvmJBQfejWJ4spKQp/pMWVxyLb0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=Soy6e70l; arc=none smtp.client-ip=209.85.218.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="Soy6e70l" Received: by mail-ej1-f47.google.com with SMTP id a640c23a62f3a-a72517e6225so247870966b.0 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=vger.kernel.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=Soy6e70liv3jd4zHbyk2wPiU0zmAw52vyKJyTOTexgkxqtydEhJ/74dLqkdGnt1r6u FZiW4IYEDSWPVkb45Hpw90G19oSHBbWTK3uD2OVJMMYmNfvvIfxdQNisPNTikCRvGCOo NxqUnPV3XyBpxRHXHwdOOAGPr1hOwSHnJf3u39sywl0izblQ+JAffoyHO/CkuPDZnMx4 DBa3VVJgp4u+XnvIRMHKZa1K6VPqt31J/OLFcPubk803D78XOu7BRuNHnCTrSLfyIK3O v9j2JpZqTC330oRa1JD5x6lz8209qceisq4Mtz1lU8ICFLMJBBXu4zQkYA5NkzbVXXYi 7NDA== 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=PpwmBW6/GdBn5aOCNW9rlBweB2Ksvm7MxO5ggBEEZ9E0Z/u6j/CtYuhY7y/ifcDV67 KHfi4TBWsYY5FR3hY3adahVMTW+3AiO02Ysyyp71lh72jPv6uzLyoXaMUhQ9X2/pDVd4 XkJcN/ZXqa092Tt9bZlKh9WUns4gEcfweVEdINMNzLgQqgxEWEG6/1PLdYrdXH6jwtZa XcH92fAyzL4Wq/Am0GpIfmfiCZDoEHmlqEQVkfvFKtJwVK2HHATgRGzj3vuPevJX5t6f IfyvqACGGvWwfwR7iBhacXiWP2cWM//MH+7girdN1tScKgBsILkc8kS/2k9ykEKidl0s YCqw== X-Forwarded-Encrypted: i=1; AJvYcCVgticIfJAhoDPS1w9LnC3KjEtibnWhuTU1j44O6tu8VWmAkpzYhmbnzuKPU3z5IPSnp/Uo7aQ/kJderEd8GTJCf9fSCrCeRQ== X-Gm-Message-State: AOJu0YxNc0HTtHbqzR6smEMHBxQENjou94IInAZxWg54qLWtV9lxfSgN HuC8IjV6wcPRVfgTvCi324zn8nnKsF0fEVyO8qhvZLVUsNCreKiCgIYMtllmowI= 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> Precedence: bulk X-Mailing-List: cgroups@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240625005906.106920-6-roman.gushchin@linux.dev> 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