* [PATCH] mm/vmpressure: replace vmpressure_to_css() with vmpressure_to_memcg()
@ 2021-06-30 11:21 Hui Su
[not found] ` <20210630112146.455103-1-suhui-OtvJRZzVyoU@public.gmane.org>
0 siblings, 1 reply; 3+ messages in thread
From: Hui Su @ 2021-06-30 11:21 UTC (permalink / raw)
To: hannes-druUgvl0LCNAfugRpC6u6w, mhocko-DgEjT+Ai2ygdnm+yROfE0A,
vdavydov.dev-Re5JQEeQqe8AvxtiuMwx3w,
akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b, suhui-OtvJRZzVyoU,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
cgroups-u79uwXL29TY76Z2rM5mHXA, linux-mm-Bw31MaZKKs3YtjvyW6yDsg
We can get memcg directly form vmpr instead of vmpr->memcg->css->memcg,
so add a new func helper vmpressure_to_memcg().
And no code will use vmpressure_to_css(), so delete it.
Signed-off-by: Hui Su <suhui-OtvJRZzVyoU@public.gmane.org>
---
include/linux/vmpressure.h | 2 +-
mm/memcontrol.c | 4 ++--
mm/vmpressure.c | 3 +--
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/include/linux/vmpressure.h b/include/linux/vmpressure.h
index 6d28bc433c1c..6a2f51ebbfd3 100644
--- a/include/linux/vmpressure.h
+++ b/include/linux/vmpressure.h
@@ -37,7 +37,7 @@ extern void vmpressure_prio(gfp_t gfp, struct mem_cgroup *memcg, int prio);
extern void vmpressure_init(struct vmpressure *vmpr);
extern void vmpressure_cleanup(struct vmpressure *vmpr);
extern struct vmpressure *memcg_to_vmpressure(struct mem_cgroup *memcg);
-extern struct cgroup_subsys_state *vmpressure_to_css(struct vmpressure *vmpr);
+extern struct mem_cgroup *vmpressure_to_memcg(struct vmpressure *vmpr);
extern int vmpressure_register_event(struct mem_cgroup *memcg,
struct eventfd_ctx *eventfd,
const char *args);
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 64ada9e650a5..62163a9cee63 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -247,9 +247,9 @@ struct vmpressure *memcg_to_vmpressure(struct mem_cgroup *memcg)
return &memcg->vmpressure;
}
-struct cgroup_subsys_state *vmpressure_to_css(struct vmpressure *vmpr)
+struct mem_cgroup *vmpressure_to_memcg(struct vmpressure *vmpr)
{
- return &container_of(vmpr, struct mem_cgroup, vmpressure)->css;
+ return container_of(vmpr, struct mem_cgroup, vmpressure);
}
#ifdef CONFIG_MEMCG_KMEM
diff --git a/mm/vmpressure.c b/mm/vmpressure.c
index d69019fc3789..04e81ac6d5d8 100644
--- a/mm/vmpressure.c
+++ b/mm/vmpressure.c
@@ -74,8 +74,7 @@ static struct vmpressure *work_to_vmpressure(struct work_struct *work)
static struct vmpressure *vmpressure_parent(struct vmpressure *vmpr)
{
- struct cgroup_subsys_state *css = vmpressure_to_css(vmpr);
- struct mem_cgroup *memcg = mem_cgroup_from_css(css);
+ struct mem_cgroup *memcg = vmpressure_to_memcg(vmpr);
memcg = parent_mem_cgroup(memcg);
if (!memcg)
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread[parent not found: <20210630112146.455103-1-suhui-OtvJRZzVyoU@public.gmane.org>]
* Re: [PATCH] mm/vmpressure: replace vmpressure_to_css() with vmpressure_to_memcg() [not found] ` <20210630112146.455103-1-suhui-OtvJRZzVyoU@public.gmane.org> @ 2021-06-30 12:22 ` Michal Hocko 2021-06-30 12:32 ` Chris Down 1 sibling, 0 replies; 3+ messages in thread From: Michal Hocko @ 2021-06-30 12:22 UTC (permalink / raw) To: Hui Su Cc: hannes-druUgvl0LCNAfugRpC6u6w, vdavydov.dev-Re5JQEeQqe8AvxtiuMwx3w, akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b, linux-kernel-u79uwXL29TY76Z2rM5mHXA, cgroups-u79uwXL29TY76Z2rM5mHXA, linux-mm-Bw31MaZKKs3YtjvyW6yDsg On Wed 30-06-21 19:21:46, Hui Su wrote: > We can get memcg directly form vmpr instead of vmpr->memcg->css->memcg, > so add a new func helper vmpressure_to_memcg(). > And no code will use vmpressure_to_css(), so delete it. Nice cleanup. > Signed-off-by: Hui Su <suhui-OtvJRZzVyoU@public.gmane.org> Acked-by: Michal Hocko <mhocko-IBi9RG/b67k@public.gmane.org> Thanks! > --- > include/linux/vmpressure.h | 2 +- > mm/memcontrol.c | 4 ++-- > mm/vmpressure.c | 3 +-- > 3 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/include/linux/vmpressure.h b/include/linux/vmpressure.h > index 6d28bc433c1c..6a2f51ebbfd3 100644 > --- a/include/linux/vmpressure.h > +++ b/include/linux/vmpressure.h > @@ -37,7 +37,7 @@ extern void vmpressure_prio(gfp_t gfp, struct mem_cgroup *memcg, int prio); > extern void vmpressure_init(struct vmpressure *vmpr); > extern void vmpressure_cleanup(struct vmpressure *vmpr); > extern struct vmpressure *memcg_to_vmpressure(struct mem_cgroup *memcg); > -extern struct cgroup_subsys_state *vmpressure_to_css(struct vmpressure *vmpr); > +extern struct mem_cgroup *vmpressure_to_memcg(struct vmpressure *vmpr); > extern int vmpressure_register_event(struct mem_cgroup *memcg, > struct eventfd_ctx *eventfd, > const char *args); > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 64ada9e650a5..62163a9cee63 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -247,9 +247,9 @@ struct vmpressure *memcg_to_vmpressure(struct mem_cgroup *memcg) > return &memcg->vmpressure; > } > > -struct cgroup_subsys_state *vmpressure_to_css(struct vmpressure *vmpr) > +struct mem_cgroup *vmpressure_to_memcg(struct vmpressure *vmpr) > { > - return &container_of(vmpr, struct mem_cgroup, vmpressure)->css; > + return container_of(vmpr, struct mem_cgroup, vmpressure); > } > > #ifdef CONFIG_MEMCG_KMEM > diff --git a/mm/vmpressure.c b/mm/vmpressure.c > index d69019fc3789..04e81ac6d5d8 100644 > --- a/mm/vmpressure.c > +++ b/mm/vmpressure.c > @@ -74,8 +74,7 @@ static struct vmpressure *work_to_vmpressure(struct work_struct *work) > > static struct vmpressure *vmpressure_parent(struct vmpressure *vmpr) > { > - struct cgroup_subsys_state *css = vmpressure_to_css(vmpr); > - struct mem_cgroup *memcg = mem_cgroup_from_css(css); > + struct mem_cgroup *memcg = vmpressure_to_memcg(vmpr); > > memcg = parent_mem_cgroup(memcg); > if (!memcg) > -- > 2.25.1 -- Michal Hocko SUSE Labs ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] mm/vmpressure: replace vmpressure_to_css() with vmpressure_to_memcg() [not found] ` <20210630112146.455103-1-suhui-OtvJRZzVyoU@public.gmane.org> 2021-06-30 12:22 ` Michal Hocko @ 2021-06-30 12:32 ` Chris Down 1 sibling, 0 replies; 3+ messages in thread From: Chris Down @ 2021-06-30 12:32 UTC (permalink / raw) To: Hui Su Cc: hannes-druUgvl0LCNAfugRpC6u6w, mhocko-DgEjT+Ai2ygdnm+yROfE0A, vdavydov.dev-Re5JQEeQqe8AvxtiuMwx3w, akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b, linux-kernel-u79uwXL29TY76Z2rM5mHXA, cgroups-u79uwXL29TY76Z2rM5mHXA, linux-mm-Bw31MaZKKs3YtjvyW6yDsg Thanks! This looks like a reasonable cleanup. Hui Su writes: >We can get memcg directly form vmpr instead of vmpr->memcg->css->memcg, >so add a new func helper vmpressure_to_memcg(). >And no code will use vmpressure_to_css(), so delete it. > >Signed-off-by: Hui Su <suhui-OtvJRZzVyoU@public.gmane.org> Acked-by: Chris Down <chris-6Bi1550iOqEnzZ6mRAm98g@public.gmane.org> >--- > include/linux/vmpressure.h | 2 +- > mm/memcontrol.c | 4 ++-- > mm/vmpressure.c | 3 +-- > 3 files changed, 4 insertions(+), 5 deletions(-) > >diff --git a/include/linux/vmpressure.h b/include/linux/vmpressure.h >index 6d28bc433c1c..6a2f51ebbfd3 100644 >--- a/include/linux/vmpressure.h >+++ b/include/linux/vmpressure.h >@@ -37,7 +37,7 @@ extern void vmpressure_prio(gfp_t gfp, struct mem_cgroup *memcg, int prio); > extern void vmpressure_init(struct vmpressure *vmpr); > extern void vmpressure_cleanup(struct vmpressure *vmpr); > extern struct vmpressure *memcg_to_vmpressure(struct mem_cgroup *memcg); >-extern struct cgroup_subsys_state *vmpressure_to_css(struct vmpressure *vmpr); >+extern struct mem_cgroup *vmpressure_to_memcg(struct vmpressure *vmpr); > extern int vmpressure_register_event(struct mem_cgroup *memcg, > struct eventfd_ctx *eventfd, > const char *args); >diff --git a/mm/memcontrol.c b/mm/memcontrol.c >index 64ada9e650a5..62163a9cee63 100644 >--- a/mm/memcontrol.c >+++ b/mm/memcontrol.c >@@ -247,9 +247,9 @@ struct vmpressure *memcg_to_vmpressure(struct mem_cgroup *memcg) > return &memcg->vmpressure; > } > >-struct cgroup_subsys_state *vmpressure_to_css(struct vmpressure *vmpr) >+struct mem_cgroup *vmpressure_to_memcg(struct vmpressure *vmpr) > { >- return &container_of(vmpr, struct mem_cgroup, vmpressure)->css; >+ return container_of(vmpr, struct mem_cgroup, vmpressure); > } > > #ifdef CONFIG_MEMCG_KMEM >diff --git a/mm/vmpressure.c b/mm/vmpressure.c >index d69019fc3789..04e81ac6d5d8 100644 >--- a/mm/vmpressure.c >+++ b/mm/vmpressure.c >@@ -74,8 +74,7 @@ static struct vmpressure *work_to_vmpressure(struct work_struct *work) > > static struct vmpressure *vmpressure_parent(struct vmpressure *vmpr) > { >- struct cgroup_subsys_state *css = vmpressure_to_css(vmpr); >- struct mem_cgroup *memcg = mem_cgroup_from_css(css); >+ struct mem_cgroup *memcg = vmpressure_to_memcg(vmpr); > > memcg = parent_mem_cgroup(memcg); > if (!memcg) >-- >2.25.1 > > ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-06-30 12:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-30 11:21 [PATCH] mm/vmpressure: replace vmpressure_to_css() with vmpressure_to_memcg() Hui Su
[not found] ` <20210630112146.455103-1-suhui-OtvJRZzVyoU@public.gmane.org>
2021-06-30 12:22 ` Michal Hocko
2021-06-30 12:32 ` Chris Down
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).