From: Peter Zijlstra <peterz@infradead.org>
Date: Thu, 23 May 2024 09:00:10 +0000 (+0200)
Subject: sched/fair: Assert {set_next,put_prev}_entity() are properly balanced
X-Git-Tag: v6.12-rc1~120^2~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e28b5f8bda01720b5ce8456b48cf4b963f9a80a1;p=thirdparty%2Fkernel%2Flinux.git

sched/fair: Assert {set_next,put_prev}_entity() are properly balanced

Just a little sanity test..

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Valentin Schneider <vschneid@redhat.com>
Tested-by: Valentin Schneider <vschneid@redhat.com>
Link: https://lkml.kernel.org/r/20240727105029.486423066@infradead.org
---

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 59b00d78d456e..37acd530f413f 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -5452,6 +5452,7 @@ set_next_entity(struct cfs_rq *cfs_rq, struct sched_entity *se)
 	}
 
 	update_stats_curr_start(cfs_rq, se);
+	SCHED_WARN_ON(cfs_rq->curr);
 	cfs_rq->curr = se;
 
 	/*
@@ -5513,6 +5514,7 @@ static void put_prev_entity(struct cfs_rq *cfs_rq, struct sched_entity *prev)
 		/* in !on_rq case, update occurred at dequeue */
 		update_load_avg(cfs_rq, prev, 0);
 	}
+	SCHED_WARN_ON(cfs_rq->curr != prev);
 	cfs_rq->curr = NULL;
 }