From nobody Mon Jun 8 15:38:29 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8BACA3B0AC8; Thu, 28 May 2026 09:42:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779961328; cv=none; b=aUPIE9zPM2em+YnxC+jqvsD7eimDtLJjCc6eAn67ygX/KGbrNQPVIlnJa9Ne6C4F7FfyCiOKr8HLK0mRlqdPVGR2wNVcT6fRO0pEVCdjO723ZnUcf1vOTkIsE1p+VTNYGBQi2FkB4QEg1QFkZ57sbb4KcIrhDi4gsVbVw4xyMak= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779961328; c=relaxed/simple; bh=5B5Dt8lqOclxTNxwoQIeTP86ed435nho19+HiiptXiY=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=Ubr4q1gaXvLWHUDyhORTeMajFys7pThoL+huS3Y42wm2WSnUInVNwveQW5BtKXzx5XU3Jo3gtxDFNbaIpkjucjpwRydVfSfrPIkZrnfb6wGNIP9TkKbzZegwmop0ES6dZqUfmco5VDWsoTc/vwjPP2DWc/wR11lO3RO27c4O7mE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=dydXKGT6; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=gpih5BGA; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="dydXKGT6"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="gpih5BGA" Date: Thu, 28 May 2026 09:42:03 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1779961325; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JAKri7U4gtxPXxUdVT03dQ6mqj18I3noSHUdYtkl3zY=; b=dydXKGT6VrjAFDYcUwWP1Ml9fdzxsId4N28QYkEqHVOIUQieoz2dnLX5KjBgmXzhu+b2Tw 9glvIN6ci/DfH/+rRBD9fRNKMLAOW5zPBwvAa+LA2ddHPsNiQJPfMmiyuCOfdX81av7UGP ZLESG2e0/KqWzo8d70WofrLIFSjldalg5NSirGM/6rKbzOjLjpIOTpvJ8mPHpS7ke6S/Kv EYSShCa1bmfOwftuPhZfzbdyKwIc8cjeV0hOD6lqhsg8VSstJb3P/u6NL6cytM/p87IuN6 hBFZfTOoBbl8V8lWvUfVFQM7x19IOyCRxyVusFLo5u7Og3j++hcFlY7Kb0r9MA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1779961325; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JAKri7U4gtxPXxUdVT03dQ6mqj18I3noSHUdYtkl3zY=; b=gpih5BGAavRonaM9rpyDF6DoLfW71Bct62Kj9k/DJrlUmuSz6TuIpB1GEXCbtDZLHiKedY Fg855+7Ilu7ni/CA== From: "tip-bot2 for Peter Zijlstra" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: sched/core] sched/debug: Collapse subsequent CONFIG_SCHED_CLASS_EXT sections Cc: "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260511120627.281160085@infradead.org> References: <20260511120627.281160085@infradead.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <177996132353.1039918.5185652045555298350.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the sched/core branch of tip: Commit-ID: e05777c44e53df8ab41d930510a384d65a34aafa Gitweb: https://git.kernel.org/tip/e05777c44e53df8ab41d930510a384d65= a34aafa Author: Peter Zijlstra AuthorDate: Mon, 11 May 2026 13:31:07 +02:00 Committer: Peter Zijlstra CommitterDate: Tue, 26 May 2026 13:53:13 +02:00 sched/debug: Collapse subsequent CONFIG_SCHED_CLASS_EXT sections Signed-off-by: Peter Zijlstra (Intel) Link: https://patch.msgid.link/20260511120627.281160085@infradead.org --- kernel/sched/debug.c | 92 ++++++++++++++++++++----------------------- 1 file changed, 44 insertions(+), 48 deletions(-) diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c index 4cdf2f9..4809e1d 100644 --- a/kernel/sched/debug.c +++ b/kernel/sched/debug.c @@ -488,6 +488,8 @@ static const struct file_operations fair_server_runtime= _fops =3D { .release =3D single_release, }; =20 +static struct dentry *debugfs_sched; + #ifdef CONFIG_SCHED_CLASS_EXT static ssize_t sched_ext_server_runtime_write(struct file *filp, const char __user *ubuf, @@ -520,75 +522,92 @@ static const struct file_operations ext_server_runtim= e_fops =3D { .llseek =3D seq_lseek, .release =3D single_release, }; -#endif /* CONFIG_SCHED_CLASS_EXT */ =20 static ssize_t -sched_fair_server_period_write(struct file *filp, const char __user *ubuf, - size_t cnt, loff_t *ppos) +sched_ext_server_period_write(struct file *filp, const char __user *ubuf, + size_t cnt, loff_t *ppos) { long cpu =3D (long) ((struct seq_file *) filp->private_data)->private; struct rq *rq =3D cpu_rq(cpu); =20 return sched_server_write_common(filp, ubuf, cnt, ppos, DL_PERIOD, - &rq->fair_server); + &rq->ext_server); } =20 -static int sched_fair_server_period_show(struct seq_file *m, void *v) +static int sched_ext_server_period_show(struct seq_file *m, void *v) { unsigned long cpu =3D (unsigned long) m->private; struct rq *rq =3D cpu_rq(cpu); =20 - return sched_server_show_common(m, v, DL_PERIOD, &rq->fair_server); + return sched_server_show_common(m, v, DL_PERIOD, &rq->ext_server); } =20 -static int sched_fair_server_period_open(struct inode *inode, struct file = *filp) +static int sched_ext_server_period_open(struct inode *inode, struct file *= filp) { - return single_open(filp, sched_fair_server_period_show, inode->i_private); + return single_open(filp, sched_ext_server_period_show, inode->i_private); } =20 -static const struct file_operations fair_server_period_fops =3D { - .open =3D sched_fair_server_period_open, - .write =3D sched_fair_server_period_write, +static const struct file_operations ext_server_period_fops =3D { + .open =3D sched_ext_server_period_open, + .write =3D sched_ext_server_period_write, .read =3D seq_read, .llseek =3D seq_lseek, .release =3D single_release, }; =20 -#ifdef CONFIG_SCHED_CLASS_EXT +static void debugfs_ext_server_init(void) +{ + struct dentry *d_ext; + unsigned long cpu; + + d_ext =3D debugfs_create_dir("ext_server", debugfs_sched); + if (!d_ext) + return; + + for_each_possible_cpu(cpu) { + struct dentry *d_cpu; + char buf[32]; + + snprintf(buf, sizeof(buf), "cpu%lu", cpu); + d_cpu =3D debugfs_create_dir(buf, d_ext); + + debugfs_create_file("runtime", 0644, d_cpu, (void *) cpu, &ext_server_ru= ntime_fops); + debugfs_create_file("period", 0644, d_cpu, (void *) cpu, &ext_server_per= iod_fops); + } +} +#endif /* CONFIG_SCHED_CLASS_EXT */ + static ssize_t -sched_ext_server_period_write(struct file *filp, const char __user *ubuf, - size_t cnt, loff_t *ppos) +sched_fair_server_period_write(struct file *filp, const char __user *ubuf, + size_t cnt, loff_t *ppos) { long cpu =3D (long) ((struct seq_file *) filp->private_data)->private; struct rq *rq =3D cpu_rq(cpu); =20 return sched_server_write_common(filp, ubuf, cnt, ppos, DL_PERIOD, - &rq->ext_server); + &rq->fair_server); } =20 -static int sched_ext_server_period_show(struct seq_file *m, void *v) +static int sched_fair_server_period_show(struct seq_file *m, void *v) { unsigned long cpu =3D (unsigned long) m->private; struct rq *rq =3D cpu_rq(cpu); =20 - return sched_server_show_common(m, v, DL_PERIOD, &rq->ext_server); + return sched_server_show_common(m, v, DL_PERIOD, &rq->fair_server); } =20 -static int sched_ext_server_period_open(struct inode *inode, struct file *= filp) +static int sched_fair_server_period_open(struct inode *inode, struct file = *filp) { - return single_open(filp, sched_ext_server_period_show, inode->i_private); + return single_open(filp, sched_fair_server_period_show, inode->i_private); } =20 -static const struct file_operations ext_server_period_fops =3D { - .open =3D sched_ext_server_period_open, - .write =3D sched_ext_server_period_write, +static const struct file_operations fair_server_period_fops =3D { + .open =3D sched_fair_server_period_open, + .write =3D sched_fair_server_period_write, .read =3D seq_read, .llseek =3D seq_lseek, .release =3D single_release, }; -#endif /* CONFIG_SCHED_CLASS_EXT */ - -static struct dentry *debugfs_sched; =20 static void debugfs_fair_server_init(void) { @@ -611,29 +630,6 @@ static void debugfs_fair_server_init(void) } } =20 -#ifdef CONFIG_SCHED_CLASS_EXT -static void debugfs_ext_server_init(void) -{ - struct dentry *d_ext; - unsigned long cpu; - - d_ext =3D debugfs_create_dir("ext_server", debugfs_sched); - if (!d_ext) - return; - - for_each_possible_cpu(cpu) { - struct dentry *d_cpu; - char buf[32]; - - snprintf(buf, sizeof(buf), "cpu%lu", cpu); - d_cpu =3D debugfs_create_dir(buf, d_ext); - - debugfs_create_file("runtime", 0644, d_cpu, (void *) cpu, &ext_server_ru= ntime_fops); - debugfs_create_file("period", 0644, d_cpu, (void *) cpu, &ext_server_per= iod_fops); - } -} -#endif /* CONFIG_SCHED_CLASS_EXT */ - static __init int sched_init_debug(void) { struct dentry __maybe_unused *numa, *llc;