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>,
        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: [RFC PATCH 2/2] Revert "mq-deadline: Fix request accounting"
Thread-Topic: [RFC PATCH 2/2] Revert "mq-deadline: Fix request accounting"
Thread-Index: AQHXm0Djs+Cyo3cAGkuJk+KGlmF30A==
Date:   Fri, 27 Aug 2021 12:41:43 +0000
Message-ID: <20210827124100.98112-3-Niklas.Cassel@wdc.com>
References: <20210827124100.98112-1-Niklas.Cassel@wdc.com>
In-Reply-To: <20210827124100.98112-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?xnyiddo1mqjoX8m6V+SZY9FFREOIfbyfo4X0wF7h9sN/DO0oqmi2cDXuHK?=
 =?iso-8859-1?Q?uBRe2gbX4MaBTfMVEKV1zFL5i+R34TvEY3zuxeo1XSRhEceyWHI/Lx+hzL?=
 =?iso-8859-1?Q?BUOs1rEtM/ozxTk+AfdTqoK7EGbOBaEerE+MwQqc1xbc3gh/3SEmvPdl1A?=
 =?iso-8859-1?Q?k/cS5UWVdExuMy+i8mj6g5BbSi2F+uN6n90s3cdKYzN84RrkxHwWFo1oCu?=
 =?iso-8859-1?Q?2B8299+rF9HuENyj56KebYSIEl8blJSdFq9D+HLSFFCJMUOqc8882dgp6M?=
 =?iso-8859-1?Q?jVwiFLqFvFmSSDFGQBvSbrnTFi0Zo/EPQyod/3enlLI9rJxtSifyRc0DgK?=
 =?iso-8859-1?Q?bKLAJxKXACgJDrmSMR9UE1cv+7K4ddzvh2S65wk8RWiBSBesNZnnsi3AlF?=
 =?iso-8859-1?Q?yCshEA8vyYIa4IRoNlhl4BUXYLD4Whs+zUewNgpDCQJ3B2KdFiG7vA3acW?=
 =?iso-8859-1?Q?byjAYPujo/RJQ2mqcZsYsF+S/MTrZU0V0lHOh9QG3sUvTxezGAkBUP+q89?=
 =?iso-8859-1?Q?/cHGUYfRA8FFohKZhfacz+hjOctR10keXkIOSuGTK9LvykyhW2ekLh/+7l?=
 =?iso-8859-1?Q?aJOlviVmf2YoROGUX3xIeKuzEYl/htItHXc1qUlthIdpCSUHO7XQMYRY+z?=
 =?iso-8859-1?Q?LY/v2h/qqJQCIfDfLqCTFNt3wNv+NONDMg7upPL8TrAI5CDjmNpqlPDZ2D?=
 =?iso-8859-1?Q?aQ1cP+hF628Vr8jxUdwkrWNcQ6S4Gc0lSnp9SY9EszLSj3uuNci8KRVvkj?=
 =?iso-8859-1?Q?ZBdlnXELhWYeAVQZCEFYM9aQ/J/zo9kgX7Hihpo3ihA7sflIiO9Bxgki58?=
 =?iso-8859-1?Q?joGakpIMSOpPQndVCDvFI/9PT9gi5oBThcDNt5p47m1Fgfo2xqEKiPnWJT?=
 =?iso-8859-1?Q?jsO2HFD9xY5yEZYvOh2RySGRowg4GrpqvVWBUKws0NU4RfNSYJXK42xZ+w?=
 =?iso-8859-1?Q?cMvuWCNfFfOkazG7ANGuFehrB+GLw7Jdjny+rM/eXc9Ae97Z1RSt54goKy?=
 =?iso-8859-1?Q?909mhdkYrH13XHklEYtJ5UAm9YsNetVrvajxrOWFcGLYLAGxnfNGVRjf3w?=
 =?iso-8859-1?Q?sQtVbUPcmZbzNQurpzF6OhzkhI9Xkui7zP86wx9we5NeY8qnMFDoIvBkWT?=
 =?iso-8859-1?Q?AZEmnIB9eo780kz+fV9Lh0cvkZ5RcEcfkgdppxXaAeSeW2Ml/b5rDUnGm0?=
 =?iso-8859-1?Q?IxwrBJ739FBqfyv0maRT+QgWN8OLBsKEn0rI2TEyenyCHLGhU9DDfx0BKu?=
 =?iso-8859-1?Q?EykcRO5ULF3djqPkiDkgD6U58ClsNbXsqJYu+r2SMViD37SMsopems9fnE?=
 =?iso-8859-1?Q?kCByXNXo9fnkvdQv0C1HsBxj7D2EkreQagpUbaWBHgsUsMFQ2PR9IC6sVY?=
 =?iso-8859-1?Q?2XCf59fGLeA0nM9NW6oml0e2+S8hvHow=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: 093927e7-fbde-4a4c-4d91-08d969580652
X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Aug 2021 12:41:43.2387
 (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: IxkF3esgJDfe2Irs9DDsQYvYncCRFWUy5y1sKhZGk/i3HdNfsO+SWG4zWjIeQfPCh0uYXr0Ueoca0hXVan/u+g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR04MB7702
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.

There is no longer any need to perform any workaround private data magic
in order to track if a request was inserted to the scheduler or not.

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

This patch also didn't handle requeues properly, so it would have
required additional private data magic if it wasn't reverted.

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 36920670dccc..a5d171b54f8e 100644
--- a/block/mq-deadline.c
+++ b/block/mq-deadline.c
@@ -682,7 +682,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);
@@ -731,10 +730,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
 /*
@@ -761,14 +762,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