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 20759C433EF for ; Mon, 28 Mar 2022 11:28:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241242AbiC1L3l (ORCPT ); Mon, 28 Mar 2022 07:29:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241289AbiC1LX3 (ORCPT ); Mon, 28 Mar 2022 07:23:29 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F46D58E65; Mon, 28 Mar 2022 04:20:31 -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 AF2B361042; Mon, 28 Mar 2022 11:20:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 73D1CC34100; Mon, 28 Mar 2022 11:20:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648466430; bh=p7xJ9qpWfezlsKnmcqhlhATGgUbph48s1/5K73DMHN0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KlLnCQa9sARq37QIWix6AqcByw92kE4yaXOP5lTyU79gai1/HRxTXnhHVp7v642Gn 4ctEp1vNpiX0504SjLyeuE7CIUxXRwLb/NEoCk9toFba631MgQxK47brlWrJ8rKLEF RdoiQp41xczepwDl4WI9YcTEG7uBAvJLnfnZst5CyWUBdekhKzGQSzpUNNqfLka34j X5ALd2OnSZwIJ1yii0gTzGv5pwJIxQJhFBGcWdxvSpBwBY8J0mguYftPRkSKYHs7vT S0DRYKmECBwTJ7SWBxm7GSjboHwSBns8YVtao7dnPJzELONCNCWO+c6844cVrlEHjf +7mmNqffobK+w== 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.16 10/35] block/bfq_wf2q: correct weight to ioprio Date: Mon, 28 Mar 2022 07:19:46 -0400 Message-Id: <20220328112011.1555169-10-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220328112011.1555169-1-sashal@kernel.org> References: <20220328112011.1555169-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: linux-kernel@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