From nobody Tue Dec 16 22:00:35 2025 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) (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 F0F37230BE5 for ; Mon, 10 Mar 2025 17:05:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741626304; cv=none; b=UIkSblTEpzWmiuSTv8VtAhABkiLQz6mWEYAnJQkIh0NXJ+xKX0cKb8KFhJty6NfIsAgoy7v0qWb3W3SgwpMK9SN6kjy+VowiL6B1HNJ+loO5QC7M0LfdCPgXFIqBIm+Oa5K+75j07iSujzef+sqB5qYaP+pEuPJq/hBmlPKCmhs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741626304; c=relaxed/simple; bh=+0+OTGy/IlZfe8fbfVCeZWpUYt2alRVziCCdrmZbW30=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=gzkUL0Yjd4ptyz5rr6D5MFtJsotJprOI4PXxKtdd7qeWMFvwIHrNuDVq769INMOW+tgSZ507LQ40vpzYyY6C7TjSRkgsYu3b/elIfatjM5ZhI45ZJKvN2cgdbjWfoqvwV6hAv34zHLcNx2c9lsypIONwv2sXR7DLaqM9NsAgGh8= 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=CGKgbvHD; arc=none smtp.client-ip=209.85.221.48 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="CGKgbvHD" Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-3914aba1ce4so897896f8f.2 for ; Mon, 10 Mar 2025 10:05:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1741626299; x=1742231099; 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=CGKgbvHDLtwNelWlORtqs7heroTZQ3euDihCM9jFyO+FbBQexw27qgwDEjGK43Paem BqSmrIiX3W4TwXqKj1xRuj9rfx7p4j8sTNAY3gmJXQXanbj3mUgJkHnK2RKGPKiX0NMZ PIq6WQ1STC1aObxmTUmbIGvnvnN6YhLTagCb3LEcrS/83F5UsRzZMemqjJFxDJLot+uB YvhANSQdQnp7sWfh03Ttwa7Ak4meoGeTqwtoiMSjewg7wJPBKP/WjR5OJGt2aQHFU9Cl MXd+wKuV4cyxXV7eQzzd8ruGqBZmNNb/w3B6ckMIPYbpGEITGGfBBcCjcQzljjRj4Y/d cfaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741626299; x=1742231099; 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=L1dkLqGM+ho2sN9P0e/NuDjtqZKrVHMMRt5sXKYPZhtrdjVrK5CyS1DHGxRPsS9iar E5vx/JaYyZVK7L2JgwhcPqWAFLpmi8FL0C5vGcDCXkVQoJAUVFnZql0YaHqtDYpgA5Mz MgOsB9SWiC8m3XSmanAgX3FEblJO7MdtCCpRGTIgsHJV+Yv0Fztx0bFdaI7pJdzO96eR NNW5zIVIkLMhmuGsy05aQRyxM+qwnhlEnPlKXadbrkCZhDonmkql32nnr8YJLJpuxedu hU6gNJR37mAft9FOFx8lwntnDIYayDbQg/w5c188yhoewtH6dIVxnPEVfW3AFhndlyFV U+Tw== X-Forwarded-Encrypted: i=1; AJvYcCXPxetzz5T5Fzc/L71Pswy/U/P5+p5hJrL/6zTLKDHHmgFXmCF4tCEwGgsEdnLcqwvhjw/k5eqNuFh8MJY=@vger.kernel.org X-Gm-Message-State: AOJu0YxAx+FGXCECt/xPJue2b3IOdg5YGzijIN+JMiFLUeRgX8eSZCM5 HK9SwImg7sVw+/QAZYoJeQIdpePwvfP6XItwVGnPu4E6GOwzUdWP4Ey7O1iKvCY= X-Gm-Gg: ASbGnct7ign8FQC06S+LgDvZre1fprfyzQfjmRgdC1vTcKNw5Iayjt4Bn1gqhf/64v+ +AoksdHS9oSO4A6pYBglF41b6J/0LAUcnbTI2O7gBDj2MF6m3NxwAUl8NDfUVlYuSXLKipT34Mu tqBAG2eCCTK8zGiTmbreUpml+sQntQb7CeZhULVTGPFLHt2GDV/1AEqvifgnC6sFtteDHDH5f8n kL3g+hrvvjOgLuAZOFh7DlPcxXc2rw0nlj29ba50GUDGWon50YGy3GEihBDk/yupHqyXG5DxKab BOJn1wEsLmDU9NU6X9geFLg9p8BItLJ4/ZrSwz/ZOxPt81I= X-Google-Smtp-Source: AGHT+IGnxbvs9WEx8x5gm1cwMA4+m7u6Ms6T87jBBqilNBg1H0VQGarcoEnIF4+qTK0yxBRtSopgfA== X-Received: by 2002:adf:b35e:0:b0:391:37e0:d40f with SMTP id ffacd0b85a97d-39137e0d59cmr5713195f8f.17.1741626299204; Mon, 10 Mar 2025 10:04:59 -0700 (PDT) Received: from blackdock.suse.cz ([193.86.92.181]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912bfba679sm15302514f8f.8.2025.03.10.10.04.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 10:04:58 -0700 (PDT) From: =?UTF-8?q?Michal=20Koutn=C3=BD?= To: Peter Zijlstra , cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ingo Molnar , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , Frederic Weisbecker , =?UTF-8?q?Michal=20Koutn=C3=BD?= Subject: [PATCH v2 01/10] sched: Convert CONFIG_RT_GROUP_SCHED macros to code conditions Date: Mon, 10 Mar 2025 18:04:33 +0100 Message-ID: <20250310170442.504716-2-mkoutny@suse.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250310170442.504716-1-mkoutny@suse.com> References: <20250310170442.504716-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 Tue Dec 16 22:00:35 2025 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) (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 7A745230BFE for ; Mon, 10 Mar 2025 17:05:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741626304; cv=none; b=fjXAN6NKtX4mbdu1tBapZDYtb164Ga5Saz1KCHXWQWw5N/VQjT6d2NZvn7aOhRGpVMIe81eqIrEoO6YKOBDUPMlvWeq/nrxY/BzIpnia0KScGLq4hDXRVztjjNY/8NTqti/iPBHrr27HVSQyB35sXOq3uJbqg5sz7RYpvCTSaME= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741626304; c=relaxed/simple; bh=ulHvHm4ifWHwuLhPFEPjoFTZbkUUcsP0tD9oetZXMyo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=NEYZW+c1CalYYcOvw19H66pPW44MiflZpMWiWRPnVi8aq9uls2WUWlvbHD2zf4bsdPEoxPDnZE9tB3ufcBUDTdsrS5QEoKdaiNVc7RiZ3TupKMJWry2rF9yFaP2KCJKNbSBkV4eUXj4qm01JqsAL6m+iNFZjr2uoANBWxkDXySQ= 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=d+Pznmcd; arc=none smtp.client-ip=209.85.221.47 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="d+Pznmcd" Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-390f5f48eafso2251850f8f.0 for ; Mon, 10 Mar 2025 10:05:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1741626301; x=1742231101; 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=d+Pznmcdu5P5tPyaVb4IQXu5YGVsjmjlbUUr1WnmCgc3vtb+Cv02A+Gcxs/bC3PRQx T49ZbG5HDQtpErOFgyXQzw+d3IKisFQFvT2R9IjyUwimuwORnmPX02r0/Dry+vadL0gO n0aNh5LQw7jQh6puW9DA085Wi+lWgwerbvffzTX6tjfsEsIF82aeuVCm4Z6lySgGAagf ht6GsZM+8iUCb/6Qq6ibxkoOWsSbrbclJwsGgPsZILq4e5ZwXpxOLLSLzKvZHMXy8BAn vQIvh2dZ0gtdI8fDtJrjIVgbG0PdOXCWwgi8nTKx0hL2gou8udwy8n5hnb39rIoQwBYW SS8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741626301; x=1742231101; 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=pEJ0gYRW1qZ/a4Ca5ciNw5Enjb9V/1By629QIvuYKwBCxzvphsETiSJAkUoJ3iG2eJ c3nJd9h2mAkrnq8lbzB2xxTEX589fROvH0lCxMTLyAbJayrpl9qFfC5k5Qkxbpw+hX1X i3cwUgN+1tfhWDg3RC3c1a8rpOgOz5U2nX+QCb38y67ZzM0pPC9DcwvbHVlDrTe4SJke f3220iM8QOSOEIytdBPNMQBpluM6dcAMG6445Qu8nskJx6Uz82Z7ZlfL7Tg4ZNWHQtdN u6yAHfCcGz8xl/NmpENUGl2Ihj6NEeSOMChFf0FVrRFhU7o0Z7HdFPAnx4kmOo41BlnF PWZg== X-Forwarded-Encrypted: i=1; AJvYcCUxFoow/KfueYLxMEETrRt5Gl7eMkJChkPa0djG1x08T1ur8aQauJx4c62mAmDeYlMPaUxCXetmMS5Z4Dg=@vger.kernel.org X-Gm-Message-State: AOJu0Yx4DmXjAvDpVmimGPMtf7iKYISDvvGu1td49A140d8rzZwatWTf +lg6FHdmW1C5Wpk8UHJ9mV5EId+on+SyrnbI0bbsb6KU57KaGYMpp+m7TSC9aqnk7+XRsib4Z4r VOno= X-Gm-Gg: ASbGnctS0VfGHLj4N+I13F22nlFelT3icGLYVHrhWehGwHpKRQjsPpFqCcgSCxftofO 6jdIusifQqrv+IX7q/uj2LHUcR73umPQl465r8M9xPfUlt4M9Cdn/crA/y+/kZz9y6wS219+6tA rumMFiMXkKVEb35Zw+oPZOs9FoMI86M1a7ovAEnxNf4OIhWAl2QHcxI28Wvv7Gh4PYnetGyreeQ 7IqoaSjNaWfNOkm10yIr3GyKtqmW7TLo2ITVDfuoRGEsQNzokxfbIi//suBDLUXnmO+4ZduVJKr 0vmFOoM/RjlUxyVAELYh9enKBQluJ/8mDcg06mgtEfwHC0w= X-Google-Smtp-Source: AGHT+IHLhYt01Kb6d2mIiq9FHtyIMTPc4IjBIT5jTxdQZOVbxaPzcSdfaEEgUiXUP6+NCd78rpobVw== X-Received: by 2002:a05:6000:186b:b0:391:231b:8e0d with SMTP id ffacd0b85a97d-39132dc5632mr12134770f8f.39.1741626300723; Mon, 10 Mar 2025 10:05:00 -0700 (PDT) Received: from blackdock.suse.cz ([193.86.92.181]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912bfba679sm15302514f8f.8.2025.03.10.10.05.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 10:05:00 -0700 (PDT) From: =?UTF-8?q?Michal=20Koutn=C3=BD?= To: Peter Zijlstra , cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ingo Molnar , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , Frederic Weisbecker , =?UTF-8?q?Michal=20Koutn=C3=BD?= Subject: [PATCH v2 02/10] sched: Remove unneeed macro wrap Date: Mon, 10 Mar 2025 18:04:34 +0100 Message-ID: <20250310170442.504716-3-mkoutny@suse.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250310170442.504716-1-mkoutny@suse.com> References: <20250310170442.504716-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 Tue Dec 16 22:00:35 2025 Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) (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 3F176230D3D for ; Mon, 10 Mar 2025 17:05:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741626305; cv=none; b=WUniHv3ZMY797C1GqyasK4L4yqRxzFwyntBKQdlnuIUTOC4hVDkbA5oWEVa6BLT4D+OyYdDPj/Zt4lnGYAkoEU6LSFlQZ3A+CtTi4S8Napjp7ervdzRdMykDyJR/hW6L0UA6RorzLpKPbtgQhpsgS4KSvwaM8gxSpoPVFp8mT5A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741626305; c=relaxed/simple; bh=xj17MFlJulz5p0jdPBcalKowBvoJHFJ9677WrwPHzAk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=KeQ+AyJWDkda+y4w33I03xqSMNVaE0CosfuFYaY2rfI8w7j2nZ+7wY3SVCuguEfKirQ22gSw3LWbkj99SWyLxczkaEbirAXbaFki4+ZhQhNpumoEoxJKjBERs7AgzwryE7dbmC4SvfrGY04qh9/g9aOZ7iMQxzHBi7uJSp7cs+0= 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=PuJc+E8W; arc=none smtp.client-ip=209.85.221.52 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="PuJc+E8W" Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-39140bd6317so1351189f8f.1 for ; Mon, 10 Mar 2025 10:05:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1741626301; x=1742231101; 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=PuJc+E8WO4yuf+rBRsFIP0kbzTY/NgODnnaCFZ4qAIObzmcLV69aNSeU5HhqbJz5bX ALk2iIbOurCjtiqmIGc2XfRElkZPAY73NhFR52K1OhzVsn5mzuoSMzuDqwWl29xCJ5jI J4b4C04cgxorPSG93n5w3jQFNIKjESM5P9Oh4Z4S9UekCP3nQFLiRMJwDnAQlFacCyGH /rDA6JQ8dLjQ5bXgUGWGPZU7AZ+Dq3DXVRdharTb8SDI1DvAqWt8scu6VCEtpra1b0BK IwpQJmwqjwCc5AMDLTzQDevNE1xzp+Xj9On3EzBy08vAo1KNuta0IHbBr63LmDH1Rf+S f/AA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741626301; x=1742231101; 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=tRl0EGowfFJwOdf1LD5njGcM5aL/q56CNcnVLtLPLgyZMT0XsvkPYT/vwqly3fejWK zPAdaRQO3QnWSu3OACdy2jl0nFVwKf5K8HThFi5YaNx5kmixeqclGYC+Ic50cqZZwtrG ApurewE7G6At3fJ+FEZAjrPo5J9Dqfe21wz49lx/gPlPFviXoFf5q9vmrEVoH6K7kTpv kmitgtA4YyteAfV0Ld71dPeXOFvtXqBvgbf3U+ZWaFRbCiVw4+KSrDmDzaGR3TFcIqlJ ckPHkBpaHGRfADAiQsnPxEd7day2pZNrcsmZa7v4kpzHQdJX/6+FDm/+XpUhFWTPs1td vAFw== X-Forwarded-Encrypted: i=1; AJvYcCVUMoN+FpCNj4NaocqsVJxDGRs+gdGY+X7kQT9hFpaGxWbt5dFabKmFHKpKtK9dltjcjYf2pdk7SYzmXC4=@vger.kernel.org X-Gm-Message-State: AOJu0YzoCo+UnRZ4h2IQrN8L2HbE7qF8tj4lRcRtUIDn9ZIo4tJCB6qg oyqk50EBRy2HPdzdl3+T94Ah6Fi6ozdDWWneXKwacMTErvywnwSqf+6yV7dGgdc= X-Gm-Gg: ASbGncvuxzvUH/4D5UssrVWlG49qLVQQLFvJh53xD7STho7P5oLb2nrjKle14Btz+nY 3iA/SSCONKP027izi/2vqwxL8WAvN0xkoSekTaYzJDg12M8Yxk/LW+5M0eQBCnu84e238iSFqI2 qdmhAlPLFzAwag5fRTu98JUpgplfbsVOvRzJZn3jfwOpTTboB5O5aXy7lfvbo7zAoHbgU6BEZBX ptQyADadwU0P5pAVunQC5NM/laWv+t+jo1z+twdyJxakc1DxsZsVIQAwpJXQgmRYyGfOY0/Iyqa 6NoLc4TrxIiWGQh1OsrBbTr/ysN8yJKKYlyBFBd+NrU08rM= X-Google-Smtp-Source: AGHT+IGgGIo4ggCkxmgbFu54U8KT/dvev04XZ2xtuqxgDeQn/qpnBz4ws/SgLAqL7IKChTe7TcyYVw== X-Received: by 2002:a05:6000:1842:b0:391:2e97:577a with SMTP id ffacd0b85a97d-39132de2e83mr8487685f8f.55.1741626301487; Mon, 10 Mar 2025 10:05:01 -0700 (PDT) Received: from blackdock.suse.cz ([193.86.92.181]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912bfba679sm15302514f8f.8.2025.03.10.10.05.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 10:05:01 -0700 (PDT) From: =?UTF-8?q?Michal=20Koutn=C3=BD?= To: Peter Zijlstra , cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ingo Molnar , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , Frederic Weisbecker , =?UTF-8?q?Michal=20Koutn=C3=BD?= Subject: [PATCH v2 03/10] sched: Always initialize rt_rq's task_group Date: Mon, 10 Mar 2025 18:04:35 +0100 Message-ID: <20250310170442.504716-4-mkoutny@suse.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250310170442.504716-1-mkoutny@suse.com> References: <20250310170442.504716-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 Tue Dec 16 22:00:35 2025 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.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 EF9E722F17C for ; Mon, 10 Mar 2025 17:05:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741626306; cv=none; b=PEO5eZXWjV8j7519yXozUdQZbhoz1NiBr6KMQNjmiqBcHjiTb0t6OinyJmsDNvLO9ebFlBaVPIljhU+WeaXUay8eSFeun+NppIwlo7nBEoUmd9cSLfVu7HcvW2sCyBGa3mYStXyFtmVsxwX7ufbUmIKxbqnjX3LId/m/SGnbPgk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741626306; c=relaxed/simple; bh=vRXJ9uOsy6Io5CIxOYOD8ydZyDCFHZfM3eEnQt7c5sU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=UxD3sTQtppnJBpuLV8BBjxFNV8tieFcVv+KDdnqvMw6helI27AsFTbazWXgqbGkkuFSEbOgEZBTtAkwE6Ht/F10X9/p0rcZPnKWYobWE/+o+b4KiMyoNQYOEknqoIIJUyAxa8yoJQ97eZeWnhiD4Es2xMFCXlPc2FbqNwoYtTlY= 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=HB8MzNc0; arc=none smtp.client-ip=209.85.128.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="HB8MzNc0" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-4394a0c65fcso49305765e9.1 for ; Mon, 10 Mar 2025 10:05:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1741626302; x=1742231102; 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=HB8MzNc0vyFxUhNiAfjeT2JRliOlnrWDAUrLyF6sRgeaNTdRfT60fyyP5CdIX1c7nF VbRfgoJx6pQc93Ft6BlGaCeUqKJvPCpk25QBD5D9aQ91JSZxvEiYb5feSOj8O96Cc5fv Vlb4ylVwKCnximn3NbaoZ8CmrlE83GPgOHkZglVJAd/VTAyDr2wzCd+dEEpS0k0JWN3+ r5DDVIBsCSd+W99WqyTZfrCgaYoaI/UfMwifvInK2qK7cmP/P8TR26RQASI5s+G6qXCh e5OKY390h7Mv8D/1Gi9SkmKZqAurCjwy9Ee1ijf/ISvrrpBgwuR9HKOxWuibgMcWZ3qD Nv7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741626302; x=1742231102; 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=q916rVViTmxCMDcDczgdgFObIrqHQiSdIvXUGKgIXgQAcltuJY1O8it9o8JTqmFwgx 7vlEzq8Tb1II19sVu/YS6Zg4wuQ5wy135GmIGUrGsN4TJpDFh/+r+AOqMfN4KFl7viYM xJnOJrq0Uq62DAKZ0GLzcP3S6qV67xYJFAYpvMTUHcgBJQxSHftHTvCDxK1Nwrrb5jKg LGU3iL/dQ1KpU0tiH1H+hzpchJJVNV28HqDtqhucgF+t4kjVoQW/ZrsccZubAHn17ZSa mWTMaPgKRLQDcUqcuF13eoD3ZSpoo9+tN7zkuOyEn/uO7NM9uQArxnQV5OejSK6A2s0B LEmA== X-Forwarded-Encrypted: i=1; AJvYcCXA5vsnr8ZbP3XS9zldN5Yj1baUh+/tk47Ipx/liX4rnzpBw6gQ75ap0aVVMTPNgOIa3rHdkcmp99Kl5T8=@vger.kernel.org X-Gm-Message-State: AOJu0YwBZxk7lc4ruyiC2FUhLEMPK2nlArXJgvkyycdjSna5RDfsEvT2 ZjQ4z77mC+/N0ZYDzEa84o51GdEWP5Qr1VScmSchctWVx6wcJlFG/66IpTo2FU0= X-Gm-Gg: ASbGnct7b124hoXS5/nZASWTUDKcOOSTDKdEX+YRC1wHmqfwlSiksFDqwT6u8q2hwL5 vApGSdLr3uTdtFUr2hMZOaPZPRoRo/QAo3K2wtXKbW+Xx5fIonehjGDeQnUSZApDLe2JAKDZTJO KLlWErIObbSHY3Up6sd8pwStbavZhfvepgX6XCjV0br2wXb6OSx+fVtBvqqj/F7oO7P45CKS0gp aV5YfQoUuoUGqLbCDgoJjQjiH5xyFQX+q0nLZufFmoQw1NHK12lqvHal6JMGTbbyTum4s19ii/9 6hSJ8EevrIETZO1RQVVwiAGzU32KWkC5fkiZ4Qzx59KEWCw= X-Google-Smtp-Source: AGHT+IF0OGZqoq6RwuNzak2w/irNE5ETyBPEb/aCYUD1mY+IM+doxWcqUB1WAHbBBc6Lw3aP2WuzVw== X-Received: by 2002:a5d:64c7:0:b0:391:11b:c7e9 with SMTP id ffacd0b85a97d-39132d6011emr11818862f8f.28.1741626302086; Mon, 10 Mar 2025 10:05:02 -0700 (PDT) Received: from blackdock.suse.cz ([193.86.92.181]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912bfba679sm15302514f8f.8.2025.03.10.10.05.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 10:05:01 -0700 (PDT) From: =?UTF-8?q?Michal=20Koutn=C3=BD?= To: Peter Zijlstra , cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ingo Molnar , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , Frederic Weisbecker , =?UTF-8?q?Michal=20Koutn=C3=BD?= Subject: [PATCH v2 04/10] sched: Add commadline option for RT_GROUP_SCHED toggling Date: Mon, 10 Mar 2025 18:04:36 +0100 Message-ID: <20250310170442.504716-5-mkoutny@suse.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250310170442.504716-1-mkoutny@suse.com> References: <20250310170442.504716-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 Tue Dec 16 22:00:35 2025 Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.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 8F0DD231A3F for ; Mon, 10 Mar 2025 17:05:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741626306; cv=none; b=gwC0WE6NSdP9MgXkTwIAViOD7eagS+EMJZoIW3khRf0Jldcnaxx4n8FPAT3JXv2osf63mVm1Oqd48n0Inzyc6mxJVIKm6Tu6f2m+Jwx2VP0Vd1qHlhCgVpbYTLtsvTShRkS85eeqp+ODLsZgj27SFeCW9yagcHAfA64aywf9eK8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741626306; c=relaxed/simple; bh=eqp+p20wQUC3G9kX8x2gTPBWxovLGLvK0huXE5jYVqM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=SVMpX3y4zPaxEosbk0goNCkg3Pqf2CALKvoa1j4+IR1khBylJVBnTTk7NU6/OpIPYTe0EtinCxG1aJ4r5K9DcnfAsTRPpGcroQVDR1mMNgbPcs7i0XxoSIqdXjy0/8y43mjrxg4OI7iiHLMD3TrrO47Bop6S0PK52aGod6H4uv0= 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=WwaY1E1A; arc=none smtp.client-ip=209.85.221.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="WwaY1E1A" Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-39133f709f5so1602043f8f.0 for ; Mon, 10 Mar 2025 10:05:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1741626303; x=1742231103; 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=WwaY1E1AE69SzPRokTlQSuDnWVlUdHM3BFSO7Dyes5LdPU1qy1s8RtalRIrgHoftT8 q14G5eG+MqiAB/df4xWvOGS3EJwN3V3Ht8im7wXnUr0NZu4LRZZEMuoIMxj4RpPVimPN /88m969lhGBpowKvAUywW/GoGOg6lZIxOfK/ibv453/Hs8IGqBA3gZ0HUSi+BlMm7XgF GKhGF3Vfc3NxkKxpB+xGLnveaSu0IQdVo8Ts2DshnI374vRqdXFM393+kbNMuuoAK7C4 gRWuLW3eJ52qffxKlyJ9dhPwUfqMiGUifFYB1edyFIRdSNQDBEgI+j28C8n8Mjtp5vfQ 1WEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741626303; x=1742231103; 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=sWfCK3ofVCL0HGYI6HGOl+GxOvFVikpzlhJKcbfrca8gBQpao4kblZuhxBMy8u8/nQ gRH+Lb1tAU91kUOZu9PJaVZt1ti226SdQpd2iADx7bNKtdVAdiMrSDPq1CBcxltBuyhh 1BxxCHf+MFJ1hSppZsIwDmXZ6enLW3G9W/m5OLf+F3VIqisF4bxl42FCM2Jk84zsXUFG /bYEXqEUvCNAZx5xiffA9nCNjt6LCLutTShQW7ZPi+rYGfji9JTaq8heg0MDvDDtz2j7 X5jnppG7MkgKO9NreHK7vjHJxlMTn9nijPgMFEuT/uFtopCT78HisHMq+EZfYtN7BgI4 zNTQ== X-Forwarded-Encrypted: i=1; AJvYcCVfb/gz3NKsS5Uz7y/2rfe2vr7fqa32HL6I/5kdkK2PkjjfpQSWG/vOTuMVeSL9ZI1EIeSMh1grG0H+0dA=@vger.kernel.org X-Gm-Message-State: AOJu0YxVsudObthK/hd2N8f/YgLL5vg8GDqAp6Etn4qFGdqv96stWpnd AZgi2ZjcWvpunFOcRL5mncxLAoHwkcyojUZ7oax2ut3RfDwd/Asr6OzH0OAGY4k= X-Gm-Gg: ASbGncuGcUzroXKH5Hc9t3Ys8WmFAdqA+dNGxKfc1eW7T9AS5nR4VNM+0bpOZz6M4Lt L6Vn8gV3hPLxvxYpITPoYektgY9+XtLKAxCGxNp8S2X1ffJQJTN/Wyieixp5PmORC+Ip9IscABj AKM7RE/nhnnndFRPuK1MEseQUrZupPlXkkLC4zxOGat2iniAfLEIWBWAnpLiMY43RMOVlW+d9kT cuXdveq7NIZVfDP6Rbpls/TOYAAQ534V1h5ov03VgxiMEMs4KCmDKR3DYsxxZdMFjOAOOZnsgLZ TGfdTPJqRY0ClfUCJflxfSvzSc9JwwvAleVYZlIiZsnlU6bSY/5WDc3Rgw== X-Google-Smtp-Source: AGHT+IFlJVRZCEshYk7Wfa802nBla5K6NUqsThPUNNSFqpHEeriX8ZJPGcyYFslAHxGKJ1PxoTJywg== X-Received: by 2002:a05:6000:1844:b0:391:8a3:d964 with SMTP id ffacd0b85a97d-39132da10e0mr10182161f8f.41.1741626302781; Mon, 10 Mar 2025 10:05:02 -0700 (PDT) Received: from blackdock.suse.cz ([193.86.92.181]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912bfba679sm15302514f8f.8.2025.03.10.10.05.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 10:05:02 -0700 (PDT) From: =?UTF-8?q?Michal=20Koutn=C3=BD?= To: Peter Zijlstra , cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ingo Molnar , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , Frederic Weisbecker , =?UTF-8?q?Michal=20Koutn=C3=BD?= Subject: [PATCH v2 05/10] sched: Skip non-root task_groups with disabled RT_GROUP_SCHED Date: Mon, 10 Mar 2025 18:04:37 +0100 Message-ID: <20250310170442.504716-6-mkoutny@suse.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250310170442.504716-1-mkoutny@suse.com> References: <20250310170442.504716-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 Tue Dec 16 22:00:35 2025 Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) (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 6699223236E for ; Mon, 10 Mar 2025 17:05:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741626307; cv=none; b=CCsaMSrgim0akUJUzEu1dJ5INU+GeWDlbYcK7pZhqB8DjgjjfW2KkbsDDxMU9qWsmWllxeAXKD/ZsGgm7O1KxoS1TCdcXMx//iQ/XtkZImVj0XidXDT4ceMDmo5VKJeoij3OzS20dQCHGtLrb3SQtTJ/qaNUDOX8NKCqtOcbGJI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741626307; c=relaxed/simple; bh=NEXQa8SMxoUZIhEM2LZtR5hPu3GN/muNBmbxrg6/Pks=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=qjfhNlO927ujsJSFXPzfUMaqDFATKDre7UJZdi1zqsztWEwNKqbJOth/mWUWvYLXPEttESeI7eyaAFQfchR6M8rdsynI1b/xXjmrOK1ImKUCd7GhiQqa2GTXvi819B7BHLbckIb4yIG+GVsDZ1IA4eGY0soBQyJyOMx3bdLno9c= 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=La9SvrDz; arc=none smtp.client-ip=209.85.221.52 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="La9SvrDz" Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-3913d45a148so1527571f8f.3 for ; Mon, 10 Mar 2025 10:05:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1741626304; x=1742231104; 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=La9SvrDzYVLL6AmRR+fYNY4z573h3sZ81a5nPhoIEoQQS3snWF84EuyMv/XOtPuoN+ Ajyz2qo+PnXbq14ydw5G5y4fKf3pb/h+2knumZeJu1OobYpoaXyvnSGKWswcauGZhlJO +uhCIvRerTZToU7l33fsyGZof1Nz7O/6LC6smWgMceP/ZibQ1Lck3yAmqvmbJFFd/SPB nMm+m4CiIYqnUHVWu68P2r3vp8ZaaPnEdfQ7y3V8QoyiSyT0hLkjfv6qiKZX6NB2pyVx KUIFX/LuEVZX5uSDX1cEtPu35ud9FfWydwrLoqQs2TVZgOWgZQxJnTAbQt5zOFOpOUti NJqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741626304; x=1742231104; 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=VuNdU/B6oAdqTAtsue99Q5VcV6pEU3cJZk1e40UCHnTteXsVZsrB6AEQLRqXwTpsql i+3Mx4PIXi8iVT4NWUPxuji5u4ckTxE1dqDIY3iFFbGQsutDJ+csGCfhBL5bpLRTdODB pVC6uXoCgyXL/Fn19J3jFrK8+xeWvntwBXkegGpqozL76WMI1IiNhJOUN4mgAEAbRhb9 W2MW1FJ7ZKTMkhBW5ect4yMZPbzRpO7FNsZCr7roGUf6Dnr5y/p8p3oblY8PypjbwDM/ uOpJiyzPUBv6CZu8cy2JS6Rvoh0BF9hBa93gHzpV0vButmVGNPrQhjmgEJQXQQdwHuvC i9aQ== X-Forwarded-Encrypted: i=1; AJvYcCVqzcLbSVuk0jhzSaP9cd4aIYWD9rRFGT8DMG+4cZQ+oNECfYaA+hFPKeSHsNzTZLRmBh0GT544yMcG9zY=@vger.kernel.org X-Gm-Message-State: AOJu0YwqQ6AMxfhkuQWW8Oksvy5D+vKIQcCWGwUwnZWS51Ucy6qGUCoF QTGtjS4RGnSHSMGSy2l4Wj0N/r1fZiiARvvZlokUZpPBek1mGgTSZIsrMRGeYNM= X-Gm-Gg: ASbGnctUSbBTea6m7DFTEPO1kgiTdqD+OJm2YMED213tbGoBjhM2nunwxmmur2bbGEZ jLGFlZonhLcpBQqjYYC9sxW1CVD1GEJStLb+ekYqr/76kQiPxxmHE+uTnabBhoVBcW/QPiDBd6T 95SveU4nEgqhu4OrKReuU90B9PzD4SAvpMG5XzHBO5Y+ngVrf1SYd5ME45f8tcmZYvAGiRTgQxN BqItyZGGgJ/aqCAmGxF2bDmRKEg1ldly61jpDS3a76SOC2YS83YSy10MeWQWattnHe2DoQItTPs PMylciqUNeez5ZemaJEVs5vNe4a1zxaMmBv3MN67zKFe9Js= X-Google-Smtp-Source: AGHT+IG6kTPO393G97E2Dsk2pny69eK7SIEG7dbAP9YioBNWsi6aOdQGFnTshbQQIrgdWs6vNe8r3w== X-Received: by 2002:a5d:47cc:0:b0:38d:bccf:f342 with SMTP id ffacd0b85a97d-39132db8b3cmr11627840f8f.43.1741626303548; Mon, 10 Mar 2025 10:05:03 -0700 (PDT) Received: from blackdock.suse.cz ([193.86.92.181]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912bfba679sm15302514f8f.8.2025.03.10.10.05.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 10:05:03 -0700 (PDT) From: =?UTF-8?q?Michal=20Koutn=C3=BD?= To: Peter Zijlstra , cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ingo Molnar , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , Frederic Weisbecker , =?UTF-8?q?Michal=20Koutn=C3=BD?= Subject: [PATCH v2 06/10] sched: Bypass bandwitdh checks with runtime disabled RT_GROUP_SCHED Date: Mon, 10 Mar 2025 18:04:38 +0100 Message-ID: <20250310170442.504716-7-mkoutny@suse.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250310170442.504716-1-mkoutny@suse.com> References: <20250310170442.504716-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 Tue Dec 16 22:00:35 2025 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (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 18773233126 for ; Mon, 10 Mar 2025 17:05:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741626308; cv=none; b=Ozf+6ZxhIs4QazldqEE5Y8r2DXd1R8NnVvayr4wgR+O61SMAwpCef5ZJmlWIJag8JcLrSORwsEvxHW3QkfZCfP+GynR6w69Gf7pFJkmEN2lJhq8g1TRZS6isLlvKovicIQ6+1QIm5TdMWC04cUPiBrOBKmISqE/Bsh0wKSNPb3o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741626308; 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=ibkemPkJEpbNYZoTH3xMycPj9kD77uuNQ/3b48G5qOBbQWMV9f1qNueA+sQGaqOefJGpgBm/uyFnxzruNyR64o/QNhGvFI5kqiCJsKBi6Rf0kuq8J6uwB0mN6y+aPE8t5QaBV1lLmw5fj1RJi5xlKu/OwoW+movX1VOVW3gs7X8= 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=KZT446zf; arc=none smtp.client-ip=209.85.128.49 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="KZT446zf" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-43948f77f1aso26812445e9.0 for ; Mon, 10 Mar 2025 10:05:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1741626304; x=1742231104; 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=KZT446zfBGpgnJDDGtt7WnO9qgjTKLRY/6MNW5lzUtgMGrQ0xxplYWyI4vUYj7IVBY FPzPDVJAyQpOYKrQvpY28KTDIdGRcQb4pFXW4Q4WKcqmuOnmP6cxU6aLbbtSzM+NIpbX Yt0DhIs44diYNclSs5cTE3h3OyFX9jCjfRrz5f4ndox/RR7xpiC4SWuYAEN27K1mzuNs EmjmSQYs39g6fxPCEocpmQWjoFgy47afBucO74a1wOTAxz0ZcFPQsOVPdTfzplk7a2R6 OeNe7GTwRVIzsxJHw6pa6r2dDGV1dhn5tf3psYFew0m4gJ/iBztcHQdexOAmEno1QOtA JjWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741626304; x=1742231104; 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=GCckBUpmjOoxOAMn5TtnHx8rHFP5Vm9ldSvnDdF6MeCCd1Y3juJIIiE5AzgdV5yV3Y x79LnUROKMMeaFg1SCtpGjJLDBArM7pXckUUek4UBCnI3KAH1Qobu9dWaKNSra8n1stX uInz21UplL0GJddabgP3l2fPHnomYxLhl3dAv80Td34uNKEX/D2JTZeJT/XjjeQ0SQoi P/12px9MkvuJ1MHE6tTbxFxUtdG963qtEFz4KcwBjD2ihJsAjSBONB8iV8ULxqr4U1/i C16G3h15mmkkMWKiGFk6g/oWOifChxlA0jeYOxhlTBtQASeMlSnGYryLinNoAhwc3oX+ IKQA== X-Forwarded-Encrypted: i=1; AJvYcCVwwFNgePijC/E7y2L1iUGBlOtNXp4qMvTh/DAyhwKmMAuRD7hWGNIM06+KGqpgKvKTVcHvwkMhOafcym0=@vger.kernel.org X-Gm-Message-State: AOJu0Yw7EqcceK+qR4uSb4xmN92m+sUSPxqpNEYEwvA1YYdLxvMyDdKg 1w0osQO2afVV7iEVVtqW71voj+vq+9nNwOPTAWU61WcLZ7fnBu8ebd4duF/P5ZU= X-Gm-Gg: ASbGnctZkj4qg5Q1YF8Ai3Xgt0Vn5HduAWpaJmNKuJbj0ShVwH2E4GvKXD2gc3A2IZu cQ2AtqCvaoYbtYwor7HrJB6YKl3b/W/6p0fxmxpQ11rbpIlq3xCWF2rnIasEUFsDFZmh/F8xYwU U12SQc0xRGCeaZhbBA/TI8tPeB5LWewkSCJzQllmoaJUvE6JrbeTQqcCdXAcB52P7B3i/U3tBTk oCUdB2Y8zHkmou29uiiEzwcaslLr3HgCsvhA5m8D1b6sANEl+o1MLu8EcmH0kzN+jwsyxYyGVfW jWCuje3IImaSK2yFaYJSyAMofwJ75/qd7rKOBGB/6XmHD98= X-Google-Smtp-Source: AGHT+IHrl+aJzW5pNkgbF9I6l+mU7rRhdrECqyUo2hjKVe+CzUcZUZcuNl1pVkPcNQTUFgWNmsbfLw== X-Received: by 2002:adf:b312:0:b0:390:f6cd:c89f with SMTP id ffacd0b85a97d-39132db6f86mr7386155f8f.53.1741626304335; Mon, 10 Mar 2025 10:05:04 -0700 (PDT) Received: from blackdock.suse.cz ([193.86.92.181]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912bfba679sm15302514f8f.8.2025.03.10.10.05.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 10:05:04 -0700 (PDT) From: =?UTF-8?q?Michal=20Koutn=C3=BD?= To: Peter Zijlstra , cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ingo Molnar , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , Frederic Weisbecker , =?UTF-8?q?Michal=20Koutn=C3=BD?= Subject: [PATCH v2 07/10] sched: Do not construct nor expose RT_GROUP_SCHED structures if disabled Date: Mon, 10 Mar 2025 18:04:39 +0100 Message-ID: <20250310170442.504716-8-mkoutny@suse.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250310170442.504716-1-mkoutny@suse.com> References: <20250310170442.504716-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 Tue Dec 16 22:00:35 2025 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.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 E8B7723371B for ; Mon, 10 Mar 2025 17:05:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741626309; cv=none; b=Dq8RuoCI9Ih7dprT/Zm/cOeCxbzOriTYbJKH5RtpzK/pS6xHYZu+4uqSni1U0/MB631VZLNGdW/d5FsMAv2FElp1HwqdJSIlvE6A2ZDYGBMdH0ccE4UIk0fbhQVZJCBbGyHe4gXuQryf30CtZs7hi9ga+ZHy3S4xbsbLIju0w1Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741626309; c=relaxed/simple; bh=pi9xguxgmi8jgveuQ3APRb4E+MjxkvqvRH3D05xwEJo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Ps16mUJ26X9C9YlogBRjuo2AfoRSY9qjWOVF2xCni1xliigjYdJ3JKXT+wPPuw93x3VVGj4jyk8DKJn3LY6BqIEJOplAY5K6L6rz3AGSNcfpQPKTo3zlW8n59HytpsKCHiQNk3llpjXDPE5bzkQSJMFuSotWgYoh1ioOkAjTlEc= 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=dxIVChwA; arc=none smtp.client-ip=209.85.221.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="dxIVChwA" Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-3913d45a148so1527640f8f.3 for ; Mon, 10 Mar 2025 10:05:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1741626305; x=1742231105; 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=dxIVChwA/2syr/8ilj++nasP4V4aXzh7NCrLJRcYok8/CUZmTaE+SrbnsgoWNdGfXP dH/xyOk2NcvgJMSeER6zW83wcl+azl9p7xM1kETbuhdolAZswcGfZEoO9H79APZTa+wW hH2wkkXFtWcElW8x/xWp3Yl3nWEG/zq6/FdJ8JRkS+0mfjBT7AwMLNmrPtez29MUSsy+ lk89I1UeY6ybX5tecnMKYR4A7q4cfjxmOw3CJARjRckmZIECx98d9QZevds3Yy7zjcUd JOEnFK566Q135/ub9q8lsmZmrz+dF3noOPm2kTQ8tspC4V/e7pFBUNlhGHQlF7o31enm GQoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741626305; x=1742231105; 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=K3wxwUoT0SMbqlT+TvlZvf5UD2w+ablVb1EVwsMHhHPqCu7V16wPGIsLSNTQqgQJ6o BxMcb7pmvFFOQVsYmMZQRdaKmBjMd0E0iDSfXb2WKq8FbA4kVoQaFH3tx+5s/p6X4b+O wrUTfdQHlmHEgDJXb/6rXyIbNgfG1l6EMhAv+ODkmmIjl3to9c9+5SEI7lGFLB/7ZNaY 9sWqTAxrSqL9XFDsa1jSB1V5EW0kOseRwzswCC1DAUIxyPX4Z8XZhH7HMo7MAWc45Uoj hi4hyQTXDYe5MA/y6cLD5PZWbXDrHJNKpKa7f31QAiD4VQbEsUNPGrrvHnyvSV0X2PAe wBXw== X-Forwarded-Encrypted: i=1; AJvYcCU6Ar0EMtM7XM6e2NRP54YO3T7ZJJGwy2UPhK1FMcQWnu0sN0g8hiaqRWfl59WJI94moA2+lfuct0ymnME=@vger.kernel.org X-Gm-Message-State: AOJu0YxpESLDwUyrTc9vfCWNt4+uRC19ZI8lG882QhTiLK5IdMz9QIUR j+sU3rHvh3hmoldb9h/1So7uD2i/ZOWn+LfsAkyIfmuoW2WSq2V8hPUMezcSkWg= X-Gm-Gg: ASbGncuyyz8gKRNY4OGBAmkNyZZW88vF24X72d7ORfLaxNK1hQEVdVcX5B3Bewjg0N2 4M6vqxjIoC2cDPBQ2av4GTkTrbtDmNE2M0rySoky7Fp5EUFAaJb+Nx1vxp8Q4s6ZVcAoHhN5nSH Vu6Bfmk3ndLAuRDBu9nX3ThN/GYCT7iV+1pf/Dk2WCLmXbz4dHo9AuQhwJbvyl8GVCi3OP5PLhF EobF2LAHzqFW/nl0rUUkjTCL6Q7gFV4mw8x7C/qe4Ld5Tc0F9DLsrbAPEGYgI/hOD2zhCwxlMX2 Ewa/SLDtdJFBAv2XsnVS6F87rz0TI4pQF8H1xumEpeISkCI= X-Google-Smtp-Source: AGHT+IEjcwJt33XK0+9oNBWYafwW/xgXhi9ZySNjt6XnxyxR7xOz/zzPFrVCVP5U0+zTQKRhB11BqQ== X-Received: by 2002:a5d:47c1:0:b0:391:2bcc:11f2 with SMTP id ffacd0b85a97d-39132d2ac45mr8673374f8f.1.1741626305012; Mon, 10 Mar 2025 10:05:05 -0700 (PDT) Received: from blackdock.suse.cz ([193.86.92.181]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912bfba679sm15302514f8f.8.2025.03.10.10.05.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 10:05:04 -0700 (PDT) From: =?UTF-8?q?Michal=20Koutn=C3=BD?= To: Peter Zijlstra , cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ingo Molnar , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , Frederic Weisbecker , =?UTF-8?q?Michal=20Koutn=C3=BD?= Subject: [PATCH v2 08/10] sched: Add RT_GROUP WARN checks for non-root task_groups Date: Mon, 10 Mar 2025 18:04:40 +0100 Message-ID: <20250310170442.504716-9-mkoutny@suse.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250310170442.504716-1-mkoutny@suse.com> References: <20250310170442.504716-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 Tue Dec 16 22:00:35 2025 Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) (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 9CCA122D786 for ; Mon, 10 Mar 2025 17:05:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741626309; cv=none; b=ouK8BjyXX2O/r4ABSX9LSwfkKf3F5micuv0VHdeF2ADgS3P14IXaOQLiLnTh+bgG4ZL4k47zUH8OZneE7Xe+FycECLcCI8eywHeGXt03c+PrU1JglXeqnDOGoJu5dwJFLOlIbWpuW/lHhW3LGE7sRoEY7dODbZoZutLfw1d46yM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741626309; 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=BVICKo15FoqI345nlvYdhXC1IJ40VqbMCnnrgveN/CTe3CPRymvK2PzvloZXW0NIMxYsGm1xYjlc/oR4myAXQoYPHPlTdsUSuYd8K28o3lVv+MMjSaJln3OF4OflKNslrM751NHoWcWmIycVRhKmcSnGvQEdmAf9CUad0RX6K2g= 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=aRbJX/r3; arc=none smtp.client-ip=209.85.221.50 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="aRbJX/r3" Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-3912fdddf8fso2227023f8f.1 for ; Mon, 10 Mar 2025 10:05:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1741626306; x=1742231106; 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=aRbJX/r3XOO1OzN3jzq/d2tuyALKLrKQvaRmNJlxjxbjRvHWmSFDdpA24uWk/3b/ht ioUV9Wau58bu6U9vO1tLU7YEyKpzU+GahrwA5eiUfiKtOxAzVboAzUr3uhHVKJ/Qn4hT m04nRGQ18c60H/VUvluipxgYrlcWOW38N1sQVJjEc3EktUbDnK8WhZ84t0vm8Se5zrKc 8XFKcPR+6+bgA9SBSGOInrSwAnuwgrhDF5p3s+9vYmz3yaFriOH8/KizVDaLG+ZA6hWf 47ZVWmE5H/X8IqMv82S2LGe0d6/bZT6m6FoWvQczGXMNHSA/DfTAV3gwdi+Wf6tJkoS8 I3tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741626306; x=1742231106; 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=vhiA9yx4rp39Nd0fDA4DzwCNeURKNzSK+2ZYd607EBN0WGIRM2Xm9p5CAcdTkdV1vg N2KwcX5JlSbr1/eVmCcb6gEwVU1Bvb1+p/Y9F5wyEMMxdEHAzOjRuDphTu5oY11NaQJp JgVp5XcLER4dzj7nIGC9g6fGvJqD/0rfgtlpKzdJNByckvu0iB5E20aEtafwhr5PrB7A 8ComgW6ZhBbjrZHMECPBnvUczjZ9qPh+zC6Q6Lwhsj6G/TbznsQ1sgcrVXY4mTCfAsGj syNvauFfX/+sLcnJFYLOPhKgcQkPZJ49VDyQdOPzRwRz09LSmTKZCUYdVWVU7zsiIOTw nlVA== X-Forwarded-Encrypted: i=1; AJvYcCWjl2cEjaQEGsioA0gKnQmKaY1qQXkVRmjhR9/9wmb+hfyCmbmxrVUp0o6s8O7kB17zmM1Ieny5vYp0gaU=@vger.kernel.org X-Gm-Message-State: AOJu0YyRzdU3aOQiEMXyfPcNluqtKNDETBpQkY/R5hGkko1WlBJIIrqZ 5inMB7OcTLx2aKQLeuuGo/z0g3tNyUJqPjFCy7gjcZNQdzPPzpQLNcM0PWvJm9Y= X-Gm-Gg: ASbGncsiE3/aktbZN5/yONtYTaJF47iPwVS2T9h3i9GFlgGyYvMht7+iYs9DbtAEV2R H3PLFAsh9hBx1Phaev8oLOKHgbVwoizWquPPjDaywcBIvqbVxWgCb8muyDOmspgc3+ZRCM8fbAm q3Zdlsr47UWxGSFtSdb0A7O6z0fa4iazS57he4R2UQRMF+yAYpHBmHt31lhoLpk/ncTm2CLxQY1 RNWgJV3gIbRwHYlPd6Y6kHqNbI4xCcVjcRduun0h3C5f7ds/OtBhESVKf/MDSML1mzT8Gc6t2Of Dt6BJuGlzkAaaxyFmNsxo86BE6gE07dDKlpC6OSMDm5VsdU= X-Google-Smtp-Source: AGHT+IF8Q0eeYBcGsH8TFyKREJ1wXJF1HOKeW5omYo1W6rFm92dzdYDmHxBpIrc2QiJ+Ywl/IGah7Q== X-Received: by 2002:a05:6000:178b:b0:38d:df15:2770 with SMTP id ffacd0b85a97d-39262c99b06mr506624f8f.0.1741626305983; Mon, 10 Mar 2025 10:05:05 -0700 (PDT) Received: from blackdock.suse.cz ([193.86.92.181]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912bfba679sm15302514f8f.8.2025.03.10.10.05.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 10:05:05 -0700 (PDT) From: =?UTF-8?q?Michal=20Koutn=C3=BD?= To: Peter Zijlstra , cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ingo Molnar , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , Frederic Weisbecker , =?UTF-8?q?Michal=20Koutn=C3=BD?= Subject: [PATCH v2 09/10] sched: Add annotations to RT_GROUP_SCHED fields Date: Mon, 10 Mar 2025 18:04:41 +0100 Message-ID: <20250310170442.504716-10-mkoutny@suse.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250310170442.504716-1-mkoutny@suse.com> References: <20250310170442.504716-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 From nobody Tue Dec 16 22:00:35 2025 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) (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 4BE2E2343D4 for ; Mon, 10 Mar 2025 17:05:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741626310; cv=none; b=DGl/S2/TWz8bXBCLgTKUQCeWxKh19dQnkiMyvUZXVrVGr8SXz0Q/ZLRidBi0GubtE8E00EZ4uzhMhguabVqsD0GTc6AmUrFRs/8vefD9rkf6eXdTiuvxBdZRyGnv5idBFHFZWj8wxO6Esrs8dMDerdIReTbXWaZfUw9RL6oFhQw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741626310; c=relaxed/simple; bh=xvZO/eWJHr5v18qgFAuJ2zD9tV9+05a3hSDFW/3DL08=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=SzdvOsRA0Sq7bssvEJ2VMH/1lXdrQh9NyYQxiJUzi6FgcNQg8xTTN7PRav82xHYIF4BQjjbKuNVGQmFKUryiWDJbOyVxyodJ/YQ4Wb+Dy82XbWmE2HtXHk5EKvhp82+AsydsjgJqXAPSdqap/jvJlXLICVnhKjSiwzhxGPP4Ueo= 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=aTQijJvh; arc=none smtp.client-ip=209.85.221.47 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="aTQijJvh" Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-39133f709f5so1602116f8f.0 for ; Mon, 10 Mar 2025 10:05:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1741626307; x=1742231107; 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=ZT+gLWqx/04LxUxfH1eW7PRrvfpM9WFH49x2PLPFue8=; b=aTQijJvhrMGi064tHm2mJ/mAf/+ejnSHFBKt7Q3f+ko+o+YdG4B4iMXYFrwDu8tKzZ h8r84SCEpDpVjRFMAbnV7QRLoNzqIuuC0+lC5r9P0t70IY6SuYereQFbqjB+ndeb5msH lcIyi1JpbU7LaJzi7UlhRRqKGq88jsKZeDhI17EsAiQ9/PkwbLcdU38JsDb2tev2aLIU uBpMDFVhn/YeAk7ObXuIRhsZq3LMHvELCaNLAVb1hs1MmCV3zGzn89p6W0E0Yd7GZ5y9 ClHdne5q+xpCIpK6vVOtw+B6yNrElq4JJxXaUbY8sK1q8TdNb57CECLOJDGhJ7OG5hk3 Y9vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741626307; x=1742231107; 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=ZT+gLWqx/04LxUxfH1eW7PRrvfpM9WFH49x2PLPFue8=; b=KdcGClyGIvnYaiKp27YY7e9ABAAks7Elhfom6WsZGronTZlCqXMp/RKzacL3iqj0Y1 zTxPXeC7cwfKj46TeQXaEAmrmxRLhz7rFio+kPr/Ou0JUGNBOmiW6zTtMy3FTlGAb6mA iMdzK+H2OmiOTOJ6bD1JDxr+b2nNWZ+TlUVprYTNKjvtu4jPI5ssOYjPHBOHKAElf7x1 g6f6cdZV7BuhCJzS3gtn5xkOW2X9T1GW8009Mn2/rlTI6t2dTo3D7/UDXMSGyfkSApNd A01/w0CFbT0QHLvUwOujJbI6OABF+0oSWVGsx7pW3U4jn2fOhpBQ5SgKPlJLLG6o3mqB dakw== X-Forwarded-Encrypted: i=1; AJvYcCVaFp3jKuBRodUbo0lKekaHUmNt92OOss4LaJf5qzTiHboKrNXqRdJHbiJgRHq9jzysvFS1R/rWF2QloFI=@vger.kernel.org X-Gm-Message-State: AOJu0Yz8BpqXmjQaM3oRfy2pRGbBDAN9t/Ong6RvjGcnDz1G5bRJLoCu v7C0Z07g1X8PC3n67aXngkReqwUfkUe8iOqVW5N2FzwTdzJWe2QPRdqSSxOcQDBcQQ1wzlBPiEJ vONQ= X-Gm-Gg: ASbGnctzaiO/ZlY6ln2v0vJk2CoqPLa1pkpn9HTBjHBG0GO/rSwQ8wgkFZLworjfGxF ncBCdDm7PXi/5kXF0qWBIhrCW7luxpubNhDx01a0sMKgW47Oqfef5Aj0ZfaLP3Iphm41NiLrSVJ 3HEYsa+g2Ompygpie2p3Fqs49AmAT7Gn8bbFBTiNld1t4cDfUlPOzHBcldSiiPYQhpI7a3T/FLZ +9zHFTfqP7hf1btjrJVvSKVpM3WiOhFZ7govZ+afmnu75J3LXef+x8WbCdz6HoRE19hKyuWIhAd 3lUtvYV6MGc1/M++dOIpCBfNYrZqXIyAheCSgckSekZxJ2M= X-Google-Smtp-Source: AGHT+IEVpdllDp8ezqPm81pST1MhCpXpU9dAvAoZOtgMqwTmUvPRTqKqLJeuqRXUT4ASXwEhDtWGYA== X-Received: by 2002:a5d:64aa:0:b0:390:e853:85bd with SMTP id ffacd0b85a97d-39132db1108mr10862381f8f.48.1741626306652; Mon, 10 Mar 2025 10:05:06 -0700 (PDT) Received: from blackdock.suse.cz ([193.86.92.181]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912bfba679sm15302514f8f.8.2025.03.10.10.05.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 10:05:06 -0700 (PDT) From: =?UTF-8?q?Michal=20Koutn=C3=BD?= To: Peter Zijlstra , cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ingo Molnar , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , Frederic Weisbecker , =?UTF-8?q?Michal=20Koutn=C3=BD?= Subject: [PATCH v2 10/10] sched: Add deprecation warning for users of RT_GROUP_SCHED Date: Mon, 10 Mar 2025 18:04:42 +0100 Message-ID: <20250310170442.504716-11-mkoutny@suse.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250310170442.504716-1-mkoutny@suse.com> References: <20250310170442.504716-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 Signed-off-by: Michal Koutn=C3=BD --- kernel/sched/core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 4b2d9ec0c1f23..6866355046d21 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -9748,6 +9748,7 @@ static int cpu_cfs_local_stat_show(struct seq_file *s= f, void *v) static int cpu_rt_runtime_write(struct cgroup_subsys_state *css, struct cftype *cft, s64 val) { + pr_warn_once("RT_GROUP throttling is deprecated, use global sched_rt_runt= ime_us and deadline tasks.\n"); return sched_group_set_rt_runtime(css_tg(css), val); } =20 --=20 2.48.1