From nobody Fri Dec 19 14:13:27 2025 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.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 B50A8208DA for ; Wed, 20 Dec 2023 00:19:35 +0000 (UTC) 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="L7YCRIpB" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-5e617562a65so44910647b3.1 for ; Tue, 19 Dec 2023 16:19:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1703031574; x=1703636374; 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=NGhThAZPlKuA3DG9SjSGW+fpPhrooALxVkfxxcKParw=; b=L7YCRIpB6vKiiJgC63DQSXvgdbkErP0jGYoJAjBj/lr5eBFz68Hko82Z37XnqWEW2v 7olIuzPZQQjfQcL2TKFxLubLWQRUyQ0CYsPN4AcGuhq+VJo8E3nZeI5csinnaJ7conEU CptNzn6/zW0FBak0vq35O1oU5c4BnVRFZ0YUkISJVW4griuqvNxtzRN+8y7ArI2dOMVW +lQDtXfpyHEQNgbtPoIowsIBEq920WPJHwW0XtNsuMFbrVs8hQnJQt14enJTKLqe+VZr Q3rduyTQ22yyRhntoFlrt71CyLeXSuneoP1FaxGAxbr3ACkiEtL2uQU8xCOe5OtaVaCQ zuSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703031574; x=1703636374; 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=NGhThAZPlKuA3DG9SjSGW+fpPhrooALxVkfxxcKParw=; b=vpE5r7p25mFmenXTHzRu3l9Lk7zv9305zYHgcNVWZ50YYxo54o9Qidyo6sd3CKwPVW /sfCStSN741RU48K20qt9g2GN32kRi5092RNkO/LZ40GjEAO+ClMfuQ7+imEHqJn0cA1 v0EaN74GJNyu1w/a2Zh+h8OZO8b0I4nX/rpbyNCV9+nsfonDwaYMT8dlrBYl9hDzyAkK N/Lpg9qgkp2QPS58jrZesSVJncPt4RiIHCJ6vvKwHIMyvKGfTFidtR9TvKBb+NllWmdH UEVoiI2fuf3CZd1eE3tmMIIw12qCsNkX2wTVM3DvNoVlqIub/GXOg83wMA/ygWJ6LLWT dZ3w== X-Gm-Message-State: AOJu0YyuspeXdTYAGjmuzhUYeixAQERcah91gp19dnxx9nTLYPbT2Pq5 Cs0fM70eSPGAWls3lvKsA1Cv7ZAkUkW0FPsy5L5Dg7K+cQ5KGugdMoiTGBH60gibbCwdYtDBV7e ZQzsUxphmPcBznI3XHZrcORzG1N3cTINLhudN+SHRWdrdyS1xZQjpYKA/zuFoxoI1wnqEgNU= X-Google-Smtp-Source: AGHT+IHyKlq58eERpBcLB7I11Bb4HermitDwI1gx5J6zFvTyMlHHWSwbUdgG2IY5MsXykKlPExet0+cL7E19 X-Received: from jstultz-noogler2.c.googlers.com ([fda3:e722:ac3:cc00:24:72f4:c0a8:600]) (user=jstultz job=sendgmr) by 2002:a05:690c:d93:b0:5d4:3013:25d4 with SMTP id da19-20020a05690c0d9300b005d4301325d4mr3569079ywb.5.1703031574440; Tue, 19 Dec 2023 16:19:34 -0800 (PST) Date: Tue, 19 Dec 2023 16:18:29 -0800 In-Reply-To: <20231220001856.3710363-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: <20231220001856.3710363-1-jstultz@google.com> X-Mailer: git-send-email 2.43.0.472.g3155946c3a-goog Message-ID: <20231220001856.3710363-19-jstultz@google.com> Subject: [PATCH v7 18/23] sched: Add push_task_chain helper From: John Stultz To: LKML Cc: "Connor O'Brien" , Joel Fernandes , Qais Yousef , Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Valentin Schneider , Steven Rostedt , Ben Segall , Zimuzo Ezeozue , Youssef Esmat , Mel Gorman , Daniel Bristot de Oliveira , Will Deacon , Waiman Long , Boqun Feng , "Paul E. McKenney" , Metin Kaya , Xuewen Yan , K Prateek Nayak , Thomas Gleixner , kernel-team@android.com, John Stultz Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Connor O'Brien Switch logic that deactivates, sets the task cpu, and reactivates a task on a different rq to use a helper that will be later extended to push entire blocked task chains. This patch was broken out from a larger chain migration patch originally by Connor O'Brien. 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: Youssef Esmat Cc: Mel Gorman Cc: Daniel Bristot de Oliveira 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: kernel-team@android.com Signed-off-by: Connor O'Brien [jstultz: split out from larger chain migration patch] Signed-off-by: John Stultz --- kernel/sched/core.c | 4 +--- kernel/sched/deadline.c | 8 ++------ kernel/sched/rt.c | 8 ++------ kernel/sched/sched.h | 9 +++++++++ 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 0cd63bd0bdcd..0c212dcd4b7a 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -2721,9 +2721,7 @@ int push_cpu_stop(void *arg) =20 // XXX validate p is still the highest prio task if (task_rq(p) =3D=3D rq) { - deactivate_task(rq, p, 0); - set_task_cpu(p, lowest_rq->cpu); - activate_task(lowest_rq, p, 0); + push_task_chain(rq, lowest_rq, p); resched_curr(lowest_rq); } =20 diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c index 4f998549ea74..def1eb23318b 100644 --- a/kernel/sched/deadline.c +++ b/kernel/sched/deadline.c @@ -2313,9 +2313,7 @@ static int push_dl_task(struct rq *rq) goto retry; } =20 - deactivate_task(rq, next_task, 0); - set_task_cpu(next_task, later_rq->cpu); - activate_task(later_rq, next_task, 0); + push_task_chain(rq, later_rq, next_task); ret =3D 1; =20 resched_curr(later_rq); @@ -2401,9 +2399,7 @@ static void pull_dl_task(struct rq *this_rq) if (is_migration_disabled(p)) { push_task =3D get_push_task(src_rq); } else { - deactivate_task(src_rq, p, 0); - set_task_cpu(p, this_cpu); - activate_task(this_rq, p, 0); + push_task_chain(src_rq, this_rq, p); dmin =3D p->dl.deadline; resched =3D true; } diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c index a7b51a021111..cf0eb4aac613 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c @@ -2128,9 +2128,7 @@ static int push_rt_task(struct rq *rq, bool pull) goto retry; } =20 - deactivate_task(rq, next_task, 0); - set_task_cpu(next_task, lowest_rq->cpu); - activate_task(lowest_rq, next_task, 0); + push_task_chain(rq, lowest_rq, next_task); resched_curr(lowest_rq); ret =3D 1; =20 @@ -2401,9 +2399,7 @@ static void pull_rt_task(struct rq *this_rq) if (is_migration_disabled(p)) { push_task =3D get_push_task(src_rq); } else { - deactivate_task(src_rq, p, 0); - set_task_cpu(p, this_cpu); - activate_task(this_rq, p, 0); + push_task_chain(src_rq, this_rq, p); resched =3D true; } /* diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 765ba10661de..19afe532771f 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -3546,5 +3546,14 @@ static inline void init_sched_mm_cid(struct task_str= uct *t) { } =20 extern u64 avg_vruntime(struct cfs_rq *cfs_rq); extern int entity_eligible(struct cfs_rq *cfs_rq, struct sched_entity *se); +#ifdef CONFIG_SMP +static inline +void push_task_chain(struct rq *rq, struct rq *dst_rq, struct task_struct = *task) +{ + deactivate_task(rq, task, 0); + set_task_cpu(task, dst_rq->cpu); + activate_task(dst_rq, task, 0); +} +#endif =20 #endif /* _KERNEL_SCHED_SCHED_H */ --=20 2.43.0.472.g3155946c3a-goog