From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B0C71C433FE for ; Mon, 28 Mar 2022 11:19:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240694AbiC1LVd (ORCPT ); Mon, 28 Mar 2022 07:21:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57370 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240680AbiC1LU4 (ORCPT ); Mon, 28 Mar 2022 07:20:56 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 44BDB55BF9; Mon, 28 Mar 2022 04:18:53 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C29986115A; Mon, 28 Mar 2022 11:18:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7F147C34100; Mon, 28 Mar 2022 11:18:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648466332; bh=p7xJ9qpWfezlsKnmcqhlhATGgUbph48s1/5K73DMHN0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mFnht4SPWBYbEJ0IAcgV7SZsBsV4oN+JHuW4Bh3h9pAEzfgGwpI/z6AYjcBIPMl4r 5j7RiN1kHWrMRgPlhTo4qNSj3sQVOGPAm88oQhDJ1mtRav3IMnHQlK8Ow+tADnow3t V783xA8Ep0ajPWnPm1u+l9Ttj5yc71qcUBQw459u1Xug6qxbwmhFNmI0ga6aDqp+xX j4j/502dl+g5IGITS9vUWI0AmzPRvcpTkZnfSyy46au9nIGohOfE6YK/YWC5praHlC xvhKCUaPHz5t3FLzLdWd8efpY9/zurs3r0uW0r7sHw+C6LLllEdlNhKOSrA9F1ZbGa ROKEL4fkZc5rg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yahu Gao , Paolo Valente , Jens Axboe , Sasha Levin , linux-block@vger.kernel.org Subject: [PATCH AUTOSEL 5.17 11/43] block/bfq_wf2q: correct weight to ioprio Date: Mon, 28 Mar 2022 07:17:55 -0400 Message-Id: <20220328111828.1554086-11-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220328111828.1554086-1-sashal@kernel.org> References: <20220328111828.1554086-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Yahu Gao [ Upstream commit bcd2be763252f3a4d5fc4d6008d4d96c601ee74b ] The return value is ioprio * BFQ_WEIGHT_CONVERSION_COEFF or 0. What we want is ioprio or 0. Correct this by changing the calculation. Signed-off-by: Yahu Gao Acked-by: Paolo Valente Link: https://lore.kernel.org/r/20220107065859.25689-1-gaoyahu19@gmail.com Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- block/bfq-wf2q.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/bfq-wf2q.c b/block/bfq-wf2q.c index b74cc0da118e..709b901de3ca 100644 --- a/block/bfq-wf2q.c +++ b/block/bfq-wf2q.c @@ -519,7 +519,7 @@ unsigned short bfq_ioprio_to_weight(int ioprio) static unsigned short bfq_weight_to_ioprio(int weight) { return max_t(int, 0, - IOPRIO_NR_LEVELS * BFQ_WEIGHT_CONVERSION_COEFF - weight); + IOPRIO_NR_LEVELS - weight / BFQ_WEIGHT_CONVERSION_COEFF); } static void bfq_get_entity(struct bfq_entity *entity) -- 2.34.1