From patchwork Fri Dec 1 02:27:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yajun Deng X-Patchwork-Id: 172219 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp834064vqy; Thu, 30 Nov 2023 18:28:12 -0800 (PST) X-Google-Smtp-Source: AGHT+IHEH0qdme5k59mNV9Ah+XP9oOE9sTavyMwf/Wu3b7tUsFATJPki0Sp1sQMRCLDllbRxhRdN X-Received: by 2002:a05:6358:9043:b0:16c:499:bbbd with SMTP id f3-20020a056358904300b0016c0499bbbdmr25062274rwf.21.1701397692473; Thu, 30 Nov 2023 18:28:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701397692; cv=none; d=google.com; s=arc-20160816; b=yYsTNvlmCwLNnzeWfwovD3SMw0/P32SRS4ZjHxhgl0lKry62LUCvYzk9GMqpA58WjQ 6LK74rW3gqwgVX6rjyFjrdPFd+em62zOroYUwAU4Wnvyv/EzO8YMLtlN7lwTorUz5U8N KHr3/LaRlLWOGzrYKjlVad0fVi1umjUNHiGyCOaZHP/iq0M1llRwgoLWiF/hl6GnwjBw uargLqMadFPml0H5hIA5RVCFgCobELjeqqfYp9fNyo7a+HB5NZhNM4lRLt0OqE8BZIYL 92jxt+RI3qfYMUD2OAXdhvK2yx2iTVjvMhxSYaZU+RrolMa2B2B77AHkuzwg7rwb0sEm F8fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=fH2a7qGhcZXIGgkMnI78AIz2EcPccxN2AHWONEyfKRs=; fh=kY5sJNvn29qhEh2SatEVpXE2cTkcQ8AnU+xu9Bnn8Ic=; b=hqxKJ7OAqqaCd01NY9ZY0+i2ddE+zvoQ/0QJej4yBEiXjFuXIBO+wu/4oTtAODZrnR t8284NQYBVvJVdEOat11LE16O0hcXDeL/QArab3kZayvisKIKKUsByKUkLTPUAmYsAXa KF8Pr+scxr2kqy2ZJYnJI1UbSHHhSgawjzRTu8Y41fc3BV2UOHRVxYDWbKQYDU5pHQ+Q /YzYR8XG/Fd7AMKGpmyyLPNKV2yLHOAIHCMEGaCUEKpEbiGWspBXP0U3yyUyxcDnYHw5 9Xt+O1vKXTxoHKxvR/154mEGj4qvOJ3Pt/kPxDoiBBjkscj79WKnIMVA63Nks/Wk8xq1 g42Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=T6evYVBw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id x13-20020a63fe4d000000b005c1cd1ba05csi2306516pgj.240.2023.11.30.18.28.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 18:28:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=T6evYVBw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 896778705E9C; Thu, 30 Nov 2023 18:28:06 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376818AbjLAC1r (ORCPT + 99 others); Thu, 30 Nov 2023 21:27:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43032 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229523AbjLAC1p (ORCPT ); Thu, 30 Nov 2023 21:27:45 -0500 Received: from out-174.mta1.migadu.com (out-174.mta1.migadu.com [IPv6:2001:41d0:203:375::ae]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 249CD1729 for ; Thu, 30 Nov 2023 18:27:48 -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=1701397666; 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=fH2a7qGhcZXIGgkMnI78AIz2EcPccxN2AHWONEyfKRs=; b=T6evYVBwsNGTj0sOvAKv/gA4H1/48MNtmuovLzHY9YTRHZcsdOx4aGQetuphmYvEg2dvZV 5t44FPvtWgQIYe+0N3X+yPJ9W08gwDmptvmT0NDQL+AbPE1llnDScD+VZE8Eg2op5WzpyO ZORbL1+/QGvlvP6O+XuJZ/Dvg7K5mMM= 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 2/2] sched/rt: Return NULL when rt entity isn't a task in rt_task_of() Date: Fri, 1 Dec 2023 10:27:04 +0800 Message-Id: <20231201022704.3526377-3-yajun.deng@linux.dev> In-Reply-To: <20231201022704.3526377-1-yajun.deng@linux.dev> References: <20231201022704.3526377-1-yajun.deng@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Thu, 30 Nov 2023 18:28:06 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784044787021372850 X-GMAIL-MSGID: 1784044787021372850 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 --- kernel/sched/rt.c | 62 +++++++++++++---------------------------------- 1 file changed, 17 insertions(+), 45 deletions(-) diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c index 3261b067b67e..be4d65e05af1 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c @@ -169,9 +169,9 @@ static void destroy_rt_bandwidth(struct rt_bandwidth *rt_b) 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); } @@ -941,12 +941,10 @@ static int do_sched_rt_period_timer(struct rt_bandwidth *rt_b, int overrun) static inline int rt_se_prio(struct sched_rt_entity *rt_se) { -#ifdef CONFIG_RT_GROUP_SCHED struct rt_rq *rt_rq = group_rt_rq(rt_se); if (rt_rq) return rt_rq->highest_prio.curr; -#endif return rt_task_of(rt_se)->prio; } @@ -1266,54 +1264,34 @@ static void __delist_rt_entity(struct sched_rt_entity *rt_se, struct rt_prio_arr rt_se->on_list = 0; } -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 = NULL; + struct task_struct *p; if (!schedstat_enabled()) return; - if (rt_entity_is_task(rt_se)) - p = rt_task_of(rt_se); - - stats = __schedstats_from_rt_se(rt_se); - if (!stats) + p = rt_task_of(rt_se); + if (!p) return; - __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); } static inline void update_stats_enqueue_sleeper_rt(struct rt_rq *rt_rq, struct sched_rt_entity *rt_se) { - struct sched_statistics *stats; - struct task_struct *p = NULL; + struct task_struct *p; if (!schedstat_enabled()) return; - if (rt_entity_is_task(rt_se)) - p = rt_task_of(rt_se); - - stats = __schedstats_from_rt_se(rt_se); - if (!stats) + p = rt_task_of(rt_se); + if (!p) return; - __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); } static inline void @@ -1330,34 +1308,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_se) { - struct sched_statistics *stats; - struct task_struct *p = NULL; + struct task_struct *p; if (!schedstat_enabled()) return; - if (rt_entity_is_task(rt_se)) - p = rt_task_of(rt_se); - - stats = __schedstats_from_rt_se(rt_se); - if (!stats) + p = rt_task_of(rt_se); + if (!p) return; - __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); } static inline void update_stats_dequeue_rt(struct rt_rq *rt_rq, struct sched_rt_entity *rt_se, int flags) { - struct task_struct *p = NULL; + struct task_struct *p; if (!schedstat_enabled()) return; - if (rt_entity_is_task(rt_se)) - p = rt_task_of(rt_se); - + p = rt_task_of(rt_se); if ((flags & DEQUEUE_SLEEP) && p) { unsigned int state;