| Message ID | 20240928021620.8369-2-kanchana.p.sridhar@intel.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | mm: zswap swap-out of large folios | expand |
On Fri, Sep 27, 2024 at 7:16 PM Kanchana P Sridhar <kanchana.p.sridhar@intel.com> wrote: > > This resolves an issue with obj_cgroup_get() not being defined if > CONFIG_MEMCG is not defined. > > Before this patch, we would see build errors if obj_cgroup_get() is > called from code that is agnostic of CONFIG_MEMCG. > > The zswap_store() changes for large folios in subsequent commits will > require the use of obj_cgroup_get() in zswap code that falls into this > category. > > Signed-off-by: Kanchana P Sridhar <kanchana.p.sridhar@intel.com> > Reviewed-by: Nhat Pham <nphamcs@gmail.com>' Reviewed-by: Yosry Ahmed <yosryahmed@google.com> > --- > include/linux/memcontrol.h | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h > index 34d2da05f2f1..15c2716f9aa3 100644 > --- a/include/linux/memcontrol.h > +++ b/include/linux/memcontrol.h > @@ -1282,6 +1282,10 @@ struct mem_cgroup *mem_cgroup_from_css(struct cgroup_subsys_state *css) > return NULL; > } > > +static inline void obj_cgroup_get(struct obj_cgroup *objcg) > +{ > +} > + > static inline void obj_cgroup_put(struct obj_cgroup *objcg) > { > } > -- > 2.27.0 >
On 2024/9/28 10:16, Kanchana P Sridhar wrote: > This resolves an issue with obj_cgroup_get() not being defined if > CONFIG_MEMCG is not defined. > > Before this patch, we would see build errors if obj_cgroup_get() is > called from code that is agnostic of CONFIG_MEMCG. > > The zswap_store() changes for large folios in subsequent commits will > require the use of obj_cgroup_get() in zswap code that falls into this > category. > > Signed-off-by: Kanchana P Sridhar <kanchana.p.sridhar@intel.com> > Reviewed-by: Nhat Pham <nphamcs@gmail.com> Reviewed-by: Chengming Zhou <chengming.zhou@linux.dev> > --- > include/linux/memcontrol.h | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h > index 34d2da05f2f1..15c2716f9aa3 100644 > --- a/include/linux/memcontrol.h > +++ b/include/linux/memcontrol.h > @@ -1282,6 +1282,10 @@ struct mem_cgroup *mem_cgroup_from_css(struct cgroup_subsys_state *css) > return NULL; > } > > +static inline void obj_cgroup_get(struct obj_cgroup *objcg) > +{ > +} > + > static inline void obj_cgroup_put(struct obj_cgroup *objcg) > { > }
On Fri, Sep 27, 2024 at 07:16:13PM -0700, Kanchana P Sridhar wrote: > This resolves an issue with obj_cgroup_get() not being defined if > CONFIG_MEMCG is not defined. > > Before this patch, we would see build errors if obj_cgroup_get() is > called from code that is agnostic of CONFIG_MEMCG. > > The zswap_store() changes for large folios in subsequent commits will > require the use of obj_cgroup_get() in zswap code that falls into this > category. > > Signed-off-by: Kanchana P Sridhar <kanchana.p.sridhar@intel.com> > Reviewed-by: Nhat Pham <nphamcs@gmail.com> Acked-by: Johannes Weiner <hannes@cmpxchg.org>
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 34d2da05f2f1..15c2716f9aa3 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -1282,6 +1282,10 @@ struct mem_cgroup *mem_cgroup_from_css(struct cgroup_subsys_state *css) return NULL; } +static inline void obj_cgroup_get(struct obj_cgroup *objcg) +{ +} + static inline void obj_cgroup_put(struct obj_cgroup *objcg) { }