From nobody Sun Dec 28 19:29:39 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E262EC46CA3 for ; Wed, 6 Dec 2023 06:35:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376732AbjLFGeg (ORCPT ); Wed, 6 Dec 2023 01:34:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1376801AbjLFGee (ORCPT ); Wed, 6 Dec 2023 01:34:34 -0500 Received: from out-179.mta0.migadu.com (out-179.mta0.migadu.com [91.218.175.179]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC868D4F for ; Tue, 5 Dec 2023 22:34:39 -0800 (PST) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1701844478; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0lDBFEoz+SUMLKMlohSt70DLpSaHMM5qAM0YknDYPRc=; b=Jki4iV4V+jHYrHoOxnxxlqEsZzBkU+FuKWila9Z99n4hUwLNHQz0EzSQUNjYBhRnHw23yW CUMJhz/RW0ZCwzxGFYA7Yk1DyIAXDz1Ed0NWI5KHEaWVs4uDdRijRVZyDyzgaagPe9iJKp o0VTbdgdDU9d5P5u4enkXVbOxZI+2CQ= From: Yajun Deng To: mingo@redhat.com, peterz@infradead.org, juri.lelli@redhat.com, vincent.guittot@linaro.org, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, mgorman@suse.de, bristot@redhat.com, vschneid@redhat.com Cc: linux-kernel@vger.kernel.org, Yajun Deng Subject: [PATCH v2 2/2] sched/rt: Return NULL when rt entity isn't a task in rt_task_of() Date: Wed, 6 Dec 2023 14:34:00 +0800 Message-Id: <20231206063400.3206346-3-yajun.deng@linux.dev> In-Reply-To: <20231206063400.3206346-1-yajun.deng@linux.dev> References: <20231206063400.3206346-1-yajun.deng@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Before calling rt_task_of(), we need to make sure that the rt entity is a task. There is also a warning in rt_task_of() if the rt entity isn't a task. That means we need to check the rt entity twice. If the rt entity isn't a task, return the task struct is meaningless. Return NULL when rt entity isn't a task in rt_task_of(), and call rt_task_of() instead of rt_entity_is_task() when we need a task_struct. Signed-off-by: Yajun Deng --- v2: fix 'struct rt_rq' no member named 'highest_prio'. v1: https://lore.kernel.org/all/20231201022704.3526377-1-yajun.deng@linux.d= ev/ --- kernel/sched/rt.c | 60 ++++++++++++++--------------------------------- 1 file changed, 17 insertions(+), 43 deletions(-) diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c index 40d24f64b444..061f5f005c35 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c @@ -169,9 +169,9 @@ static void destroy_rt_bandwidth(struct rt_bandwidth *r= t_b) =20 static inline struct task_struct *rt_task_of(struct sched_rt_entity *rt_se) { -#ifdef CONFIG_SCHED_DEBUG - WARN_ON_ONCE(!rt_entity_is_task(rt_se)); -#endif + if (!rt_entity_is_task(rt_se)) + return NULL; + return container_of(rt_se, struct task_struct, rt); } =20 @@ -1266,54 +1266,34 @@ static void __delist_rt_entity(struct sched_rt_enti= ty *rt_se, struct rt_prio_arr rt_se->on_list =3D 0; } =20 -static inline struct sched_statistics * -__schedstats_from_rt_se(struct sched_rt_entity *rt_se) -{ -#ifdef CONFIG_RT_GROUP_SCHED - /* schedstats is not supported for rt group. */ - if (!rt_entity_is_task(rt_se)) - return NULL; -#endif - - return &rt_task_of(rt_se)->stats; -} - static inline void update_stats_wait_start_rt(struct rt_rq *rt_rq, struct sched_rt_entity *rt= _se) { - struct sched_statistics *stats; - struct task_struct *p =3D NULL; + struct task_struct *p; =20 if (!schedstat_enabled()) return; =20 - if (rt_entity_is_task(rt_se)) - p =3D rt_task_of(rt_se); - - stats =3D __schedstats_from_rt_se(rt_se); - if (!stats) + p =3D rt_task_of(rt_se); + if (!p) return; =20 - __update_stats_wait_start(rq_of_rt_rq(rt_rq), p, stats); + __update_stats_wait_start(rq_of_rt_rq(rt_rq), p, &p->stats); } =20 static inline void update_stats_enqueue_sleeper_rt(struct rt_rq *rt_rq, struct sched_rt_entit= y *rt_se) { - struct sched_statistics *stats; - struct task_struct *p =3D NULL; + struct task_struct *p; =20 if (!schedstat_enabled()) return; =20 - if (rt_entity_is_task(rt_se)) - p =3D rt_task_of(rt_se); - - stats =3D __schedstats_from_rt_se(rt_se); - if (!stats) + p =3D rt_task_of(rt_se); + if (!p) return; =20 - __update_stats_enqueue_sleeper(rq_of_rt_rq(rt_rq), p, stats); + __update_stats_enqueue_sleeper(rq_of_rt_rq(rt_rq), p, &p->stats); } =20 static inline void @@ -1330,34 +1310,28 @@ update_stats_enqueue_rt(struct rt_rq *rt_rq, struct= sched_rt_entity *rt_se, static inline void update_stats_wait_end_rt(struct rt_rq *rt_rq, struct sched_rt_entity *rt_s= e) { - struct sched_statistics *stats; - struct task_struct *p =3D NULL; + struct task_struct *p; =20 if (!schedstat_enabled()) return; =20 - if (rt_entity_is_task(rt_se)) - p =3D rt_task_of(rt_se); - - stats =3D __schedstats_from_rt_se(rt_se); - if (!stats) + p =3D rt_task_of(rt_se); + if (!p) return; =20 - __update_stats_wait_end(rq_of_rt_rq(rt_rq), p, stats); + __update_stats_wait_end(rq_of_rt_rq(rt_rq), p, &p->stats); } =20 static inline void update_stats_dequeue_rt(struct rt_rq *rt_rq, struct sched_rt_entity *rt_se, int flags) { - struct task_struct *p =3D NULL; + struct task_struct *p; =20 if (!schedstat_enabled()) return; =20 - if (rt_entity_is_task(rt_se)) - p =3D rt_task_of(rt_se); - + p =3D rt_task_of(rt_se); if ((flags & DEQUEUE_SLEEP) && p) { unsigned int state; =20 --=20 2.25.1