From nobody Thu Dec 18 00:25:43 2025 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (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 DB72D1CF7A1 for ; Mon, 16 Dec 2024 20:13:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734379997; cv=none; b=MhoJA4bhra4t1yMm8BBSL74mVCwL3xjycV//Xbyly47hL0Q9CLwFcUEV5Isa9QafYwXk2t7/FKyCEmdCWRt7DO4Dk7yQ9ZyN+vlnaYn8lnLvJ9IDGPVqWiqsooCOHTHYJsiVG4wDuoI5FsdIIUvFeKQ94CbSjugNRQ3nE9OXkSA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734379997; c=relaxed/simple; bh=sBbcW+mFe9y8oA+JwKVNSCOVQeN+nDtYYa9zn14EvWU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=EtxALwPQaZrAWBn0MoZo6r1noVR4gk240JTYRgOvGWH+UOCvV+0AqIbpro176lhIJMUkp/0I5cnL7CyXS9Jz2zWO+r9XN8p+rTT3SjvNauEccGddjZk6IqPnBLdjV8l0youjbcBETJy6L+UdbNQJzSMzsI4+u5JsvOoAA4hTgRs= 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=UX1LNf8e; arc=none smtp.client-ip=209.85.128.41 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="UX1LNf8e" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-436341f575fso32202845e9.1 for ; Mon, 16 Dec 2024 12:13:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1734379993; x=1734984793; 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=UAD9QQaJMjOoF8GYY259h6abZLmkhVQBDuUpRGuLzv4=; b=UX1LNf8eP2kPtb4TQ0sWPhR7w3bUqt4ThglInQTVwxcDktG2PQ5bTZYctNMaSZatLN jcv2aemSOYSP/1FfCUsCvF8evb7z4WAKfgADxduthw/iP5rbqJ16h6G5z8bAdledFfEK KlWZUeeiTN8beWBCo3jOiBINwDywOAjMU8fzO7u7InY0CkQFBmpr2ZzLq3QbF9Jr2FAT OZCod5/2JJLOaUuMUGSY8wxmzXlxuNwD2j9jyOJx3pejEXBKEKE3R3+77xXBIxQcBUuv LA6aG5CJYmaABrviSnmXwIEsGbKxSYGrG3TYnJ61SbbvUl5Fb2dQIqiLoJ5mgCpKk2t2 NGAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734379993; x=1734984793; 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=UAD9QQaJMjOoF8GYY259h6abZLmkhVQBDuUpRGuLzv4=; b=ewnt/1jzzIXLs0ueeEA1N5aYCKwt88fmp2YUG1tRZc5BlWQDf2PlIYLyA9gCNDW84U UVZ2ygTavA6fQej1KA3YhT7dFoWna89EDN5gmyIOuUUFawrX/mGJdD81ZZ5HEvcWy+mp qKy4qSAQwNsolhN3YzZHHd6K4HAbcAg/UAV+f2JmrahUoSYjPeOAAk4/UNvEIQokhyje NcoH9pYIg4oQC+Ud7LYZ3rkbcYPwcA+r6FuUxwkjYw2583q4J/DJoHvxFVT5nUFDpwec CW4pQblARCUJLx2c97tzpf1Xelb11xhP3QHiQ4otKZTLIs5huZ2NslAkm38HncUk82H4 eOWQ== X-Forwarded-Encrypted: i=1; AJvYcCV33O+KSxlXKh5ITgxZ7Inri/6PaA1JXWE3rqQvRuHIl7RUNKxKO4Lntgb8cLX9kofd3DtWKTNslzDyvcU=@vger.kernel.org X-Gm-Message-State: AOJu0YyYcqwGJqiqBItunHj1jcoxyQhHoRAfNic/f/tLinFbMmL5Wsu1 CFIwLhSBtNrLrZKMgJMAgeVx5mB0Gm2a6HULS30c31rviLsQ/BE/g8ZClAW6ics= X-Gm-Gg: ASbGnctDVpvA/uu6qt4H0ZS6vCphNiQhPh+zISQjRb0Z5rIqI4VP6nmQZNpFKpn+DgQ 0EZLTMRy2shliRFfgFUE9/xhWZN20mMr6dROC3A5pbGTicJHbZHHgDfgUG1MJ5mpzaoS+vGlpXe /DuD3BhNCeOfIsgb7CELZi8b4n9NJpygIuZ8ypL9fZZFnF06ZXmP4ZaDkZNe8IGkHEkYuFs4BDx tYmvk+85akuHOP6e7e1FOvgHUSdQCmBwl94KdaNplrSFRHZKMOAgo6sUg== X-Google-Smtp-Source: AGHT+IFMZaawvgQ0mmiXQ+XIost4nkLrH59oXQYTws/XE+0Hed0N6s2bXCIdJJdDop0UM3Vco0N0aw== X-Received: by 2002:a05:600c:468b:b0:434:a706:c0fb with SMTP id 5b1f17b1804b1-4362aa369ffmr164608895e9.10.1734379993276; Mon, 16 Dec 2024 12:13:13 -0800 (PST) Received: from blackbook2.suse.cz ([84.19.86.74]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4364a379d69sm473715e9.0.2024.12.16.12.13.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Dec 2024 12:13:13 -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: [RFC PATCH 1/9] sched: Convert CONFIG_RT_GROUP_SCHED macros to code conditions Date: Mon, 16 Dec 2024 21:12:57 +0100 Message-ID: <20241216201305.19761-2-mkoutny@suse.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241216201305.19761-1-mkoutny@suse.com> References: <20241216201305.19761-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 bd66a46b06aca..6ea46c7219634 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 ff0e5ab4e37cb..77d0d4a2b68da 100644 --- a/kernel/sched/syscalls.c +++ b/kernel/sched/syscalls.c @@ -650,7 +650,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.47.1