Message ID | 20240304030042.2690-3-dtcccc@linux.alibaba.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel+bounces-89994-ouuuleilei=gmail.com@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:fa17:b0:10a:f01:a869 with SMTP id ju23csp1189314dyc; Sun, 3 Mar 2024 19:01:12 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCV7Kx+ETeiZyEqWbsLtpv7b9E6CGc+mXAeinUpGDqsgsxpnBBhrVns4QeAOWpf8ugG93hXvbLTcI1LeTRMtyJejNjvhDQ== X-Google-Smtp-Source: AGHT+IGbHqjZ9iXITlQ74md81xZ4+az7VSahDnhr8SqCg3NA0xWCt20tlo8UbMMPgLvTDB0+2ajO X-Received: by 2002:a05:6402:b57:b0:567:3437:f06b with SMTP id bx23-20020a0564020b5700b005673437f06bmr1652742edb.17.1709521272146; Sun, 03 Mar 2024 19:01:12 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709521272; cv=pass; d=google.com; s=arc-20160816; b=qeBJiADPqNiquf2oDdWG+gu5VVgfWP3EDMrVgqJdJqODetYW8WtID1xcK4ENiHQylU He+7ZZmxxwSegNVdNO6SyCJ3mMAG0B2NgI3kq2D1JcfbvQ4ATNYe0Ak9OLORTB1d0n9+ QpOo7+Sxr3eN5FeGLjRebJWOxjEh7rKBBdz8WUFcGw2pL9q+qHhyOS4n2Z29uLfj7FQK Ch/KAx5kAcHr79bjJU1kv9HoE1cY9zFVzx8y7zzgh0gTv/tBsvBvBuMkmKb3km2XVslX LItQ4orq0xxUyBmzF2yQyIXKsR1eObslHqL/sPd7jFGIerp/1N2gXG3q3Q836iNljftz +U3A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=OAEj4XYKb6Z7iXVcveEaFUEGuCaJ8azk2/tiA7nFnrA=; fh=HGPOwMD1U+bU1zkI6pk9BDAYYJSoTCIazwWVkER0sVk=; b=QQ8TcleWCI3um/vblZtn5MTz0b2kiVH3e5Km4ACG/qigxjUg65vd/7GCG4F0/v19ea lgtsB0bQtEYawGQ7nFhrxo/V7UKs5xQG61Xt/QhRE3owDVP/6PdUcjTfTURBQ6B+9FCu 9MzN31fGSsyzbxe1bOGfSpc4jb7EWnjCunlF0cxsLZzqhTBY9bdxmbcOTdwLXo4VpO9l Gaebr0ZrUvWabX8DrdoOT7m4Cw4oiylRCAO85Vu2ahze09Jn+pWT8Xf8+pHdyIRj9hZo 0awMWG5ym4d72wXjWjX70ZJg58TnhxGQ7PSZcstK+kmXPF8ZQ6C3pxPI6Nx2QgrzM25w YEhQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linux.alibaba.com header.s=default header.b=Myqptbhw; arc=pass (i=1 spf=pass spfdomain=linux.alibaba.com dkim=pass dkdomain=linux.alibaba.com dmarc=pass fromdomain=linux.alibaba.com); spf=pass (google.com: domain of linux-kernel+bounces-89994-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-89994-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.alibaba.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id u23-20020a50c057000000b00566e07a0f4csi2357915edd.498.2024.03.03.19.01.11 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Mar 2024 19:01:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-89994-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.alibaba.com header.s=default header.b=Myqptbhw; arc=pass (i=1 spf=pass spfdomain=linux.alibaba.com dkim=pass dkdomain=linux.alibaba.com dmarc=pass fromdomain=linux.alibaba.com); spf=pass (google.com: domain of linux-kernel+bounces-89994-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-89994-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.alibaba.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id BBD4E1F214CC for <ouuuleilei@gmail.com>; Mon, 4 Mar 2024 03:01:11 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BAA43522D; Mon, 4 Mar 2024 03:00:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b="Myqptbhw" 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 0AB2617C9 for <linux-kernel@vger.kernel.org>; Mon, 4 Mar 2024 03:00:53 +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=1709521256; cv=none; b=pcXpAbRqi5D2IMk2zZaGBqRoldlQS6vTCh8rvosHOkz+54cv2EG+ZHMaR7a0ArtDsAEhuke2J1ai7oWXyQmscpySYttyXLef3jyYiGZCN+N5qd06HMFK3C8+mAxPkbvwZtJnQieKq9LkD3VTxSQclyACwoh38Ii/H6n86ruq0wg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709521256; c=relaxed/simple; bh=nw9L+W2RdaeA/JiFU5L3vP+VcASNnK3QbAN7wrUFDFQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=e96P08fQlqNRrAr9zjl9l1jBaLpHKFHRme0dmhjFt+yFHOakS5X1dnB/oy3jPFRhOzY2V7KTL5ylRxZLXuS8oGSG7A/FF6OON+ohZ2qQVFSB3SqqfB7VzNw2o5jwA3cF5hvauhr5aeKGcXTWzcFeGxhc2gb2BBCSOtz9cO86Mp0= 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=Myqptbhw; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1709521251; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=OAEj4XYKb6Z7iXVcveEaFUEGuCaJ8azk2/tiA7nFnrA=; b=MyqptbhwDSgqNFwQg+dfz2ORR+xFL8mW4MSbmcPLxGILWPfp38hCZEkkVjOf0c4ECOQYbr9awrQiQNUYM7nz4s82gHNdmKOjzNDPd3Aqqqiqq9WrOKOutK+XjlNIkasaain0TgkMXudi3fFGwaZnfsl/ZlbruKmjlvROTSGur88= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R101e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045168;MF=dtcccc@linux.alibaba.com;NM=1;PH=DS;RN=12;SR=0;TI=SMTPD_---0W1i0XYp_1709521250; Received: from localhost.localdomain(mailfrom:dtcccc@linux.alibaba.com fp:SMTPD_---0W1i0XYp_1709521250) by smtp.aliyun-inc.com; Mon, 04 Mar 2024 11:00:50 +0800 From: Tianchen Ding <dtcccc@linux.alibaba.com> To: linux-kernel@vger.kernel.org Cc: Ingo Molnar <mingo@redhat.com>, Peter Zijlstra <peterz@infradead.org>, Juri Lelli <juri.lelli@redhat.com>, Vincent Guittot <vincent.guittot@linaro.org>, Dietmar Eggemann <dietmar.eggemann@arm.com>, Steven Rostedt <rostedt@goodmis.org>, Ben Segall <bsegall@google.com>, Mel Gorman <mgorman@suse.de>, Daniel Bristot de Oliveira <bristot@redhat.com>, Valentin Schneider <vschneid@redhat.com>, Abel Wu <wuyun.abel@bytedance.com> Subject: [PATCH 2/2] sched/eevdf: Fix miscalculation in reweight_entity() when se is not curr Date: Mon, 4 Mar 2024 11:00:42 +0800 Message-Id: <20240304030042.2690-3-dtcccc@linux.alibaba.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20240304030042.2690-1-dtcccc@linux.alibaba.com> References: <20240304030042.2690-1-dtcccc@linux.alibaba.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: <linux-kernel.vger.kernel.org> List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792562977311226630 X-GMAIL-MSGID: 1792562977311226630 |
Series |
sched/eevdf: Minor fixes for reweight_entity()
|
|
Commit Message
Tianchen Ding
March 4, 2024, 3 a.m. UTC
reweight_eevdf() only keeps V unchanged inside itself. When se !=
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 <dtcccc@linux.alibaba.com>
---
kernel/sched/fair.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
Comments
On 3/4/24 11:00 AM, Tianchen Ding Wrote: > reweight_eevdf() only keeps V unchanged inside itself. When se != > 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 <dtcccc@linux.alibaba.com> > --- > 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 > > -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 = se->load.weight; > - u64 avruntime = avg_vruntime(cfs_rq); > s64 vlag, vslice; > > /* > @@ -3787,10 +3786,12 @@ static void reweight_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, > unsigned long weight) > { > bool curr = cfs_rq->curr == se; > + u64 avruntime; > > if (se->on_rq) { > /* commit outstanding execution time */ > update_curr(cfs_rq); > + avruntime = 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, struct sched_entity *se, > */ > se->vlag = div_s64(se->vlag * se->load.weight, weight); > } else { > - reweight_eevdf(cfs_rq, se, weight); > + reweight_eevdf(se, avruntime, weight); > } > > update_load_set(&se->load, weight); Reviewed-by: Abel Wu <wuyun.abel@bytedance.com>
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 -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 = se->load.weight; - u64 avruntime = avg_vruntime(cfs_rq); s64 vlag, vslice; /* @@ -3787,10 +3786,12 @@ static void reweight_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, unsigned long weight) { bool curr = cfs_rq->curr == se; + u64 avruntime; if (se->on_rq) { /* commit outstanding execution time */ update_curr(cfs_rq); + avruntime = 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, struct sched_entity *se, */ se->vlag = div_s64(se->vlag * se->load.weight, weight); } else { - reweight_eevdf(cfs_rq, se, weight); + reweight_eevdf(se, avruntime, weight); } update_load_set(&se->load, weight);