From nobody Mon Dec 1 22:02:17 2025 Received: from mail-ed1-f42.google.com (mail-ed1-f42.google.com [209.85.208.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 DA76030BBBB for ; Mon, 1 Dec 2025 12:42:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764592934; cv=none; b=cqiCpaOHpaeQ/bTPkEBr+nFsFP/988jCvrCUhtZ/LOkZ8q61Kc3MDPZfOarGzO6fc/OhiU0MvMEteYTTTL39fHXHN0lfe0rQvBG4UK19Smgr4pjqU8DhwQWci96KpqIx2oWE0j4U/HtS+hiRz3UxhTh8vOUlqpeATHPLf99X8AI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764592934; c=relaxed/simple; bh=eKQmw+YKYRUrzNEnspCBhJYfWsdCTd+kyXQy35hAu9U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rjhdM5vWbMAILne+3uPmxqkOuXip39hRZ+SpoMlYHsL8gzGPG1oYVH5h4lIb9SiBmqKMNr7L7Pm4WeAcZskm/WWJuIEDRPTs5B7h0mbKfQDNvyPvdjgLp/KYUzQ1rU5SALWjlIkgvGhQpWhKe8uaUEuZdmZJ+QO+ZGyHciLs/08= 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=cAX5reQQ; arc=none smtp.client-ip=209.85.208.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="cAX5reQQ" Received: by mail-ed1-f42.google.com with SMTP id 4fb4d7f45d1cf-64198771a9bso8038735a12.2 for ; Mon, 01 Dec 2025 04:42:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764592931; x=1765197731; 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=gg5gfp1wMHo7BZByH/VSJvF4QUqT0jh+BRltGi2JdnU=; b=cAX5reQQFEAzzk2K75wJiF8hRRl7kiwe+FBuf2TEOLstIz/FDvMD14E4LiieRF4Xda 9p/rOYWhb4Cr3GbZH8bQx+lFp8GDDqmfVpBNCcTBOH4yjxgYLqpLf6ZNGuG43msnroAO ij1lIWBKM71CMI4SNgHPtjwYZPTB2Qng0IoBUyLbsFW1n1hVBRPJF7hwWYggKZljnSAU /bFOCLNyLvH5P6btWDtGhYxaO4uC1YXr1xh6hGBOe1h6NVjWashhrS6iLKJU8JUhCuQM bndPLBzGBCFI9yTp4vXkGT+/RDab/WfswIFy3S+m4YMYcVIsJCgGcN1PBpzZoYoJLGRH 4f5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764592931; x=1765197731; 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=gg5gfp1wMHo7BZByH/VSJvF4QUqT0jh+BRltGi2JdnU=; b=DEVMdGn/qKyC4rScdJDn64468TIpw9UAux8Em9n35oSAYG81jXJGwo9WxpG0pT12Jp jqmYNdJo4F/6+GaqxchrnTX8zqkGlWMgent81zsqJtYd1JZDfABrhjT1KT0GV8uvvyLw JvQqK2yKcu3/bLvjikEd/h5ipOzY4ausBBNCpH9UFdxSSY4eA4scJLDPDbe+RRm6VfM3 jXzeQ4n3TIh4+nFUgpI3wskYf8EapFY3wK78Kzeo1QjOLt7zePXRXLT2HXJRcfZcR+Gz NmPv4A+wNShugStEo9ot88y6wFBaEkrQf1Ms76X25yDL6naI3/fISt467gZ1WZ8VWcyq alug== X-Gm-Message-State: AOJu0YyvHLoRbnoqdnU2CdQ1Qz2p1Ob89u01Evsxgnks2zKuvR4qI69x yiTDQy37VmuG9m76dorB2FwVhALzUxEjCEJ991bWuWtZs0QXTdFD7SeH X-Gm-Gg: ASbGncsHL42FiUclBb0vM+0z3Uk33o77jI4wWXMcmibYbwSB5v2Vh/Qh2GT9tQ25XyU T8qkq6oCQdyvkkkVzu2D9aQcesTCnXaJxvg6fbTQknqMQFXgeYRTczybk0GwtMEtjVG3ChkFyua zfq1NxbeCNWMnLor34x5ltAqKIkonl+pD2bGpD7Z2qFnsdwCbRFgZtEN1aK+t7HGeiJsjxBVA0X AVZreCtGcHfzTiyckNLfvKaoliJJA5X2w1mLlkWJ9W8yxK0824S3Fwzw+ndxX+Y0BUUOc/imEOy PcdFbsCL9NK6stamxK6Kqh9mF0PBuxwsFsXTAGMtDIWgDY7zQ15tIquYm/nxJUVCnKJl6jtXLnC ZXGfSIJDLRkbJ1DuNOTdrwy3V+jQfb4uE9lJXoKOl6hqeXKJB4cA37fNM11TbL3+/3c/UpW8l8H W5ZNuX+SDs X-Google-Smtp-Source: AGHT+IFXV/QwkOcHoYKisyYle/kvP8ENJFSSh7+Y2OAD1tMutjVmmjxGE7NdHqFlJc+HXE3FwUNMcA== X-Received: by 2002:a17:907:928e:b0:b73:3d15:6337 with SMTP id a640c23a62f3a-b767158b529mr4329817566b.21.1764592930888; Mon, 01 Dec 2025 04:42:10 -0800 (PST) Received: from victus-lab ([193.205.81.5]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b76f59e8612sm1173738266b.52.2025.12.01.04.42.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Dec 2025 04:42:10 -0800 (PST) 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 v4 04/28] sched/rt: Move some functions from rt.c to sched.h Date: Mon, 1 Dec 2025 13:41:37 +0100 Message-ID: <20251201124205.11169-5-yurand2000@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251201124205.11169-1-yurand2000@gmail.com> References: <20251201124205.11169-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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. 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 b7bf80a571..b6264e715c 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 !=3D &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 !=3D &root_task_gro= up); - return rt_se->rt_rq; -} - -static inline struct rq *rq_of_rt_se(struct sched_rt_entity *rt_se) -{ - struct rt_rq *rt_rq =3D rt_se->rt_rq; - - WARN_ON(!rt_group_sched_enabled() && rt_rq->tg !=3D &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 =3D 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 =3D 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 10733b7cb7..964d596d8e 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -3071,6 +3071,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(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 !=3D &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 !=3D &root_task_gro= up); + return rt_se->rt_rq; +} + +static inline struct rq *rq_of_rt_se(struct sched_rt_entity *rt_se) +{ + struct rt_rq *rt_rq =3D rt_se->rt_rq; + + WARN_ON(!rt_group_sched_enabled() && rt_rq->tg !=3D &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(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 =3D 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 =3D 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.51.0