mm, memcg: clean up reclaim iter array

The mem_cgroup_reclaim_cookie is only used in memcg softlimit reclaim now, and the priority of the reclaim is always 0. We don't need to define the iter in struct mem_cgroup_per_node as an array any more. That could make the code more clear and save some space.

Yafang Shao committed 6 years ago

Commit 9da83f31 parent a1100a72 files · +4 −10Browse files

Unified · Split

2 files

include/linux/memcontrol.h +1 −2
mm/memcontrol.c +3 −8

include/linux/memcontrol.h+1−2

 struct mem_cgroup_reclaim_cookie {
 	pg_data_t *pgdat;
-	int priority;
 	unsigned int generation;
 };
 	unsigned long		lru_zone_size[MAX_NR_ZONES][NR_LRU_LISTS];
-	struct mem_cgroup_reclaim_iter	iter[DEF_PRIORITY + 1];
+	struct mem_cgroup_reclaim_iter	iter;
 	struct memcg_shrinker_map __rcu	*shrinker_map;

mm/memcontrol.c+3−8

 		struct mem_cgroup_per_node *mz;
 		mz = mem_cgroup_nodeinfo(root, reclaim->pgdat->node_id);
-		iter = &mz->iter[reclaim->priority];
+		iter = &mz->iter;
 		if (prev && reclaim->generation != iter->generation)
 			goto out_unlock;
 	struct mem_cgroup_reclaim_iter *iter;
 	struct mem_cgroup_per_node *mz;
 	int nid;
-	int i;
 	for_each_node(nid) {
 		mz = mem_cgroup_nodeinfo(from, nid);
-		for (i = 0; i <= DEF_PRIORITY; i++) {
+		iter = &mz->iter;
-			iter = &mz->iter[i];
+		cmpxchg(&iter->position, dead_memcg, NULL);
-			cmpxchg(&iter->position,
-				dead_memcg, NULL);
-		}
 	}
 }
 	unsigned long nr_scanned;
 	struct mem_cgroup_reclaim_cookie reclaim = {
 		.pgdat = pgdat,
-		.priority = 0,
 	};
 	excess = soft_limit_excess(root_memcg);

mm, memcg: clean up reclaim iter array

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code