From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (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 AE26F3B2FD5 for ; Thu, 30 Apr 2026 21:38:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777585135; cv=none; b=izGSmZ47e8IMAZNCQmh6jDQpLVniZSzpN+nY+tbbMSJKbDH1YX3UHptjnFasLeWy4CZQaj3ROngpePEdPlP1JbMO1gfnvlJL4CrekdMOuMabb5kuI/AliccdFazwW/UdSaXQV3maHTfHOVPg4pZgEjulB+nIVDXBvGnSz4Lm9uM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777585135; c=relaxed/simple; bh=TxS1jjzRrjS7edTSUKOro7wxkDlJRj9WFFvZDVBIPxk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KKhEoQA40XG/GXL1HuqExej/ZvFFo39EtrHSF2WG40WSQ2b1TcGxRnhHffglas09xL5dDsnvQT1lJEp1fz4kJm7Qrtw29c1B2ytj1UYvRECIADMoiI5yZ7jq8alVMC6IKvjc/Gkm/OE5fEdBoBZYyfKZ6I7KA4/fP+m7RgqK53I= 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=EVubwjY7; arc=none smtp.client-ip=209.85.128.42 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="EVubwjY7" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-4891f625344so15392865e9.0 for ; Thu, 30 Apr 2026 14:38:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777585128; x=1778189928; 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=QfxiE9y2IhgGw3IJI8mz/YCwy+mZEwuFD+yzPSDreW0=; b=EVubwjY7Q1CbAsr+UykZwF25MYEmTgcQE+fRWS+yRHWpQcewCH4I1KONDt49SXjGBG vioFGebzUxB6azWOYtxeu3gMhRQtqUxc8hl3oVJ30PkYayQAdRVGa+hL0J4PzU+CIz3j ooqkyum6UQSfLDn5mieP1oXXAv99AhWQ33BLcUP0L5Vk4qJ4koj5Mlwe67uiSKrkqW8+ AZoum39AdRODD0PPro4cRSMN/9CmxaRYSg3YGZWq7kkQE8TgG+iKuETDR1/kxEWXzWCp scpnfYOWJu5MEiWDodEKI2NkhAK6z8vQ/2z6EmtpshlPEfKUV+daDGhBmnVmFUM81YQS g9xQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777585128; x=1778189928; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=QfxiE9y2IhgGw3IJI8mz/YCwy+mZEwuFD+yzPSDreW0=; b=DRm4+JSRGpp3bGLxyWCxOGf0CUxD0S9sXKP1syOV43kTrisKtuOD81H81WsJHH2+09 DJmHlEYVusQUyWAtHq258fTTWn9rx81OM9anp7MsQEg997rbPfnzACiN9Yh4tKk/KqLz 2R2Qr7zv341dG61DrLJo1HRMplq3nSgIxSuXedGgPd5vwZyg4+nAUy92iJ27Wlxh/g4W jjUUxM19D96a7t1md1+VlDrDWLYx/3MCQpK1bRE3T9FByBjn/jAEuZtjLJozCXNBsL4X jZ0fndYo5GFcA1ynRnGXwBWlTlzZgac4AYDAOV18muZBWmt1gPG+VpgrFhzA0AoeakjH 778w== X-Gm-Message-State: AOJu0YxHgYqUhiICOghqTBhFl/B9onHuW7CiAGSdNTER7CaQVdEn48Oy gC66ev2NqMN+t0KDedb+cbm+jXRFk8LL6tTXDgpvUMPeMINFwe4PDAc1CT0y7Q== X-Gm-Gg: AeBDies7MXEXvL2lhXijtqk00GBgHOzgk+ippH1dEuwR5rk/E0Emq+NmUk3ZOP1U+zJ i8q67KNV88VQX8xalSdunC5dFcXuQeTqQkZ0qVofuBIAOFQeBxnbjC1y6TT+79chcVmURV6Dvf1 2VzeziLiOpjqo4VJCvKEBUFlLD2IoeRPSmsUfh/vwOn7kGWJCktuPIPykfEqYQkmAMMzPVGO7Yi Twmdo6HQMnq2p5lB/IcqaT2vV0whsjvSV0ctNaHCtESys1cifWuaQ/bnJEVAgY8lR0X4MKNSYA3 Wml0GfoiHnHngm50Pt0HzvH7gurWwuX/LbYOY4XgF3ZLgo8zP391e7p6ZWwH3bextfBvWvyPWe8 qq3eVyJPsj8r1/jXVbQIK0QIHfkm6Dr5ld8Mg/3o7xB5UDjEAm/FwEmgnT1kGPG3h86DzJvnLqD y5ojbNNbr8+Vw6BH9bM+4XQCgM0xJyKkd3bxLHmFdJ X-Received: by 2002:a05:600c:5286:b0:486:faa8:9e4 with SMTP id 5b1f17b1804b1-48a86085131mr68142435e9.12.1777585128056; Thu, 30 Apr 2026 14:38:48 -0700 (PDT) Received: from yuri-framework13 ([78.211.51.156]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-44a9879ef89sm418510f8f.30.2026.04.30.14.38.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Apr 2026 14:38:47 -0700 (PDT) From: Yuri Andriaccio To: Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider Cc: linux-kernel@vger.kernel.org, Luca Abeni , Yuri Andriaccio Subject: [RFC PATCH v5 05/29] sched/rt: Move functions from rt.c to sched.h Date: Thu, 30 Apr 2026 23:38:09 +0200 Message-ID: <20260430213835.62217-6-yurand2000@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260430213835.62217-1-yurand2000@gmail.com> References: <20260430213835.62217-1-yurand2000@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: 8bit From: luca abeni Make the following functions/macros be non-static and move them in sched.h, so that they can be also used in other source files: - rt_entity_is_task() - rt_task_of() - rq_of_rt_rq() - rt_rq_of_se() - rq_of_rt_se() There are no functional changes, apart from the use of container_of_const() instead of container_of() where applicable. This is needed by future patches. Signed-off-by: luca abeni Signed-off-by: Yuri Andriaccio --- kernel/sched/rt.c | 56 ------------------------------------------ kernel/sched/sched.h | 58 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 56 deletions(-) diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c index 597eaba00a20..5f89c080a3ef 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c @@ -166,36 +166,6 @@ static void destroy_rt_bandwidth(struct rt_bandwidth *rt_b) hrtimer_cancel(&rt_b->rt_period_timer); } -#define rt_entity_is_task(rt_se) (!(rt_se)->my_q) - -static inline struct task_struct *rt_task_of(struct sched_rt_entity *rt_se) -{ - WARN_ON_ONCE(!rt_entity_is_task(rt_se)); - - return container_of(rt_se, struct task_struct, rt); -} - -static inline struct rq *rq_of_rt_rq(struct rt_rq *rt_rq) -{ - /* Cannot fold with non-CONFIG_RT_GROUP_SCHED version, layout */ - WARN_ON(!rt_group_sched_enabled() && rt_rq->tg != &root_task_group); - return rt_rq->rq; -} - -static inline struct rt_rq *rt_rq_of_se(struct sched_rt_entity *rt_se) -{ - WARN_ON(!rt_group_sched_enabled() && rt_se->rt_rq->tg != &root_task_group); - return rt_se->rt_rq; -} - -static inline struct rq *rq_of_rt_se(struct sched_rt_entity *rt_se) -{ - struct rt_rq *rt_rq = rt_se->rt_rq; - - WARN_ON(!rt_group_sched_enabled() && rt_rq->tg != &root_task_group); - return rt_rq->rq; -} - void unregister_rt_sched_group(struct task_group *tg) { if (!rt_group_sched_enabled()) @@ -294,32 +264,6 @@ int alloc_rt_sched_group(struct task_group *tg, struct task_group *parent) #else /* !CONFIG_RT_GROUP_SCHED: */ -#define rt_entity_is_task(rt_se) (1) - -static inline struct task_struct *rt_task_of(struct sched_rt_entity *rt_se) -{ - return container_of(rt_se, struct task_struct, rt); -} - -static inline struct rq *rq_of_rt_rq(struct rt_rq *rt_rq) -{ - return container_of(rt_rq, struct rq, rt); -} - -static inline struct rq *rq_of_rt_se(struct sched_rt_entity *rt_se) -{ - struct task_struct *p = rt_task_of(rt_se); - - return task_rq(p); -} - -static inline struct rt_rq *rt_rq_of_se(struct sched_rt_entity *rt_se) -{ - struct rq *rq = rq_of_rt_se(rt_se); - - return &rq->rt; -} - void unregister_rt_sched_group(struct task_group *tg) { } void free_rt_sched_group(struct task_group *tg) { } diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 8572bd12d0a2..2b8630ed1353 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -3305,6 +3305,64 @@ extern void set_rq_offline(struct rq *rq); extern bool sched_smp_initialized; +#ifdef CONFIG_RT_GROUP_SCHED +#define rt_entity_is_task(rt_se) (!(rt_se)->my_q) + +static inline struct task_struct *rt_task_of(struct sched_rt_entity *rt_se) +{ + WARN_ON_ONCE(!rt_entity_is_task(rt_se)); + + return container_of_const(rt_se, struct task_struct, rt); +} + +static inline struct rq *rq_of_rt_rq(struct rt_rq *rt_rq) +{ + /* Cannot fold with non-CONFIG_RT_GROUP_SCHED version, layout */ + WARN_ON(!rt_group_sched_enabled() && rt_rq->tg != &root_task_group); + return rt_rq->rq; +} + +static inline struct rt_rq *rt_rq_of_se(struct sched_rt_entity *rt_se) +{ + WARN_ON(!rt_group_sched_enabled() && rt_se->rt_rq->tg != &root_task_group); + return rt_se->rt_rq; +} + +static inline struct rq *rq_of_rt_se(struct sched_rt_entity *rt_se) +{ + struct rt_rq *rt_rq = rt_se->rt_rq; + + WARN_ON(!rt_group_sched_enabled() && rt_rq->tg != &root_task_group); + return rt_rq->rq; +} +#else +#define rt_entity_is_task(rt_se) (1) + +static inline struct task_struct *rt_task_of(struct sched_rt_entity *rt_se) +{ + return container_of_const(rt_se, struct task_struct, rt); +} + +static inline struct rq *rq_of_rt_rq(struct rt_rq *rt_rq) +{ + return container_of_const(rt_rq, struct rq, rt); +} + +static inline struct rq *rq_of_rt_se(struct sched_rt_entity *rt_se) +{ + struct task_struct *p = rt_task_of(rt_se); + + return task_rq(p); +} + +static inline struct rt_rq *rt_rq_of_se(struct sched_rt_entity *rt_se) +{ + struct rq *rq = rq_of_rt_se(rt_se); + + return &rq->rt; +} +#endif + DEFINE_LOCK_GUARD_2(double_rq_lock, struct rq, double_rq_lock(_T->lock, _T->lock2), double_rq_unlock(_T->lock, _T->lock2)) -- 2.53.0