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 1/2] blk-mq: don't call callbacks for requests that bypassed
 the scheduler
Thread-Topic: [PATCH 1/2] blk-mq: don't call callbacks for requests that
 bypassed the scheduler
Thread-Index: AQHXo/O1j+Dxeg06HkOKzFhsF9jhAg==
Date:   Tue, 7 Sep 2021 14:21:55 +0000
Message-ID: <20210907142145.112096-2-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?TxTU0HNC2n0uFsHex8u1RDbMceoUu74vp8a4FUVJOhzuiIhs+oGkfaJ4iY?=
 =?iso-8859-1?Q?D//jz+RcHoNHtohbnF1HhGrStz9Vjad0KUlA7lhLLrGDz9YP5N664Vri4h?=
 =?iso-8859-1?Q?iox5px6lJ7MfwhcdNFwPVonnc8cwTUWvXg77b8BdnkWj1gP8YwNLd0ptMP?=
 =?iso-8859-1?Q?FQkfXL40WPCJwzFSeSpy3lZVqkihTnNnzjEQTk7jnJs+EAGJgxAVr3cY61?=
 =?iso-8859-1?Q?ADrTcsXDGiFEVCxYJn33lzHAcsoEjFR7yF218BMZ6Qic2TUCy79mfThGdm?=
 =?iso-8859-1?Q?MZ5jZhIkkVDmlb76OpisHNTGLra00fw5p57T/NIbF5Gh7ro1C+HwLLpFYP?=
 =?iso-8859-1?Q?9FDX2hoHRv3pZzMnIuFy7lnaqCzk1ONS3qy0bKgAMWW6hq/CnfM7OPHrKf?=
 =?iso-8859-1?Q?l8HK49Ij3glQ7FlKiUgRN1SDk8isxrWSXSrDwo2ChSI2x110gSnnIO/RC5?=
 =?iso-8859-1?Q?5c9eoufN6Igid49iD8GhZSZd6ZQADseQ2bSQzDQj9W6D3ydVeLKTASyxd+?=
 =?iso-8859-1?Q?tbVRZhH1kFe2v6LwKhBiMv/aBOuwLreIXINwdgUi0r1e6ONiyg93gdgrX7?=
 =?iso-8859-1?Q?rJYq/J3u3RhwD8msBcvMnZaeRK56Cr/LC7HjUi8DfXSRXJitBYAnTd5ewu?=
 =?iso-8859-1?Q?DGvBI9qax4nSuGSpUW1CpOQJ/coWKRGxNfhjvdfxPDd1+sgDR7oKlVVR+M?=
 =?iso-8859-1?Q?aOBmJQ0s1cnuGtX0g5BctvwV4Flk9kYNcX3bO43IXk5seJ8TVnR7TnXXfr?=
 =?iso-8859-1?Q?9SYvWyKVBzhSbaViIJcgWsxVcwhu2arT77QzomqXeMgsiRL0vnnGvFO/mF?=
 =?iso-8859-1?Q?RqgV1An3DOdTsj1847C1KgaKQSEw7bobfP0BkpB0GTA/Lqha461qqxSDqI?=
 =?iso-8859-1?Q?mGjEQw8w3+t76NporHNFUs28cWKjWplVZ8L1sYM6wcNFLNCF3B/iO/Fsy/?=
 =?iso-8859-1?Q?P1sQZxteBprSSGaPNHtTQIX6J8upPvxpmNe99zHGmHB8DZSK4iMZ9y+f7T?=
 =?iso-8859-1?Q?ZiEyo3kYpTzy+Bu6ELCR/TqQTrPN9sSTbZsrMTvzakG2VgTfofnp6F5g0E?=
 =?iso-8859-1?Q?rn8tQb1+CaoWX/KhV2DUvsWZfvPTRvpHJQNpEgMzlYiEh64t0lWPDI0aH5?=
 =?iso-8859-1?Q?OPRQFEDO4ouhAwffQ7l4BOKstfBR0afXp5ipRBlMjHU0fkZEViDNNLUYdt?=
 =?iso-8859-1?Q?puqKmUNZGC0y9X/w8g2erO3imL6uIVhQQifrN2FwsA6if9u37anpkSOxDq?=
 =?iso-8859-1?Q?5OEOo3MvhQcxuyB3NrYhSykMGhuBmgCLYXTevwaw18CIGypUd+XvLcorEL?=
 =?iso-8859-1?Q?dMi7aNmXEGsfjW3b9G//48ZbKG6tPjohQtcAlY6HBxkBcLgtq+mIqmoPKB?=
 =?iso-8859-1?Q?FbRDki+I0PC+Kebc0mhkBwZ9BQqi1DMQ=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: 3eac2590-4489-4a9a-9f43-08d9720ad84e
X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Sep 2021 14:21:55.2243
 (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: CZ7xs9Ti7QGdeBSldJyHMhsv5b6NUWyKRQPXJn/I/h5JCLUGSLi2mI/IiVdpRn3YZRWAOBki/M1sdF67XP7F9g==
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>

Currently, __blk_mq_alloc_request() (via blk_mq_rq_ctx_init()) calls the
I/O scheduler callback e->type->ops.prepare_request(), which will set
RQF_ELVPRIV, even though passthrough (and flush) requests will later
bypass the I/O scheduler in blk_mq_submit_bio().

Later, blk_mq_free_request() checks if the RQF_ELVPRIV flag is set,
if it is, the e->type->ops.finish_request() I/O scheduler callback
will be called.

i.e., the prepare_request and finish_request I/O scheduler callbacks
will be called for requests which were never inserted to the I/O
scheduler.

Fix this by not calling e->type->ops.prepare_request(), nor setting
the RQF_ELVPRIV flag for passthrough requests.
Since the RQF_ELVPRIV flag will not get set for passthrough requests,
e->type->ops.prepare_request() will no longer get called for
passthrough requests which were never inserted to the I/O scheduler.

Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com>
---
 block/blk-mq.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 65d3a63aecc6..0816af125059 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -328,7 +328,12 @@ static struct request *blk_mq_rq_ctx_init(struct blk_m=
q_alloc_data *data,
 	data->ctx->rq_dispatched[op_is_sync(data->cmd_flags)]++;
 	refcount_set(&rq->ref, 1);
=20
-	if (!op_is_flush(data->cmd_flags)) {
+	/*
+	 * Flush/passthrough requests are special and go directly to the
+	 * dispatch list, bypassing the scheduler.
+	 */
+	if (!op_is_flush(data->cmd_flags) &&
+	    !blk_op_is_passthrough(data->cmd_flags)) {
 		struct elevator_queue *e =3D data->q->elevator;
=20
 		rq->elv.icq =3D NULL;
--=20
2.31.1