From nobody Fri Apr 3 10:17:53 2026 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (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 8A7A33BFE34 for ; Tue, 24 Mar 2026 19:13:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774379634; cv=none; b=ESxXtSTWCGjKIPMOaI2FDhFWvQKBFQxsDtbu04f91c503w0C1Y4rhsB58+T1M1YWhf2NnO6czdeEFq1Kj1fAUlMOPaHXrTAuyIEuv1fXcrKy/QoLs3GYjzGrSnVZjfcR158zlDQK9kTYIcnpsZ1VTQfDJIn+FHIzN31vM/02zGM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774379634; c=relaxed/simple; bh=/eZJFY5uhia92AI7Ho19mC2qaMCeVxXvpv/NzMKp2sA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=OSNSwtn5PdIoCvC0PspEu7gA2IFKXBFNdW9IHl9BQ4hfwGmUAy/0PBS9jpn4orvSBrPVqGIOOWT045T+3jgAdt45kVoRbAu1C46XLwy2IMjQcPdn4oVf6Kfm2vplD2M6TjIpR3JB5I0yo0zfUcnaXaJ5tUikkMsirDSiG5FsLr4= 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=tDxx9Q9R; arc=none smtp.client-ip=209.85.214.201 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="tDxx9Q9R" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-2b0560c1320so121396585ad.2 for ; Tue, 24 Mar 2026 12:13:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1774379632; x=1774984432; 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=mSL183B1Idyggo5Iz6pvpRnPaL/uqCRmDARcuYitFV4=; b=tDxx9Q9R7H+56VpE0kHLzoMICSu2ioK7/CGLmAfyloHsbFS+JC3bC1Idjewjep1t0P eULAOLsBR9vT8K0E7C0wBFfDIZWKyxxUSyNj4pFBjMkEGUtRkM7o/bFcsg7M0Ms8v9A4 l+Jjf/slo07uP6qt121UxYl/usUgEv0TgnyJksE//CG5nwUsGPwBCMnOkiuFH1hOfRYy 5Bx6BezthAHeavuR8jE/efGlF6/crmjjmnVWhn/AbfAUPFl2lhufEIp0fXDdZ4HPC2fF PPiUeimprwTW+cDhEh55rnLfZYuNgBMdKa0DRZwSdm0inWmO8UiZkQXYTz2sTLY0/J/f Gtrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774379632; x=1774984432; 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=mSL183B1Idyggo5Iz6pvpRnPaL/uqCRmDARcuYitFV4=; b=ZDNMHPBCERqG1aUGzQC+Fp2UTlLSkxoFCljkX8GlvcIbBL/xtA+Lq+CvbcuAmXVIre UAwTxTr/yXGgL2nBtVhCfPEOu+kiAvH2zpjiJVOgBKRroA7cmJokNVDBQ/RToNg4xfvA WBn4ODmMhY9siBc8LEPl5vS/yQP/ls5eqJabwV1LFdblAWYt4HE5Paic6XCF4d7zaEIV v3BOECPA/Rk95dnVDTVnOGKv6CgORdNXolbe+x7li1HtsxDSK+ztXoZgHl2/i8xBFT5k DZqL372kMXqEeLMvGmbDeVG1g7aUDV4Xh3pXG7nIT4VYAm7A+LUzzDRKwW3D9SRL3f/e kapA== X-Gm-Message-State: AOJu0Yxf+wvJtoeh1mNqH9JLorwObdzdVKO8Vdt9WPpe/knCVvZ8dAPj 7KXlsnXBgSBbu+GFXdKLwjaU6jDq5r+jcmUwr5PrLipNFmtfLSym0TkvuGyuyG3xzJ+Mkj+L+db ssmko4e7AL42MOtND/SAuSevp6l+Tdkh/oBdvFq6tmmc3Sx+2mSqM9cHktK/SejenQUgA0pryOK DEIWau0D4c6mOQx4SoCVvInvCMWtyukv8iFUqIVjwNkBBtsUoT X-Received: from ploh5.prod.google.com ([2002:a17:902:f705:b0:2b0:abae:5cf7]) (user=jstultz job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:46cb:b0:2b0:4b37:e9a5 with SMTP id d9443c01a7336-2b0b0b2efd3mr7048255ad.53.1774379631545; Tue, 24 Mar 2026 12:13:51 -0700 (PDT) Date: Tue, 24 Mar 2026 19:13:22 +0000 In-Reply-To: <20260324191337.1841376-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: <20260324191337.1841376-1-jstultz@google.com> X-Mailer: git-send-email 2.53.0.1018.g2bb0e51243-goog Message-ID: <20260324191337.1841376-8-jstultz@google.com> Subject: [PATCH v26 07/10] 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 aa2e7287235e3..b316b6015ffea 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -6856,6 +6856,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->next_class =3D next->sched_class; if (sched_proxy_exec()) { 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.1018.g2bb0e51243-goog