From nobody Fri Dec 19 22:05:59 2025 Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) (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 E0EAD20485F for ; Mon, 10 Feb 2025 15:12:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739200379; cv=none; b=mdHD8vfS1PdawWjRk3WtzlcnA7ker596tv7cBitEXO/Haj3CaEw/HYVPU9oK3JxfgSsHr5samxTIq3T/EfyNYaFUftITc3ZxhvjRuY1s/6+5N123MkQ94Ig3O83WNd7TCUeSkbdwo7e+51AWxfhIkTkxU4DCdTsfTqaQTo2o4I4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739200379; c=relaxed/simple; bh=+0+OTGy/IlZfe8fbfVCeZWpUYt2alRVziCCdrmZbW30=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=TbM0S9j2tBogUpGDGi3YVz7n6/c3PhFQyLZr06r64JWOrXOaxwbHFK55J94bUZUhw7SEqGa1ptjKv2ywstXRLZIIzxcI/PrDlunvAx6UQiYgE/SR0S0Xn/H78Z5n9RVHOD6hc56mAcCCw8tYsSFRE8kuLmIM3RTFJcnTeWz9h2s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=bAWZkfOu; arc=none smtp.client-ip=209.85.218.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="bAWZkfOu" Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-aa68b513abcso856617066b.0 for ; Mon, 10 Feb 2025 07:12:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1739200375; x=1739805175; 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=LHPvs5h0lN5qcRjT7tnplrDlfrX3Yssy64qHxvPIi1w=; b=bAWZkfOuJYPgN8oSyv5kk9kNLMHhI2QytCT4UlwY0q/lc0OTtiUJGGtQ7vFGLw+THX IxUbUReEknQxZZsU4dWzhWqU3jQeVvYBm3vrQDuy+3ggPo4qH2sgFydZhrfNaRpv+EBt O/GIJVyUuLUp6+Abqnq9IAVbcQmBT21LVqj26jS0G1On1KR6lmPPgu1jQ+P1vEKoUd6x C1i120JGZl3m/iOeLSIg21i3i/ClRVCU6lHBpk97ym9TJOyRZp2w04C4X1pAuGjECl29 lfCb5wUGYvQgi/wJboagn0jXOzOHa3pKJWyn9MCoOtTMrW5NsnmXqtFdbXpeJR4q3ZKY BMQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739200375; x=1739805175; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LHPvs5h0lN5qcRjT7tnplrDlfrX3Yssy64qHxvPIi1w=; b=k7/AOmGfGoP2h+1iAX+j63bQvr8HbZdtVcfbkExBJtWszCEhLZc9J6rHFLWWyP9KJY jdtdkWRBUSmeMDhH0NkWxoUva3rXwaEvwKW0+b7Yit4UnFIukH81NujGkmwHhuM6oQhp ghkh0z+WRb0WDWng5q0e5LWA4xPjZcC0+wKZCocps3LMFyS0LiEpKu3n3CW4m/QzGxcx UdZbzJ9u1GjL6ZYtRV2wcmKH95k88zA13u3MYgTOhd2+4OFU0JnEb2MoQCh/YzC336rp SrNc08dMmNuo4D/SgF95hmXPXSf6LrGjF3nVHed/evotLNCBzcUhbX1EE2iocZUrXYY8 d38g== X-Forwarded-Encrypted: i=1; AJvYcCXN+LbYswjw+EaD/MXzb4fbXfdZbqeFoNgkL1Zb92P451rVfGz8fyYcfSAsybWsGcyju1wS2+5j0RdSjdU=@vger.kernel.org X-Gm-Message-State: AOJu0Ywx6Tgbfez+5NkDGUgotRlLm14vqICvhbp0HGXKgL7OvzpGs4w5 TaqUGAYSG70TJUZYwBmcl8s5xWUv4G69QUn+exC5QrjfR8neYsES7rttwJs6Dff8DBUAWKDBzMZ z X-Gm-Gg: ASbGncu3i1yS3vH3BYQnZIV95mH3d+KufL406fEJCEBOJZDkblcS2zIscEaKPZzSkWx 4eDigMv8Vs8K4Js9dc1L6oL8IGgiG+EpXC2TDTNCSFosN6QtXr5fQvoeybrCicU7uqAO138J85P bBSuo6hLHN/YssAb7SnnkmPfrRGS3UFKRNkwW2Q9/kspXCsokMzBdTlkoo/8EsM7A30mucIkSMj OyaDXr195S0NiFLECE26sB4njsGmiq2406PZgw/Dr+t4+ELBTO+eYXSTVnMVzid70No4hyOONhF EKRzHUopI5NkPti81g== X-Google-Smtp-Source: AGHT+IEqT2HqyEU97xbfdsBL84h2jKrpMtkd/2pq59J3hPZeDg9i4UwQ1Su0OfZqBDIMGK/V+nmmOw== X-Received: by 2002:a17:907:748:b0:ab7:a39:db4 with SMTP id a640c23a62f3a-ab789cfaef4mr1355751566b.57.1739200375206; Mon, 10 Feb 2025 07:12:55 -0800 (PST) Received: from blackdock.suse.cz ([193.86.92.181]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ab773339e82sm895192866b.143.2025.02.10.07.12.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 07:12:54 -0800 (PST) From: =?UTF-8?q?Michal=20Koutn=C3=BD?= To: cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , Frederic Weisbecker Subject: [PATCH 1/9] sched: Convert CONFIG_RT_GROUP_SCHED macros to code conditions Date: Mon, 10 Feb 2025 16:12:31 +0100 Message-ID: <20250210151239.50055-2-mkoutny@suse.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250210151239.50055-1-mkoutny@suse.com> References: <20250210151239.50055-1-mkoutny@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Convert the blocks guarded by macros to regular code so that the RT group code gets more compile validation. Reasoning is in Documentation/process/coding-style.rst 21) Conditional Compilation. With that, no functional change is expected. Signed-off-by: Michal Koutn=C3=BD --- kernel/sched/rt.c | 10 ++++------ kernel/sched/syscalls.c | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c index 4b8e33c615b12..3116745be304b 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c @@ -1068,13 +1068,12 @@ inc_rt_prio_smp(struct rt_rq *rt_rq, int prio, int = prev_prio) { struct rq *rq =3D rq_of_rt_rq(rt_rq); =20 -#ifdef CONFIG_RT_GROUP_SCHED /* * Change rq's cpupri only if rt_rq is the top queue. */ - if (&rq->rt !=3D rt_rq) + if (IS_ENABLED(CONFIG_RT_GROUP_SCHED) && &rq->rt !=3D rt_rq) return; -#endif + if (rq->online && prio < prev_prio) cpupri_set(&rq->rd->cpupri, rq->cpu, prio); } @@ -1084,13 +1083,12 @@ dec_rt_prio_smp(struct rt_rq *rt_rq, int prio, int = prev_prio) { struct rq *rq =3D rq_of_rt_rq(rt_rq); =20 -#ifdef CONFIG_RT_GROUP_SCHED /* * Change rq's cpupri only if rt_rq is the top queue. */ - if (&rq->rt !=3D rt_rq) + if (IS_ENABLED(CONFIG_RT_GROUP_SCHED) && &rq->rt !=3D rt_rq) return; -#endif + if (rq->online && rt_rq->highest_prio.curr !=3D prev_prio) cpupri_set(&rq->rd->cpupri, rq->cpu, rt_rq->highest_prio.curr); } diff --git a/kernel/sched/syscalls.c b/kernel/sched/syscalls.c index 456d339be98fb..8629a87628ebf 100644 --- a/kernel/sched/syscalls.c +++ b/kernel/sched/syscalls.c @@ -640,7 +640,7 @@ int __sched_setscheduler(struct task_struct *p, retval =3D -EPERM; goto unlock; } -#endif +#endif /* CONFIG_RT_GROUP_SCHED */ #ifdef CONFIG_SMP if (dl_bandwidth_enabled() && dl_policy(policy) && !(attr->sched_flags & SCHED_FLAG_SUGOV)) { --=20 2.48.1 From nobody Fri Dec 19 22:05:59 2025 Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) (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 C8E59204873 for ; Mon, 10 Feb 2025 15:12:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739200379; cv=none; b=e8lf1Io4239epEZnTh437IaufWFO9P6snIlqJnzhtF3XZDNZtbiwM2eTiB9AEQ3Ezs43/c6i+EpeYSQLmjCgZwSeu3AjYKA6yQ5hqKLsHjct9h8w+Ka6inbjuQIAzEBT48kuufhT/Zgk1i62kZgOXkF9TaRTepceO1DCUJqcTHo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739200379; c=relaxed/simple; bh=ulHvHm4ifWHwuLhPFEPjoFTZbkUUcsP0tD9oetZXMyo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=EBEt7zdxNMiACpoVIvTrQor6mDlPtWxHIWowN8RUGns1pU22DOgr3qJbgGLrNsBfOOI+teGbCij6FsBWOM9TxF5lMODSCp8OkJDmtfN0Voo2SgkIYurxIAT5VG/debvbGYqRcivO/CQ+Ry5JsWO0tgTEIeIPixXSMl+MR2Vzym8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=McNG672j; arc=none smtp.client-ip=209.85.208.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="McNG672j" Received: by mail-ed1-f53.google.com with SMTP id 4fb4d7f45d1cf-5de84c2f62aso1724714a12.2 for ; Mon, 10 Feb 2025 07:12:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1739200376; x=1739805176; 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=+1XVXoywLqfki7vGasTJjryB1AUnkPOTgHHVt4Rbtn8=; b=McNG672j6sqqp+IGQiZuENkWW6y7g2R68sks8diMZd4Lx3i2VXluYNlXHRoKwt2bZj gcY4xW9aaFk8y358uMqU0yq0KkifjeWr5sHc/TfoGA+6WFhOvDicZQJ57QXixNw3ZAFp pKH3yA4uJ2uiEdsvFiQ8g7eGs0evi2PQM9bEKiJP5WHrqoWGKRjQKjuqfcOnjaeI5W4I gbG+AoXlzaK8DBGvBeq9/RHOXRup8k8ARtyDBiwFvMdiadIPhYaR3lIQzR7W4Lp8X1tU uMSz0YV+V59NnyMVe1iaKapzeTIRoPJYO9Js3BWZRhxmvyxz1B07yCQBrXY7gWtrLJtO 9acA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739200376; x=1739805176; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+1XVXoywLqfki7vGasTJjryB1AUnkPOTgHHVt4Rbtn8=; b=Ma5nfkRev4rjwiCdMHOP0703y8OyHm64UoH21sjY3rgVDLoH+Xo/Rrx23EN7tB7lJQ N5XXrytZZP1PafwMUfno85aco3lVgvUvGvWn9G9vldzgLm+rkIwTSvxxI/QHJqZRPogM +AmfegNSZ9A8LRNYfEpKB4zKQ3BlFa7ybh2P74uMNxkIq7D+WWyQ02zwogjnp7KfQUCo QpgINHy18+pS3oyJ+Ww8BwsB4HE870NpOc0zMMHRtULg/+tz908jhA61uF8KMhTAXLTL u9itb+D+HmxOYYqwePyUUPx4RCEheNE/O99pcNHqq1LtSz5pQ0RSKpEnfH804VoGfX3+ FFpA== X-Forwarded-Encrypted: i=1; AJvYcCV/j94dZtDSLzg9v4s92VxkZp0boHxQVbOdziyhYsx+6XA0k0Z140k4u3UjJQlDmuLQEAjWT7+JvRQkLbA=@vger.kernel.org X-Gm-Message-State: AOJu0YzcKO0ROd87rdSNGsphC/b7QdRqevwVEeOmwkdH7tmrdqetG20o 7V912cj/jaQdeoPXoxRm51FJZ+K9Gm+sK4v3nAtfugo/b8RyssRKqncryV2fu/4= X-Gm-Gg: ASbGncuyTjj8E4CDlfva7nAjSeLayiAhNUOYTjQNU/E8Gb9YLfNniEciNEK7Ye2YlrU knY3G4zj+jHgUGJ1pYaoNttK1hAzUc96FMu7lRJT0V0Oz1Z9H7TCEZ110Gelf47fGbJ9plG6y2S idzRWky/ZLgOY9cXfQzLahCkzLEXyPpWb4DNLgpMi0e5TZsbJOYsxW8pXesp5OKdgileUrGvZ7B VDHbfUxmwpkYT+piyJjusNSQ0eSkUhp7X3FEMYciwFR0gfMumVPv47L08AgRVktR5RrqGTnKkAC kaJknRek+X5vuNHUWw== X-Google-Smtp-Source: AGHT+IHsHQFc3X6Y/WpOuje7/im6oWOB0bQqY28XRbEOckOEoxISoOotX0WPyGhk1EP1KQLT3TLonA== X-Received: by 2002:a17:907:6eac:b0:ab7:d6c:5781 with SMTP id a640c23a62f3a-ab789b1e3bamr1456428866b.24.1739200375951; Mon, 10 Feb 2025 07:12:55 -0800 (PST) Received: from blackdock.suse.cz ([193.86.92.181]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ab773339e82sm895192866b.143.2025.02.10.07.12.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 07:12:55 -0800 (PST) From: =?UTF-8?q?Michal=20Koutn=C3=BD?= To: cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , Frederic Weisbecker Subject: [PATCH 2/9] sched: Remove unneeed macro wrap Date: Mon, 10 Feb 2025 16:12:32 +0100 Message-ID: <20250210151239.50055-3-mkoutny@suse.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250210151239.50055-1-mkoutny@suse.com> References: <20250210151239.50055-1-mkoutny@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable rt_entity_is_task has split definitions based on CONFIG_RT_GROUP_SCHED, therefore we can use it always. No functional change intended. Signed-off-by: Michal Koutn=C3=BD --- kernel/sched/rt.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c index 3116745be304b..17b1fd0bac1d9 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c @@ -1257,11 +1257,9 @@ static void __delist_rt_entity(struct sched_rt_entit= y *rt_se, struct rt_prio_arr 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 =20 return &rt_task_of(rt_se)->stats; } --=20 2.48.1 From nobody Fri Dec 19 22:05:59 2025 Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) (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 7E85E136E21 for ; Mon, 10 Feb 2025 15:12:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739200380; cv=none; b=rf2EIUIJwV/dg4IbWV6NEoThCcyLd2Up143Rzx8nuQgqSikcrwzo72q3nHJ5AWkEYYIPMHPsbLtzvjEZiloP7GETS9QJoK1xfnszbk8VJIBuXeYcLgURtyho5NAXtiGylnEXIUAXfNBf+EXU7IT5SC6qQsvM6FcJaiqBaMFp6dw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739200380; c=relaxed/simple; bh=xj17MFlJulz5p0jdPBcalKowBvoJHFJ9677WrwPHzAk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=JbsMBeJ/f8aDSB9BojKdL64/hg4/34CnVVPm3h8NUk7hkY3WaWgBpSX9MvzyC9yAn9OHHFYRx18eqgRwWdM4xaLBP7aoL99acFJRhRr/8OgL4lHzml2wDq6rby7p+xjuv8MP9JR/fiLkPGHhucbB0wgD0IrwrBdUmmRaOxR3++8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=O+vU7twm; arc=none smtp.client-ip=209.85.218.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="O+vU7twm" Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-aaec111762bso1086855866b.2 for ; Mon, 10 Feb 2025 07:12:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1739200377; x=1739805177; 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=friAMnSjLY0+SGaIxPPMR2wFL3NaVBwarbQhTRSR7xY=; b=O+vU7twmNJ0IUZ6ed++VpYIoENxMTlmNYdzPZ6i0zkQpPir7iFBwyfJIndN3L2H/mb r6B9f6p3CVSi6aCed+h59QxurfNyrT0QoMCI+ksSHI9QzJXz++nIl2QtujYwQVFLHfVb fwWrHpZeclvF2arj/9xIPHR/CLSnvV+qmSD3J4ANjVB2orciGly2HhXmquADDHfrrBQ/ gpExhRX7wRDkt2BDgIXaqLy60afi4vJ5UtnI5M0VG0ylZ/bJXB+e8Hge0PsWo0X3gZSm 1AM63z2zkxGKxx4mFSmCab0qUa7BJoipAmQ5rCjYd2PD8gRVyr/pU9WO+RHW0zlr1KvW Qdtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739200377; x=1739805177; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=friAMnSjLY0+SGaIxPPMR2wFL3NaVBwarbQhTRSR7xY=; b=Y5Uk2kJOentCjfwH8V0aAX/90il4Mx3vte+dDB040M3/QiyQJBxD5hduRJQRH1iaxe GrXnbS3SlNWvvzzig4/2S0gDraReIi168bqzKnx2faBPo+Njs4WQMTHUjwnNnbiVGtVy dBPjQswSS4c1yX9CgkqEhJMoVBI1iOfxBGDJlCbsfmrbavInlCvpdph6KSduhKikO/Si qzgbFMTRGElUhe84Yx9GyQNLda/BjSpWFQOSoOnYYDMIYtDpakzyNeqRRYkXgcZVmn6p EtgQjJwnwI/2YDHJK0Qim8tmCICq9nnVUHjUOOMeaAJRHhOBp1CXvjXCV14OAqdhTmT2 pyjw== X-Forwarded-Encrypted: i=1; AJvYcCUtlb8fU5XfLy9EGjKbzziOcCcVrpOV1nE5wpYYzZHZQPRElXb1vH127l1N7Rge73sEo/dgeBEPdbRAfO8=@vger.kernel.org X-Gm-Message-State: AOJu0YyNXx2TVBMxQ5AWwFT2fAhky/N0daFyl6TOYryFwHkJ8Ya0mGqe 5vTleCVOMtvEJVG2NBFDxkJAqZN4iFcdUR25VtsiqeMPp+MdfBHdujqVs0CMDtE= X-Gm-Gg: ASbGncswHfbNqNyPmVoslYz+j3DQ0FIGw7M+YN88HYtzc1/F1/InWtroLl7L4AZA5dD qtQCToGPMpyjTON5nhcAJhxH/yRyIKwySOyYh4Tkh/bqLjG9pztKTovSWVvrckDpAXeTMvCt/5M 1/MHa8mUPEVR/2TWOds65LABrh4sLSw6M0Zz1jNRKEpUdoWehRS+LaFGQWdZLGJ8ynMV3R0qqB7 dkpHKPlm+rohscRg0ZspbvpzeQ+urf5+wZdcCoa0PlwnSSyOIaW0lyyiizRpdh+c4quOx9cGeLp ov04FM4RwrGK5tDpLQ== X-Google-Smtp-Source: AGHT+IG/vCz02gYL/LIB5SscWC32zJnOpctVQAJXvp5QEx6eAgb2yHXEDLpqT66quaqHwD+vieK5PA== X-Received: by 2002:a17:907:d01:b0:ab6:d59b:614d with SMTP id a640c23a62f3a-ab789b395a1mr1619973666b.23.1739200376665; Mon, 10 Feb 2025 07:12:56 -0800 (PST) Received: from blackdock.suse.cz ([193.86.92.181]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ab773339e82sm895192866b.143.2025.02.10.07.12.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 07:12:56 -0800 (PST) From: =?UTF-8?q?Michal=20Koutn=C3=BD?= To: cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , Frederic Weisbecker Subject: [PATCH 3/9] sched: Always initialize rt_rq's task_group Date: Mon, 10 Feb 2025 16:12:33 +0100 Message-ID: <20250210151239.50055-4-mkoutny@suse.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250210151239.50055-1-mkoutny@suse.com> References: <20250210151239.50055-1-mkoutny@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable rt_rq->tg may be NULL which denotes the root task_group. Store the pointer to root_task_group directly so that callers may use rt_rq->tg homogenously. root_task_group exists always with CONFIG_CGROUPS_SCHED, CONFIG_RT_GROUP_SCHED depends on that. This changes root level rt_rq's default limit from infinity to the value of (originally) global RT throttling. Signed-off-by: Michal Koutn=C3=BD --- kernel/sched/rt.c | 7 ++----- kernel/sched/sched.h | 2 ++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c index 17b1fd0bac1d9..dabb26b438e88 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c @@ -89,6 +89,7 @@ void init_rt_rq(struct rt_rq *rt_rq) rt_rq->rt_throttled =3D 0; rt_rq->rt_runtime =3D 0; raw_spin_lock_init(&rt_rq->rt_runtime_lock); + rt_rq->tg =3D &root_task_group; #endif } =20 @@ -484,9 +485,6 @@ static inline bool rt_task_fits_capacity(struct task_st= ruct *p, int cpu) =20 static inline u64 sched_rt_runtime(struct rt_rq *rt_rq) { - if (!rt_rq->tg) - return RUNTIME_INF; - return rt_rq->rt_runtime; } =20 @@ -1156,8 +1154,7 @@ inc_rt_group(struct sched_rt_entity *rt_se, struct rt= _rq *rt_rq) if (rt_se_boosted(rt_se)) rt_rq->rt_nr_boosted++; =20 - if (rt_rq->tg) - start_rt_bandwidth(&rt_rq->tg->rt_bandwidth); + start_rt_bandwidth(&rt_rq->tg->rt_bandwidth); } =20 static void diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 38e0e323dda26..4453e79ff65a3 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -827,6 +827,8 @@ struct rt_rq { unsigned int rt_nr_boosted; =20 struct rq *rq; +#endif +#ifdef CONFIG_CGROUP_SCHED struct task_group *tg; #endif }; --=20 2.48.1 From nobody Fri Dec 19 22:05:59 2025 Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) (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 09C48223336 for ; Mon, 10 Feb 2025 15:12:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739200381; cv=none; b=eiw0Y/s4eMoDOOKA/zFyOt96UAHgaWiv0621TI+jYnE1py6HIOyYAaIxwI1PK/5U4bgm//2poETzVbBYKUqJxO9YOTv7M2Ac3OLQmPYM2D9yC81/oUaEHZH/hw19hwkBXfa4wck9HbcdRZRg0gK3tLYaiRny7vgZfL6iu3qnwZ8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739200381; c=relaxed/simple; bh=vRXJ9uOsy6Io5CIxOYOD8ydZyDCFHZfM3eEnQt7c5sU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=NtvRomorFEUwLMzpwnYoOJHOpYT5FHwIIFwUgpC4Y9WDDsGt31zu7Jic0JN3CVDIt2jS9uHA4gU71b8jSt20q7zisGDypBxSdnR+TZLvk/h5Sa7Qb336wLbEZTmKvFCgcWrRRGKrLy365m2fBXw3w65YmpcZagA7nWLE8j8FSXs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=bYKGlJch; arc=none smtp.client-ip=209.85.218.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="bYKGlJch" Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-ab7917fc0c2so541222566b.0 for ; Mon, 10 Feb 2025 07:12:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1739200377; x=1739805177; 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=TnS8Fb21gYaFTzUKkHBeeupETZBcyFIfLsl4jvQZsEE=; b=bYKGlJchuQxbwZzqanMcZFVcvoSYvNZhx7pXLjYFSnQ9fIB3Cys/UlwKsardsuKDDz KBNafuxcNfI53PSc/xmz3CUSoHmr3i34r4nwig9KOKEJcBpDFW17rA53O6Aa4LmYRTgX inRPYLTRk5CUztW/onHI1t5E/ERdAr5/ksaAVWKJtdKqSoUH+jqLnnQA4n4ypoJ2uAEG laaDQIb7BBueJNoI/psAhCHNYwY7FpL2u8s1uj3M43wlZr0Aum2DioDiT6bOrbBh0fB7 PbbqKBscR4I14zsKKU84cRz+M8narD8+D7judlSeJmII9E+Aqv3tXpou8Wyg0cRVREb7 GNPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739200377; x=1739805177; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TnS8Fb21gYaFTzUKkHBeeupETZBcyFIfLsl4jvQZsEE=; b=T5JhBQ7rwBD4M9eTNglW5eIGe8gobY6CJeRHdBkEVz3W0CaQI0q6PQqNBejS1vsh1j 7KZiEpknEFeOziiWLqClPgZfRLY1BKnsmnXYl55AeR0JJJV59XCmJc+I6JQ49jPtAiNh wgtMY3kXOaLPs5WxxJdxL+dShLqXy6vC9rvlhynWoAVR2VlVcJ4G21wrdfmxvqrQ7TQG uUsRHnHRUvUWZFV8k0fxFIPnz2BZFPkqDAUSLcQL9PSHRaUsZaJWGjaAISmGvCPNkMIh /Gl6CqqYZ115UQhtGycH8MOv24rjTudmGlaKr3CXQv9nL8nu1OfIabQv10EXGs4IQ6+p MjNg== X-Forwarded-Encrypted: i=1; AJvYcCWtuPW9NGQFEmOQJnWB6TWh09S2xshTh2MTfNzxkLGtVC05Q6lQ/Nr0xWOtuDxPWqkiramzKwEhlolokpU=@vger.kernel.org X-Gm-Message-State: AOJu0YxNiVklMUsXoAWRgqos0mzcEdOYS4MshLy1EaHxipr3o7xg+e6f 9wFLXKoGKSBjD4p7eV7gBh2H7PSGKyt4VY1Z2A5TjcwUHBWqAc75bpdjjpe+BFU= X-Gm-Gg: ASbGnctdcIfGbhzez+tdUdMi9X1cMbGCCAhSsbJCky+H3NHkd+DNeV4M6KKd5LBwy1c 078QPh0oGvOz49O4sUTBWSYVVVd12WiMJ4YmDPOC8tR5iqcRLZm5VxxFBa62Q9bNT6TWzkhBJNQ JfrKOahJi4tI+UmHYo/xNjmLe6sTtINIfMe0CDKIkREHZT898P5kXBBf5yZZX15BnkYlVCeWTxg Hr4FNUF8/v2mM3MMhj03R5vJ3mM6I3RwyByhvJu+CFGHrLfGgzOd2J2fB1UDaHcNgLck0PgFknx Vpvac+u9e2u6JaW42Q== X-Google-Smtp-Source: AGHT+IGeC3y9dgn3AprFzBwU08Se3CqMxXHrvrh5PMSt4mKEXumoIzf4t5zEtY3KhoTWYTvDWPjqSA== X-Received: by 2002:a17:907:94c9:b0:ab7:b356:62e0 with SMTP id a640c23a62f3a-ab7b3566f6amr701123766b.53.1739200377255; Mon, 10 Feb 2025 07:12:57 -0800 (PST) Received: from blackdock.suse.cz ([193.86.92.181]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ab773339e82sm895192866b.143.2025.02.10.07.12.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 07:12:57 -0800 (PST) From: =?UTF-8?q?Michal=20Koutn=C3=BD?= To: cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , Frederic Weisbecker Subject: [PATCH 4/9] sched: Add commadline option for RT_GROUP_SCHED toggling Date: Mon, 10 Feb 2025 16:12:34 +0100 Message-ID: <20250210151239.50055-5-mkoutny@suse.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250210151239.50055-1-mkoutny@suse.com> References: <20250210151239.50055-1-mkoutny@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Only simple implementation with a static key wrapper, it will be wired in later. Signed-off-by: Michal Koutn=C3=BD --- .../admin-guide/kernel-parameters.txt | 5 ++++ init/Kconfig | 11 ++++++++ kernel/sched/core.c | 25 +++++++++++++++++++ kernel/sched/sched.h | 17 +++++++++++++ 4 files changed, 58 insertions(+) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentatio= n/admin-guide/kernel-parameters.txt index fb8752b42ec85..6f734c57e6ce2 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -6235,6 +6235,11 @@ Memory area to be used by remote processor image, managed by CMA. =20 + rt_group_sched=3D [KNL] Enable or disable SCHED_RR/FIFO group scheduling + when CONFIG_RT_GROUP_SCHED=3Dy. Defaults to + !CONFIG_RT_GROUP_SCHED_DEFAULT_DISABLED. + Format: + rw [KNL] Mount root device read-write on boot =20 S [KNL] Run init in single mode diff --git a/init/Kconfig b/init/Kconfig index 4dbc059d2de5c..5461e232d325a 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1079,6 +1079,17 @@ config RT_GROUP_SCHED realtime bandwidth for them. See Documentation/scheduler/sched-rt-group.rst for more information. =20 +config RT_GROUP_SCHED_DEFAULT_DISABLED + bool "Require boot parameter to enable group scheduling for SCHED_RR/FIFO" + depends on RT_GROUP_SCHED + default n + help + When set, the RT group scheduling is disabled by default. The option + is in inverted form so that mere RT_GROUP_SCHED enables the group + scheduling. + + Say N if unsure. + config EXT_GROUP_SCHED bool depends on SCHED_CLASS_EXT && CGROUP_SCHED diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 165c90ba64ea9..e6e072e618a00 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -9852,6 +9852,31 @@ static struct cftype cpu_legacy_files[] =3D { { } /* Terminate */ }; =20 +#ifdef CONFIG_RT_GROUP_SCHED +# ifdef CONFIG_RT_GROUP_SCHED_DEFAULT_DISABLED +DEFINE_STATIC_KEY_FALSE(rt_group_sched); +# else +DEFINE_STATIC_KEY_TRUE(rt_group_sched); +# endif + +static int __init setup_rt_group_sched(char *str) +{ + long val; + + if (kstrtol(str, 0, &val) || val < 0 || val > 1) { + pr_warn("Unable to set rt_group_sched\n"); + return 1; + } + if (val) + static_branch_enable(&rt_group_sched); + else + static_branch_disable(&rt_group_sched); + + return 1; +} +__setup("rt_group_sched=3D", setup_rt_group_sched); +#endif /* CONFIG_RT_GROUP_SCHED */ + static int cpu_extra_stat_show(struct seq_file *sf, struct cgroup_subsys_state *css) { diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 4453e79ff65a3..e4f6c0b1a3163 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -1508,6 +1508,23 @@ static inline bool sched_group_cookie_match(struct r= q *rq, } =20 #endif /* !CONFIG_SCHED_CORE */ +#ifdef CONFIG_RT_GROUP_SCHED +# ifdef CONFIG_RT_GROUP_SCHED_DEFAULT_DISABLED +DECLARE_STATIC_KEY_FALSE(rt_group_sched); +static inline bool rt_group_sched_enabled(void) +{ + return static_branch_unlikely(&rt_group_sched); +} +# else +DECLARE_STATIC_KEY_TRUE(rt_group_sched); +static inline bool rt_group_sched_enabled(void) +{ + return static_branch_likely(&rt_group_sched); +} +# endif /* CONFIG_RT_GROUP_SCHED_DEFAULT_DISABLED */ +#else +# define rt_group_sched_enabled() false +#endif /* CONFIG_RT_GROUP_SCHED */ =20 static inline void lockdep_assert_rq_held(struct rq *rq) { --=20 2.48.1 From nobody Fri Dec 19 22:05:59 2025 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (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 BA77822DFAD for ; Mon, 10 Feb 2025 15:12:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739200381; cv=none; b=Qt57oVpiqUJLVYbEUjf8X9823JvneqBiccQrQ2x7wdbaoiCmGYZPPjygvyWOJD1uXQ/XX78ME0pPNsf0FizwHhpfJWcyFS9ta5HHzMny1b8RrLxFRyxS7wvC7vXI3JNADRC+HYKOETj5wufy8kqv3jwg9B2gVGoHe3N1fTqupGw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739200381; c=relaxed/simple; bh=eqp+p20wQUC3G9kX8x2gTPBWxovLGLvK0huXE5jYVqM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Ii2hhpppKnZz+S5cp5aGI+eDTr24zcY5Gw2eqHrrvLB7l7XNpUGHg0nloahbX/hhgqH6g8oitbUfVLiT+rjhAslB0BfJ7B1+M9sC/7fWxvfJU9vmi7YQoMyH8sPY2mG7MfKX+CnDYU+dV6JHKb2BulGRhANBzlQap8PPDXM5zrk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=MLzUWYYw; arc=none smtp.client-ip=209.85.128.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="MLzUWYYw" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-43932b9b09aso21293605e9.3 for ; Mon, 10 Feb 2025 07:12:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1739200378; x=1739805178; 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=G8u7m4f90z4ywcN2Oo3EiIsdxXzNCHdgpNAW3hDLWX8=; b=MLzUWYYwer6TUCXHogcUEo64m499yH7Ze3mqmDIdvopWpBo/c4V7pA109mZ3CijnUT 2HCXdHENai4xpC54x1RN9+z4mBDwI6Ym9N6iD/hsgnfFqZ1rv/50sQRQdwrfW1WpQFj2 kjYnwWDzgEq5u/Ti5hxQgJmlCh4P6QYEb70kO+gQasesJ2U++WHrfdeAJAZ6M3V1AgP4 90VlE4OP9AtMeBEZuXp27+/JmI8tf3X7sn5bey6caUATNW7EJ4b3FLvB1KabeEIavCro 07J7/W0ZzBuUrUTu8jd1V5y1fp1F0MOePicrVXOl140vj9YH7XK7jxiW78TpNvv2ZkR+ 6UUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739200378; x=1739805178; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=G8u7m4f90z4ywcN2Oo3EiIsdxXzNCHdgpNAW3hDLWX8=; b=bRWQH80ZwVWJeJpRP+GFfeBGCO90PMPdMZDYTAZKjA01YzS/fQKhXOOclgRBvcpui+ tWADeqDbK9ruj0B2+IskSu4yV+G3NhPhFzYYc1cH/BjXO3sE42fXBD2aaMtkqP0jbD6G cw3ULdTHNgr2G/QVDBFOV4T7vv3YJZUFy8VKSCnBkMJt5bOzQmm1OHVabFjHIvNGGkE8 XDpoa+iihJUUibK/5wni6PZUhhN8hBiiHiu1rXZVfM8Lr6B3OxvbkP1WQEzxwHKepBFM bXydVUDM8u7hjYPujG4EsXh6cq9jm+n2JmSTbVfgsSsCyqUFrGvHYRTl3rTNrVD6KrZ+ WaSA== X-Forwarded-Encrypted: i=1; AJvYcCXTApv1uIDw6EuDnbIcTu5II+T8dPjFUNrc61wtH5KZDAw1VW7BLCBUdsufiCHW/U3mytr/LKzGa+V9Oi0=@vger.kernel.org X-Gm-Message-State: AOJu0YzFafdaiFtywrptWBeOtSHhLECjmzQ6H/MT9GSVD4zmhrsCNSmj oO3bIWT5vkjOkjjxJArcf+VkHexqqpkIm5MSMY8zO4Hel05Tz4ZFkjtnpXuOVyA= X-Gm-Gg: ASbGnctrEJgDewI1qF2mfLdZuOPNWtL3lYmg8WfBX3Q1aSITZXXm6w6bc52rZjVIs2b v4A1b2xIcWoL7LpY46zfdv/zBlGDJtXnWhHGnnS9N5rSQcw9T5T/hIwqH7nX1ENwGetWBbcewhS OhCmkngfZdP59Rm2RwPBJeiDY+HUYt8UDc18AT5Ooiz6XrrIyge4/irNCMJZbHE9Qga8O22ucPi iSNk8HpTRLKm1jNc7vBzXVq+FO4p26h9kv/5WKg8vRPapVSVUolSHzIqyuVC68+C+HKtCwzEUpH TSwbJ3mjq+nnSpiJYA== X-Google-Smtp-Source: AGHT+IEge08iLsF1RRQW3k1u5tD9yIP/8sgYpac4yAMXvhMo/XohY8zQN34d83VvEo4HX5DSd15g2g== X-Received: by 2002:a5d:64a6:0:b0:38d:de38:746d with SMTP id ffacd0b85a97d-38dde387647mr4442150f8f.47.1739200378025; Mon, 10 Feb 2025 07:12:58 -0800 (PST) Received: from blackdock.suse.cz ([193.86.92.181]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ab773339e82sm895192866b.143.2025.02.10.07.12.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 07:12:57 -0800 (PST) From: =?UTF-8?q?Michal=20Koutn=C3=BD?= To: cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , Frederic Weisbecker Subject: [PATCH 5/9] sched: Skip non-root task_groups with disabled RT_GROUP_SCHED Date: Mon, 10 Feb 2025 16:12:35 +0100 Message-ID: <20250210151239.50055-6-mkoutny@suse.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250210151239.50055-1-mkoutny@suse.com> References: <20250210151239.50055-1-mkoutny@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable First, we want to prevent placement of RT tasks on non-root rt_rqs which we achieve in the task migration code that'd fall back to root_task_group's rt_rq. Second, we want to work with only root_task_group's rt_rq when iterating all "real" rt_rqs when RT_GROUP is disabled. To achieve this we keep root_task_group as the first one on the task_groups and break out quickly. Signed-off-by: Michal Koutn=C3=BD --- kernel/sched/core.c | 2 +- kernel/sched/rt.c | 9 ++++++--- kernel/sched/sched.h | 7 +++++++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index e6e072e618a00..5b67b4704a5ed 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -8966,7 +8966,7 @@ void sched_online_group(struct task_group *tg, struct= task_group *parent) unsigned long flags; =20 spin_lock_irqsave(&task_group_lock, flags); - list_add_rcu(&tg->list, &task_groups); + list_add_tail_rcu(&tg->list, &task_groups); =20 /* Root should already exist: */ WARN_ON(!parent); diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c index dabb26b438e88..a427c3f560b71 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c @@ -497,6 +497,9 @@ typedef struct task_group *rt_rq_iter_t; =20 static inline struct task_group *next_task_group(struct task_group *tg) { + if (!rt_group_sched_enabled()) + return NULL; + do { tg =3D list_entry_rcu(tg->list.next, typeof(struct task_group), list); @@ -509,9 +512,9 @@ static inline struct task_group *next_task_group(struct= task_group *tg) } =20 #define for_each_rt_rq(rt_rq, iter, rq) \ - for (iter =3D container_of(&task_groups, typeof(*iter), list); \ - (iter =3D next_task_group(iter)) && \ - (rt_rq =3D iter->rt_rq[cpu_of(rq)]);) + for (iter =3D &root_task_group; \ + iter && (rt_rq =3D iter->rt_rq[cpu_of(rq)]); \ + iter =3D next_task_group(iter)) =20 #define for_each_sched_rt_entity(rt_se) \ for (; rt_se; rt_se =3D rt_se->parent) diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index e4f6c0b1a3163..4548048dbcb8f 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -2187,6 +2187,13 @@ static inline void set_task_rq(struct task_struct *p= , unsigned int cpu) #endif =20 #ifdef CONFIG_RT_GROUP_SCHED + /* + * p->rt.rt_rq is NULL initially and it is easier to assign + * root_task_group's rt_rq than switching in rt_rq_of_se() + * Clobbers tg(!) + */ + if (!rt_group_sched_enabled()) + tg =3D &root_task_group; p->rt.rt_rq =3D tg->rt_rq[cpu]; p->rt.parent =3D tg->rt_se[cpu]; #endif --=20 2.48.1 From nobody Fri Dec 19 22:05:59 2025 Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) (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 8134B1CA84 for ; Mon, 10 Feb 2025 15:13:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739200383; cv=none; b=Hv1CgA85HtJ8edAZP+Mo+pj05y++uqWmkE3e5yWogax7twKa9rLZ5cgLfwHlTIJuMrdvXh8r3qkJ5UACTjEenIPy1daXknbgAywFGIMWPPGvczcNQROBbfATja9NX7egNHnWu0rk0mFXPASqACs1kxX5sjrpIuxnyMNheHRAbwQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739200383; c=relaxed/simple; bh=NEXQa8SMxoUZIhEM2LZtR5hPu3GN/muNBmbxrg6/Pks=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=PhJmYoxvKK05uCZN2ols/tNsxQp1V6SPZ4ByokAwMOqMKFstZHFG4nvSV2eiV00/OMbwDaPJOPM7QDakjfd+x4Y4wSr4tKxzB5c3E6oY/j9vt+1slek4TREjdAsNLWMNH/a26MXsyxxkC8/GdQtVyY99+KHWkbwa1dBp/QxBkgo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=XR/xLSMG; arc=none smtp.client-ip=209.85.218.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="XR/xLSMG" Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-aaec111762bso1086868066b.2 for ; Mon, 10 Feb 2025 07:13:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1739200379; x=1739805179; 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=HcDctnJZ8SS/Sh/C+IjYe92Zf0/KDo0yTr6Uc7WvnrA=; b=XR/xLSMGiZHIg/MK+pj/LhzN6/y515tyAMHM3+D99T5oQdWbivvYEyT8cZ3HEY5mKl 6CGIQkxK9Uo+31Kg253/noB3nuTf5O+8nLTZ2KDwQN1DQIVB0xF1A9T4JxTI11BQ0AsG TjO/jB7bOPkAvEqIeVE9nlDsXhpIYDpEeVQEuL8YZcOVd/9bwtPilYUV13K1q5R7bOAq laLQHW0Gv/R1tlvyJ6ZPhRRm5tr2bz5oG11Kdy7dPIvSYGzTclqKKgaiwYpBPPSsBu6P j6BMJDGRNvKYDypUOxAjGkgT1CTBa5qJK4YwMeYzZ79u1hG/bc7wfkMk1q33qtclfSub aP5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739200379; x=1739805179; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HcDctnJZ8SS/Sh/C+IjYe92Zf0/KDo0yTr6Uc7WvnrA=; b=GmEqgrSftu/br/GS5evPibfFVLs+qdpUsLkXgi7Y7pthWcVqAPVbwHqDsY5jltFZPh +20V2VkgndSApUtCFzDSNs6YscAxxr9TyasmRCr0/KK10oz7UWRmrcBH2Cpu0JP3XWMk CNK9VpZ/2LLYIkme5p9d2dOGzYqwX0eCY+kEVrSzJ06WINYh1ctDeB+NxuD3iHSH2nVb tQoMgTJZi0PP97Offi9Q2I7Ex0+WY4BYDh9v7un/SjI6xog87ZJQi1jQqUZJphbyMqcj jiSKmmr8OZsYNDrES1BADoa+jTli+fZrDQnTRhLiA3KIknn2a99KVWLZPHCRU2HIsTCP k+hA== X-Forwarded-Encrypted: i=1; AJvYcCVwlgavf7H/tRzcxYGvzlBmGQ6MAaXvKscF/nUVmmSyhqq6cwMbgrItRx766w7OcLX+sJPiKbCh3/4yfuU=@vger.kernel.org X-Gm-Message-State: AOJu0Yyz0eeQoQVn9md3UVLY3zvm0KxJGoM1vQ2EUwJfs4AwtbWsiDeM cztz2KRUzFOK/6picuonVXPeTIC0s7vqgq5uq78wzUUDyGIGcxrZJjSc5+Ol+5I= X-Gm-Gg: ASbGncuT0y+F3emoyzPoWNnTY8xs166YFGg+qYffXgMcyOwy7p3lclsu6v3hVliRkrR ykp1yz06hsSa1Rz89eLAMjbpojSureVwIzf63CqK5+4cgnvyqqW/V4D2rbP/Oc6zI1EJ1CW00j/ 17KFOey44hTlozrQdxZ37wPHV4DmNJ4/hYKS29IKBj9svhIXLasGQ4Z665dgnhbNdoWMuc+ei2s 6g1IC5Hu1HkiedhjVokw1xgLY7oX3Bs18lpGB88cUiDYGAo4NLrk02vkaM2FTaJ/QyEbwTR0KSh +HeSLJ822akXd3xhqg== X-Google-Smtp-Source: AGHT+IHquCmS/Ws+N8ETp6qk1W23JXufqv87KorQqO19dV0bfSzpED9DtUd1td8zYliKuvNKqQEfZw== X-Received: by 2002:a17:906:110c:b0:ab7:c3c9:2ab1 with SMTP id a640c23a62f3a-ab7c3c92cd1mr379092866b.50.1739200378588; Mon, 10 Feb 2025 07:12:58 -0800 (PST) Received: from blackdock.suse.cz ([193.86.92.181]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ab773339e82sm895192866b.143.2025.02.10.07.12.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 07:12:58 -0800 (PST) From: =?UTF-8?q?Michal=20Koutn=C3=BD?= To: cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , Frederic Weisbecker Subject: [PATCH 6/9] sched: Bypass bandwitdh checks with runtime disabled RT_GROUP_SCHED Date: Mon, 10 Feb 2025 16:12:36 +0100 Message-ID: <20250210151239.50055-7-mkoutny@suse.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250210151239.50055-1-mkoutny@suse.com> References: <20250210151239.50055-1-mkoutny@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable When RT_GROUPs are compiled but not exposed, their bandwidth cannot be configured (and it is not initialized for non-root task_groups neither). Therefore bypass any checks of task vs task_group bandwidth. This will achieve behavior very similar to setups that have !CONFIG_RT_GROUP_SCHED and attach cpu controller to cgroup v2 hierarchy. (On a related note, this may allow having RT tasks with CONFIG_RT_GROUP_SCHED and cgroup v2 hierarchy.) Signed-off-by: Michal Koutn=C3=BD --- kernel/sched/core.c | 6 +++++- kernel/sched/rt.c | 2 +- kernel/sched/syscalls.c | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 5b67b4704a5ed..a418e7bc6a123 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -9166,11 +9166,15 @@ static int cpu_cgroup_can_attach(struct cgroup_task= set *tset) struct task_struct *task; struct cgroup_subsys_state *css; =20 + if (!rt_group_sched_enabled()) + goto scx_check; + cgroup_taskset_for_each(task, css, tset) { if (!sched_rt_can_attach(css_tg(css), task)) return -EINVAL; } -#endif +scx_check: +#endif /* CONFIG_RT_GROUP_SCHED */ return scx_cgroup_can_attach(tset); } =20 diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c index a427c3f560b71..f25fe2862a7df 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c @@ -2866,7 +2866,7 @@ static int sched_rt_global_constraints(void) int sched_rt_can_attach(struct task_group *tg, struct task_struct *tsk) { /* Don't accept real-time tasks when there is no way for them to run */ - if (rt_task(tsk) && tg->rt_bandwidth.rt_runtime =3D=3D 0) + if (rt_group_sched_enabled() && rt_task(tsk) && tg->rt_bandwidth.rt_runti= me =3D=3D 0) return 0; =20 return 1; diff --git a/kernel/sched/syscalls.c b/kernel/sched/syscalls.c index 8629a87628ebf..7b1689af9ff1e 100644 --- a/kernel/sched/syscalls.c +++ b/kernel/sched/syscalls.c @@ -634,7 +634,8 @@ int __sched_setscheduler(struct task_struct *p, * Do not allow real-time tasks into groups that have no runtime * assigned. */ - if (rt_bandwidth_enabled() && rt_policy(policy) && + if (rt_group_sched_enabled() && + rt_bandwidth_enabled() && rt_policy(policy) && task_group(p)->rt_bandwidth.rt_runtime =3D=3D 0 && !task_group_is_autogroup(task_group(p))) { retval =3D -EPERM; --=20 2.48.1 From nobody Fri Dec 19 22:05:59 2025 Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.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 EEF73236447 for ; Mon, 10 Feb 2025 15:13:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739200383; cv=none; b=WBlkbPF4mJDJasXrj1AYJ0/rQFptO+zAQwDf0IfYv7bVpJ3/OTAzsANL5xiXlnxE7IvcVmZoeVIWDB4uR+5UliNbrtTXWPetMRnP4LOKi1UvSak3GI31/co5aeFw3OZPTJHWSFsWEpSCfBgqxX6RGE8Dhbh841JJUcq0DtQWHJ4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739200383; c=relaxed/simple; bh=e1GtMQHyXqLttzeCe+LsTrtmYMYgOJr+zxNK5BFPZ+Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=aZdcmZas/fJdBluj7PhY61FEQUzO14PLfj+V87d6yCfKmMV4G/RTuGKcbt91mEW+ek71TaYNpoH+bCwIOf0viA0oxmsa6IzUBEjPwPrIYuyfe0eajhZ1vSsB1a2/WtCES/mlBTZEaFjGZx+NebyX6TZMqPJdP4jlC+3etd3gfW4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=JhQanq6C; arc=none smtp.client-ip=209.85.218.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="JhQanq6C" Received: by mail-ej1-f42.google.com with SMTP id a640c23a62f3a-ab7d601bda0so39502366b.2 for ; Mon, 10 Feb 2025 07:13:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1739200379; x=1739805179; 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=/CdFzOQJ6hH6QUOgKxio0cWYoQzFtWX3s2A4l5iJzf4=; b=JhQanq6CRa2EtQcyBxaCpgZ2DLlBaqsGzPhZe5P53it/db8YkCM0GHQAoPAjD8ckTu ChBQ/1L47cUHRWvkaIYMzRfNDgtAwY/GDD7b7ZAmbiCaclMK6yeiEVq5lQ3ec8SQpPCQ yEQPXq740/3U0wPx6O2+0xx5SDsGZhDfWkHOyH02vRe5lDygKj0uk6n2fSs29JSjYCmz IV2rTj3O/rL9y3tIu+tdz1S3h56tQ2FPuYu4kFn2bDx2CdqNPgfJVNlowE0KmY+cTFr+ v5kNXFLbBgCNZJs0TLBbRYfkKhIrWZ/jC04LLXQGTlYGm0B0/KYKahOG+4FP/40t9bqm F/jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739200379; x=1739805179; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/CdFzOQJ6hH6QUOgKxio0cWYoQzFtWX3s2A4l5iJzf4=; b=cdUxjkjZLxZA92sLBC7i58EF7arSOYAvHnh8h11euvg5k9kO4mJHdgmHY+yDhEe3vp DpPSQj51u4GzjQwynV/F99rgxaj6aK3X+LolE4Nnp5yUlqH9aK2L+ztesMe57DwhKChE Ymb1fF0WvKueWsDfJKyoCe55Sqab00eeBI8AX8WhUKK5pShVKhmxHjdAaxbV3qajjUKf bNsWtEPFTO3uiw7rYaW9oGKGQq5ze5QaTGcvLg21RG5VD6SSADZcQ1CHa4xjeAFe7bCw DfDbNPZ2v1+weRaqzy8g1RHBybzhKCghH7q8Uqpbbk/dC4P+VGa/8jDfJECVaVl/ohLk PPag== X-Forwarded-Encrypted: i=1; AJvYcCWFjRrstc7FEm8lbQBH165quGdcx+u3fV0HR1UceEpVrjhBjZabJPZLI4TDrKEHrvbDN2evjvAO9OOB6Xw=@vger.kernel.org X-Gm-Message-State: AOJu0Yxvqp1CkFweDvwyCaSCf/a2A1oEAGjJkKKBOOOCOSmpi1dgPAVz AbuRXO71/HVp5jkbRJcZNLTFjE+/OE5KVifPMWZ/W3qOS1amVa1PhixKanZXS04= X-Gm-Gg: ASbGncstXozysUNcGcEkyfbieqD3DTgAH+5HuQ75BYUj3EDcjZ5OJqDkLi0enB8Sz4D MXTd08zt1Cf7UYTvBjwSDq/+W8Vo9na2ULSSk28zxCRF5/lIQucEb2+G44RAbhUymT6Ym8c6sol FQpzaJLP8wZbz+vaKbEefqKmkq8Q6CLcIbtLvc632qhcEvTCEVPdvL0AVatK6KEu0o8WBJr3Tiq hQJnmOCm+VvoCpYyQKx+oOoj+xbvEYIwOIBmB9Kr7mp08G1DtTSt4QwrkxpcoTEWKXjCAwK7wJK Yl+9lIfy0Ru7XwiKTA== X-Google-Smtp-Source: AGHT+IH/BV7V8vs1uXFvIC4uN9ZnTMvJSeRLysfZRy4ypVIbXT1Ov45yrEhapv3A6zivAa4othcS2Q== X-Received: by 2002:a17:907:6d12:b0:ab7:cd83:98c4 with SMTP id a640c23a62f3a-ab7cd839b76mr268690466b.50.1739200379226; Mon, 10 Feb 2025 07:12:59 -0800 (PST) Received: from blackdock.suse.cz ([193.86.92.181]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ab773339e82sm895192866b.143.2025.02.10.07.12.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 07:12:59 -0800 (PST) From: =?UTF-8?q?Michal=20Koutn=C3=BD?= To: cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , Frederic Weisbecker Subject: [PATCH 7/9] sched: Do not construct nor expose RT_GROUP_SCHED structures if disabled Date: Mon, 10 Feb 2025 16:12:37 +0100 Message-ID: <20250210151239.50055-8-mkoutny@suse.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250210151239.50055-1-mkoutny@suse.com> References: <20250210151239.50055-1-mkoutny@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Thanks to kernel cmdline being available early, before any cgroup hierarchy exists, we can achieve the RT_GROUP_SCHED boottime disabling goal by simply skipping any creation (and destruction) of RT_GROUP data and its exposure via RT attributes. We can do this thanks to previously placed runtime guards that would redirect all operations to root_task_group's data when RT_GROUP_SCHED disabled. Signed-off-by: Michal Koutn=C3=BD --- kernel/sched/core.c | 36 ++++++++++++++++++++++++------------ kernel/sched/rt.c | 9 +++++++++ 2 files changed, 33 insertions(+), 12 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index a418e7bc6a123..4b2d9ec0c1f23 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -9827,18 +9827,6 @@ static struct cftype cpu_legacy_files[] =3D { .seq_show =3D cpu_cfs_local_stat_show, }, #endif -#ifdef CONFIG_RT_GROUP_SCHED - { - .name =3D "rt_runtime_us", - .read_s64 =3D cpu_rt_runtime_read, - .write_s64 =3D cpu_rt_runtime_write, - }, - { - .name =3D "rt_period_us", - .read_u64 =3D cpu_rt_period_read_uint, - .write_u64 =3D cpu_rt_period_write_uint, - }, -#endif #ifdef CONFIG_UCLAMP_TASK_GROUP { .name =3D "uclamp.min", @@ -9857,6 +9845,20 @@ static struct cftype cpu_legacy_files[] =3D { }; =20 #ifdef CONFIG_RT_GROUP_SCHED +static struct cftype rt_group_files[] =3D { + { + .name =3D "rt_runtime_us", + .read_s64 =3D cpu_rt_runtime_read, + .write_s64 =3D cpu_rt_runtime_write, + }, + { + .name =3D "rt_period_us", + .read_u64 =3D cpu_rt_period_read_uint, + .write_u64 =3D cpu_rt_period_write_uint, + }, + { } /* Terminate */ +}; + # ifdef CONFIG_RT_GROUP_SCHED_DEFAULT_DISABLED DEFINE_STATIC_KEY_FALSE(rt_group_sched); # else @@ -9879,6 +9881,16 @@ static int __init setup_rt_group_sched(char *str) return 1; } __setup("rt_group_sched=3D", setup_rt_group_sched); + +static int __init cpu_rt_group_init(void) +{ + if (!rt_group_sched_enabled()) + return 0; + + WARN_ON(cgroup_add_legacy_cftypes(&cpu_cgrp_subsys, rt_group_files)); + return 0; +} +subsys_initcall(cpu_rt_group_init); #endif /* CONFIG_RT_GROUP_SCHED */ =20 static int cpu_extra_stat_show(struct seq_file *sf, diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c index f25fe2862a7df..1633b49b2ce26 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c @@ -195,6 +195,9 @@ static inline struct rq *rq_of_rt_se(struct sched_rt_en= tity *rt_se) =20 void unregister_rt_sched_group(struct task_group *tg) { + if (!rt_group_sched_enabled()) + return; + if (tg->rt_se) destroy_rt_bandwidth(&tg->rt_bandwidth); } @@ -203,6 +206,9 @@ void free_rt_sched_group(struct task_group *tg) { int i; =20 + if (!rt_group_sched_enabled()) + return; + for_each_possible_cpu(i) { if (tg->rt_rq) kfree(tg->rt_rq[i]); @@ -247,6 +253,9 @@ int alloc_rt_sched_group(struct task_group *tg, struct = task_group *parent) struct sched_rt_entity *rt_se; int i; =20 + if (!rt_group_sched_enabled()) + return 1; + tg->rt_rq =3D kcalloc(nr_cpu_ids, sizeof(rt_rq), GFP_KERNEL); if (!tg->rt_rq) goto err; --=20 2.48.1 From nobody Fri Dec 19 22:05:59 2025 Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) (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 8DEBE23C387 for ; Mon, 10 Feb 2025 15:13:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739200383; cv=none; b=RDhkz+tY0vPjJfzNDqUDh5cEs0IgNQBWQGfOq0YpBe+PiO4vKM13ij5Ann5O5r+B6ODpt9PVf56SAiOP9pxvzLDep/30ftiqYEegILPbNgXAayiLh3m41zncbnVxb87tKAnJn/b1tzG8ANSZ0sg7wo8jm24nrRoPZJ69tmV/IMk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739200383; c=relaxed/simple; bh=pi9xguxgmi8jgveuQ3APRb4E+MjxkvqvRH3D05xwEJo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=U9skMaBI//V6MlBTDB1VXrkH3Z15ZVvtna7FurFqRPdQ5X7MKHcePLVWqykXDL6eqGX53OikkmtrSisHFEzLg5gHnyhEGTUUovgSheMA9j7R/aSkyyKgfTYbxgwgX8Aw3wQaOmzUrq2PI2QHWvh/APDUZ4brvtLuzYvpJUYXBlQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=OFy4zNEF; arc=none smtp.client-ip=209.85.218.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="OFy4zNEF" Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-ab7a342ef4eso431405566b.0 for ; Mon, 10 Feb 2025 07:13:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1739200380; x=1739805180; 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=tsKAVR4VpZ3o1CX3CIQeDuMn525H6M2KaGLkBcm6fQw=; b=OFy4zNEFZ6VIRIJ2HT3Qijood/Mh9pogOcbwjJKnLdIyFOYNbgJVnmrUuNYS2k0elb 4RzZ9ADZBjfxcQ5EN4yi5BbAtAk5QNjkaDwuXYFF+HL+wBWSgICbq+fnoCWA3Bn8Xx/I jl3Vb0pX8TefGc2Zwb/wrtuD9MLJ5jPCO8WIG8WrF3i6J7iPcMyFFl0csJHC3052DtYh kJvdaCh32IGDwtCgu6d58YoDF62eZFn6UPKtgM4SN2dWRGcxBTjGD2lVXwv8bUPHdfoZ 22jJS1hkO6MqXJoBx1LHgFKSBQZ/masyvOYEiL/6rIyBhEZeoK82o8t37N0bmKhJSI3Q fTIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739200380; x=1739805180; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tsKAVR4VpZ3o1CX3CIQeDuMn525H6M2KaGLkBcm6fQw=; b=sqgB/LnxFWEtaTCzJre4OQ0J01Y9dxj0+2E3SF8UQ0+3vr2OcF/uiMtqf88qw5u39P pkKoYe76GNMysXM+fS841OzHtqy7WmuYi91URlEJb42k3AAG7vbXovdylh8PlYzCAlA9 Vu1xPUepqyGGTd/nqoDlKZ2sHdhP/r31IB8aroF3EeJtOIssd7/GyGV5IT2QDkRCAmxd c9LZsL5qLQy6Ln6x7AcDvQ4y9gjrt8CamOy2lqvcm3gAA0hdcbRwsxXMcFoh1MflOVn4 QY+s25jJw5UlpWvbxnAdklVByMAhQ3+2X5NGlZyil/C1/2Eh0kE6vdPtIKGXRvO9lHih ekUw== X-Forwarded-Encrypted: i=1; AJvYcCVW9bJSMUfNWA7CWE0o61S4ZA4+AkWPaVQ33Ht2gugTNVbZfA1Oos5IaHt5Mf3X5fcOs/cJfRao7wJJcUQ=@vger.kernel.org X-Gm-Message-State: AOJu0Ywkj0RTfyo+Joe/sbJwi6xzmM0mTZhwxsX86haqa1Kl4jHS0bvP FQEgVMoYpuwVGvUTfgZwXK5YnquqZwHLf6aS47ZvLiT7guZAuL2dBnxyQwsHL8M= X-Gm-Gg: ASbGncsxfvQCGSajdmqC9YQ26m4SNWNhTRzGP/yTDwjiFRBHSZb76XIQtCEWmicjJ3w /RrYaU9k/W7bkEgDmTsWBjVQ40gPrN72vdTJLSzZps5ZIIfDCfCDAhK4ecIMQhxK9BOKpZfvbrT LCPP3Obi/HWj0e9qr8ZkVUJAKW9Z+4zTVLnm4Y9X5ZjFZBREliTEFbDf4vfrUbrAZ3ThlNGi5fx 8nrdA8tJNEaCexr6Plv1+QQey9a8KfhQn9c15si4kaNPS0g/N7I3MZNfa2k3DU9tsBhVZtGcYLo GvBN+IHd1bL/OoxegA== X-Google-Smtp-Source: AGHT+IHT6NnKwYsI6TprB2iMRHM/h1jJUEiVDEKn7peT9uyPdC0s/d7xz0F+2KsYIHFQId6TRqa5Nw== X-Received: by 2002:a17:907:360c:b0:ab7:63fa:e4a8 with SMTP id a640c23a62f3a-ab7897b37ffmr1256700366b.0.1739200379887; Mon, 10 Feb 2025 07:12:59 -0800 (PST) Received: from blackdock.suse.cz ([193.86.92.181]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ab773339e82sm895192866b.143.2025.02.10.07.12.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 07:12:59 -0800 (PST) From: =?UTF-8?q?Michal=20Koutn=C3=BD?= To: cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , Frederic Weisbecker Subject: [PATCH 8/9] sched: Add RT_GROUP WARN checks for non-root task_groups Date: Mon, 10 Feb 2025 16:12:38 +0100 Message-ID: <20250210151239.50055-9-mkoutny@suse.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250210151239.50055-1-mkoutny@suse.com> References: <20250210151239.50055-1-mkoutny@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable With CONFIG_RT_GROUP_SCHED but runtime disabling of RT_GROUPs we expect the existence of the root task_group only and all rt_sched_entity'ies should be queued on root's rt_rq. If we get a non-root RT_GROUP something went wrong. Signed-off-by: Michal Koutn=C3=BD --- kernel/sched/rt.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c index 1633b49b2ce26..d0acfc112d68e 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c @@ -178,11 +178,14 @@ static inline struct task_struct *rt_task_of(struct s= ched_rt_entity *rt_se) =20 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; } =20 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; } =20 @@ -190,6 +193,7 @@ static inline struct rq *rq_of_rt_se(struct sched_rt_en= tity *rt_se) { struct rt_rq *rt_rq =3D rt_se->rt_rq; =20 + WARN_ON(!rt_group_sched_enabled() && rt_rq->tg !=3D &root_task_group); return rt_rq->rq; } =20 @@ -506,8 +510,10 @@ typedef struct task_group *rt_rq_iter_t; =20 static inline struct task_group *next_task_group(struct task_group *tg) { - if (!rt_group_sched_enabled()) + if (!rt_group_sched_enabled()) { + WARN_ON(tg !=3D &root_task_group); return NULL; + } =20 do { tg =3D list_entry_rcu(tg->list.next, @@ -2609,8 +2615,9 @@ static int task_is_throttled_rt(struct task_struct *p= , int cpu) { struct rt_rq *rt_rq; =20 -#ifdef CONFIG_RT_GROUP_SCHED +#ifdef CONFIG_RT_GROUP_SCHED // XXX maybe add task_rt_rq(), see also sched= _rt_period_rt_rq rt_rq =3D task_group(p)->rt_rq[cpu]; + WARN_ON(!rt_group_sched_enabled() && rt_rq->tg !=3D &root_task_group); #else rt_rq =3D &cpu_rq(cpu)->rt; #endif @@ -2720,6 +2727,9 @@ static int tg_rt_schedulable(struct task_group *tg, v= oid *data) tg->rt_bandwidth.rt_runtime && tg_has_rt_tasks(tg)) return -EBUSY; =20 + if (WARN_ON(!rt_group_sched_enabled() && tg !=3D &root_task_group)) + return -EBUSY; + total =3D to_ratio(period, runtime); =20 /* --=20 2.48.1 From nobody Fri Dec 19 22:05:59 2025 Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) (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 764DE23DEAB for ; Mon, 10 Feb 2025 15:13:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739200384; cv=none; b=fHxOTbF8c64vP5FongTcczsVNYcZ/VheZk4Y2P7LtTG9QX9yaUycrv0GFD0+7ggFZlq5SeT3ypd8u2q3GGUdu8jOLrK5c33ARWvFqmoPhHDI29YoSAzg+fQXL9+nQb2Hs17j1YMgHdOAtjVMLgT/n8YEzlWJYeCKHfPeiDAgEEk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739200384; c=relaxed/simple; bh=iqeMyg2aM7rOxUpDWS/hr/9N/tXvFYSx8aHXmJaW8IE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Y/SswWBhC3Px6Npna4C9U/JW8tt9gPTPB9yxS3HErnWy8YPmAcRKeNTFMbvX6Ylvhdxy8+gdfTZ+0hXrZpOV+vMU4vuC3Yy2S1VjIRBjNskxqhvtwgboPY6tL3sw4SSYrE44Eb/9ro4fs/fVW1wggTBvZnO3M/bc7xX8VZUh3B4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=cPI3/4kP; arc=none smtp.client-ip=209.85.218.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="cPI3/4kP" Received: by mail-ej1-f46.google.com with SMTP id a640c23a62f3a-ab7ca64da5dso138241366b.0 for ; Mon, 10 Feb 2025 07:13:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1739200380; x=1739805180; 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=S7MdvLo2eJNuv+SAzqGScNlKUwpiF8b6hAU2gKf+PuM=; b=cPI3/4kPGhCpWqSc5MwGXkQo+kYmiF7kcNbax9523QDkCcMDarEkuOEOptJq7pyOWH OuK/KsbIyUndWq5qzuO5wg+cJ/bqFZmEEahUNQi2VCaDLlCly1dKpq4P8uOGeb8K/D26 INJhc2UiNtVcV8YcYyFbXL30GKHCnk5rK2vzEdHg4JFFN2zP2xIv8aAA6e/kj/fdQFbv mv4M6iVCgKh671IMXB9dJOEJJ5Xy+h8r5rLuVciwfJD1Ht9gRKw6Udv/46tZVew8FqaE fzV8X6fvYN5Keyp7xqiXTsujUpLYuLKQPXw8ADnTdJbD+sNX9euD9uWsZyZLltq97GxZ QB9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739200380; x=1739805180; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=S7MdvLo2eJNuv+SAzqGScNlKUwpiF8b6hAU2gKf+PuM=; b=LZ8FpoY8GNi+dk7mCigp0hjuJN/V9vPm5GVRpb1lUTr3eWOUmQsIRyEMsQG4+Ugkgr 36oZIesvE+ckC6jzPhpbep1Jkg4AxNfikIug4sMb4aJT9DalAGfhhgSrr90W5riv+b76 oHO+h1w9OE4HkTDf9CMVKI6gQGPDwgptnNGs1krt3XM+htBjtOE5Lb5iy5AZNOT8d8nX 9MPB/kdSZJqduIsxjTZfdxpp4cI5monUV4Sse/kHua54BjAoCow+99tt63N5AsM/IZcK Zex5b6kgEGGZ6ido/mxjsPnxhoUMC54pktv6/AcEo+R2pQtHOVLO80PX6GYpO/z9D1KC 2Uvg== X-Forwarded-Encrypted: i=1; AJvYcCUa5SYF712VipxqhSalEFfA7UWE8LCVlRsBp1zRidMPBGoX2bofI8CBOMTLQjrBYL1hGZw32amLN9QkzcA=@vger.kernel.org X-Gm-Message-State: AOJu0Yyhl7qp2SEUsEyEJ7IAPzgMRFZb7wx7AvpWArffrhywBrkb8hGA m63KBr0nd9a26U1/9jweFhyTuq5UoY7Q3dzxVVmljD7fQO1elg+VxenK1djflB13AaoDTzG6juw P X-Gm-Gg: ASbGnct7KorhgMTch6VD3IbSTSp5HzSSrG1SC4A2fLTy1MaAQRnC4y6Y9eSrTBZ2Zag 58Eblgk4W2aL/RKsLQ28wsU9aDRNiCWgk3mirAGAmEieEXukjIBwEM2NuFOjiSNha0xZf7J8Xin CY8HGg5airloCHRS+v5djVp3JeWB2hxlm10Y8GaMfxX+e25Zu5rOTtp1NdnUaAysCcqhhm15m6i ZQHhM8kIhPkeItU+uHDqm6wKh6Dq7x16ve3JXsIl0GpeC+RRIMaUAqjK0lUgdPTMggWWYn71KCZ OiVQ40Bi226OK0KljA== X-Google-Smtp-Source: AGHT+IGk13SlYbxa8hsziKdtSAXkNvItrd13FwoaDhO6Dj5aOXPATenE3duFftBrONekaMv0xj1FKQ== X-Received: by 2002:a17:907:d26:b0:ab7:d34a:8f83 with SMTP id a640c23a62f3a-ab7d34a94a4mr151220666b.17.1739200380472; Mon, 10 Feb 2025 07:13:00 -0800 (PST) Received: from blackdock.suse.cz ([193.86.92.181]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ab773339e82sm895192866b.143.2025.02.10.07.12.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 07:13:00 -0800 (PST) From: =?UTF-8?q?Michal=20Koutn=C3=BD?= To: cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , Frederic Weisbecker Subject: [PATCH 9/9] sched: Add annotations to RT_GROUP_SCHED fields Date: Mon, 10 Feb 2025 16:12:39 +0100 Message-ID: <20250210151239.50055-10-mkoutny@suse.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250210151239.50055-1-mkoutny@suse.com> References: <20250210151239.50055-1-mkoutny@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Update comments to ease RT throttling understanding. Signed-off-by: Michal Koutn=C3=BD --- kernel/sched/sched.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 4548048dbcb8f..51feefef65c66 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -819,17 +819,17 @@ struct rt_rq { =20 #ifdef CONFIG_RT_GROUP_SCHED int rt_throttled; - u64 rt_time; - u64 rt_runtime; + u64 rt_time; /* consumed RT time, goes up in update_curr_rt */ + u64 rt_runtime; /* allotted RT time, "slice" from rt_bandwidth, RT shar= ing/balancing */ /* Nests inside the rq lock: */ raw_spinlock_t rt_runtime_lock; =20 unsigned int rt_nr_boosted; =20 - struct rq *rq; + struct rq *rq; /* this is always top-level rq, cache? */ #endif #ifdef CONFIG_CGROUP_SCHED - struct task_group *tg; + struct task_group *tg; /* this tg has "this" rt_rq on given CPU for runna= ble entities */ #endif }; =20 --=20 2.48.1