From mboxrd@z Thu Jan 1 00:00:00 1970 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 E6B253630BA; Mon, 29 Jun 2026 11:13:17 +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=1782731599; cv=none; b=Cd0pK6S94SH3rqyyd3KDiOc+BxuLDEKqyH5GxTZgADllDh0Am0MmBAb8ghPR/Q2r9qHcdTaPYlNuyiXyvYAlu0NywT+T/EILVL3jRlBMqZNodQjSINGX/8VyKzg+G9FTViDSE2wVxZkv/jBvCRRX04EIetQi90DHQx+XT5HG+9U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782731599; c=relaxed/simple; bh=3KmrglqZyeCjM78WualWUtXIQTz+5n5XAWkri/X6u8E=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=WWHKJRfc7rlbt8Yn4aYswvAkoGrehGVEdhCMJd9DdOkHKW3hHd0LqQ+HHnbLZv1+ZxU8MKLggdlD89yd+cYUmFEIaLhQ5YrtWJNwx9XGoYmL3NGD9zWV0Jr7qljTp7i09Vf3ljU+EleC97jiqaYZsg8U+tyy55TfIg80SzZdWc0= 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=r5H+ir2q; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=9JUYkIgl; 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="r5H+ir2q"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="9JUYkIgl" Date: Mon, 29 Jun 2026 11:13:14 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1782731596; 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=RLeKMLD3ayzzEiljDnc9rHRU/cDJbKZm4C5ibcY/MQg=; b=r5H+ir2qwRUdkI8y/bYHuCE7WrPPy27Jh7w+dT3EvquiJTc8T8magcamfrS+Mm4IDS0GWj EAwF1q2dA9jCwVn3SHOljB4KYFq0fIK/p0FU0iZFfr1nG10+RtPt1vAwdZ5Bte13fitc7u 270e9nKKX/02nTTm1jjXVUo4QiNf0zBY3czHU+JbCpiKj+9u4icLnfhrJXOyeqepzNnrPS xF7QpiwYgJ2e8RJAu63TfPLnKSCX0DgdALiAeKt2yv99qP3h3eJW+GBSg8i039Dl+1JYkH zk/FSzJ9iO5Y8ApGB1GV7o3oa/+d0/aFoULPH7EV96KcB4KlpHDHi4h6xrbXfw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1782731596; 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=RLeKMLD3ayzzEiljDnc9rHRU/cDJbKZm4C5ibcY/MQg=; b=9JUYkIgl6aZ3zpHZaGrk7+7oEj3SAe935i7u54XwjaLXTpKN4faihIQ1G/PJBRa9X90pzX D0+2HUUKqrD9WkAQ== From: "tip-bot2 for Zhan Xusheng" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: sched/urgent] sched/fair: Fix stale comments referring to removed CFS concepts Cc: Zhan Xusheng , Ingo Molnar , Peter Zijlstra , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260629030200.3165589-1-zhanxusheng@xiaomi.com> References: <20260629030200.3165589-1-zhanxusheng@xiaomi.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <178273159419.3843924.17455384806679869461.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/urgent branch of tip: Commit-ID: 17fdabfa3aeca3d07846a8d56ac0abf61b58bffd Gitweb: https://git.kernel.org/tip/17fdabfa3aeca3d07846a8d56ac0abf61b5= 8bffd Author: Zhan Xusheng AuthorDate: Mon, 29 Jun 2026 11:02:00 +08:00 Committer: Ingo Molnar CommitterDate: Mon, 29 Jun 2026 13:11:52 +02:00 sched/fair: Fix stale comments referring to removed CFS concepts A few comments still describe the pre-EEVDF CFS world: - sysctl_sched_base_slice is documented as "Minimal preemption granularity for CPU-bound tasks". That was the wording of the old sysctl_sched_min_granularity, renamed in commit e4ec3318a17f ("sched/debug: Rename sysctl_sched_min_granularity to sysctl_sched_base_slice"). Under EEVDF it is the default base time slice / request size (r_i) used to compute the virtual deadline, as documented in update_deadline(). - Two comments still mention sched_slice(), which was removed when the fair class committed to EEVDF in commit 5e963f2bd465 ("sched/fair: Commit to EEVDF"). The dequeue-path comment should simply refer to the task's slice (se->slice); the forced-idle comment describes the slice accounting now performed by __entity_slice_used(), which is the function actually used right below it. No functional changes. Signed-off-by: Zhan Xusheng Signed-off-by: Ingo Molnar Cc: Peter Zijlstra Link: https://patch.msgid.link/20260629030200.3165589-1-zhanxusheng@xiaomi.com --- kernel/sched/fair.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index d78467e..599ff23 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -72,7 +72,10 @@ unsigned int sysctl_sched_tunable_scaling =3D SCHED_TUNABLESCALING_LOG; =20 /* - * Minimal preemption granularity for CPU-bound tasks: + * Default base time slice (request size r_i) for SCHED_NORMAL/SCHED_BATCH: + * + * Under EEVDF this is the request size used to compute the virtual + * deadline; see update_deadline(). * * (default: 0.70 msec * (1 + ilog(ncpus)), units: nanoseconds) */ @@ -7974,7 +7977,7 @@ static int dequeue_entities(struct rq *rq, struct sched= _entity *se, int flags) se =3D parent_entity(se); /* * Bias pick_next to pick a task from this cfs_rq, as - * p is sleeping when it is within its sched_slice. + * p is sleeping when it is within its slice. */ if (task_sleep && se) set_next_buddy(se); @@ -14571,7 +14574,7 @@ static inline void task_tick_core(struct rq *rq, stru= ct task_struct *curr) * if the sibling is forced idle, then trigger schedule to * give forced idle task a chance. * - * sched_slice() considers only this active rq and it gets the + * __entity_slice_used() considers only this active rq and it gets the * whole slice. But during force idle, we have siblings acting * like a single runqueue and hence we need to consider runnable * tasks on this CPU and the forced idle CPU. Ideally, we should