Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Niklas Cassel <Niklas.Cassel@wdc.com>
To:     Jens Axboe <axboe@kernel.dk>
CC:     Bart Van Assche <bvanassche@acm.org>,
        Damien Le Moal <Damien.LeMoal@wdc.com>,
        Paolo Valente <paolo.valente@linaro.org>,
        Ming Lei <ming.lei@redhat.com>,
        Niklas Cassel <Niklas.Cassel@wdc.com>,
        "linux-block@vger.kernel.org" <linux-block@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: [PATCH 2/2] Revert "mq-deadline: Fix request accounting"
Thread-Topic: [PATCH 2/2] Revert "mq-deadline: Fix request accounting"
Thread-Index: AQHXo/O2L+LBuS/YJECb1WaT3ju4YA==
Date:   Tue, 7 Sep 2021 14:21:56 +0000
Message-ID: <20210907142145.112096-3-Niklas.Cassel@wdc.com>
References: <20210907142145.112096-1-Niklas.Cassel@wdc.com>
In-Reply-To: <20210907142145.112096-1-Niklas.Cassel@wdc.com>
Accept-Language: en-US
Content-Language: en-US
wdcipoutbound: EOP-TRUE
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?7wmGab3acS/FcazQCAHeO0vel5rMHf1/NCNMnXqvw7xBoNKCWgmZecHxee?=
 =?iso-8859-1?Q?uWTZx1vob9dzNmqovgUUiZ09//ZD/9Cp421LixBFXvQ/HEwKVY5HsgqMcT?=
 =?iso-8859-1?Q?mVZ0e6W4f0RuoTSoBA2Cf6ynTEm1n41Oi0PV8G7Mw4s9GSHNv2rIqaIV/5?=
 =?iso-8859-1?Q?2WiEXAOjn2J+HesHU1vblM8IR0WBWsEk2RMkZFsMJXLdK6qufZKby8SVN3?=
 =?iso-8859-1?Q?Jfg++EFGQi8zOFPIglcmqr54MDKpGPgPihrayn15mlgLrbcTEnRsaREmuL?=
 =?iso-8859-1?Q?lfvE3ePnSIlOMJWy/FFk8EPKwCMBSTj3yIP74qOFuQQ40yRodrDovC4wi5?=
 =?iso-8859-1?Q?GU+AhrZpIh8GfcNk4+p0877JrTs15MM53Nzo2/nk9jiEMwOEOXFN++25Zi?=
 =?iso-8859-1?Q?VtNwsWMh1B1pHLkH6tqImljRHwQWd9cdTSmF1jujPvIIocx3lLdQGq9ODF?=
 =?iso-8859-1?Q?+kMVKgD2FYPFwJayFcwSi8qB5c29enBfqufxU3nwVwWyoeoPMEbtWTnK0j?=
 =?iso-8859-1?Q?FcPkaY0Mh1OF3SYuHXQ9IkRFSUvNkA+T7b+rMR7YiXS8mklP7QYCzSraAq?=
 =?iso-8859-1?Q?+O1e440OlZO7NU3JUwrFhce02tP7L3xd/fRSojQM+kEdW1AO2+zDlReclf?=
 =?iso-8859-1?Q?Ui/OdbvkWjZ1obkqJosttPWWerSfczPxBBMHjXHvF4Sh2ROgC2INYz+4Sv?=
 =?iso-8859-1?Q?bBK+/UYTuto2ML0CATKDuN0/8DRrDLVxsUB5Lp805OVqGwi1EMf+YlwCdi?=
 =?iso-8859-1?Q?icIONmYJ6NjH5j92CuPifKMe6MH9l/cSEXrFQZSBYxIYLG8Hn1vYqxBiTN?=
 =?iso-8859-1?Q?jwtM38ihLPmI2j0R/ApF6S68W9PnNLAxUiSaIsnzLK1tYSlkAM1EtEXsNt?=
 =?iso-8859-1?Q?Bg9Z/2qUMGXJUZzGu2r2RY6hj7JyFWqulkZ0JaPHkWv26Yrg6UKmWBHIDm?=
 =?iso-8859-1?Q?27KAp2+OfcbEenRyOp47WKNs5mL2glVuZaNz2Xt0lDAnAQ8IFeoNqPwhbv?=
 =?iso-8859-1?Q?r9p5Mc7to5jzf4C3WZvGJRzzw0InefGdW4r9Dd31ER1HHG5rh5/D2vYH5X?=
 =?iso-8859-1?Q?58Qo9WJ4a+WwqxEQfFIrZXVj//p93ENophMlUQUuQKpA10BFnNRVU9sXIf?=
 =?iso-8859-1?Q?7wJOHuchrE1Y8t4qov1monX5Hdwa27I7fZpAxI9pg66bTbFY/hr/qt4/aJ?=
 =?iso-8859-1?Q?P8IydAyenOy3NMmX7S8eKBmUYSzHX7XA2W0ADBcu/Db4d64BxMmI9qJume?=
 =?iso-8859-1?Q?tLpn5KzmNjTnZ6bHpnirK3sYXFUlBuPVwqZkmJKMNVuoQKCfQxJC8LmquJ?=
 =?iso-8859-1?Q?5nAr9g2AiWmKBa2vIVOTtI2Xc8Q7LgoGZ9w2dhODwdpRsJHVCSS3JMV+PO?=
 =?iso-8859-1?Q?wWCLLkAgiJlaj5xAMXnd3yD7ksurPAmA=3D=3D?=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: wdc.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: PH0PR04MB7158.namprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 88aa69fe-3444-42e0-55b5-08d9720ad8c6
X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Sep 2021 14:21:56.0407
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: 37cK5aB6Ga1Ajwvf+oMkoTTD9RqgU3FFAg2izBHGNygok0pdiTW9ZxWQLpuCKr9XG1YDGDtERmv9Qt7LCXJQeQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR04MB7382
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Niklas Cassel <niklas.cassel@wdc.com>

This reverts commit b6d2b054e8baaee53fd2d4854c63cbf0f2c6262a.

blk-mq will no longer call the I/O scheduler .finish_request() callback
for requests that were never inserted to the I/O scheduler.

Therefore, we can remove the logic inside mq-deadline that was added to
workaround the (no longer existing) quirky behavior of blk-mq.

Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com>
---
 block/mq-deadline.c | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/block/mq-deadline.c b/block/mq-deadline.c
index 7f3c3932b723..b2d1e3adcb39 100644
--- a/block/mq-deadline.c
+++ b/block/mq-deadline.c
@@ -678,7 +678,6 @@ static void dd_insert_request(struct blk_mq_hw_ctx *hct=
x, struct request *rq,
=20
 	prio =3D ioprio_class_to_prio[ioprio_class];
 	dd_count(dd, inserted, prio);
-	rq->elv.priv[0] =3D (void *)(uintptr_t)1;
=20
 	if (blk_mq_sched_try_insert_merge(q, rq, &free)) {
 		blk_mq_free_requests(&free);
@@ -727,10 +726,12 @@ static void dd_insert_requests(struct blk_mq_hw_ctx *=
hctx,
 	spin_unlock(&dd->lock);
 }
=20
-/* Callback from inside blk_mq_rq_ctx_init(). */
+/*
+ * Nothing to do here. This is defined only to ensure that .finish_request
+ * method is called upon request completion.
+ */
 static void dd_prepare_request(struct request *rq)
 {
-	rq->elv.priv[0] =3D NULL;
 }
=20
 /*
@@ -757,14 +758,7 @@ static void dd_finish_request(struct request *rq)
 	const enum dd_prio prio =3D ioprio_class_to_prio[ioprio_class];
 	struct dd_per_prio *per_prio =3D &dd->per_prio[prio];
=20
-	/*
-	 * The block layer core may call dd_finish_request() without having
-	 * called dd_insert_requests(). Hence only update statistics for
-	 * requests for which dd_insert_requests() has been called. See also
-	 * blk_mq_request_bypass_insert().
-	 */
-	if (rq->elv.priv[0])
-		dd_count(dd, completed, prio);
+	dd_count(dd, completed, prio);
=20
 	if (blk_queue_is_zoned(q)) {
 		unsigned long flags;
--=20
2.31.1