From nobody Thu Dec 18 06:35:04 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