From patchwork Fri Apr 7 19:16:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 13205262 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 095BBC76196 for ; Fri, 7 Apr 2023 19:17:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230113AbjDGTRM (ORCPT ); Fri, 7 Apr 2023 15:17:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44386 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229932AbjDGTRM (ORCPT ); Fri, 7 Apr 2023 15:17:12 -0400 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 10DBAC159 for ; Fri, 7 Apr 2023 12:17:04 -0700 (PDT) Received: from pps.filterd (m0044010.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 337GhSXt030595 for ; Fri, 7 Apr 2023 12:17:03 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=meta.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=s2048-2021-q4; bh=NRUfXoo+zRRKwmGsi/Srk58rVRQNCgmkeDuGygd3+t8=; b=kDNSLrSU+tNp1M3FXO1PreRyCln4G5QB6Sj6SqR3C+Cj4Nsbq3yYRXcx8aLaiSBBh2UL 7w8u196u3XX/d3ux9vqO/imUR9MVsXLPBzo8c0MGZH5VyxuX8TiabdH5yciAwDnzlxzY IlySIVX4TUaQEa01bhlScb6XLYxs58RiCF5a99SXsciGC4IdwMtDLwQvEj3QAR6mWM7C qu7dhG7xxthhNb9QTwtAY77KjbS1zA9XwaywdJsOa+cjZVff61PQFlRO74ei3C7ZbSRn YYPbANQj92DoRY4osLkD+vKOsmie/pDOLXlpfMOjlDgXdnVHHmkF6Gf2clGsJG/xGJ52 ug== Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3pt7e6np35-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 07 Apr 2023 12:17:03 -0700 Received: from twshared15216.17.frc2.facebook.com (2620:10d:c085:208::11) by mail.thefacebook.com (2620:10d:c085:21d::4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.17; Fri, 7 Apr 2023 12:17:02 -0700 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id B210B157B5F82; Fri, 7 Apr 2023 12:16:47 -0700 (PDT) From: Keith Busch To: , , , , CC: , , Keith Busch Subject: [PATCHv2 2/5] nvme: simplify passthrough bio cleanup Date: Fri, 7 Apr 2023 12:16:33 -0700 Message-ID: <20230407191636.2631046-3-kbusch@meta.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230407191636.2631046-1-kbusch@meta.com> References: <20230407191636.2631046-1-kbusch@meta.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-ORIG-GUID: _7WJTcDGKS2uC89m8UbURSEhHTzO7n7f X-Proofpoint-GUID: _7WJTcDGKS2uC89m8UbURSEhHTzO7n7f X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-07_12,2023-04-06_03,2023-02-09_01 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org From: Keith Busch Set the bio's bi_end_io to handle the cleanup so that uring_cmd doesn't need this complex pdu->{bio,req} switchero and restore. Signed-off-by: Keith Busch --- drivers/nvme/host/ioctl.c | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/drivers/nvme/host/ioctl.c b/drivers/nvme/host/ioctl.c index d24ea2e051564..278c57ee0db91 100644 --- a/drivers/nvme/host/ioctl.c +++ b/drivers/nvme/host/ioctl.c @@ -159,6 +159,11 @@ static struct request *nvme_alloc_user_request(struct request_queue *q, return req; } +static void nvme_uring_bio_end_io(struct bio *bio) +{ + blk_rq_unmap_user(bio); +} + static int nvme_map_user_request(struct request *req, u64 ubuffer, unsigned bufflen, void __user *meta_buffer, unsigned meta_len, u32 meta_seed, void **metap, struct io_uring_cmd *ioucmd, @@ -204,6 +209,7 @@ static int nvme_map_user_request(struct request *req, u64 ubuffer, *metap = meta; } + bio->bi_end_io = nvme_uring_bio_end_io; return ret; out_unmap: @@ -249,8 +255,6 @@ static int nvme_submit_user_cmd(struct request_queue *q, if (meta) ret = nvme_finish_user_metadata(req, meta_buffer, meta, meta_len, ret); - if (bio) - blk_rq_unmap_user(bio); blk_mq_free_request(req); if (effects) @@ -443,10 +447,7 @@ struct nvme_uring_data { * Expect build errors if this grows larger than that. */ struct nvme_uring_cmd_pdu { - union { - struct bio *bio; - struct request *req; - }; + struct request *req; u32 meta_len; u32 nvme_status; union { @@ -482,8 +483,6 @@ static void nvme_uring_task_meta_cb(struct io_uring_cmd *ioucmd, if (pdu->meta_len) status = nvme_finish_user_metadata(req, pdu->u.meta_buffer, pdu->u.meta, pdu->meta_len, status); - if (req->bio) - blk_rq_unmap_user(req->bio); blk_mq_free_request(req); io_uring_cmd_done(ioucmd, status, result, issue_flags); @@ -494,9 +493,6 @@ static void nvme_uring_task_cb(struct io_uring_cmd *ioucmd, { struct nvme_uring_cmd_pdu *pdu = nvme_uring_cmd_pdu(ioucmd); - if (pdu->bio) - blk_rq_unmap_user(pdu->bio); - io_uring_cmd_done(ioucmd, pdu->nvme_status, pdu->u.result, issue_flags); } @@ -507,7 +503,6 @@ static enum rq_end_io_ret nvme_uring_cmd_end_io(struct request *req, struct nvme_uring_cmd_pdu *pdu = nvme_uring_cmd_pdu(ioucmd); void *cookie = READ_ONCE(ioucmd->cookie); - req->bio = pdu->bio; if (nvme_req(req)->flags & NVME_REQ_CANCELLED) pdu->nvme_status = -EINTR; else @@ -533,9 +528,6 @@ static enum rq_end_io_ret nvme_uring_cmd_end_io_meta(struct request *req, struct nvme_uring_cmd_pdu *pdu = nvme_uring_cmd_pdu(ioucmd); void *cookie = READ_ONCE(ioucmd->cookie); - req->bio = pdu->bio; - pdu->req = req; - /* * For iopoll, complete it directly. * Otherwise, move the completion to task work. @@ -624,8 +616,8 @@ static int nvme_uring_cmd_io(struct nvme_ctrl *ctrl, struct nvme_ns *ns, req->bio->bi_opf |= REQ_POLLED; } } - /* to free bio on completion, as req->bio will be null at that time */ - pdu->bio = req->bio; + + pdu->req = req; pdu->meta_len = d.metadata_len; req->end_io_data = ioucmd; if (pdu->meta_len) {