summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/linux/memcontrol.h11
-rw-r--r--mm/memcontrol.c32
2 files changed, 10 insertions, 33 deletions
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index 8006bc3bd7bf..b3d2e3e60eed 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -1805,9 +1805,18 @@ void __memcg_kmem_uncharge_page(struct page *page, int order);
* needs to be used outside of the local scope.
*/
struct obj_cgroup *current_obj_cgroup(void);
-struct obj_cgroup *get_obj_cgroup_from_current(void);
struct obj_cgroup *get_obj_cgroup_from_folio(struct folio *folio);
+static inline struct obj_cgroup *get_obj_cgroup_from_current(void)
+{
+ struct obj_cgroup *objcg = current_obj_cgroup();
+
+ if (objcg)
+ obj_cgroup_get(objcg);
+
+ return objcg;
+}
+
int obj_cgroup_charge(struct obj_cgroup *objcg, gfp_t gfp, size_t size);
void obj_cgroup_uncharge(struct obj_cgroup *objcg, size_t size);
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index a6457c8b5e16..8b0859b8cc03 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -3138,38 +3138,6 @@ static struct obj_cgroup *current_objcg_update(void)
return objcg;
}
-__always_inline struct obj_cgroup *get_obj_cgroup_from_current(void)
-{
- struct mem_cgroup *memcg;
- struct obj_cgroup *objcg;
-
- if (in_task()) {
- memcg = current->active_memcg;
- if (unlikely(memcg))
- goto from_memcg;
-
- objcg = READ_ONCE(current->objcg);
- if (unlikely((unsigned long)objcg & CURRENT_OBJCG_UPDATE_FLAG))
- objcg = current_objcg_update();
-
- if (objcg) {
- obj_cgroup_get(objcg);
- return objcg;
- }
- } else {
- memcg = this_cpu_read(int_active_memcg);
- if (unlikely(memcg))
- goto from_memcg;
- }
- return NULL;
-
-from_memcg:
- rcu_read_lock();
- objcg = __get_obj_cgroup_from_memcg(memcg);
- rcu_read_unlock();
- return objcg;
-}
-
__always_inline struct obj_cgroup *current_obj_cgroup(void)
{
struct mem_cgroup *memcg;