From nobody Fri Apr 3 10:17:52 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 4BC003C13F5 for ; Tue, 24 Mar 2026 19:13:55 +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=1774379637; cv=none; b=U1nfWL9FXi6FckuC9Zyg6tPaFqWE7ImhYa/1Tb3C4CCAP1WsW/6hUCjjgYwSscrP3sfF8F6oL0Iv4HkqnaO5Pin5FYEBz3P5dOvyVCmDqz2RAn1o4UYG/vtuOwQ5s95h5OzC+NoURbz5cgMRGc/REGLTFRlPw+aKjMsuJx5/UdU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774379637; c=relaxed/simple; bh=/V3gaHlTHv/x429QQd88aapwPmpMOfi/GWuEqIpg4Ig=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=CVOmSZ3/78u06tk02cSZ2dJOAAGCbHgHC5xHa6VDsHr5Sohm8yMKQuBveOY+QrkK0yliu1mRKPuBvFPaIEn0FFwgfP9rpKLlpB9aOGXeBe8daRqtxOYMS3s8EB3dJKzH2BmkFXy2HiNdvs21dQfmHehatt5QZuDdg1lyaJaxcHI= 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=fUw+LWbT; 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="fUw+LWbT" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-2b08025f240so2501805ad.1 for ; Tue, 24 Mar 2026 12:13:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1774379635; x=1774984435; 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=R6cQ3WpqP5ss2YZOuRfU4M9m0rbTHLz4QTo0lRNq+Bk=; b=fUw+LWbTj1OTtbU0sTzbe6uOHP8t2Y933CYGeuYVA8Fysb+IKPrtS+eyhK02WH5G0d E86vFOAM7yhy2DFQQYgHPJ61Fvis1SgnBy9bkjl1RTLHpMKAt5WlWCPFd0RzMtQfiN4I Gi+C35Nu1uCMLsIgvPD9fYU9IZ0vYjZJMcVPHerZ5/9w9R2Ms+HmSWX/OZP2UFydKaaM uN/fR9VwWS9UBq6LBS8GuJ2/gUgfbIMV22vsmI+CDSPWdXk4rKttDwsW7/954GeXbgj/ EvVNTpuKfq2hxmVAx34fJRKkHe7b/Zae7wOEyVawVZhzs6vjLfWE3M38HXh58AGbV6XT M7gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774379635; x=1774984435; 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=R6cQ3WpqP5ss2YZOuRfU4M9m0rbTHLz4QTo0lRNq+Bk=; b=lgA6dfLN19RlOFOXVWW5sfxaIVA+Q6ljj+jgXSJwYm//h5QI1IGk+PpLPguUNNEjm+ JrKbWt0+4nwyOBN6p1v6fLOVXAwSRgkvuCprluH2Pcei2VMRbn2iTsI6BnKKRXCUKuFG aorSfUR3zGdMtBaTe09Hsa4RxID9y2NKq+EPem5m8O7kQjP8EAPM5wSSm2JLkDBBd75Z h85xfxc5YNCloDARrlQm6eaoJbFSzYSd0NCBlwWp0OGVLufVfTmQZ2bTheoREc9i4Prc TFvwVfceQdv3gv8ZOptPFBAnepmqUL3a0LF/gPhmo93b4Ro9KZjVAQxNzT07rr0eDHv+ UBEQ== X-Gm-Message-State: AOJu0Yz7in3pQY3KZ2cwogSIHA8ejNtVSmAaTgVrTun9Lah+NDU025d7 NGQjGaDh8sweEFcCEzser9EJf8iWT5Q/UAaZ4F09LvHIp16tO8rhnD2ceYwwirX4gZ3mIJcA2Dp S9IyWRmI5Trikq9aBkipmLhx55p6gjLjZHwb6A8LHnwMAUOextDPUlZMjsOQI6MYKdZrSoCYrcF +dwKMD9i+7tbYLzPsRxKxPYL2K+TffBMpLyuTHhTgRlBWrRiRx X-Received: from plpn15.prod.google.com ([2002:a17:902:968f:b0:2ae:c5aa:fcd7]) (user=jstultz job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:c943:b0:2b0:7502:6ebe with SMTP id d9443c01a7336-2b0b083a7d6mr8360365ad.25.1774379634332; Tue, 24 Mar 2026 12:13:54 -0700 (PDT) Date: Tue, 24 Mar 2026 19:13:24 +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-10-jstultz@google.com> Subject: [PATCH v26 09/10] sched: Move attach_one_task and attach_task helpers to sched.h From: John Stultz To: LKML Cc: John Stultz , K Prateek Nayak , Joel Fernandes , Qais Yousef , Ingo Molnar , Peter Zijlstra , 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" The fair scheduler locally introduced attach_one_task() and attach_task() helpers, but these could be generically useful so move this code to sched.h so we can use them elsewhere. One minor tweak made to utilize guard(rq_lock)(rq) to simplifiy the function. Suggested-by: K Prateek Nayak Reviewed-by: K Prateek Nayak Signed-off-by: John Stultz --- v26: * Folded in switch to use guard(rq_lock)(rq) 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/fair.c | 26 -------------------------- kernel/sched/sched.h | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 26 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index bf948db905ed1..53da01a251487 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -9784,32 +9784,6 @@ static int detach_tasks(struct lb_env *env) return detached; } =20 -/* - * attach_task() -- attach the task detached by detach_task() to its new r= q. - */ -static void attach_task(struct rq *rq, struct task_struct *p) -{ - lockdep_assert_rq_held(rq); - - WARN_ON_ONCE(task_rq(p) !=3D rq); - activate_task(rq, p, ENQUEUE_NOCLOCK); - wakeup_preempt(rq, p, 0); -} - -/* - * attach_one_task() -- attaches the task returned from detach_one_task() = to - * its new rq. - */ -static void attach_one_task(struct rq *rq, struct task_struct *p) -{ - struct rq_flags rf; - - rq_lock(rq, &rf); - update_rq_clock(rq); - attach_task(rq, p); - rq_unlock(rq, &rf); -} - /* * attach_tasks() -- attaches all tasks detached by detach_tasks() to their * new rq. diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 2a0236d745832..d4def70df05a6 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -3008,6 +3008,29 @@ extern void deactivate_task(struct rq *rq, struct ta= sk_struct *p, int flags); =20 extern void wakeup_preempt(struct rq *rq, struct task_struct *p, int flags= ); =20 +/* + * attach_task() -- attach the task detached by detach_task() to its new r= q. + */ +static inline void attach_task(struct rq *rq, struct task_struct *p) +{ + lockdep_assert_rq_held(rq); + + WARN_ON_ONCE(task_rq(p) !=3D rq); + activate_task(rq, p, ENQUEUE_NOCLOCK); + wakeup_preempt(rq, p, 0); +} + +/* + * attach_one_task() -- attaches the task returned from detach_one_task() = to + * its new rq. + */ +static inline void attach_one_task(struct rq *rq, struct task_struct *p) +{ + guard(rq_lock)(rq); + update_rq_clock(rq); + attach_task(rq, p); +} + #ifdef CONFIG_PREEMPT_RT # define SCHED_NR_MIGRATE_BREAK 8 #else --=20 2.53.0.1018.g2bb0e51243-goog