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 F10BAC2BBCA for ; Tue, 25 Jun 2024 07:08:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 814246B032E; Tue, 25 Jun 2024 03:08:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7C40D6B032F; Tue, 25 Jun 2024 03:08:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 68C456B0330; Tue, 25 Jun 2024 03:08:17 -0400 (EDT) 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 487366B032E for ; Tue, 25 Jun 2024 03:08:17 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id BFE01404DF for ; Tue, 25 Jun 2024 07:08:16 +0000 (UTC) X-FDA: 82268532192.12.409A5BC Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) by imf26.hostedemail.com (Postfix) with ESMTP id D0451140015 for ; Tue, 25 Jun 2024 07:08:14 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=suse.com header.s=google header.b="GTK5d/uW"; spf=pass (imf26.hostedemail.com: domain of mhocko@suse.com designates 209.85.218.50 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=1719299280; 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=gPmf8JrNAJELxCAuJ9enLvpVFftABv9+GR65thp0q78=; b=etlAwjHadHPSzEWPXNZLpKIM47AbwJ/M64cBW1TOdv3di8gQTgmxER2pZ3DYOtRv4qdaPZ nOXSdZ53q7w9jNdBEloVVE2qQ1rM+1R/M42nuSG0RHO0szcPcEBB1Mm/l03XlxuooEmT43 l19H0DkPwjlHJWDAzy+exj8dV9gTksA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1719299280; a=rsa-sha256; cv=none; b=ir2xFzjWCwGB2fKK2mMaGKIi8ahm5yM47J3Qe7euARZLiWrrW8l+3v6+yXCpVWC0pspoag WEdVz42pMf6YT2XRoPRpwFO5voB9LQhtBGK5+ezAB56E91jhVq5I2V8EE+YQyGX9bsSOOE VYr3OHL69ZRzYR58WDV8rRVWJUWcXDk= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=suse.com header.s=google header.b="GTK5d/uW"; spf=pass (imf26.hostedemail.com: domain of mhocko@suse.com designates 209.85.218.50 as permitted sender) smtp.mailfrom=mhocko@suse.com; dmarc=pass (policy=quarantine) header.from=suse.com Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-a6fd513f18bso371355866b.3 for ; Tue, 25 Jun 2024 00:08:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1719299293; x=1719904093; 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=gPmf8JrNAJELxCAuJ9enLvpVFftABv9+GR65thp0q78=; b=GTK5d/uWWeM/1kpcBQhXuIYEMLDgUEXkKU7Ft47XqrxsM3Cs3CV2RnLLs3PopNFWFt 5u+WeqnIlGF+x5P6FlBGGRq2OI4mVnZWzL5ypsinvQVuRRbVHVks6ddweIAnhaCNctXp Ap1FmhYmwNNVgfaGQfYnYo+FLYGXjQNhri5Sqdy/f2+6vGU6GXLvXlJwg3k2A6iOI3LN bgNN02Ec9TkJNinK4GIeSEFamWsZ6hSA44OkGS3DppygWlwtofbH632tfHDF4VJ5CgJx fKx9Up60Qe3zBOy8tbvtRQn0IcAq+B2HQprb5PSIKgVfudQuy53ocUQLumEySy+9U1Za pHhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719299293; x=1719904093; 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=gPmf8JrNAJELxCAuJ9enLvpVFftABv9+GR65thp0q78=; b=lu4dOWfnORKs+/imxyiJlH7tGK0bMJ5xI8wsvo6UdvY2J5Eshf7cMYnmDm86m97psm G5K0AOM2wr02dcdONbXLKe6JGRjiEnrxPnQgR3BWXVq80OSg9p7RpcYpduGJy68ueecl ky7ZX+yAJHrCju/HIVHFtc7rORuMu4wtWE9nYzm/bBeT1x0a7+lqWF778LIZvDoRbImA rOunhChl+J3Ol1WoP5CYtnhnZBpQuOw3Vs9iHL893rtei80a0VhBvKmZfRGNbDMFxe4C P/4J0K5emfWyi9cQsPBFXSEgPl0o7Hlwfv8xRVjZM6DcyJj5kiZoqPUmfdMNh9lar5jD 3SfQ== X-Forwarded-Encrypted: i=1; AJvYcCWUf1zLNVZwRc/dSUMc3hImU+IMuvte5NpUC+Afb4n0e5sawT9qo3y2gEx8lUmqQgq3KfnX5exab5ae7VFJtkN0nx0= X-Gm-Message-State: AOJu0YzXnwPdIqnrOqu85ri82oc4zQBCDCeulQNx59zQ+eBY95it09bO rxt0PnVYgmtapIrcqZVcrMFHxB9i6WbaYDaHqwc3MRKjwq1h4scm2nV7SIvQWLk= X-Google-Smtp-Source: AGHT+IHCwpbLAXbF2I0ruqrqQv4cNF+RPF/xKNyZPjInXI3/GXOG9IZcWsfO4KVpVF1cD/JmtBfN5A== X-Received: by 2002:a17:906:68d4:b0:a72:428f:cd66 with SMTP id a640c23a62f3a-a7245b73276mr389391966b.39.1719299293323; Tue, 25 Jun 2024 00:08:13 -0700 (PDT) Received: from localhost (109-81-95-13.rct.o2.cz. [109.81.95.13]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a725d7b190fsm124917366b.50.2024.06.25.00.08.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jun 2024 00:08:12 -0700 (PDT) Date: Tue, 25 Jun 2024 09:08:12 +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 07/14] mm: memcg: rename memcg_check_events() Message-ID: References: <20240625005906.106920-1-roman.gushchin@linux.dev> <20240625005906.106920-8-roman.gushchin@linux.dev> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240625005906.106920-8-roman.gushchin@linux.dev> X-Stat-Signature: 6n16xktyfpx8hud4ajfi6t8kho194zbe X-Rspamd-Queue-Id: D0451140015 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1719299294-749298 X-HE-Meta: U2FsdGVkX1/ngtpxDs+89/mcG+cgvismu0lc3FznGmkGEc+iIVDMMjiO1APKz1MagO4xWSQIhxUkCXSE2uknQIyU5jU5fZiqrR/SXV8vtxXsEjvg9AOb8RqgnCdLVRqCFFDyaCHhetRYTBnQeOXuO5YGwJwJLxzQhPFQtR5NyXn/+n2088pQwvqgWG7At2dd/IcZpVc23A1KmXxEGCmkMBQegvYj76ANQNeB89vgxOpsop5VWCw8/q4Bp4/4/eVwMZ8rJUcQKxcvMApziR5MtmqXILXEUU0V02LobvY9iH2HExuA+a+OngZ8r+qLnuE2yQftdZi9mgQJJVBiFh/LpWP+MIGaNL2ou2EBmAgjYEuVP8H/SOp2mGtVN/eE25st5X622jmtiUCzDHZQ0UF+HSCT93a6lAqjTSP4wLYqJoSaohZ4i/ZPbFFbqsZvsnNiq6jVYEWuAns/yzYIIkjpyxT3HjqiU0i4WsoqHjMruL1/VRRvpzC3kWOuV8dc0Ze/HeFFC04Rm9RV0mV8L7B9K8M8luCFiuupXtl7FwQiGGA5mpiXk6fmCk8eRoUozKlLpPl497zi87OGE9OWAT2Qn0HoDUgEPeusTdqrv7zyS/t4JI1tX6s6NLghXkb/SaIuE8F+aMfpCgpukgcOcF/LnPI2NXBfEalNgkGBZvYbJzju/GDhbJwG9sl0nUHyWbD+P4BNLOm5GXIQ+rp809UkdBHmJd0ZGki/7ucI28iXr2NWwFG/JP2A9C7D77miWYlH+gVxxClsv0DtgQsaJY3c7oogwQT0nB8fPltMs6b/vdgNlhXg/DDje3rLC/F8dT0QRFhhxs+nAr61H6i9dQD+nUX3qr28v1+ESpPkKyFaXtdBRItlnpk8DziuRxJL2l4iR56FbkIhRI0Gy62b0W+rNrHqnD0w8mxTLufaZu/u5XyfeEwrEUfSVRU04R+rrdO/Yiji8dGwypbhHkTyk30 fxpskM9X BLhM26LaXIkc/o7UXiIH7Rxr9mV5LCqgR8hqZY0du+rYkEY3kQM+JUVXRoMq7KC6+AjKtefSA4h4auMfEliHQlepnqIgT3gf7xpNhMuLbKhn20TzbNF+TFz0k/OCh6b4Q1rbilGY4ehOblUMruYZkrdApIUIAEz/o4Xst8770qcKqpv085osd5G11tGRyBnHwNIA0lyBcv2NR8bb3zp/ZbyngvYN0NcdOQp5jMFumM2ezUQKgxP2EUazBnxRKfKx2Zrd6HRKJtQsEaVDfUZDRZfGdvBFUf6Jq98SpEk2E0HngpjDmHmCnWCnzdF17DeFvczgx0rdMBGzgZTood4OywM6/dXcTwas1utIG6BBsQ6U/vK/ZxJvs9g7dcFSw4U4RS6y9sIkVUfYsSAtjQoqodiRS2/Pyg9WBolOhDdOQHhvDVuA= 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:59, Roman Gushchin wrote: > Rename memcg_check_events() into memcg1_check_events() for > consistency with other cgroup v1-specific functions. > > Signed-off-by: Roman Gushchin Acked-by: Michal Hocko > --- > mm/memcontrol-v1.c | 6 +++--- > mm/memcontrol-v1.h | 2 +- > mm/memcontrol.c | 8 ++++---- > 3 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/mm/memcontrol-v1.c b/mm/memcontrol-v1.c > index 4b2290ceace6..d7b5c4c14732 100644 > --- a/mm/memcontrol-v1.c > +++ b/mm/memcontrol-v1.c > @@ -835,9 +835,9 @@ static int mem_cgroup_move_account(struct folio *folio, > > local_irq_disable(); > mem_cgroup_charge_statistics(to, nr_pages); > - memcg_check_events(to, nid); > + memcg1_check_events(to, nid); > mem_cgroup_charge_statistics(from, -nr_pages); > - memcg_check_events(from, nid); > + memcg1_check_events(from, nid); > local_irq_enable(); > out: > return ret; > @@ -1424,7 +1424,7 @@ static void mem_cgroup_threshold(struct mem_cgroup *memcg) > * Check events in order. > * > */ > -void memcg_check_events(struct mem_cgroup *memcg, int nid) > +void memcg1_check_events(struct mem_cgroup *memcg, int nid) > { > if (IS_ENABLED(CONFIG_PREEMPT_RT)) > return; > diff --git a/mm/memcontrol-v1.h b/mm/memcontrol-v1.h > index 524a2c76ffc9..ef1b7037cbdc 100644 > --- a/mm/memcontrol-v1.h > +++ b/mm/memcontrol-v1.h > @@ -12,7 +12,7 @@ static inline void memcg1_soft_limit_reset(struct mem_cgroup *memcg) > } > > void mem_cgroup_charge_statistics(struct mem_cgroup *memcg, int nr_pages); > -void memcg_check_events(struct mem_cgroup *memcg, int nid); > +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); > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index bd4b26a73596..92fb72bbd494 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -2632,7 +2632,7 @@ void mem_cgroup_commit_charge(struct folio *folio, struct mem_cgroup *memcg) > > local_irq_disable(); > mem_cgroup_charge_statistics(memcg, folio_nr_pages(folio)); > - memcg_check_events(memcg, folio_nid(folio)); > + memcg1_check_events(memcg, folio_nid(folio)); > local_irq_enable(); > } > > @@ -5697,7 +5697,7 @@ static void uncharge_batch(const struct uncharge_gather *ug) > local_irq_save(flags); > __count_memcg_events(ug->memcg, PGPGOUT, ug->pgpgout); > __this_cpu_add(ug->memcg->vmstats_percpu->nr_page_events, ug->nr_memory); > - memcg_check_events(ug->memcg, ug->nid); > + memcg1_check_events(ug->memcg, ug->nid); > local_irq_restore(flags); > > /* drop reference from uncharge_folio */ > @@ -5836,7 +5836,7 @@ void mem_cgroup_replace_folio(struct folio *old, struct folio *new) > > local_irq_save(flags); > mem_cgroup_charge_statistics(memcg, nr_pages); > - memcg_check_events(memcg, folio_nid(new)); > + memcg1_check_events(memcg, folio_nid(new)); > local_irq_restore(flags); > } > > @@ -6104,7 +6104,7 @@ void mem_cgroup_swapout(struct folio *folio, swp_entry_t entry) > memcg_stats_lock(); > mem_cgroup_charge_statistics(memcg, -nr_entries); > memcg_stats_unlock(); > - memcg_check_events(memcg, folio_nid(folio)); > + memcg1_check_events(memcg, folio_nid(folio)); > > css_put(&memcg->css); > } > -- > 2.45.2 -- Michal Hocko SUSE Labs