瀏覽代碼

memcg: only free spare array when readers are done

A spare array holding mem cgroup threshold events is kept around to make
sure we can always safely deregister an event and have an array to store
the new set of events in.

In the scenario where we're going from 1 to 0 registered events, the
pointer to the primary array containing 1 event is copied to the spare
slot, and then the spare slot is freed because no events are left.
However, it is freed before calling synchronize_rcu(), which means
readers may still be accessing threshold->primary after it is freed.

Fixed by only freeing after synchronize_rcu().

Signed-off-by: Martijn Coenen <maco@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Vladimir Davydov <vdavydov@virtuozzo.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Martijn Coenen 9 年之前
父節點
當前提交
6611d8d761
共有 1 個文件被更改,包括 6 次插入5 次删除
  1. 6 5
      mm/memcontrol.c

+ 6 - 5
mm/memcontrol.c

@@ -3491,16 +3491,17 @@ static void __mem_cgroup_usage_unregister_event(struct mem_cgroup *memcg,
 swap_buffers:
 swap_buffers:
 	/* Swap primary and spare array */
 	/* Swap primary and spare array */
 	thresholds->spare = thresholds->primary;
 	thresholds->spare = thresholds->primary;
-	/* If all events are unregistered, free the spare array */
-	if (!new) {
-		kfree(thresholds->spare);
-		thresholds->spare = NULL;
-	}
 
 
 	rcu_assign_pointer(thresholds->primary, new);
 	rcu_assign_pointer(thresholds->primary, new);
 
 
 	/* To be sure that nobody uses thresholds */
 	/* To be sure that nobody uses thresholds */
 	synchronize_rcu();
 	synchronize_rcu();
+
+	/* If all events are unregistered, free the spare array */
+	if (!new) {
+		kfree(thresholds->spare);
+		thresholds->spare = NULL;
+	}
 unlock:
 unlock:
 	mutex_unlock(&memcg->thresholds_lock);
 	mutex_unlock(&memcg->thresholds_lock);
 }
 }