From patchwork Wed Aug 2 02:24:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yajun Deng X-Patchwork-Id: 129566 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp161245vqx; Tue, 1 Aug 2023 19:47:20 -0700 (PDT) X-Google-Smtp-Source: APBJJlE625WvSYoZ7dXCnilfBiEO6FV0VWV3IYdfkgwnBpmC8+MErFUXez+RtgFRTEaUeAD7NnRL X-Received: by 2002:a05:6a20:8f21:b0:13d:1b66:9e16 with SMTP id b33-20020a056a208f2100b0013d1b669e16mr14528774pzk.10.1690944440391; Tue, 01 Aug 2023 19:47:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690944440; cv=none; d=google.com; s=arc-20160816; b=sLpmqRil1L9MBYako8urjo/sZ+iTLnNqFONkmLol1/g/Eh66stWuQQoizPDv9etORk Mb9Po0G93zGUWPppJBkYrNuODEms4r+16skv1LdUVmZO/BflCgWEPxP+uewcgN2RhFHd bQyV7MBHACj+fqfuMzVlXarpfi8/nZQZyMLMiXRJ3o//lX4lROlIBxS5ikxlEcv/haVP Ukd+H4f8IwDrzAJrwgiuuQeQpqUWJ2QnRyTed91PA1ejP/2e4vqpvZbr5zHuZuwhZ5j/ 5w6O5EXODkcW+HE/3i+9mvvT0dGWMyzX9LHUcZfkToURL6rfO1yYe7IzgFuLrrx6mMlj 9cww== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=fwE+Rq9mSoCZ0Nln+HHt8N0bG1PTqQvHzIw9QHmw6bs=; fh=tYiG3tLjVNirZmCEAhO0ijnhlpkD5/sPPUKSOiTGBDQ=; b=qVf8fLMbNpN9JpXriBVhExZMuCndCMUPAPJi251YTJsSZ6XosjCw5moqq0Euq9JMwY IyutozFVZwvtrfXiYYoo+CuDtYlrYhrdWMPJOAe/XFsusqOT7OjXiCmzJThxJnCyWxPc jJuyGnbrJ0cF2/EMti+TaGbWy21swJcfRpg0k5WI5H7RORo+h1QzM62vtrUu9iIdeMW0 NdtRSStd5562CImlT6gpxg32NAgCw9MwExhvOOIDpyHlJD1shVQvEi85F9GEscs9Ga1o yX8TLsVAEUnyYM5SUPLa0ORaV1fo93Z1zGBrAAWzcR89CbVkHUGknGKKk4ITxpUeF5aO Xkyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=dLfBcyCu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w8-20020a63f508000000b00563f0cddf83si10108012pgh.782.2023.08.01.19.47.04; Tue, 01 Aug 2023 19:47:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=dLfBcyCu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231618AbjHBCYd (ORCPT + 99 others); Tue, 1 Aug 2023 22:24:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34986 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230180AbjHBCYc (ORCPT ); Tue, 1 Aug 2023 22:24:32 -0400 Received: from out-120.mta1.migadu.com (out-120.mta1.migadu.com [95.215.58.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC77E213F for ; Tue, 1 Aug 2023 19:24:30 -0700 (PDT) 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=1690943067; 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; bh=fwE+Rq9mSoCZ0Nln+HHt8N0bG1PTqQvHzIw9QHmw6bs=; b=dLfBcyCus8YC/ybHlmyFMKLW7KJXaxqnWgSK17lfGcbv8Qqhh3EDBOb2nA/Ly8fxSwm/wh 7KemxI6RQAVD4qd87aWAj4xT9KxxshCvpG1jy6BhBlNaUSnx8wxz2yk1/yw1X8wka+Li1h OqAts/cjjBpXHDHXQYnSoPOWxSaGB5Q= 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] sched/rt: move back to RT_GROUP_SCHED and rename it child Date: Wed, 2 Aug 2023 10:24:08 +0800 Message-Id: <20230802022408.529208-1-yajun.deng@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773083757823633848 X-GMAIL-MSGID: 1773083757823633848 The member back in struct sched_rt_entity only related to RT_GROUP_SCHED, it should not place out of RT_GROUP_SCHED, move back to RT_GROUP_SCHED and rename it child. Init child in init_tg_rt_entry(). Also, add WARN_ON_ONCE if parent is NULL, because parent is only NULL when rt_se is NULL. Introduce for_each_sched_rt_entity_reverse() to iterate rt_entity from top to down. Signed-off-by: Yajun Deng --- V1 -> V2: Add WARN_ON_ONCE in init_tg_rt_entry(). --- include/linux/sched.h | 2 +- kernel/sched/rt.c | 29 +++++++++++++++++------------ 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/include/linux/sched.h b/include/linux/sched.h index 177b3f3676ef..5635655d6c35 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -594,8 +594,8 @@ struct sched_rt_entity { unsigned short on_rq; unsigned short on_list; - struct sched_rt_entity *back; #ifdef CONFIG_RT_GROUP_SCHED + struct sched_rt_entity *child; struct sched_rt_entity *parent; /* rq on which this entity is (to be) queued: */ struct rt_rq *rt_rq; diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c index 00e0e5074115..8e577c7b9257 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c @@ -228,13 +228,13 @@ void init_tg_rt_entry(struct task_group *tg, struct rt_rq *rt_rq, if (!rt_se) return; - if (!parent) - rt_se->rt_rq = &rq->rt; - else - rt_se->rt_rq = parent->my_q; + if (WARN_ON_ONCE(!parent)) + return; + rt_se->rt_rq = parent->my_q; rt_se->my_q = rt_rq; rt_se->parent = parent; + parent->child = rt_se; INIT_LIST_HEAD(&rt_se->run_list); } @@ -564,6 +564,9 @@ static inline struct task_group *next_task_group(struct task_group *tg) #define for_each_sched_rt_entity(rt_se) \ for (; rt_se; rt_se = rt_se->parent) +#define for_each_sched_rt_entity_reverse(rt_se) \ + for (; rt_se; rt_se = rt_se->child) + static inline struct rt_rq *group_rt_rq(struct sched_rt_entity *rt_se) { return rt_se->my_q; @@ -669,6 +672,9 @@ typedef struct rt_rq *rt_rq_iter_t; #define for_each_sched_rt_entity(rt_se) \ for (; rt_se; rt_se = NULL) +#define for_each_sched_rt_entity_reverse(rt_se) \ + for_each_sched_rt_entity(rt_se) + static inline struct rt_rq *group_rt_rq(struct sched_rt_entity *rt_se) { return NULL; @@ -1481,22 +1487,21 @@ static void __dequeue_rt_entity(struct sched_rt_entity *rt_se, unsigned int flag */ static void dequeue_rt_stack(struct sched_rt_entity *rt_se, unsigned int flags) { - struct sched_rt_entity *back = NULL; + struct sched_rt_entity *root; unsigned int rt_nr_running; - for_each_sched_rt_entity(rt_se) { - rt_se->back = back; - back = rt_se; - } + for_each_sched_rt_entity(rt_se) + root = rt_se; - rt_nr_running = rt_rq_of_se(back)->rt_nr_running; + rt_nr_running = rt_rq_of_se(root)->rt_nr_running; - for (rt_se = back; rt_se; rt_se = rt_se->back) { + rt_se = root; + for_each_sched_rt_entity_reverse(rt_se) { if (on_rt_rq(rt_se)) __dequeue_rt_entity(rt_se, flags); } - dequeue_top_rt_rq(rt_rq_of_se(back), rt_nr_running); + dequeue_top_rt_rq(rt_rq_of_se(root), rt_nr_running); } static void enqueue_rt_entity(struct sched_rt_entity *rt_se, unsigned int flags)