From: Shakeel Butt <shakeelb@google.com>
To: Vasily Averin <vvs@virtuozzo.com>
Cc: Michal Hocko <mhocko@kernel.org>,
Johannes Weiner <hannes@cmpxchg.org>,
Vladimir Davydov <vdavydov.dev@gmail.com>,
Andrew Morton <akpm@linux-foundation.org>,
Mel Gorman <mgorman@techsingularity.net>,
Roman Gushchin <guro@fb.com>, Uladzislau Rezki <urezki@gmail.com>,
Vlastimil Babka <vbabka@suse.cz>,
Cgroups <cgroups@vger.kernel.org>, Linux MM <linux-mm@kvack.org>,
LKML <linux-kernel@vger.kernel.org>,
kernel@openvz.org
Subject: Re: [PATCH mm v3] memcg: enable memory accounting in __alloc_pages_bulk
Date: Tue, 12 Oct 2021 08:19:37 -0700 [thread overview]
Message-ID: <CALvZod69v-D-WtwEPNPRTUzt5us0oCOueH-ED-WjmTCfs5qVTA@mail.gmail.com> (raw)
In-Reply-To: <60df0efd-f458-a13c-7c89-749bdab21d1d@virtuozzo.com>
On Tue, Oct 12, 2021 at 7:58 AM Vasily Averin <vvs@virtuozzo.com> wrote:
>
> Enable memory accounting for bulk page allocator.
>
> Fixes: 387ba26fb1cb ("mm/page_alloc: add a bulk page allocator")
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Vasily Averin <vvs@virtuozzo.com>
> ---
> v3: added comments,
> removed call of post charge hook for nr_pages = 0
> v2: modified according to Shakeel Butt's remarks
> ---
> include/linux/memcontrol.h | 11 +++++++++
> mm/memcontrol.c | 48 +++++++++++++++++++++++++++++++++++++-
> mm/page_alloc.c | 21 ++++++++++++++++-
> 3 files changed, 78 insertions(+), 2 deletions(-)
>
> diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
> index 3096c9a0ee01..990acd70c846 100644
> --- a/include/linux/memcontrol.h
> +++ b/include/linux/memcontrol.h
> @@ -810,6 +810,12 @@ static inline void obj_cgroup_put(struct obj_cgroup *objcg)
> percpu_ref_put(&objcg->refcnt);
> }
>
> +static inline void obj_cgroup_put_many(struct obj_cgroup *objcg,
> + unsigned long nr)
> +{
> + percpu_ref_put_many(&objcg->refcnt, nr);
> +}
> +
> static inline void mem_cgroup_put(struct mem_cgroup *memcg)
> {
> if (memcg)
> @@ -1746,4 +1752,9 @@ static inline struct mem_cgroup *mem_cgroup_from_obj(void *p)
>
> #endif /* CONFIG_MEMCG_KMEM */
>
> +bool memcg_bulk_pre_charge_hook(struct obj_cgroup **objcgp, gfp_t gfp,
> + unsigned int nr_pages);
> +void memcg_bulk_charge_hook(struct obj_cgroup *objcgp, struct page *page);
> +void memcg_bulk_post_charge_hook(struct obj_cgroup *objcg,
> + unsigned int nr_pages);
> #endif /* _LINUX_MEMCONTROL_H */
> diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> index 87e41c3cac10..16fe3384c12c 100644
> --- a/mm/memcontrol.c
> +++ b/mm/memcontrol.c
> @@ -3239,7 +3239,53 @@ void obj_cgroup_uncharge(struct obj_cgroup *objcg, size_t size)
> refill_obj_stock(objcg, size, true);
> }
>
> -#endif /* CONFIG_MEMCG_KMEM */
> +bool memcg_bulk_pre_charge_hook(struct obj_cgroup **objcgp, gfp_t gfp,
> + unsigned int nr_pages)
> +{
> + struct obj_cgroup *objcg = NULL;
No need to explicitly set it to NULL.
> +
> + if (!memcg_kmem_enabled() || !(gfp & __GFP_ACCOUNT))
> + return true;
> +
> + objcg = get_obj_cgroup_from_current();
> +
> + if (objcg && obj_cgroup_charge_pages(objcg, gfp, nr_pages)) {
> + obj_cgroup_put(objcg);
> + return false;
> + }
get_obj_cgroup_from_current() can return NULL, so you would need to
return true early for that condition.
> + obj_cgroup_get_many(objcg, nr_pages - 1);
> + *objcgp = objcg;
> + return true;
> +}
> +
> +void memcg_bulk_charge_hook(struct obj_cgroup *objcg, struct page *page)
> +{
> + page->memcg_data = (unsigned long)objcg | MEMCG_DATA_KMEM;
> +}
> +
> +void memcg_bulk_post_charge_hook(struct obj_cgroup *objcg,
> + unsigned int nr_pages)
> +{
> + obj_cgroup_uncharge_pages(objcg, nr_pages);
> + obj_cgroup_put_many(objcg, nr_pages);
> +}
You can keep the following '#else' code block in the header file.
> +#else /* !CONFIG_MEMCG_KMEM */
> +bool memcg_bulk_pre_charge_hook(struct obj_cgroup **objcgp, gfp_t gfp,
> + unsigned int nr_pages)
> +{
> + return true;
> +}
> +
> +void memcg_bulk_charge_hook(struct obj_cgroup *objcgp, struct page *page)
> +{
> +}
> +
> +void memcg_bulk_post_charge_hook(struct obj_cgroup *objcg,
> + unsigned int nr_pages)
> +{
> +}
> +#endif
> +
next prev parent reply other threads:[~2021-10-12 15:19 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-07 8:04 memcg memory accounting in vmalloc is broken Vasily Averin
2021-10-07 8:13 ` Michal Hocko
2021-10-07 8:16 ` Michal Hocko
2021-10-07 8:50 ` Vasily Averin
2021-10-07 10:08 ` Michal Hocko
2021-10-07 10:20 ` Mel Gorman
2021-10-07 14:02 ` Vlastimil Babka
2021-10-07 14:00 ` Vlastimil Babka
2021-10-07 14:09 ` Michal Hocko
2021-10-07 19:33 ` Vasily Averin
2021-10-08 9:23 ` [PATCH memcg] memcg: enable memory accounting in __alloc_pages_bulk Vasily Averin
2021-10-08 17:35 ` Shakeel Butt
2021-10-12 10:18 ` [PATCH mm v2] " Vasily Averin
2021-10-12 13:10 ` Mel Gorman
2021-10-12 13:40 ` Vasily Averin
2021-10-12 14:58 ` [PATCH mm v3] " Vasily Averin
2021-10-12 15:19 ` Shakeel Butt [this message]
2021-10-12 15:20 ` Mel Gorman
2021-10-12 15:36 ` Michal Hocko
2021-10-12 16:08 ` Shakeel Butt
2021-10-12 18:24 ` Michal Hocko
2021-10-13 16:41 ` Shakeel Butt
2021-10-13 17:16 ` Michal Hocko
2021-10-13 17:30 ` Shakeel Butt
2021-10-12 18:45 ` Vasily Averin
2021-10-14 8:02 ` [PATCH mm v5] " Vasily Averin
2021-10-15 21:34 ` Andrew Morton
2021-10-16 6:04 ` Vasily Averin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CALvZod69v-D-WtwEPNPRTUzt5us0oCOueH-ED-WjmTCfs5qVTA@mail.gmail.com \
--to=shakeelb@google.com \
--cc=akpm@linux-foundation.org \
--cc=cgroups@vger.kernel.org \
--cc=guro@fb.com \
--cc=hannes@cmpxchg.org \
--cc=kernel@openvz.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mgorman@techsingularity.net \
--cc=mhocko@kernel.org \
--cc=urezki@gmail.com \
--cc=vbabka@suse.cz \
--cc=vdavydov.dev@gmail.com \
--cc=vvs@virtuozzo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).