From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-173.mta1.migadu.com (out-173.mta1.migadu.com [95.215.58.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4AF2719CCFD for ; Wed, 29 Oct 2025 03:38:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761709088; cv=none; b=CRFPmMSN77CdmHnqgsXyxzrjHnCxgOnYJLhCZdiw9xh9+XCXOtjlXsaSFqnHodjuVWlgUmX1nbrIGwPHqkWWhLqAjX+fxTh5RiBdx64Lj8iJVCw3Z4ux4UuAXCxKpx1Z8tnY1Bb9n7wOOLaObKxwhMDpMBzOcGzRxyLPRhuEX+w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761709088; c=relaxed/simple; bh=adOEgdLxv+En/0DVoZ+G6r7C+UJDRx9EQHILI5WbYh8=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=cdaHy7g7LzaY0kNBwnmJIRZR5Q+mJaTl/8By6OMoIBuWox78IPznFMeCuSyo/a6nukoVEfe3zdt59EeGzIraiBLgn+d+MDICgGLS+4870TkfbiRSgFivJ/Z0DJ+AvGSjbqrT192cmBVMVxNGYr4MIlUjtVARj2Vgeiz3Yg+dvyE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=bEGFqF+j; arc=none smtp.client-ip=95.215.58.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="bEGFqF+j" 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=1761709081; 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=DrhAiZKHtHCx6uzRzL/qhjnrTRM1IUGETBHVAxvmwyY=; b=bEGFqF+jbwnfqYijFZx0fN4B15wN9XE86KMHheFVB8gEvQFowXdgDU4EHVUsn1LwCbMxoS FO9eIrmaF2T2GQb8W2BKfDa+k43SHYKJxjeq1oaHEqKhtWEitamPSWf6HHEhL8PSANDbXN Sus5+i6CiSOi3zkAGjmlyCBbuHy+wg0= 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, vschneid@redhat.com Cc: linux-kernel@vger.kernel.org, Yajun Deng Subject: [PATCH] sched/rt: Remove the unnecessary CONFIG_RT_GROUP_SCHED Date: Wed, 29 Oct 2025 11:37:36 +0800 Message-Id: <20251029033736.85509-1-yajun.deng@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT After commit 5f6bd380c7bd ("sched/rt: Remove default bandwidth control"), these bandwidth control members are only initialized when CONFIG_RT_GROUP_SCHED is enabled. Remove the unnecessary CONFIG_RT_GROUP_SCHED from init_rt_rq() and initialize the members in init_tg_rt_entry(). init_rt_bandwidth() is called in sched_init(). The rt_runtime of rt_bandwidth is initialized by global_rt_runtime(), Therefore, we can set the rt_runtime of rt_rq by the rt_runtime of rt_bandwidth in init_tg_rt_entry(). Also, remove the unnecessary CONFIG_RT_GROUP_SCHED in rt_se_prio(). Signed-off-by: Yajun Deng --- kernel/sched/core.c | 6 ------ kernel/sched/rt.c | 17 +++++------------ 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 1842285eac1e..76b6c7b15604 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -8645,12 +8645,6 @@ void __init sched_init(void) #endif /* CONFIG_FAIR_GROUP_SCHED */ #ifdef CONFIG_RT_GROUP_SCHED - /* - * This is required for init cpu because rt.c:__enable_runtime() - * starts working after scheduler_running, which is not the case - * yet. - */ - rq->rt.rt_runtime = global_rt_runtime(); init_tg_rt_entry(&root_task_group, &rq->rt, NULL, i, NULL); #endif rq->sd = NULL; diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c index 1fd97f2d7ec6..a7b27f80f3a0 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c @@ -84,14 +84,6 @@ void init_rt_rq(struct rt_rq *rt_rq) plist_head_init(&rt_rq->pushable_tasks); /* We start is dequeued state, because no RT tasks are queued */ rt_rq->rt_queued = 0; - -#ifdef CONFIG_RT_GROUP_SCHED - rt_rq->rt_time = 0; - rt_rq->rt_throttled = 0; - rt_rq->rt_runtime = 0; - raw_spin_lock_init(&rt_rq->rt_runtime_lock); - rt_rq->tg = &root_task_group; -#endif } #ifdef CONFIG_RT_GROUP_SCHED @@ -229,10 +221,14 @@ void init_tg_rt_entry(struct task_group *tg, struct rt_rq *rt_rq, { struct rq *rq = cpu_rq(cpu); - rt_rq->highest_prio.curr = MAX_RT_PRIO-1; + rt_rq->rt_time = 0; + rt_rq->rt_throttled = 0; rt_rq->rt_nr_boosted = 0; + raw_spin_lock_init(&rt_rq->rt_runtime_lock); + rt_rq->rq = rq; rt_rq->tg = tg; + rt_rq->rt_runtime = tg->rt_bandwidth.rt_runtime; tg->rt_rq[cpu] = rt_rq; tg->rt_se[cpu] = rt_se; @@ -280,7 +276,6 @@ int alloc_rt_sched_group(struct task_group *tg, struct task_group *parent) goto err_free_rq; init_rt_rq(rt_rq); - rt_rq->rt_runtime = tg->rt_bandwidth.rt_runtime; init_tg_rt_entry(tg, rt_rq, rt_se, i, parent->rt_se[i]); } @@ -957,12 +952,10 @@ static void __disable_runtime(struct rq *rq) { } 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; } -- 2.25.1