From patchwork Mon May 10 10:19:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 433112 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp2796722jao; Mon, 10 May 2021 05:33:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyO3YRZYrqXj/iYGxCc04zCUU9/Vt9SP6Fli1yAsoMDuBcghugb2u9NPblzwrlP75kRShby X-Received: by 2002:a17:907:2662:: with SMTP id ci2mr25721680ejc.459.1620650001785; Mon, 10 May 2021 05:33:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620650001; cv=none; d=google.com; s=arc-20160816; b=L0ae1T68hRI8+IUR8PP+V0C74EP+Zxi/jpnRPFnaYlDF0DX+frASmVTrPS06RbBsn3 9PEUgIVAVCD4ITF2kOK2yAvvJZwYsiaq2hmmc5jEOfSgUnG6npuCU5Iest/vdzlkmgGz z3D5MF3AC3qGOR+BFJ5deJj89VGxMrzmwOB6MdA3upZjbL9XyIkW6GBKEPJC+RsaWSoV mqeFWI9g+ZnCZk3xqJw2a1gQ66ix8wOu2gXLOmtRZWA4dzIYd1p1ZF5Zn9OD6DxQLE0N tSFNAYzFxNLevEumRZTzNzTQjzghpWjx/+aZz2K5mcJMIx1RWMRUcFOli4kvM1+S7J2/ NVrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=FHI1FdxI05Cc9q2a2Q6Oss3aW/hGQoNmqLFfXtf9YBM=; b=PiQ9jdTyJYL7DYmlqptecT6vwD8R3M/bTaboIa4fNR+FK+oQUC2Gv5gj4LXtbdh7g4 MfytwspmMFrpE9iQlOsZRgjdkn492hO1am21IFX+27XPDcO6GeCiYiuCvfSI3nq01Pwe 7goqo78n1P4+mDBspKA1XvGTtUT/n9pDJICacc4kORmiWKHjMj7Yuzeq2Ox1jRpwEs8h GXnLW8/+6mVDca3/JnEySyNbR4wirPLYyk8Q8+oTUS3h98bj3OO5Rgkck31FH0X2ddDA FxedUQRmWiOaAbcsxuoQJJVsTUMHwwbh7kY2SiJ1QQjojkTAlslUd8GxITDMwRdl68+Y +ixQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="Z7SM/iP1"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r17si13500365edw.273.2021.05.10.05.33.21; Mon, 10 May 2021 05:33:21 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="Z7SM/iP1"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233859AbhEJLWe (ORCPT + 12 others); Mon, 10 May 2021 07:22:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:44344 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235240AbhEJLKG (ORCPT ); Mon, 10 May 2021 07:10:06 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 941B36143C; Mon, 10 May 2021 11:05:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620644722; bh=dpiciSMR6RISrdvVoW7CrBO0+Jrk4Cgg6GoFd/SA6nE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z7SM/iP167mVIlFDsj0xIJXCV/7l20Nm0vGkH3kX8X/ksu7aFek2JCit4r9PlPjc1 srtaUl8IgEOWhucLYvdqNgHgib4GFDXgo0PGnU6k3Rw7zBpb5DDsTlOqjcYp9FPJ01 EBwRQsI3zCgsbNwgoKYdWMRvoyVQIKU/GFeKydwY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jan Kara , Paolo Valente , Oleksandr Natalenko , Jens Axboe , Sasha Levin Subject: [PATCH 5.12 198/384] block, bfq: fix weight-raising resume with !low_latency Date: Mon, 10 May 2021 12:19:47 +0200 Message-Id: <20210510102021.407354969@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510102014.849075526@linuxfoundation.org> References: <20210510102014.849075526@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Paolo Valente [ Upstream commit 8c544770092a3d7532d01903b75721e537d87001 ] When the io_latency heuristic is off, bfq_queues must not start to be weight-raised. Unfortunately, by mistake, this may happen when the state of a previously weight-raised bfq_queue is resumed after a queue split. This commit fixes this error. Tested-by: Jan Kara Signed-off-by: Paolo Valente Tested-by: Oleksandr Natalenko Link: https://lore.kernel.org/r/20210304174627.161-5-paolo.valente@linaro.org Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- block/bfq-iosched.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) -- 2.30.2 diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 95586137194e..20ba5db0f61c 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -1012,7 +1012,7 @@ static void bfq_bfqq_resume_state(struct bfq_queue *bfqq, struct bfq_data *bfqd, struct bfq_io_cq *bic, bool bfq_already_existing) { - unsigned int old_wr_coeff = bfqq->wr_coeff; + unsigned int old_wr_coeff = 1; bool busy = bfq_already_existing && bfq_bfqq_busy(bfqq); if (bic->saved_has_short_ttime) @@ -1033,7 +1033,13 @@ bfq_bfqq_resume_state(struct bfq_queue *bfqq, struct bfq_data *bfqd, bfqq->ttime = bic->saved_ttime; bfqq->io_start_time = bic->saved_io_start_time; bfqq->tot_idle_time = bic->saved_tot_idle_time; - bfqq->wr_coeff = bic->saved_wr_coeff; + /* + * Restore weight coefficient only if low_latency is on + */ + if (bfqd->low_latency) { + old_wr_coeff = bfqq->wr_coeff; + bfqq->wr_coeff = bic->saved_wr_coeff; + } bfqq->service_from_wr = bic->saved_service_from_wr; bfqq->wr_start_at_switch_to_srt = bic->saved_wr_start_at_switch_to_srt; bfqq->last_wr_start_finish = bic->saved_last_wr_start_finish;