From nobody Tue Apr 7 14:19:04 2026 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 458251D6195 for ; Fri, 13 Mar 2026 02:30:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773369038; cv=none; b=jGcpfScouVv2SGH237iDSA3+gNXoZe0kUdqQOk0hh6LZSscK5ahGRCQYo6ZpV3IPHbfZYkD6A7VsObwcmrh/PJmrDki11ezis8BCg9eJPJmjQtVx43nEFxNEeF+shCaGtn62Uy3GEnkfZDaxLLtFUkM+VOxDG72z7Jumm/r6dak= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773369038; c=relaxed/simple; bh=fVqQ1eGTWwDT1GO1KZsD2s81lfAZrw50APz1xHM9qIs=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=jZoOFaXEu8duOAYOt7fSf/oEEhIczAgLCXA3GGDLQkk4pbHZ1Y050DtIkweOBr9hog6tynONVRJuoGQenDRH9Y2mnsNcPOTIZqCaccXcSTwxQ8+IWDDOXFkyGQM7uLD63d6CsBZrbHrm8bN5R7ODwbaN3+scjdgXN1l8gF0utHE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--jstultz.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Kttu/XL2; arc=none smtp.client-ip=209.85.214.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--jstultz.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Kttu/XL2" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-2ae6961bff0so131758225ad.2 for ; Thu, 12 Mar 2026 19:30:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1773369036; x=1773973836; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=808JJUEjIBH5mtg1HfkcbobcjxGGZpssbTl6iIUWUyE=; b=Kttu/XL2+F3DIQy5XiOdf4w1oV/LO0kNb0mJ8Y5vHJSuFUL8z7JIqEvmH5Dnf4A6B9 +7lZ+2Q675YsqZsuymg1J9B7n1eMsVWm1HOxENgq2gXj1KIAPE4gIhjjS1AKSaQeBB+k 4Mnbod3VBkpoDwQEOfXGqzWg1gO58RtG6VeDTZn6VhvgC13Ll+YViOYnwJDsFwAXmiy0 kbBQhwei3a4Ag0IzvF8pYENjJGjMVw+170nAPzF6kLFgP66vHiSrk6AZDFYV1UuDbU92 0w8KfeEihlmwtEpgAdP6eXAunuz3kxioC1CKJfTQ54RMmfEhuYHLAS+NebZicBf8y7hW DMdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773369036; x=1773973836; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=808JJUEjIBH5mtg1HfkcbobcjxGGZpssbTl6iIUWUyE=; b=ol/vtXyRv3FYIaPV5LhAgD/kWej1c967e5WY/wUvzbUcGAMI4TZeMdpDCJiQ5k28mV ct4t0JFiFqGbQWpRR/CDODXw/aRmdOSaqT4e4IZZ50Oos517m4+vRRg9U7L4NRF8ebwZ D+Fp4wrNx2q5X4wj6Duh1CPYbVXNdi2Xtdt4hKmch2DM402SUOvVRhcor1a2V3LVxibi BWsB5i2A6jtGjatLpRbvYLNNc160xdaIK7hwr3Dm+Va3xpU004kYcqH1HeyYeXo0Jq9u iMCF5H+3Mm6hXbeTP+ZecaxfPrLxAox+o8X/CNRv2JtLsxUoKR4gg9FJ/NkMa45F8ll7 xTeg== X-Gm-Message-State: AOJu0YyByIUEGSs7mGM3ylZLWKYyFvdXjwD5kNyOVpXqiotFwOkVbjQS M7PdI06tjS4Ox9amZEPILoelZ2Gxrnp5HgsEBwcl0PLnerLP6I4yj9QFA6+fgQ/7mSzG2hm2Iuz BbySTWdQ0bJ/iskJxweYfQIi2uxAZReydfVoqJTqNlXVOTuPhmTE4neWN36hQbj/xAhWRgvEdfB TJ9XNihNByf+/SCaegQrn7rcLssBMJT/r2gJ//9W828AQVFigE X-Received: from plhz15.prod.google.com ([2002:a17:902:d9cf:b0:2ad:9f2a:e9e2]) (user=jstultz job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:ac7:b0:2ae:414c:d0a8 with SMTP id d9443c01a7336-2aecac8782bmr13671515ad.48.1773369036209; Thu, 12 Mar 2026 19:30:36 -0700 (PDT) Date: Fri, 13 Mar 2026 02:30:07 +0000 In-Reply-To: <20260313023022.2902479-1-jstultz@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260313023022.2902479-1-jstultz@google.com> X-Mailer: git-send-email 2.53.0.880.g73c4285caa-goog Message-ID: <20260313023022.2902479-7-jstultz@google.com> Subject: [PATCH v25 6/9] sched: Add assert_balance_callbacks_empty helper From: John Stultz To: LKML Cc: John Stultz , Peter Zijlstra , K Prateek Nayak , Joel Fernandes , Qais Yousef , Ingo Molnar , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Valentin Schneider , Steven Rostedt , Ben Segall , Zimuzo Ezeozue , Mel Gorman , Will Deacon , Waiman Long , Boqun Feng , "Paul E. McKenney" , Metin Kaya , Xuewen Yan , Thomas Gleixner , Daniel Lezcano , Suleiman Souhlal , kuyo chang , hupu , kernel-team@android.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" With proxy-exec utilizing pick-again logic, we can end up having balance callbacks set by the preivous pick_next_task() call left on the list. So pull the warning out into a helper function, and make sure we check it when we pick again. Suggested-by: Peter Zijlstra Reviewed-by: K Prateek Nayak Signed-off-by: John Stultz --- v24: * Use IS_ENABLED() as suggested by K Prateek Cc: Joel Fernandes Cc: Qais Yousef Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Juri Lelli Cc: Vincent Guittot Cc: Dietmar Eggemann Cc: Valentin Schneider Cc: Steven Rostedt Cc: Ben Segall Cc: Zimuzo Ezeozue Cc: Mel Gorman Cc: Will Deacon Cc: Waiman Long Cc: Boqun Feng Cc: "Paul E. McKenney" Cc: Metin Kaya Cc: Xuewen Yan Cc: K Prateek Nayak Cc: Thomas Gleixner Cc: Daniel Lezcano Cc: Suleiman Souhlal Cc: kuyo chang Cc: hupu Cc: kernel-team@android.com --- kernel/sched/core.c | 1 + kernel/sched/sched.h | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 7212a439124a9..ec9e8fe39f9fc 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -6853,6 +6853,7 @@ static void __sched notrace __schedule(int sched_mode) } =20 pick_again: + assert_balance_callbacks_empty(rq); next =3D pick_next_task(rq, rq->donor, &rf); rq_set_donor(rq, next); rq->next_class =3D next->sched_class; diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 43bbf0693cca4..2a0236d745832 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -1853,6 +1853,13 @@ static inline void scx_rq_clock_update(struct rq *rq= , u64 clock) {} static inline void scx_rq_clock_invalidate(struct rq *rq) {} #endif /* !CONFIG_SCHED_CLASS_EXT */ =20 +static inline void assert_balance_callbacks_empty(struct rq *rq) +{ + WARN_ON_ONCE(IS_ENABLED(CONFIG_PROVE_LOCKING) && + rq->balance_callback && + rq->balance_callback !=3D &balance_push_callback); +} + /* * Lockdep annotation that avoids accidental unlocks; it's like a * sticky/continuous lockdep_assert_held(). @@ -1869,7 +1876,7 @@ static inline void rq_pin_lock(struct rq *rq, struct = rq_flags *rf) =20 rq->clock_update_flags &=3D (RQCF_REQ_SKIP|RQCF_ACT_SKIP); rf->clock_update_flags =3D 0; - WARN_ON_ONCE(rq->balance_callback && rq->balance_callback !=3D &balance_p= ush_callback); + assert_balance_callbacks_empty(rq); } =20 static inline void rq_unpin_lock(struct rq *rq, struct rq_flags *rf) --=20 2.53.0.880.g73c4285caa-goog