From nobody Sat Oct 11 04:17:26 2025 Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) (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 DDE7B289E1F for ; Wed, 11 Jun 2025 13:54:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749650068; cv=none; b=mRqLu6e3Xt8XDik0Q0zclCDryUTqD6BEGUNSTqJY5H4/1LxIvzWIBPzI38IxBl+qG8Hfjb0IQYJDciE9ExjDsfLYvYKLEIxhRDYg0sm1H5DL1mfnopC9Oh9F30ey2m5uD81+IyLJ84Fp1KHgrwPpl2Xm7EmLDKJ6eVyBMXFOIW0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749650068; c=relaxed/simple; bh=bq/tUz8+PnqM6nxcezrNEqn5rYJuAd3brMzH40sTN4k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Dl+pYRt1MPueCes56bMSJHo/IKSXBGeiuNscit0hU3QoJbEVwr3M7O0qxoEMRwdGrJJiMaoVbVUD9qiVr1zDXOS/muNwZk4Kr3FIar1m7JlhzyeDRL3t0Yg8ZmbcsxiziZwEs3p326M3MDV7LhV8GzmmUwFJosKrT/PC8c/OMbU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Qs1Kn3dn; arc=none smtp.client-ip=209.85.210.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Qs1Kn3dn" Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-73c17c770a7so7433405b3a.2 for ; Wed, 11 Jun 2025 06:54:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749650066; x=1750254866; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FR9o2apmoS5K1kwH23e2gWRlf4LgWrNIowsdolXs2NM=; b=Qs1Kn3dnBarWqeUXBS0P+UQdvtVeCkrhmFwY1McUZXcwj5TG2DAQCmPcIYRu3dkLp3 WdOqohba2aNbS26Wcl2iUK226uQN584OghzVI+n709trAXhoIU5aCPDXKJqiPcxQ9xQM tzgCjBAyDnxIZMNNsdKcBPoM4JEjO9spGUDUDGFxGGnGgut2OFR5BfTXmMEZ63Qkoaph LfBQsGEOyy3vE3rolH/4HjZaLY06sPlchCdGxKOggVJBDuaWeoXTRUMpgf5Dauyu7qdE oVAx3hmhiGvuecj4v/hkY4JFdPu5PIA2FY3Emghs0Q/CnPR1ah3VnPIoYomq6qWR3CFJ 3haw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749650066; x=1750254866; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FR9o2apmoS5K1kwH23e2gWRlf4LgWrNIowsdolXs2NM=; b=JYEpbVofkv5KdwTfr1h8dCyiaoyl4bez8avsCc89sEYxW4DRpVtHrwVFXe53SwMCmP sxHZ54Ol+jCJ11nApiFzqeqjA/5nE3drTWuvCpTY9WkL8BWfhH68GIhFU8Id755XIug9 4tHpq05IQCFWVUU1tKp3aX1TmMqxMQ/KkKiTwJifF/mq61Wh8+sK4LJqQ/Z/QgbGpW0a 1lWR+REMU+ruenwYx2U8U0viVFPFeXmBTNlP/4Krc5hmuPlO10MGeDWynyulK1dBEskx GvZpHBxdcc92XqMDZgv/BIFIlwJZvK6sEz41bUV6BJPHb0JYxnbz75HA90W+ItWskcEu 2rJw== X-Gm-Message-State: AOJu0YxfNY3P+l7KekYvXzfO1ypY3vnB4FT/k7QXi0wPaBjR9CWsSYkU IMZmutB4WI9xy6fU76+GWVghrO1UfDQkP9nVa5sM3kLlb7HxWlKO113NxhjzH1jibbk= X-Gm-Gg: ASbGnctFgjz2r3iJn/5iPCWwb1K/GnUsIQtKsHiVqb+mujfJH+wvs+pXvPu3KuFzT30 5bkqI3MIEFQ/0Omi2tlYSpHP8udUBdK2ghrLiLN2IFf5PMObNwZX1uFLlTUsSZku8su0/0OfzkP 0CY9KajcHhM9XE7i6k3RO/jRzI3m6tHQYblTpjAGS7sYd2Wtw3a8i7K1J+5CZ3CdwGAVU5N7+8h yjkagsG1Vx6AE+V0NtYbb1OsmKcitHG89pSqoQDmf7fIGW5ruBjn1Ke7wmkajSaGtnv2Gjn31LZ 4w7ufsGYaVONk4rmhCYJLGIIqQ1f538WFqV7ecd1u6x/uq2xW/IN4Z3SqcpOg6UEmEypLzRv13M HzLlw/SHEuVIiJdwdgDF1CpmqkN017UPsPfjiSl074g== X-Google-Smtp-Source: AGHT+IFrLC+yuJFvq4r3rOF1rC2VfzOmPUFL/Fma5cMOOqtOKXcRgS+zxE30RWeyGI88Zc+2bQ/fbA== X-Received: by 2002:a05:6a20:2451:b0:1f5:9024:324f with SMTP id adf61e73a8af0-21f8673d1famr5056807637.31.1749650065784; Wed, 11 Jun 2025 06:54:25 -0700 (PDT) Received: from eric-acer.tail151456.ts.net (36-225-84-3.dynamic-ip.hinet.net. [36.225.84.3]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7482b0ea3cdsm9247523b3a.159.2025.06.11.06.54.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jun 2025 06:54:25 -0700 (PDT) From: Cheng-Yang Chou To: linux-kernel@vger.kernel.org Cc: tj@kernel.org, void@manifault.com, arighi@nvidia.com, changwoo@igalia.com, jserv@ccns.ncku.edu.tw, yphbchou0911@gmail.com Subject: [PATCH 1/4] sched_ext: Clean up and standardize #if/#else/#endif markers in sched/ext.c Date: Wed, 11 Jun 2025 21:54:01 +0800 Message-ID: <20250611135404.13851-2-yphbchou0911@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250611135404.13851-1-yphbchou0911@gmail.com> References: <20250611135404.13851-1-yphbchou0911@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Simplify the scheduler by making formerly SMP-only primitives and data structures unconditional. Signed-off-by: Cheng-Yang Chou --- kernel/sched/ext.c | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/kernel/sched/ext.c b/kernel/sched/ext.c index 2c41c78be61e..55702b7a72e2 100644 --- a/kernel/sched/ext.c +++ b/kernel/sched/ext.c @@ -1792,12 +1792,10 @@ static void run_deferred(struct rq *rq) process_ddsp_deferred_locals(rq); } =20 -#ifdef CONFIG_SMP static void deferred_bal_cb_workfn(struct rq *rq) { run_deferred(rq); } -#endif =20 static void deferred_irq_workfn(struct irq_work *irq_work) { @@ -1820,7 +1818,6 @@ static void schedule_deferred(struct rq *rq) { lockdep_assert_rq_held(rq); =20 -#ifdef CONFIG_SMP /* * If in the middle of waking up a task, task_woken_scx() will be called * afterwards which will then run the deferred actions, no need to @@ -1838,7 +1835,7 @@ static void schedule_deferred(struct rq *rq) deferred_bal_cb_workfn); return; } -#endif + /* * No scheduler hooks available. Queue an irq work. They are executed on * IRQ re-enable which may take a bit longer than the scheduler hooks. @@ -2542,7 +2539,6 @@ static void move_local_task_to_local_dsq(struct task_= struct *p, u64 enq_flags, p->scx.dsq =3D dst_dsq; } =20 -#ifdef CONFIG_SMP /** * move_remote_task_to_local_dsq - Move a task from a foreign rq to a loca= l DSQ * @p: task to move @@ -2709,11 +2705,6 @@ static bool consume_remote_task(struct rq *this_rq, = struct task_struct *p, return false; } } -#else /* CONFIG_SMP */ -static inline void move_remote_task_to_local_dsq(struct task_struct *p, u6= 4 enq_flags, struct rq *src_rq, struct rq *dst_rq) { WARN_ON_ONCE(1); } -static inline bool task_can_run_on_remote_rq(struct scx_sched *sch, struct= task_struct *p, struct rq *rq, bool enforce) { return false; } -static inline bool consume_remote_task(struct rq *this_rq, struct task_str= uct *p, struct scx_dispatch_q *dsq, struct rq *task_rq) { return false; } -#endif /* CONFIG_SMP */ =20 /** * move_task_between_dsqs() - Move a task from one DSQ to another @@ -2886,9 +2877,7 @@ static void dispatch_to_local_dsq(struct scx_sched *s= ch, struct rq *rq, { struct rq *src_rq =3D task_rq(p); struct rq *dst_rq =3D container_of(dst_dsq, struct rq, scx.local_dsq); -#ifdef CONFIG_SMP struct rq *locked_rq =3D rq; -#endif =20 /* * We're synchronized against dequeue through DISPATCHING. As @p can't @@ -2902,7 +2891,6 @@ static void dispatch_to_local_dsq(struct scx_sched *s= ch, struct rq *rq, return; } =20 -#ifdef CONFIG_SMP if (src_rq !=3D dst_rq && unlikely(!task_can_run_on_remote_rq(sch, p, dst_rq, true))) { dispatch_enqueue(sch, find_global_dsq(p), p, @@ -2962,9 +2950,6 @@ static void dispatch_to_local_dsq(struct scx_sched *s= ch, struct rq *rq, raw_spin_rq_unlock(locked_rq); raw_spin_rq_lock(rq); } -#else /* CONFIG_SMP */ - BUG(); /* control can not reach here on UP */ -#endif /* CONFIG_SMP */ } =20 /** @@ -3288,10 +3273,8 @@ static void set_next_task_scx(struct rq *rq, struct = task_struct *p, bool first) static enum scx_cpu_preempt_reason preempt_reason_from_class(const struct sched_class *class) { -#ifdef CONFIG_SMP if (class =3D=3D &stop_sched_class) return SCX_CPU_PREEMPT_STOP; -#endif if (class =3D=3D &dl_sched_class) return SCX_CPU_PREEMPT_DL; if (class =3D=3D &rt_sched_class) @@ -3304,14 +3287,12 @@ static void switch_class(struct rq *rq, struct task= _struct *next) struct scx_sched *sch =3D scx_root; const struct sched_class *next_class =3D next->sched_class; =20 -#ifdef CONFIG_SMP /* * Pairs with the smp_load_acquire() issued by a CPU in * kick_cpus_irq_workfn() who is waiting for this CPU to perform a * resched. */ smp_store_release(&rq->scx.pnt_seq, rq->scx.pnt_seq + 1); -#endif if (!(sch->ops.flags & SCX_OPS_HAS_CPU_PREEMPT)) return; =20 @@ -3508,8 +3489,6 @@ bool scx_prio_less(const struct task_struct *a, const= struct task_struct *b, } #endif /* CONFIG_SCHED_CORE */ =20 -#ifdef CONFIG_SMP - static int select_task_rq_scx(struct task_struct *p, int prev_cpu, int wak= e_flags) { struct scx_sched *sch =3D scx_root; @@ -3639,7 +3618,6 @@ static void rq_offline_scx(struct rq *rq) rq->scx.flags &=3D ~SCX_RQ_ONLINE; } =20 -#endif /* CONFIG_SMP */ =20 static bool check_rq_for_timeouts(struct rq *rq) { @@ -4299,14 +4277,12 @@ DEFINE_SCHED_CLASS(ext) =3D { .put_prev_task =3D put_prev_task_scx, .set_next_task =3D set_next_task_scx, =20 -#ifdef CONFIG_SMP .select_task_rq =3D select_task_rq_scx, .task_woken =3D task_woken_scx, .set_cpus_allowed =3D set_cpus_allowed_scx, =20 .rq_online =3D rq_online_scx, .rq_offline =3D rq_offline_scx, -#endif =20 .task_tick =3D task_tick_scx, =20 --=20 2.43.0 From nobody Sat Oct 11 04:17:26 2025 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) (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 5797428C2CA for ; Wed, 11 Jun 2025 13:54:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749650069; cv=none; b=D18HKgGNkAfF4V21kkLw2UNOUydYieEgm1RmitrZnKQaDuodGUKBkigYjKJCdApyoywOAaQcCvhZ+ZN/qHUF7g70mPvAPBkReiebqrRLtWC+ruRh39UtjF/d0bOzHOZ9UI2Q53zQPYPEhSTXjRYVL3aFLRS50bmLMw67yC/qdFc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749650069; c=relaxed/simple; bh=M6Hd5cfJW89cMbQiBp0pq3gj0iTZOghGN7mOhRv6024=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Q+vsr6MDJAhurcoH3Sda6bcKKaRuHCcpD7lgyQyU0IapEM69dvWJWy0oxx0UTRAU9pcnqSZkcDGiDZXAwjaVfdfpMHfSxzkJs7gzx2pBDsuZ/RI4GXQBcjimAoXwuFDOzzGzX1878ydqH7bE8yBPrkVxrzfxFOy0Pw6W3ye6B80= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=TYuubngR; arc=none smtp.client-ip=209.85.210.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TYuubngR" Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-7424ccbef4eso6009377b3a.2 for ; Wed, 11 Jun 2025 06:54:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749650067; x=1750254867; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PzIxibGEI2FDfWCRvs8TwMUYH3iwSFSbOXZyVQqmYEo=; b=TYuubngRME9AHNVzEtHp88iFPgd+uhSRIsV29X38quqKECBZwRrz0y9yZENSmKHRFO NX+VvCCwP2KSBm13m09ehC223w5CGSernFjRoyVUu1wDka9Uj7uNA8tjfuEG9+RtjHpk FUUpRd55Wzv14Tc+mo90wehW5zLTFrBtfxM35sQZuAKlOd/5osFKu4hXOLXxu419ZQvX AJhgtsw8OHu/A8me2FIXHj1DlR+dcZGjB+2Yk+mMFAOoyBrxXdHMsyum6P39QYwxWYq9 RXZ4ofefyYyvINhyDe+OXp6m7drlP9KmXF7Xkv87MEvNlzx8UO32s8y9D4vSmGH7LGWA 7VFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749650067; x=1750254867; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PzIxibGEI2FDfWCRvs8TwMUYH3iwSFSbOXZyVQqmYEo=; b=NCJswyMSi9Tc2i55f8g7DCnqqjGiDEIbEP7ScKhyAqKg2x0WBsHWpWtC/5Lp+PVHfP WG793KgdWYU8RTxSh3DludltXxd2tF0qaDJ30qQzkLZwwPZ61BMmX3S5aVibtbxx5GkX kxEkscFX8OYVPMa6dMXSPRQCp9tOUL95GbrtN6LWoKrIC3ZxJrCiUzGrPwUQoMKOq9b3 LXiXr0kIV0KNG6S68I49G+IxcmOuP6AtZ3y9am0Z8yUTDqF6Ps+7kDQi4GrkJKL+tFep Wqsj5F/VtDVA3/yFGDHpsFqGzFWks1McxBmoAcW0kgKqvqAKQ00SwCcw751L5DRRvH95 rSxQ== X-Gm-Message-State: AOJu0YxxIyxE2cHGB0NFW28l7TmDlrRFPZtRjEHaMRtAL4hDvYKpxmxK UtiKHHBlSnUNyGa9IMcou0vaM+sEgtzLeKMBws+Z/jmGXvhJT0XKpIrbrbubFcklXiE= X-Gm-Gg: ASbGncs6FGQJ6Ua5lUfeB/dhwdMWNkWg720D2YZWRgoPVtBJnN0i1phQMF3TG4WK2hj qLKqUL8gTkb/ASlkdqBOgscsMkqBASW5EnyaMIsIFk4YdjGVEpTbZcvjr1Vevv5h6KvhcCHLMHC EsuA7OLaL/GRGZjVsytMORBw4k1gjTdkiteBISjUCO2QLXt7sDDOsusRVcq6yRZr8MzIdBySE1i ufpAeTInqDg2RkcIKkvTP22kPI2TkHaAzFQCeehj4te8tQKK1WHB+LprmL1lhGKVKqQ2e5lYizl WDqu+HGpwcwLCg3LGxyP2QlVLUblypSDoNNYTiU+r4tXWn//RRZLsr7foHxG22PxKtbTf/as5Rw e+zBMKWk8WJOHc4AqloRsfKcbIf1osfFLzT70budAWIbA08Bc1i46 X-Google-Smtp-Source: AGHT+IGtUrqiNTY7W5nEP+DP9ZN3+AsYH0Dq/DI53poolu4vmM+XLxWhkA5h32YQZiB/zei8K5VsJQ== X-Received: by 2002:a05:6a21:38a:b0:1f5:889c:3cdb with SMTP id adf61e73a8af0-21f866158e2mr5678795637.8.1749650067364; Wed, 11 Jun 2025 06:54:27 -0700 (PDT) Received: from eric-acer.tail151456.ts.net (36-225-84-3.dynamic-ip.hinet.net. [36.225.84.3]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7482b0ea3cdsm9247523b3a.159.2025.06.11.06.54.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jun 2025 06:54:27 -0700 (PDT) From: Cheng-Yang Chou To: linux-kernel@vger.kernel.org Cc: tj@kernel.org, void@manifault.com, arighi@nvidia.com, changwoo@igalia.com, jserv@ccns.ncku.edu.tw, yphbchou0911@gmail.com Subject: [PATCH 2/4] sched_ext: Clean up and standardize #if/#else/#endif markers in sched/ext.h Date: Wed, 11 Jun 2025 21:54:02 +0800 Message-ID: <20250611135404.13851-3-yphbchou0911@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250611135404.13851-1-yphbchou0911@gmail.com> References: <20250611135404.13851-1-yphbchou0911@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Simplify the scheduler by making formerly SMP-only primitives and data structures unconditional. Signed-off-by: Cheng-Yang Chou --- kernel/sched/ext.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/sched/ext.h b/kernel/sched/ext.h index 6e5072f57771..d2f8cefae68c 100644 --- a/kernel/sched/ext.h +++ b/kernel/sched/ext.h @@ -65,7 +65,7 @@ static inline void init_sched_ext_class(void) {} =20 #endif /* CONFIG_SCHED_CLASS_EXT */ =20 -#if defined(CONFIG_SCHED_CLASS_EXT) && defined(CONFIG_SMP) +#if defined(CONFIG_SCHED_CLASS_EXT) void __scx_update_idle(struct rq *rq, bool idle, bool do_notify); =20 static inline void scx_update_idle(struct rq *rq, bool idle, bool do_notif= y) --=20 2.43.0 From nobody Sat Oct 11 04:17:26 2025 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) (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 37D94295502 for ; Wed, 11 Jun 2025 13:54:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749650071; cv=none; b=mVui5aFx6RcczGF4fvwV9kUqBODojLGpUtROu0S2xGi4X6F1BOGfUoSaFX7axyANBBMC7KPZD/hAFupNfXK+BE1yuu2st/Bo41QurEFl//wVfV+MlP69uk3zzVYog/2XGh0fcw+KwYk785s1Ihq4jx9l5u2+6LMBEjvrqxzFySU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749650071; c=relaxed/simple; bh=5L1vIHR8TGG/tdz0Ehy1NjsEUUVfaCR5C7HcJeayTmc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uGisShATYNebSLEF6wz2DNA2f/MCBKxA7iUhqdhc+2Xw+DBX+/8LPZMaMUbgx6qUQ4I6dyFDiX27UphjRuC0xPcZKuceIola9MF+aKHEmfzEMJDiceS/62Z7t5BvyS3r49qhhwtEK4h7iYgCT+3z8ox3tMn2cRyv3yyUC6TeVv4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=SrfToam1; arc=none smtp.client-ip=209.85.210.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="SrfToam1" Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-747e41d5469so7094360b3a.3 for ; Wed, 11 Jun 2025 06:54:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749650069; x=1750254869; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bkbrVc9Ysm1N35GkO2QgZpIQc5HrqYsMOh3qst28mJA=; b=SrfToam17q14Ottil4xiEQkF+byMGpf4HnIhY+vrD3LyAf1qZtZRl389mBT39m4Ayp Uz0utTRLqQYCG2APSUsw9hSfyfa4H/EpExDtq3uFLJb4Wi7Xee1wh1+Xq0oXrZEOW2UT 9wlLeGN/FEbB+s3zA/iFX1+o6ZGcabthmRfgsYvysRC7wHu99ggx7jgVuW+H1p/tjWGL 6c/ThD44cRCsj5z2iVJukFsUBkfOHH6VVYE17CGcp+/XrkNRxX8rxk9ZL2rXAyBXjDni WVWHDbPGD+IzLYLdQF9tW5pUezt2TINGtN9lit2peS/Y/c5IB/OLzEmZJHyloUZzLGzg jGRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749650069; x=1750254869; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bkbrVc9Ysm1N35GkO2QgZpIQc5HrqYsMOh3qst28mJA=; b=IZtnt79dUZk4b+DIkYdhV7BBeApEOOScPrXXVIlhfYJuAt6uUgp2/MSvK0RbJ4n4zJ 5cUMkX7skiSz2Xow6knYU6KKrWdjITXVu2+fs2Bu0wePw3eQXdAWpSgeDgo7AxQmzp47 EoNT7A7Bhuv4BFTe35HTDeiycZ6ca6jSZAm5TLyi6WpEpJ54a+LkBsoiE2yG7c5n37k7 qYUiwOjj5F5pFRF8Zlk/JW9ATYntthpsRTeXRrdopqg+vjk24P0PfHsPV5VD59ifyc/F e8lSTDoVFgTEonaDO0zkcz0jciSGHKwUtHRe0bR3Emr0zylyyhnWP2HIffoDaoBDD4Zc vDYg== X-Gm-Message-State: AOJu0YzolugjZRID+cjVdAly+W1bEfBAU81cXKAvzc1pd2Ssi9BjwRKB PluPDwpuoNAoY75S2L/f1zNIzNPGLQfWAh57hMFe8wXJwISwe6xTLq5c7xbJsHKDbT8= X-Gm-Gg: ASbGncuaB6+hoN/tTsbEDKXA5mIWr11Qn+2dpmvwmNEv/Un3awxKlb+65dUB7GummlJ p4Vgqjpml0IQ08AhSA4Z5iuYre25cYJjG2yaby/3S3EQdiXpy6AniM03SKo+xo9GjU7v8FVfC+7 rSH+PPkbyhiJWXPNbCpyNDHVRrmZpr6FcSmf3fC8nlzruvtAb6dNMgzNTJCICFEUFDFZkt7XPhX vT3PsqkztMlIuV7MpdUZ4hnC8S4nwscRaYEEBnRFhVIXpzdkUJ4tqWISObV9tuuUPtfnXjdx04V P2zpfwXYGbDpaFAzKAYo5Ohd2S366SOVZwz+dynkm0UXIHkShHDA3d86dAK7JCGAT9ZtpfUxr49 mEnzfitU2vJte/lXKE2tiIpkLlt9LSrt20opJx1Ij4Q== X-Google-Smtp-Source: AGHT+IGq5z8uVoBSvKjd2tubxDY0MuW1gNIQ0n/WSZVlIDWZ7YcM/1ugFk08xbBN7SJm/Bp0iT/icg== X-Received: by 2002:a05:6a20:7f8c:b0:21a:ef2f:100b with SMTP id adf61e73a8af0-21f8671587amr5346540637.24.1749650069127; Wed, 11 Jun 2025 06:54:29 -0700 (PDT) Received: from eric-acer.tail151456.ts.net (36-225-84-3.dynamic-ip.hinet.net. [36.225.84.3]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7482b0ea3cdsm9247523b3a.159.2025.06.11.06.54.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jun 2025 06:54:28 -0700 (PDT) From: Cheng-Yang Chou To: linux-kernel@vger.kernel.org Cc: tj@kernel.org, void@manifault.com, arighi@nvidia.com, changwoo@igalia.com, jserv@ccns.ncku.edu.tw, yphbchou0911@gmail.com Subject: [PATCH 3/4] sched_ext: Clean up and standardize #if/#else/#endif markers in sched/ext_idle.c Date: Wed, 11 Jun 2025 21:54:03 +0800 Message-ID: <20250611135404.13851-4-yphbchou0911@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250611135404.13851-1-yphbchou0911@gmail.com> References: <20250611135404.13851-1-yphbchou0911@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Simplify the scheduler by making formerly SMP-only primitives and data structures unconditional. Signed-off-by: Cheng-Yang Chou --- kernel/sched/ext_idle.c | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/kernel/sched/ext_idle.c b/kernel/sched/ext_idle.c index 6d29d3cbc670..6d01cfe10875 100644 --- a/kernel/sched/ext_idle.c +++ b/kernel/sched/ext_idle.c @@ -17,7 +17,6 @@ static DEFINE_STATIC_KEY_FALSE(scx_builtin_idle_enabled); /* Enable/disable per-node idle cpumasks */ static DEFINE_STATIC_KEY_FALSE(scx_builtin_idle_per_node); =20 -#ifdef CONFIG_SMP /* Enable/disable LLC aware optimizations */ static DEFINE_STATIC_KEY_FALSE(scx_selcpu_topo_llc); =20 @@ -794,7 +793,6 @@ static void reset_idle_masks(struct sched_ext_ops *ops) cpumask_and(idle_cpumask(node)->smt, cpu_online_mask, node_mask); } } -#endif /* CONFIG_SMP */ =20 void scx_idle_enable(struct sched_ext_ops *ops) { @@ -808,9 +806,7 @@ void scx_idle_enable(struct sched_ext_ops *ops) else static_branch_disable_cpuslocked(&scx_builtin_idle_per_node); =20 -#ifdef CONFIG_SMP reset_idle_masks(ops); -#endif } =20 void scx_idle_disable(void) @@ -896,7 +892,6 @@ s32 select_cpu_from_kfunc(struct task_struct *p, s32 pr= ev_cpu, u64 wake_flags, if (!rq) lockdep_assert_held(&p->pi_lock); =20 -#ifdef CONFIG_SMP /* * This may also be called from ops.enqueue(), so we need to handle * per-CPU tasks as well. For these tasks, we can skip all idle CPU @@ -913,9 +908,7 @@ s32 select_cpu_from_kfunc(struct task_struct *p, s32 pr= ev_cpu, u64 wake_flags, cpu =3D scx_select_cpu_dfl(p, prev_cpu, wake_flags, allowed ?: p->cpus_ptr, flags); } -#else - cpu =3D -EBUSY; -#endif + if (scx_kf_allowed_if_unlocked()) task_rq_unlock(rq, p, &rf); =20 @@ -1010,11 +1003,7 @@ __bpf_kfunc const struct cpumask *scx_bpf_get_idle_c= pumask_node(int node) if (node < 0) return cpu_none_mask; =20 -#ifdef CONFIG_SMP return idle_cpumask(node)->cpu; -#else - return cpu_none_mask; -#endif } =20 /** @@ -1034,11 +1023,7 @@ __bpf_kfunc const struct cpumask *scx_bpf_get_idle_c= pumask(void) if (!check_builtin_idle_enabled()) return cpu_none_mask; =20 -#ifdef CONFIG_SMP return idle_cpumask(NUMA_NO_NODE)->cpu; -#else - return cpu_none_mask; -#endif } =20 /** @@ -1057,14 +1042,10 @@ __bpf_kfunc const struct cpumask *scx_bpf_get_idle_= smtmask_node(int node) if (node < 0) return cpu_none_mask; =20 -#ifdef CONFIG_SMP if (sched_smt_active()) return idle_cpumask(node)->smt; else return idle_cpumask(node)->cpu; -#else - return cpu_none_mask; -#endif } =20 /** @@ -1085,14 +1066,10 @@ __bpf_kfunc const struct cpumask *scx_bpf_get_idle_= smtmask(void) if (!check_builtin_idle_enabled()) return cpu_none_mask; =20 -#ifdef CONFIG_SMP if (sched_smt_active()) return idle_cpumask(NUMA_NO_NODE)->smt; else return idle_cpumask(NUMA_NO_NODE)->cpu; -#else - return cpu_none_mask; -#endif } =20 /** --=20 2.43.0 From nobody Sat Oct 11 04:17:26 2025 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) (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 D702D29ACF1 for ; Wed, 11 Jun 2025 13:54:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749650073; cv=none; b=D7jNUyrZ0Xf+lB/quWp6v/qUrDucrWNi2/cBTel1+Ev5oRt3Th63qzmaE3JQcwO4glMTYKaT1k5/c5YCs9WuyseZIUzlWQDB8NgCxogwXMqyOA01KsPq0fFQoMzWQc66eN7FcCKeRrF6hxhC/wuyhE7xBF45bNtp60XzFWEPQwQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749650073; c=relaxed/simple; bh=edxnWgMRe12yk26KeyItjWTQwYTVb8+ySOLJEZ02jlQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=c/rRHxxBrVKg1fg1KoEOYP7koUxGdw4Ile/cnvJRAP+O8yj5GIC9AUBttaLZ/bRwimUUE5cCBmaR/+jUfTvwWis3hLULUtH4cFUsycFdZhDPmXitTctnmNM5sAlwTIuiucbkWAaFDh5XvRZT0tMzN/oNJZC+8QRtPBWo6r2+5t8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=XpwulRuk; arc=none smtp.client-ip=209.85.210.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XpwulRuk" Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-742caef5896so5608510b3a.3 for ; Wed, 11 Jun 2025 06:54:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749650071; x=1750254871; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gwej+7RXCoLvIwzjqOEtOf4IscdkDTkk86t84fhTaT8=; b=XpwulRuk00Jq16phZaEGo7FXXdQb1l0KXt+vfAdbwD5tmTwoHeetE/h1iyKbIPaEVj SM4tyCzl4WOCI/2PMjB9NnCbohXo1SzGs6wMsRZAZ5ghAsUe+d3XgycvlFT/qojuA8dh HoJbLOldCJSYiEX4HzIWuGHXC/y1b7vf/EHUeGZJ+Dbn7z6PncBJImc3a6oqeFgVp1pU JEcQ5+M3mTxcCWIlYHArLgV3WuDVFcZxabyjvYYGfljb2nG3xwlpFjUd9zM05Xmb31+8 voO51wynxIBe0A0/yuUNo9dEjOBG/abz2woZE/UwlsgSQ730t5ra7grGV+pqD/rRu58w qGmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749650071; x=1750254871; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gwej+7RXCoLvIwzjqOEtOf4IscdkDTkk86t84fhTaT8=; b=ZUbvGsBF5KvpRcMZbyWwHoN9wWwGJhFnvTub3ylu5NAdNXwKJULuHuqz5RllNCrtES LmGRsaCVeIl4Qyv+uf/05ivDRg5sWcY8/e7SuHgJLp7R3bOxciDBnnvJvdEhIJqCgnjY ZjdGMjvJR9MBQOX8YNeUc/IB/VQ8lgahDGDTznSlEeYDbLLrv2WSJb2oo8d4bukb/iBU kjdDogTaJCfhb25aMIpu7uoYHb7IVgXiXMAT5TrfH76Ob7wBK9DTekJf3OA8IRhR1l0d zonC8c/q7EU8tA/rQhFEH9zNWsPkjYnYOIceaF70JjKXtlBhF2OyNiZux3pjn9gxywj3 8Ekg== X-Gm-Message-State: AOJu0Yzkj3BklTC0qLg4k/ja8Y3lcnfK/19RecQRofGQAbZm9DA5V9Zy BESkqDbqkgm+IU3CdIBbvQ1mYlmJYW36zIPGZKq2K79pbjISe5U6KUfrcn0r0rytHiQ= X-Gm-Gg: ASbGncv6v/+MH9Pj3WpEZi/E6FGMjjN9+nzMBJ0sofOwmAXBiqFf3A98Ug1iZI9qhwU M4eq6ohGyoi8AEETf7GqZio+j0pJLqLEIiyb7UFykIqWDb3UTzhrySFho/p7fcqQkzGbcb2HqwZ LKWQIZ1W/tm5T6g63skQxiptm9AIzJpiJyKLLqKzKnPGykxlqU/8mIU30OVOv/cC7ADCDhAbpMT jgDVbnhYyJVbBZKghQ6jtwIAdT8UizbiBLrVi7IhrFYfwuLJQ7y97IEY6pFpKJB3U+IcYXbcyTa 18WwSN/sgxg1YLkFOfJKPZj+6Fu3/IqaTn5GBobNgwZvmtMf3ymtWciG6N7+I1TEPyAU5FoLO7k n7Kt/B7Uah/WeBrjN2TJAJqyUZDIxmwnFclEb/FeXOQ== X-Google-Smtp-Source: AGHT+IHbj6DYjUALG9JKwussK+VlVCr2ZyH9OjsqKrX0uBtfGhcudgVDTFPCQ9dCQ7hpPGK37nyuZg== X-Received: by 2002:a05:6a00:92a0:b0:748:1bac:aff9 with SMTP id d2e1a72fcca58-7486cbd90f4mr5326703b3a.18.1749650070777; Wed, 11 Jun 2025 06:54:30 -0700 (PDT) Received: from eric-acer.tail151456.ts.net (36-225-84-3.dynamic-ip.hinet.net. [36.225.84.3]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7482b0ea3cdsm9247523b3a.159.2025.06.11.06.54.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jun 2025 06:54:30 -0700 (PDT) From: Cheng-Yang Chou To: linux-kernel@vger.kernel.org Cc: tj@kernel.org, void@manifault.com, arighi@nvidia.com, changwoo@igalia.com, jserv@ccns.ncku.edu.tw, yphbchou0911@gmail.com Subject: [PATCH 4/4] sched_ext: Clean up and standardize #if/#else/#endif markers in sched/ext_idle.h Date: Wed, 11 Jun 2025 21:54:04 +0800 Message-ID: <20250611135404.13851-5-yphbchou0911@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250611135404.13851-1-yphbchou0911@gmail.com> References: <20250611135404.13851-1-yphbchou0911@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Simplify the scheduler by making formerly SMP-only primitives and data structures unconditional. Signed-off-by: Cheng-Yang Chou --- kernel/sched/ext_idle.h | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/kernel/sched/ext_idle.h b/kernel/sched/ext_idle.h index 37be78a7502b..906f1672c1d7 100644 --- a/kernel/sched/ext_idle.h +++ b/kernel/sched/ext_idle.h @@ -12,20 +12,10 @@ =20 struct sched_ext_ops; =20 -#ifdef CONFIG_SMP void scx_idle_update_selcpu_topology(struct sched_ext_ops *ops); void scx_idle_init_masks(void); bool scx_idle_test_and_clear_cpu(int cpu); s32 scx_pick_idle_cpu(const struct cpumask *cpus_allowed, int node, u64 fl= ags); -#else /* !CONFIG_SMP */ -static inline void scx_idle_update_selcpu_topology(struct sched_ext_ops *o= ps) {} -static inline void scx_idle_init_masks(void) {} -static inline bool scx_idle_test_and_clear_cpu(int cpu) { return false; } -static inline s32 scx_pick_idle_cpu(const struct cpumask *cpus_allowed, in= t node, u64 flags) -{ - return -EBUSY; -} -#endif /* CONFIG_SMP */ =20 s32 scx_select_cpu_dfl(struct task_struct *p, s32 prev_cpu, u64 wake_flags, const struct cpumask *cpus_allowed, u64 flags); --=20 2.43.0