Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31;
From:   Daniel Jordan <daniel.m.jordan@oracle.com>
To:     peterz@infradead.org
Cc:     bristot@redhat.com, bsegall@google.com, chris.hyser@oracle.com,
        corbet@lwn.net, dietmar.eggemann@arm.com, efault@gmx.de,
        joel@joelfernandes.org, joshdon@google.com, juri.lelli@redhat.com,
        kprateek.nayak@amd.com, linux-kernel@vger.kernel.org,
        mgorman@suse.de, mingo@kernel.org, patrick.bellasi@matbug.net,
        pavel@ucw.cz, pjt@google.com, qperret@google.com,
        qyousef@layalina.io, rostedt@goodmis.org, tglx@linutronix.de,
        tim.c.chen@linux.intel.com, timj@gnu.org,
        vincent.guittot@linaro.org, youssefesmat@chromium.org,
        yu.c.chen@intel.com, daniel.m.jordan@oracle.com
Subject: [PATCH] sched/fair: Always update_curr() before placing at enqueue
Date:   Fri,  6 Oct 2023 12:48:26 -0400
Message-ID: <20231006164826.335223-1-daniel.m.jordan@oracle.com>
In-Reply-To: <20230531124604.068911180@infradead.org>
References: <20230531124604.068911180@infradead.org>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?DWbHc2jnnhtyAvtqIvub2poR7A62Hw1pPmrUVC5VNX3TEb37ge81dVUPFHVq?=
 =?us-ascii?Q?469zQTsc2Ndra1f8L7T9oHwnS2eFhvGJ7SIFARFcZwOo6P/GSylTRreOehD4?=
 =?us-ascii?Q?uknqF17f8j5Hux3NZC1ytjrTEnL2oxBppo8TyARJHzco4npiraCl0VJhu/3A?=
 =?us-ascii?Q?IxBpnOIyUV3IrWCps8ZRDZ5dwTu/Q6TqWqR72v3swLYmyuoRRmhPnO0U9JUE?=
 =?us-ascii?Q?LdiTKnVjTu1LIavM6ZT5pmV4Jubheh9BegzX/7MSI6R6sH2tSPIu/WE5Kog5?=
 =?us-ascii?Q?55Up5woHMPtCxUPxRkZf0v3QFdftiWZn+sLFfgqSqB6VwsP8cAOARAWysEjL?=
 =?us-ascii?Q?tP3ljpu03uIAgkExGZfMwdMEQINHe1KcjJVGlBBM7F88p58F1xn1xI8yfJmX?=
 =?us-ascii?Q?9/dvwXPV1JHEF2eABCBffIqzSqsIgi/5puRXbIpBglyTEVw30f7Rzl2X/grf?=
 =?us-ascii?Q?RgRXJqN2ngF1sGhF4nPFAJSrV2l1WPimpd6tte7NDIohiQGdP22Ugv5AC9EV?=
 =?us-ascii?Q?jCG8cJWVTpuFZao4AIXZnHoPgNRu2fPMqqdhscfLDy2oPqQ02FB0drowGl9N?=
 =?us-ascii?Q?KND0SpWFlf6FhZR4DfTK5/57lqx95AL0UuUtG7YQx9P2bc4VMvcrrwUR6FN/?=
 =?us-ascii?Q?O773ShO2358foYKggX4aDeUv+Vj28e52VAE2ffNAiG5y6ENEVPmG+nS+Y2pO?=
 =?us-ascii?Q?BtD1EJcTGTzsfAL2b4yd3G41gL8a9UIzmQgDEHSM3t2kEJ3imnp69+d2pHu0?=
 =?us-ascii?Q?wmQ1UcpjgcsJjWqIm0f/Ncvh6A6vfO5xvU0+ClpI5KE3l5zc654xFeKCDhMR?=
 =?us-ascii?Q?jAY7Bk37d5Ww/U7zLiLARUvGtxG2qSO34wdKNBqc9RWyKP7X5T2nH1HxJNCy?=
 =?us-ascii?Q?XbAjEdE91zZBwYRjPlWTQdt+dPE29WFngDiqBo9PTsWb5LRbqNVvvKZ4Pqsw?=
 =?us-ascii?Q?X64ZcTqTdkdcANtJ/pW3H30HGudVVp29VRH6lflFX1rtHQyyRjKPxOW8OfZy?=
 =?us-ascii?Q?QSEs75GnoVLXj2jf0BmEIAOh27OmkrPJCqH0oRQSZDVmUb5umS7tLOIL4T6W?=
 =?us-ascii?Q?Lw8ym6cahnfw37EkKwjB/n8TwRQ1NPnwdDHdFTFMFIUY6rxzO0KSMF3Y7Olt?=
 =?us-ascii?Q?sRxYN/zs0BuvP/fYzIOBo7UiAbqbAbqRKV+OpPLSrq4ud9dGaB2BBtvFbRXT?=
 =?us-ascii?Q?EWmHmGRAJrGyLcaT/5bXUJS0ajIbYU08uJvzIoI6xptaV378GIlKy3ZTjmG3?=
 =?us-ascii?Q?cCJ9KigTjQbQAi0eighYlWRcr9gp+GcgehXBs9oyQFY6v2R1Shmubt64/GJi?=
 =?us-ascii?Q?OeWehy0gF/uRyhWD6g6jqDmG3Zc9rt0Izuj0NPnlplZJj4Pp0YmyuvC38+8I?=
 =?us-ascii?Q?oEDOlgLHC5rzHsYKAztvWktA+zXH12QYSxPfhPopIk4HbWkqSUxRXhyc3rPN?=
 =?us-ascii?Q?Mcc1hak5YVLQjxTakOlgvAgZPG7WVrN9+I+c8RLJD/SYiRZESCRpvLH5b1EN?=
 =?us-ascii?Q?hEtCAj6KhkT9ExyRpjFTpM32Fr4msG+K2PiexzZluRIezkqFxhv0azHFhwI7?=
 =?us-ascii?Q?axlxE7NBmQm57sP4Z/PaOLo0c9FLYwKbFuu9yo6b75SRTODBvJ75uB9gYZx7?=
 =?us-ascii?Q?jw=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?ZW5eFcOmiZAXBUwHQOQZSDCEOTnehAlJPSI5esXaTDqEX8mHCX7q0QBBmGkx?=
 =?us-ascii?Q?xNGDhsG6duoc0rDgMdXX2tzk/SXo8B6AaJ0Ylrs3U4tVg3pune9/9nGSGqiz?=
 =?us-ascii?Q?3UQrbrc78Ucf4ipqCnxn+dcCPlitmeNgnF20TGdySH7OxZ2GtieDCDP8bztR?=
 =?us-ascii?Q?+HvLrPf9LBsK7gRLW2rQypgn8dHJ3EXHtsSyE4KubSnh7fOsX0q9Yr8Ssapn?=
 =?us-ascii?Q?CF7Vg8Sr3p+LO22UCIz5r1pqXaWVQ1MFYV/OwVmfnkG3WmjfA6xC9LSJbKBC?=
 =?us-ascii?Q?rrRsCum62r4kiZe5Jl6AwM4ckV9Czz5vyf/eMIR8MBfQstfexjxU79ZF7HIy?=
 =?us-ascii?Q?Zp7OFR8ySRj1nHdeaHaDpVhqnpsP9mGFc7KucHlnoD0oq8zuv4IbkiE71rds?=
 =?us-ascii?Q?NaQ2Myno4NhqdGknSl1S4X1QAHDa3fAwOXgqFNcEkpof/8BnsYCtwUKd8hdB?=
 =?us-ascii?Q?a7iw7FG6r232g4aMsHeMFNZU4xPAcdWA0RudKrMJNBzkdeDrvq2It9avo8SY?=
 =?us-ascii?Q?Req8/qxtpXEB4iVkH7DMfPv5m69XtLjO/2sOv68TPZdEfYzBGUKeMveTGitw?=
 =?us-ascii?Q?ZVhYbsVrlWVSD18V+GBcssCjWqsD93SYJhGWQOWY2/8BzgPU1dLVsHQedvT7?=
 =?us-ascii?Q?ijQjlD5tdOEyq2FPQwr9XDc8Eq38a9IsH1Rh0tfawNrdgmrbYBVb95I4g3l1?=
 =?us-ascii?Q?YkUxcH4tpT7Qsfig9X5VvAqaCc6jBcur0IH7QtV8kj5z1FIzKIXGvmdPU4K8?=
 =?us-ascii?Q?UMksCpXvynOx+Hx5jqKkBN7cfK/nOj9ubUMRrF/7Z+r79Ipz0OuR7x8hEg97?=
 =?us-ascii?Q?EhBaOUQoFstzq7FxPlRV8fvGimNl3zZTRvywAGfxtgotwYl6rIT5tq18cfzc?=
 =?us-ascii?Q?Pr7E+d+QSW6BK2kvOewAYNr4CSakJHiRNAQFAHTROUusN1VAV8pB8uj+MMZE?=
 =?us-ascii?Q?VLOKE9q85JoHPlNbf8u5qkNStlXK06Mf+vSfOpsrS6yHIHZLFHi8s4Vp5D3l?=
 =?us-ascii?Q?6EhfAbQq0dIKiuzipmJPlN8N3R8gLsaihk9E9bARFdjqm7a/bVwy56j8gZdT?=
 =?us-ascii?Q?ZjAiDBt+7sC3M9FcJ1kkIx5gT+eNvcZmg83Ivy3ES7Cw9pUXWCv3hCr6Z8/M?=
 =?us-ascii?Q?0PW/+iKcgP6geenYIPUJsMxgpdNC8K1yADRBG1TFkRiVkpXyaV7DgqwY0vpR?=
 =?us-ascii?Q?bsalBkb+j2rBmeCiJoV+25/gp3FCkIGjoI4jSXac707PSeSc0FOiB/XrcyOV?=
 =?us-ascii?Q?cIaP5Bx48aBox4F5IJ4pbaWVbCGAjkqngRPJQhBG2++EyOJZVjKioLokPmk/?=
 =?us-ascii?Q?UQ8vzqBO1qAu6TL4ktJmIN0fL4Zp4nsLcd0nZk2RUGioBQ=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 491913fd-1e0e-4c0a-068e-08dbc68c112e
X-MS-Exchange-CrossTenant-AuthSource: SA1PR10MB5711.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Oct 2023 16:48:29.0661
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: cy0iwv6GnHbCbN6ZtSbSSyA+W48BGzzTIvvvwfeXfSm9pQyobDv+ggzOuos5nJQBwyJ4ZKaAg6+Ib3Mtg9dZBbj/KEodgZpGD2/K8o5xk80=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR10MB6115
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.267,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2023-10-06_12,2023-10-06_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 malwarescore=0
 adultscore=0 suspectscore=0 mlxlogscore=999 bulkscore=0 mlxscore=0
 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2309180000 definitions=main-2310060126
X-Proofpoint-GUID: 3J0OmotUmCeBpZKPir8eaWAP6sv-VTcd
X-Proofpoint-ORIG-GUID: 3J0OmotUmCeBpZKPir8eaWAP6sv-VTcd
X-Spam-Status: No, score=2.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no
	version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Fri, 06 Oct 2023 09:49:28 -0700 (PDT)
X-Spam-Level: **

Placing wants current's vruntime and the cfs_rq's min_vruntime up to
date so that avg_runtime() is too, and similarly it wants the entity to
be re-weighted and lag adjusted so vslice and vlag are fresh, so always
do update_curr() and update_cfs_group() beforehand.

There doesn't seem to be a reason to treat the 'curr' case specially
after e8f331bcc270 since vruntime doesn't get normalized anymore.

Fixes: e8f331bcc270 ("sched/smp: Use lag to simplify cross-runqueue placement")
Signed-off-by: Daniel Jordan <daniel.m.jordan@oracle.com>
---

Not sure what the XXX above place_entity() is for, maybe it can go away?

Based on tip/sched/core.

 kernel/sched/fair.c | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 04fbcbda97d5f..db2ca9bf9cc49 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -5047,15 +5047,6 @@ static inline bool cfs_bandwidth_used(void);
 static void
 enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
 {
-	bool curr = cfs_rq->curr == se;
-
-	/*
-	 * If we're the current task, we must renormalise before calling
-	 * update_curr().
-	 */
-	if (curr)
-		place_entity(cfs_rq, se, flags);
-
 	update_curr(cfs_rq);
 
 	/*
@@ -5080,8 +5071,7 @@ enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
 	 * XXX now that the entity has been re-weighted, and it's lag adjusted,
 	 * we can place the entity.
 	 */
-	if (!curr)
-		place_entity(cfs_rq, se, flags);
+	place_entity(cfs_rq, se, flags);
 
 	account_entity_enqueue(cfs_rq, se);
 
@@ -5091,7 +5081,7 @@ enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags)
 
 	check_schedstat_required();
 	update_stats_enqueue_fair(cfs_rq, se, flags);
-	if (!curr)
+	if (cfs_rq->curr != se)
 		__enqueue_entity(cfs_rq, se);
 	se->on_rq = 1;
 
-- 
2.41.0