From patchwork Fri Jan 18 11:52:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Valente X-Patchwork-Id: 155921 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3163598jaa; Fri, 18 Jan 2019 03:52:40 -0800 (PST) X-Google-Smtp-Source: ALg8bN4T6xt/NmD3RLqEnA8l3gYrGGL4kFTc1dVK/0NQRDX2WdXRMDA7g6E9PLWT2sAyN6qmfxqi X-Received: by 2002:a62:104a:: with SMTP id y71mr161849pfi.34.1547812360159; Fri, 18 Jan 2019 03:52:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547812360; cv=none; d=google.com; s=arc-20160816; b=xTfgcePEGj53JxHJe5EDcY+/YRf00/v0yWzo4i7SYK0d+cRLm0FZYyzqaLeMbAfL+6 Qa1Zg2SPM/m4H5z2Nqfm36Vtk4ZaZmdVCrad/MOltFW7lVsnegXfJAZ45bh0J3U9/1RH 2fErjoPYNlECWSl8slIEuUEZvKjd41+KATfII4rGBI0RfMs0EUkCsSpCO/VeUpWxDtQ5 fCVV5BBMUc3iz7vqFPNVpzVZ4QsdS4dT61DGt5n+AyYS+WRCAPtJs3Zn6wDbovpD6D8N JfnR8kVtOVjSFgSrqJXMDgs9F6hamppfGRpx8iWZQwdyRFde0VIE3unEJ5idppMEW2Pk q6DA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=T8vQW2xfZ3nYT48XTv7O5Fvq/rW1TVfhYcpInM5Lwzo=; b=fy0+JuuUJk0tRf3JhfEoIyW48+MLumzdn28hJyCxmO70M7LVS1hkOPpX3/ppjBWnOA ofTiIti/ja5IwTIMLlSFQsRt1Wb8FflzlMmd867+L9t3wbyTxVMX876q//SptLrvbGIH mVCBqhZMr6eQspT2pzUVqBAqvthH8OZ5fhO2t/jHPAEkcAAySlKhOil+y2MImPoo1WE+ DlESVd1efT2rUq2Jo/Hyea0IQhWeOhAjhX2eMfCKn0a1Nqz4B1Pbbq4TzTCAscgC48qp ul//lMef9s07yHOJN0dVimjI8xSWFlkgGXcYfrmKI6E2Wpxki5GjocepulLHOU2qH+Z7 HxPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZM9f5QXx; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y12si4270738plk.174.2019.01.18.03.52.39; Fri, 18 Jan 2019 03:52:40 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZM9f5QXx; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727457AbfARLwj (ORCPT + 13 others); Fri, 18 Jan 2019 06:52:39 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:35124 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727384AbfARLwg (ORCPT ); Fri, 18 Jan 2019 06:52:36 -0500 Received: by mail-wm1-f66.google.com with SMTP id t200so4271305wmt.0 for ; Fri, 18 Jan 2019 03:52:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=T8vQW2xfZ3nYT48XTv7O5Fvq/rW1TVfhYcpInM5Lwzo=; b=ZM9f5QXxENn1/zcigDnvU61nSMmX6E/IaP7lKHQ1H21ACWYHq4oT4OenfjicVjDtqK agPkCIdOiHU+zZRL/8RjUpKhq0+HFQNIM4JRwWCYhZV5t2H2McQdsBn6CIqL5OZiEj6Q tGQDYpW19wJUiKGkUxUQY2JVkTr9jAYatVstg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=T8vQW2xfZ3nYT48XTv7O5Fvq/rW1TVfhYcpInM5Lwzo=; b=MZjKZalISxCCSZnLllZrANVIKHdBgXT0kpBAEq6LJYiLo7EJf/55/f9uahufT7LstR jDX07VLfJNzunWKSfVrXrCMf1apWIWXYExEbZ8ecCt2z2HYoESYxiCgPubEHKpdbKNJd VkXzN9g8NAg5o27fw2VHL2STF5I3mSoEY5EdVxG/A/+cSdipT9M9z0ldXr/m5xHiZT9F YMpotcCtB/szfA76yCiA/GfSdwi2qtm0cNrv2d7BBhbNZBFNHqKymoQ8pSyJgF8+Wu8C JpsUqwg1cQdM/XP2kszOewdgBrKAF2qYhfbMBDmcFaPTxWJIw/RyQZvsCJeHgIyjTwOh LFpw== X-Gm-Message-State: AJcUukfVIXYw1GFmIbn/4kUirlZTmI/RRK7hqU229JZ9eXESXZ2jUKy0 grgwyEReSTYhJ8i1hGo34Js+zw== X-Received: by 2002:a1c:9d57:: with SMTP id g84mr15707901wme.16.1547812354308; Fri, 18 Jan 2019 03:52:34 -0800 (PST) Received: from localhost.localdomain (146-241-71-93.dyn.eolo.it. [146.241.71.93]) by smtp.gmail.com with ESMTPSA id i13sm75183049wrw.32.2019.01.18.03.52.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Jan 2019 03:52:33 -0800 (PST) From: Paolo Valente To: Jens Axboe Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, ulf.hansson@linaro.org, linus.walleij@linaro.org, broonie@kernel.org, bfq-iosched@googlegroups.com, oleksandr@natalenko.name, hurikhan77+bko@gmail.com, Paolo Valente Subject: [PATCH BUGFIX RFC 1/2] Revert "bfq-iosched: remove unused variable" Date: Fri, 18 Jan 2019 12:52:18 +0100 Message-Id: <20190118115219.63576-2-paolo.valente@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190118115219.63576-1-paolo.valente@linaro.org> References: <20190118115219.63576-1-paolo.valente@linaro.org> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This reverts commit bd7d4ef6a4c9b3611fa487a0065bf042c71ce620. --- block/bfq-iosched.c | 15 ++++++++------- block/bfq-iosched.h | 6 ++++++ 2 files changed, 14 insertions(+), 7 deletions(-) -- 2.20.1 diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index cd307767a134..8cc3032b66de 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -5303,25 +5303,26 @@ static unsigned int bfq_update_depths(struct bfq_data *bfqd, struct sbitmap_queue *bt) { unsigned int i, j, min_shallow = UINT_MAX; + bfqd->sb_shift = bt->sb.shift; /* * In-word depths if no bfq_queue is being weight-raised: * leaving 25% of tags only for sync reads. * * In next formulas, right-shift the value - * (1U<sb.shift), instead of computing directly - * (1U<<(bt->sb.shift - something)), to be robust against - * any possible value of bt->sb.shift, without having to + * (1U<sb_shift), instead of computing directly + * (1U<<(bfqd->sb_shift - something)), to be robust against + * any possible value of bfqd->sb_shift, without having to * limit 'something'. */ /* no more than 50% of tags for async I/O */ - bfqd->word_depths[0][0] = max((1U << bt->sb.shift) >> 1, 1U); + bfqd->word_depths[0][0] = max((1U<sb_shift)>>1, 1U); /* * no more than 75% of tags for sync writes (25% extra tags * w.r.t. async I/O, to prevent async I/O from starving sync * writes) */ - bfqd->word_depths[0][1] = max(((1U << bt->sb.shift) * 3) >> 2, 1U); + bfqd->word_depths[0][1] = max(((1U<sb_shift) * 3)>>2, 1U); /* * In-word depths in case some bfq_queue is being weight- @@ -5331,9 +5332,9 @@ static unsigned int bfq_update_depths(struct bfq_data *bfqd, * shortage. */ /* no more than ~18% of tags for async I/O */ - bfqd->word_depths[1][0] = max(((1U << bt->sb.shift) * 3) >> 4, 1U); + bfqd->word_depths[1][0] = max(((1U<sb_shift) * 3)>>4, 1U); /* no more than ~37% of tags for sync writes (~20% extra tags) */ - bfqd->word_depths[1][1] = max(((1U << bt->sb.shift) * 6) >> 4, 1U); + bfqd->word_depths[1][1] = max(((1U<sb_shift) * 6)>>4, 1U); for (i = 0; i < 2; i++) for (j = 0; j < 2; j++) diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h index 0b02bf302de0..4de5dc349a1e 100644 --- a/block/bfq-iosched.h +++ b/block/bfq-iosched.h @@ -697,6 +697,12 @@ struct bfq_data { /* bfqq associated with the task issuing current bio for merging */ struct bfq_queue *bio_bfqq; + /* + * Cached sbitmap shift, used to compute depth limits in + * bfq_update_depths. + */ + unsigned int sb_shift; + /* * Depth limits used in bfq_limit_depth (see comments on the * function)