From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 14D09C6FA8E for ; Sun, 26 Feb 2023 03:46:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230112AbjBZDqV (ORCPT ); Sat, 25 Feb 2023 22:46:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55310 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230073AbjBZDp7 (ORCPT ); Sat, 25 Feb 2023 22:45:59 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F0A09193D4; Sat, 25 Feb 2023 19:45:17 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 808B460B9E; Sun, 26 Feb 2023 03:44:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EF8B1C433A8; Sun, 26 Feb 2023 03:44:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677383047; bh=iJ/Mn8C6xIH8W7vjzriC/JEYNPf3Ca5vtB+B/+0Yxj0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kLAk8+7FnUGomvZZrdtDR+j/VPWHivWA2tu14ofXgGyITtY1yKvrPuRupwPcuTSEi vidCdFyEHgVq9Kv1KBwEWITZu3YyR5Tpm6b4weMPvM3ahV+LWVjvoAjyr3n4GU1sdW P426ibJHl7DQypSYBluWKLfvjAleqSHsWxAOMpHTwTtHXTRc9zUaqnOsWZzw8C65At h54mcbeXG1E1JQXINv6Og/WNJgQT4bZywnfaQCXKjogB8wVJD7Z4vk0/A/r9JE4pos Vx+KygG+TGa3voRik8xAzEKAnBdQ98ZQh8VuSZ+CV0e7tkjTu/1Iq/tbq8s0q4pVlM NbdzZe6AByjGA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zhang Qiao , Roman Kagan , Peter Zijlstra , Sasha Levin , mingo@redhat.com, juri.lelli@redhat.com, vincent.guittot@linaro.org Subject: [PATCH AUTOSEL 5.15 6/6] sched/fair: sanitize vruntime of entity being placed Date: Sat, 25 Feb 2023 22:43:58 -0500 Message-Id: <20230226034359.773806-6-sashal@kernel.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230226034359.773806-1-sashal@kernel.org> References: <20230226034359.773806-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Zhang Qiao [ Upstream commit 829c1651e9c4a6f78398d3e67651cef9bb6b42cc ] When a scheduling entity is placed onto cfs_rq, its vruntime is pulled to the base level (around cfs_rq->min_vruntime), so that the entity doesn't gain extra boost when placed backwards. However, if the entity being placed wasn't executed for a long time, its vruntime may get too far behind (e.g. while cfs_rq was executing a low-weight hog), which can inverse the vruntime comparison due to s64 overflow. This results in the entity being placed with its original vruntime way forwards, so that it will effectively never get to the cpu. To prevent that, ignore the vruntime of the entity being placed if it didn't execute for much longer than the characteristic sheduler time scale. [rkagan: formatted, adjusted commit log, comments, cutoff value] Signed-off-by: Zhang Qiao Co-developed-by: Roman Kagan Signed-off-by: Roman Kagan Signed-off-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/20230130122216.3555094-1-rkagan@amazon.de Signed-off-by: Sasha Levin --- kernel/sched/fair.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 6648683cd9644..671bbd71ff26c 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -4331,6 +4331,7 @@ static void place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial) { u64 vruntime = cfs_rq->min_vruntime; + u64 sleep_time; /* * The 'current' period is already promised to the current tasks, @@ -4355,8 +4356,18 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial) vruntime -= thresh; } - /* ensure we never gain time by being placed backwards. */ - se->vruntime = max_vruntime(se->vruntime, vruntime); + /* + * Pull vruntime of the entity being placed to the base level of + * cfs_rq, to prevent boosting it if placed backwards. If the entity + * slept for a long time, don't even try to compare its vruntime with + * the base as it may be too far off and the comparison may get + * inversed due to s64 overflow. + */ + sleep_time = rq_clock_task(rq_of(cfs_rq)) - se->exec_start; + if ((s64)sleep_time > 60LL * NSEC_PER_SEC) + se->vruntime = vruntime; + else + se->vruntime = max_vruntime(se->vruntime, vruntime); } static void check_enqueue_throttle(struct cfs_rq *cfs_rq); -- 2.39.0