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 BD34D3451DA for ; Fri, 13 Mar 2026 02:30:40 +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=1773369042; cv=none; b=Xc1tI21Zh8N724vX8IZS8ao1b+LOtm63QMHs07WwjBBMcUXh1wzyv5Upi/goh8/pcbf+BI92dv7SMx5DCLN06K2IbvGQo+fsPbIW2hF0QrfLzuont5o1KxwhQquRUF7HKCrEStipL36um5qBeuPquJPnWFeU92qe7Wy2Vkvvsdw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773369042; c=relaxed/simple; bh=/ZrLFMXlOA5ycRv5sLKzYWrX/sWrnE4uXyvnOTIiLxE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=acXAxUPfA5adzm2RMCtv9uU84Qififq0CrpaCA4wKAzNnJJxjzO/2Qi+yp6bJJa52cq0Teaju+iF6nz8mvUyDI9jNAVtUYaf5rIOEp/riC3YjsYic9wcyPNto9zHjyrBaMvic5+Y2lSsQnnunSbqk+gQPiV8wXVZ9bZhQ+zptAw= 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=WXJgzDgX; 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="WXJgzDgX" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-2aecd4f7c37so2612255ad.1 for ; Thu, 12 Mar 2026 19:30:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1773369040; x=1773973840; 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=nc1PeXdKztWL7oqAkvY2/RZ62naVi0MC12J5472olWI=; b=WXJgzDgXi7X/AuMqmDNJTWz0EEJ1YBbQfA3stFGf7kK3Ol0zT8jyNjUlfa/jH6A9NW N3DwvGpIUDowJiD/Mt+6ka8fLQrwGEeRh0ovBXehmJcvSgVP4b8sxM6omVZhi5P48I+l Kn4hal/wz86C8Z6ytRF+HMrRJCOq+3iUZnMXJAjkg+ywwK1Lxhek8KTa0e1+P/x7Ii2l PeolNzQuit2yNFApBYXEyieQXddX4VW4CPfMy6fxAVVNqKJSo05MAdZxMcrdTbnNoM1O iKFUbpNJqYc3iQTEVy9qSet8ZBgTo/yHLu5sut7LR8RfsPh+gR8eYgO9GqbReg6hANgq /tIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773369040; x=1773973840; 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=nc1PeXdKztWL7oqAkvY2/RZ62naVi0MC12J5472olWI=; b=o9en4sGSyRiqj8ogqki0ImusBAZ0hD1ldhwsLBLyOcKroCoOT8XiWyWIAGCxJAPXlh orBaJhbb1emLuIprftGfq0LS5v4YZKn1Tf6sLLnXRpQDjV4qoFwXvaNR9728IPi3s2w3 6X5opRAE1M6rNHNrpEeof+Wh0yCp+7hrc84dMolYCX3zKfom+pPcErOt4Td+XR316k9A U0lsqeP+cTDNcNG8SdFzuf+dyN67usrTCTZmYHlRgUYZ6YbB/LTd4OgOKcqMOKj6NQXc kPYL9VJDYw9tLwDOHgSpZ+zcxvp+Qj01XNlye9idkpL9UBz2bQabtqt3cMEfO5NbNsdr o7nw== X-Gm-Message-State: AOJu0YyvLB7dqzSNJo0dtZRaBHuREEj47rD81gHAwWje4smRXUXSgzf1 tZYqlIqNfa+92nP5BNsiHjWu6QgD8DfdT2cS6TizOBFaGKQarxflb0pJSAiEQXjdOzOYL8aoiUI 0Z7QK+fkRnknN9EczuOIgVoHQizTtvdxUdAVHjUEielPqaDDNOXBwCb34YhuFOSlVMEjwTSC98L mNFFQQUxjJBGSToQbF73TeLqHDYiJm+LKvaIQLOPg9EoTyxUZ8 X-Received: from plbbj9.prod.google.com ([2002:a17:902:8509:b0:2ae:bfa5:6ba4]) (user=jstultz job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:fc87:b0:2ae:cfb5:a7a2 with SMTP id d9443c01a7336-2aecfb5aa91mr1584845ad.32.1773369039863; Thu, 12 Mar 2026 19:30:39 -0700 (PDT) Date: Fri, 13 Mar 2026 02:30:09 +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-9-jstultz@google.com> Subject: [PATCH v25 8/9] 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. Suggested-by: K Prateek Nayak Signed-off-by: John Stultz Reviewed-by: K Prateek Nayak --- 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 | 26 ++++++++++++++++++++++++++ 2 files changed, 26 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..d4a73c3db03d4 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -3008,6 +3008,32 @@ 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) +{ + struct rq_flags rf; + + rq_lock(rq, &rf); + update_rq_clock(rq); + attach_task(rq, p); + rq_unlock(rq, &rf); +} + #ifdef CONFIG_PREEMPT_RT # define SCHED_NR_MIGRATE_BREAK 8 #else --=20 2.53.0.880.g73c4285caa-goog