From nobody Wed Dec 17 01:47:46 2025 Received: from mail-pl1-f228.google.com (mail-pl1-f228.google.com [209.85.214.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D05241C4A13 for ; Fri, 28 Mar 2025 15:47:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.228 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743176839; cv=none; b=ZaAW1OgGp2wGhh+feM7L0JIigYim5GZuzYYrp0EKwKvITxko58qylip6yAtfI3TtqXWapC99ZHgm21Y5LrV33WXFguGPZSZFXQSpdhL5QQ8FvJrICXbhWV8RQbqBDwfVNrb2VIzvFlGkZAS99eDcnoFg95Sszh2KpdR85BCyNXM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743176839; c=relaxed/simple; bh=fUXrNvezfQcUlckLuYQ/mreZHTic4EIPjfaDUroijsU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hFf8YrnmAHJibKd2gQE3FCbaN6VQ1pNGOQq3C6ZASgMK84YoX2AzljkvKilAQhhQQWbdjYANwXUsDyGyDhDOfDTF/QGJcTCeFRhUbBLwO+CXgTymKObOLq7MIpCnS58EhVRgyEHxapwZe6Eb2kFINQJ7SC0uPkHRxIPj54igHrI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com; spf=fail smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=ayti3Y4A; arc=none smtp.client-ip=209.85.214.228 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=purestorage.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b="ayti3Y4A" Received: by mail-pl1-f228.google.com with SMTP id d9443c01a7336-223f7b10cbbso6108245ad.3 for ; Fri, 28 Mar 2025 08:47:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1743176837; x=1743781637; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0mVM8AOP/uQwd1MDpgpJ58oiDfod93l3Y9l0W6NadbQ=; b=ayti3Y4AZ/Tmx5mEhS53XGb9xnP5Bj3IV/ePBkbyXJFa70JE2iOUO0bagfcfuU6xr4 cKnbi2UlHNIoGvBTNnmWgEJjIJtuAokU7vECYf1wk/cnDgHcTu/yuffbYLrLhsmKiOvL yRN2XahA6kxEWA3OmexT05Lu4f4VmwvYwBhhpSsH3mYWRAUlhXpaBLuNyCpZxpxPb8oe +Nlux3f3shJwBaKHryYHLkP3CHY3PPpH/P9rwUIE991DuQjs3mWClnOZTns8o2mRgkYk KLXNY/MT2w1ar/Th0puIGWhFuwDphafG/asCQriz0zbkTIFXnF2a+li6mdx107AhzGof 4+hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743176837; x=1743781637; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0mVM8AOP/uQwd1MDpgpJ58oiDfod93l3Y9l0W6NadbQ=; b=qqUIVCX57cu3XRJdPmmEF0c5vwueLB1TGYyorY5erle6qHTXcb8ekN/Xw8MV00tIZq RWprA2gdlWZPW28owPMFVLcWKJfcrS0iVOfte/4HBrOsTYiA8d3YO912fFd/I9b0MozH Zw68K5jIY2VB6OA1sEl3cOrCmotyzbKOwonVpndKQyAqoNsK7CzoC+t/UsFq0+gioe16 ir/Js6RHsw4l1H6OVk7dcAlbkHJnW4kQCwVx3/r6l6Nh0guqz+XoTCpx0cfBY9nqVWMn 4Bp6l2wx1ftmepnhCpQvmdXubDVhcqTTy5rXZdQXfuN469GErq6bljPQdU4xRRbGRfiH FvIg== X-Forwarded-Encrypted: i=1; AJvYcCUssSbAp4qDzguMUnHD8IhQa1p3ZNI+IbYL5PAL7Kbq1d/77gq2kVYoWbAb62GSIUYDdQDt6JEHC4wmARo=@vger.kernel.org X-Gm-Message-State: AOJu0YwXlUoYMX9iTgrLB7dDjg10xHWZIE5A+GvzCgnBTVPyLBuE3aTu 6YO59MlbSLPPHXH8cCCCETEcEDtGZbCA/rpN0Xo/DMqobEWwz0gvNx6Y5mC0R1tZGKLliJ2Clw6 LnZwbBaGKehPvhyGDS1qYG1B91PVVTZOPwPVAaBja3bt1XpmP X-Gm-Gg: ASbGncv09YgBNP4ElNYX7TEK7IceDVtT1+r3Krkaks7PCxyAu3IvmpAyqKInvu++Mms 2K0++tr33GzCFer/dNkjhOVOCTT5v8MrvZf8DovOVCt7bpRYtgDbfb/OlGfoXfALEWoGIUz6Jo6 9erZ86V75mDs/mt8Z+cZ8KhnC0xs98zxYRZCL++Twww4sfN4sYGevsJ7YKVglsXFOQ6mJu2cWIk pBFQdOLFA225E9VCa+l7E8Ih+Hv2vgQHyc2YCKZiqiySpZgtP+XEvQIHcXDoeoO8m9Snba99C/X CqydvcAsp+OJvWcW/azujtOLZ1LNQC9tmA== X-Google-Smtp-Source: AGHT+IHcHduh5E0s2skNSV47XrUM4N9lgZTh46ndYiV2vIM8885gcd/Exi/meEMDt1hOO7Sm4si1VNwfTQYp X-Received: by 2002:a17:903:985:b0:223:28a8:610b with SMTP id d9443c01a7336-229200f26damr22792405ad.14.1743176836796; Fri, 28 Mar 2025 08:47:16 -0700 (PDT) Received: from c7-smtp-2023.dev.purestorage.com ([2620:125:9017:12:36:3:5:0]) by smtp-relay.gmail.com with ESMTPS id d9443c01a7336-2291f1db993sm2730225ad.126.2025.03.28.08.47.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Mar 2025 08:47:16 -0700 (PDT) X-Relaying-Domain: purestorage.com Received: from dev-csander.dev.purestorage.com (dev-csander.dev.purestorage.com [10.7.70.37]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id 31D4F34018F; Fri, 28 Mar 2025 09:47:16 -0600 (MDT) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id 2FA11E40A9F; Fri, 28 Mar 2025 09:47:16 -0600 (MDT) From: Caleb Sander Mateos To: Keith Busch , Jens Axboe , Christoph Hellwig , Sagi Grimberg , Pavel Begunkov Cc: Chaitanya Kulkarni , linux-nvme@lists.infradead.org, io-uring@vger.kernel.org, linux-kernel@vger.kernel.org, Caleb Sander Mateos Subject: [PATCH v4 2/3] nvme/ioctl: move blk_mq_free_request() out of nvme_map_user_request() Date: Fri, 28 Mar 2025 09:46:46 -0600 Message-ID: <20250328154647.2590171-3-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250328154647.2590171-1-csander@purestorage.com> References: <20250328154647.2590171-1-csander@purestorage.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The callers of nvme_map_user_request() (nvme_submit_user_cmd() and nvme_uring_cmd_io()) allocate the request, so have them free it if nvme_map_user_request() fails. Signed-off-by: Caleb Sander Mateos Reviewed-by: Jens Axboe Reviewed-by: Chaitanya Kulkarni --- drivers/nvme/host/ioctl.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/drivers/nvme/host/ioctl.c b/drivers/nvme/host/ioctl.c index 0634e24eac97..42dfd29ed39e 100644 --- a/drivers/nvme/host/ioctl.c +++ b/drivers/nvme/host/ioctl.c @@ -127,41 +127,39 @@ static int nvme_map_user_request(struct request *req,= u64 ubuffer, int ret; =20 if (!nvme_ctrl_sgl_supported(ctrl)) dev_warn_once(ctrl->device, "using unchecked data buffer\n"); if (has_metadata) { - if (!supports_metadata) { - ret =3D -EINVAL; - goto out; - } + if (!supports_metadata) + return -EINVAL; + if (!nvme_ctrl_meta_sgl_supported(ctrl)) dev_warn_once(ctrl->device, "using unchecked metadata buffer\n"); } =20 if (ioucmd && (ioucmd->flags & IORING_URING_CMD_FIXED)) { struct iov_iter iter; =20 /* fixedbufs is only for non-vectored io */ - if (flags & NVME_IOCTL_VEC) { - ret =3D -EINVAL; - goto out; - } + if (flags & NVME_IOCTL_VEC) + return -EINVAL; + ret =3D io_uring_cmd_import_fixed(ubuffer, bufflen, rq_data_dir(req), &iter, ioucmd, iou_issue_flags); if (ret < 0) - goto out; + return ret; ret =3D blk_rq_map_user_iov(q, req, NULL, &iter, GFP_KERNEL); } else { ret =3D blk_rq_map_user_io(req, NULL, nvme_to_user_ptr(ubuffer), bufflen, GFP_KERNEL, flags & NVME_IOCTL_VEC, 0, 0, rq_data_dir(req)); } =20 if (ret) - goto out; + return ret; =20 bio =3D req->bio; if (bdev) bio_set_dev(bio, bdev); =20 @@ -174,12 +172,10 @@ static int nvme_map_user_request(struct request *req,= u64 ubuffer, return ret; =20 out_unmap: if (bio) blk_rq_unmap_user(bio); -out: - blk_mq_free_request(req); return ret; } =20 static int nvme_submit_user_cmd(struct request_queue *q, struct nvme_command *cmd, u64 ubuffer, unsigned bufflen, @@ -200,11 +196,11 @@ static int nvme_submit_user_cmd(struct request_queue = *q, req->timeout =3D timeout; if (ubuffer && bufflen) { ret =3D nvme_map_user_request(req, ubuffer, bufflen, meta_buffer, meta_len, NULL, flags, 0); if (ret) - return ret; + goto out_free_req; } =20 bio =3D req->bio; ctrl =3D nvme_req(req)->ctrl; =20 @@ -216,11 +212,14 @@ static int nvme_submit_user_cmd(struct request_queue = *q, blk_rq_unmap_user(bio); blk_mq_free_request(req); =20 if (effects) nvme_passthru_end(ctrl, ns, effects, cmd, ret); + return ret; =20 +out_free_req: + blk_mq_free_request(req); return ret; } =20 static int nvme_submit_io(struct nvme_ns *ns, struct nvme_user_io __user *= uio) { @@ -520,20 +519,24 @@ static int nvme_uring_cmd_io(struct nvme_ctrl *ctrl, = struct nvme_ns *ns, if (d.data_len) { ret =3D nvme_map_user_request(req, d.addr, d.data_len, nvme_to_user_ptr(d.metadata), d.metadata_len, ioucmd, vec, issue_flags); if (ret) - return ret; + goto out_free_req; } =20 /* to free bio on completion, as req->bio will be null at that time */ pdu->bio =3D req->bio; pdu->req =3D req; req->end_io_data =3D ioucmd; req->end_io =3D nvme_uring_cmd_end_io; blk_execute_rq_nowait(req, false); return -EIOCBQUEUED; + +out_free_req: + blk_mq_free_request(req); + return ret; } =20 static bool is_ctrl_ioctl(unsigned int cmd) { if (cmd =3D=3D NVME_IOCTL_ADMIN_CMD || cmd =3D=3D NVME_IOCTL_ADMIN64_CMD) --=20 2.45.2