From nobody Wed Nov 5 00:33:45 2025 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 C2BE718785B for ; Tue, 9 Jul 2024 20:32: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=1720557159; cv=none; b=soDFIXegG2WdQej12ms0ONm6oj39cPP1IjAbzQiL7qq6q1ILZZHXrdr5XtYigHwAbBK0QtBw444bqF45SX7gkU5uSq1VaIep23mk/bQj6nLk3YnwAx5XTbYf7wYwHXPdM7GOPvzzDLVApQC4SC4ACnn1oz23FkEceBvOvDYa7oY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720557159; c=relaxed/simple; bh=V1PF08pJ+tLWUnbiVFTp/QGQhy5yYg7gQLXFb/OQcQ4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=uLeR5nDPS21p/QsBpwwrydhFBN4x+hsKfTACqoP71LLV8H9Qig6f62mAkZNLsJAYv4898Bq4jmDHaDxHLWL5plw77YDFRd58oaE8npKYdSEz3V1WOWgWZlL6yT1yzIaWhmv7zsIIJFxkb9KenJFNui9IttQeGBBaQR1ESy0dqI0= 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=H04tlgh8; 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="H04tlgh8" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-1fb2ee83169so42772435ad.3 for ; Tue, 09 Jul 2024 13:32:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1720557157; x=1721161957; 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=q6xxvV2bWwwSWDlU+VJFmJ+e4u0BCl9LU2uMRtJJq7g=; b=H04tlgh8975QOJTdnCyA0433UcmoNXsf+8jlnpoW9oOmY0K8bU88MtdxPYwQ7LJ86I ///aCSorh93PC5EiDW890bECBIepHIngGk6mU3zygbeMrM6dsjEhBCxtena6msKIAnj0 lMf30+qT49MyqTEJBvmxMF16dxJXNIHF0AUk3Ne6uEJNTLiohGneiHs27tGCI8R/acje QAtItwSNKo7v+vuSuTTHwmD1Co6lQh9zfInZGBEKJ/36BIaYqqltNlGZr6ljZub2eAVp vDsfojcHffXRaWZV3qiv4mZUJhOPBShSEbgVw/TpluhV0Lc1tfx6IjTnnGEDbHmAPEuF XfIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720557157; x=1721161957; 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=q6xxvV2bWwwSWDlU+VJFmJ+e4u0BCl9LU2uMRtJJq7g=; b=wUMhUf0L2ID9G1ZfoeYpjVJwZROb8brfhJeshsU/okGexQPns6GmEa7D3vB2+3/hKD kVyRrospeIOARMa2cACGHHnwRUp95GHFxHoNFVDlP8I/q7g86jyJJvMjCy1PQyo2f1hr A+lu6FH8OJC4yVK4rvT7RndUMfnX02bo4GP0B1hLHuWvBvI2bJhBcB9Slx1BCFf4TK70 1TLmFwyBAocoBWxFlqrU6FQ1RfrP0j47DgHBHkrhxDarxLQ/y1uDbm5Hg9FFLaqccv4p FccgwDufKkNynzyuls1w2PfKI9WlRPkNhHCJcJO9o7C+4iv6cbMiSkd0c5LVUKeBVCrU e8SQ== X-Gm-Message-State: AOJu0YwdYWDdt8yrOKdGIvE3IJbwjP8itMX03Oro9WEj+wTLO2eknxHM tbqdpECSGUKN5El5dKnjlU1GfbSKWJbDfT4T3MZFCdLOj6QAl21pjr6vwlyd3guVaGvY8jM1w6C STOrgMAT5CYpvdAuERNNg5VkRoD55g/S72Ps6TMB4h73iENgVoDnmyEtASQ1CHJmHQbcgdoYtH4 OOiDf4SiZ6aVgSJm7it+S2N+o5QXTY/E8BgP40IfENW3rc X-Google-Smtp-Source: AGHT+IFl1bSmqEi3C8wdAPOssZy1aEGWMhMjHM4X/fIsGQ249Cc0QIbjiNLJqMXt9/yCo0Du1jYzfmP+7xoc X-Received: from jstultz-noogler2.c.googlers.com ([fda3:e722:ac3:cc00:24:72f4:c0a8:600]) (user=jstultz job=sendgmr) by 2002:a17:902:ecc7:b0:1fa:acf0:72d6 with SMTP id d9443c01a7336-1fbb6cd2646mr161955ad.3.1720557156775; Tue, 09 Jul 2024 13:32:36 -0700 (PDT) Date: Tue, 9 Jul 2024 13:31:48 -0700 In-Reply-To: <20240709203213.799070-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: <20240709203213.799070-1-jstultz@google.com> X-Mailer: git-send-email 2.45.2.993.g49e7a77208-goog Message-ID: <20240709203213.799070-6-jstultz@google.com> Subject: [PATCH v11 5/7] sched: Consolidate pick_*_task to task_is_pushable 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 , Will Deacon , Waiman Long , Boqun Feng , "Paul E. McKenney" , Metin Kaya , Xuewen Yan , K Prateek Nayak , Thomas Gleixner , Daniel Lezcano , kernel-team@android.com, John Stultz , Metin Kaya Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Connor O'Brien This patch consolidates rt and deadline pick_*_task functions to a task_is_pushable() helper 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: 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: kernel-team@android.com Signed-off-by: Connor O'Brien [jstultz: split out from larger chain migration patch, renamed helper function] Signed-off-by: John Stultz Tested-by: K Prateek Nayak Tested-by: Metin Kaya Reviewed-by: Metin Kaya Reviewed-by: Valentin Schneider --- v7: * Split from chain migration patch * Renamed function v11: * Switched to bool (though later in the series it goes to a tri-state return) for now to simplify review. Will add tri-state handling later in the series when its needed. Suggested by Metin and others. --- kernel/sched/deadline.c | 10 +--------- kernel/sched/rt.c | 11 +---------- kernel/sched/sched.h | 9 +++++++++ 3 files changed, 11 insertions(+), 19 deletions(-) diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c index 3e05e239f5f6..ef135776e068 100644 --- a/kernel/sched/deadline.c +++ b/kernel/sched/deadline.c @@ -2178,14 +2178,6 @@ static void task_fork_dl(struct task_struct *p) /* Only try algorithms three times */ #define DL_MAX_TRIES 3 =20 -static int pick_dl_task(struct rq *rq, struct task_struct *p, int cpu) -{ - if (!task_on_cpu(rq, p) && - cpumask_test_cpu(cpu, &p->cpus_mask)) - return 1; - return 0; -} - /* * Return the earliest pushable rq's task, which is suitable to be executed * on the CPU, NULL otherwise: @@ -2204,7 +2196,7 @@ static struct task_struct *pick_earliest_pushable_dl_= task(struct rq *rq, int cpu if (next_node) { p =3D __node_2_pdl(next_node); =20 - if (pick_dl_task(rq, p, cpu)) + if (task_is_pushable(rq, p, cpu)) return p; =20 next_node =3D rb_next(next_node); diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c index 55bb33f367ad..56363e18949a 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c @@ -1790,15 +1790,6 @@ static void put_prev_task_rt(struct rq *rq, struct t= ask_struct *p) /* Only try algorithms three times */ #define RT_MAX_TRIES 3 =20 -static int pick_rt_task(struct rq *rq, struct task_struct *p, int cpu) -{ - if (!task_on_cpu(rq, p) && - cpumask_test_cpu(cpu, &p->cpus_mask)) - return 1; - - return 0; -} - /* * Return the highest pushable rq's task, which is suitable to be executed * on the CPU, NULL otherwise @@ -1812,7 +1803,7 @@ static struct task_struct *pick_highest_pushable_task= (struct rq *rq, int cpu) return NULL; =20 plist_for_each_entry(p, head, pushable_tasks) { - if (pick_rt_task(rq, p, cpu)) + if (task_is_pushable(rq, p, cpu)) return p; } =20 diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index a24286059a6a..493de4cc320a 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -3490,6 +3490,15 @@ void move_queued_task_locked(struct rq *src_rq, stru= ct rq *dst_rq, struct task_s set_task_cpu(task, dst_rq->cpu); activate_task(dst_rq, task, 0); } + +static inline +bool task_is_pushable(struct rq *rq, struct task_struct *p, int cpu) +{ + if (!task_on_cpu(rq, p) && + cpumask_test_cpu(cpu, &p->cpus_mask)) + return true; + return false; +} #endif =20 #endif /* _KERNEL_SCHED_SCHED_H */ --=20 2.45.2.993.g49e7a77208-goog