From nobody Fri Dec 19 21:50:53 2025 Received: from out30-130.freemail.mail.aliyun.com (out30-130.freemail.mail.aliyun.com [115.124.30.130]) (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 034D411737 for ; Wed, 6 Mar 2024 02:21:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=115.124.30.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709691711; cv=none; b=Jyks4rtlATVw3SBCTbVEMQp/9nP0E7Ab7yHvCNZ91A1LlSOAOWVRbCTMGJN8tJunUXxP8SZWFd8KORBjfx5nwEmAur/NIxuVb7u+MClVVMoo/WUi4DtncCxmQlO4xrNp6OiNbN89vzmUS/T/8UnIFNTxQYLTQwlH4E08AtALX48= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709691711; c=relaxed/simple; bh=4Qcvxbo4yVnHGI1XijOvuVxr8KAxzPC/FWF9Ngs7Ecg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=lhGX0/0xOs10KCdGeYVVWSllYwe/0E0jofFdF0ihZmZDFdZkjI1VVNm753P9gAvtzX/gjj5tBp7wQ5Sou5dmNBYaSyUwELt8XVwOsfFrR2/so/NhI/GP2IxdAbtTiTWYfJKqair0ZbK22ALJVTIiyl4MI4Zsy5YkyNrfCaMhUEA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com; spf=pass smtp.mailfrom=linux.alibaba.com; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b=i+/4xbF4; arc=none smtp.client-ip=115.124.30.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b="i+/4xbF4" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1709691701; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=sHdpStoisiwB+BViHQryg1RajFi92J6Co77x3KsUFjI=; b=i+/4xbF4OMXW/8gkwZOga9RCoOYh/CHdfvaksFBIp8ABl4q7Fc+VedW086NJepxuL120y5ltj6zE1Uh2po1ePeSd0vtRbL3U9sI1mJ4GN68OPHUZ9PPFgoxtSM4JwM5KXlOPe96eUQ61kuhjNG7nEc1gO6BUdlvFURRsETsgEus= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R341e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045170;MF=dtcccc@linux.alibaba.com;NM=1;PH=DS;RN=12;SR=0;TI=SMTPD_---0W1vhPKb_1709691700; Received: from localhost.localdomain(mailfrom:dtcccc@linux.alibaba.com fp:SMTPD_---0W1vhPKb_1709691700) by smtp.aliyun-inc.com; Wed, 06 Mar 2024 10:21:40 +0800 From: Tianchen Ding To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Daniel Bristot de Oliveira , Valentin Schneider , Abel Wu Subject: [PATCH v2 1/2] sched/eevdf: Always update V if se->on_rq when reweighting Date: Wed, 6 Mar 2024 10:21:32 +0800 Message-Id: <20240306022133.81008-2-dtcccc@linux.alibaba.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20240306022133.81008-1-dtcccc@linux.alibaba.com> References: <20240306022133.81008-1-dtcccc@linux.alibaba.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" reweight_eevdf() needs the latest V to do accurate calculation for new ve and vd. So update V unconditionally when se is runnable. Fixes: eab03c23c2a1 ("sched/eevdf: Fix vruntime adjustment on reweight") Suggested-by: Abel Wu Signed-off-by: Tianchen Ding Reviewed-by: Abel Wu Tested-by: Chen Yu Tested-by: K Prateek Nayak --- kernel/sched/fair.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 03be0d1330a6..5551ce2af73e 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -3790,9 +3790,8 @@ static void reweight_entity(struct cfs_rq *cfs_rq, st= ruct sched_entity *se, =20 if (se->on_rq) { /* commit outstanding execution time */ - if (curr) - update_curr(cfs_rq); - else + update_curr(cfs_rq); + if (!curr) __dequeue_entity(cfs_rq, se); update_load_sub(&cfs_rq->load, se->load.weight); } --=20 2.39.3 From nobody Fri Dec 19 21:50:53 2025 Received: from out30-100.freemail.mail.aliyun.com (out30-100.freemail.mail.aliyun.com [115.124.30.100]) (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 1C6D22F32 for ; Wed, 6 Mar 2024 02:21:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=115.124.30.100 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709691706; cv=none; b=IMdcQ/NqP/yg1teU6IHxuAKol8vlCsgiIiazd4CUGargIq3qpXQbYo0DCo5Xv4c2XUyw606dx6WwhrfD9E8LtHxG7KTZe9F8TAihVbBG0Q+xIgLD2u2qj5tP4uVsqlV6p1ZczGLLRREvlJCRXsFVV0Zh1sXR9ykPt2UqUgVFy1M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709691706; c=relaxed/simple; bh=llxPm/WzisI+fXOfjRbkdh3EW/AIJNXwoI7XOjyXYcc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ZcnruGT7fFlBPRfEKt41jpBjQ6Qr82IiISJN2PV0p0XyBZSy6FDNGvBfPA7adRGB/A9HhzP3is7Icte/7/jq/yXSWl7bjTVjMdXyvtfCKQQjmrfrJbPycJaVA8jUa8HHdVyiG9iSTs7Zi0fXar52Noxx0Bou06b7sI+ucaH4eBk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com; spf=pass smtp.mailfrom=linux.alibaba.com; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b=FukrBhaU; arc=none smtp.client-ip=115.124.30.100 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b="FukrBhaU" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1709691701; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=7C9rxAZf2p6XR/2XiWXhnPifuebioXZkTUeVUjvyyeI=; b=FukrBhaUaG6JcR+IbuDIQSozVvzLeMces7Pi52l+eXPSyVBHxJ0sA4uyVu/xIna6BKvD7VZlumLYGIAk83nzPDHhIGiUwhhBRdZtwY4OKUncxNvamf7WyPJM3uCCw//euwZ6n5YxUNbpm9/m3dv4dXeMDaa9uxKvPhk8s6aHpf0= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R211e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046059;MF=dtcccc@linux.alibaba.com;NM=1;PH=DS;RN=12;SR=0;TI=SMTPD_---0W1vhPKm_1709691700; Received: from localhost.localdomain(mailfrom:dtcccc@linux.alibaba.com fp:SMTPD_---0W1vhPKm_1709691700) by smtp.aliyun-inc.com; Wed, 06 Mar 2024 10:21:41 +0800 From: Tianchen Ding To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Daniel Bristot de Oliveira , Valentin Schneider , Abel Wu Subject: [PATCH v2 2/2] sched/eevdf: Fix miscalculation in reweight_entity() when se is not curr Date: Wed, 6 Mar 2024 10:21:33 +0800 Message-Id: <20240306022133.81008-3-dtcccc@linux.alibaba.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20240306022133.81008-1-dtcccc@linux.alibaba.com> References: <20240306022133.81008-1-dtcccc@linux.alibaba.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" reweight_eevdf() only keeps V unchanged inside itself. When se !=3D cfs_rq->curr, it would be dequeued from rb tree first. So that V is changed and the result is wrong. Pass the original V to reweight_eevdf() to fix this issue. Fixes: eab03c23c2a1 ("sched/eevdf: Fix vruntime adjustment on reweight") Signed-off-by: Tianchen Ding Reviewed-by: Abel Wu Tested-by: Chen Yu Tested-by: K Prateek Nayak --- kernel/sched/fair.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 5551ce2af73e..091a1a750638 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -3676,11 +3676,10 @@ static inline void dequeue_load_avg(struct cfs_rq *cfs_rq, struct sched_entity *se) { } #endif =20 -static void reweight_eevdf(struct cfs_rq *cfs_rq, struct sched_entity *se, +static void reweight_eevdf(struct sched_entity *se, u64 avruntime, unsigned long weight) { unsigned long old_weight =3D se->load.weight; - u64 avruntime =3D avg_vruntime(cfs_rq); s64 vlag, vslice; =20 /* @@ -3787,10 +3786,12 @@ static void reweight_entity(struct cfs_rq *cfs_rq, = struct sched_entity *se, unsigned long weight) { bool curr =3D cfs_rq->curr =3D=3D se; + u64 avruntime; =20 if (se->on_rq) { /* commit outstanding execution time */ update_curr(cfs_rq); + avruntime =3D avg_vruntime(cfs_rq); if (!curr) __dequeue_entity(cfs_rq, se); update_load_sub(&cfs_rq->load, se->load.weight); @@ -3804,7 +3805,7 @@ static void reweight_entity(struct cfs_rq *cfs_rq, st= ruct sched_entity *se, */ se->vlag =3D div_s64(se->vlag * se->load.weight, weight); } else { - reweight_eevdf(cfs_rq, se, weight); + reweight_eevdf(se, avruntime, weight); } =20 update_load_set(&se->load, weight); --=20 2.39.3