From nobody Mon Feb 9 07:23:50 2026 Received: from mail-yw1-f228.google.com (mail-yw1-f228.google.com [209.85.128.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 12507230BE7 for ; Fri, 21 Mar 2025 20:57:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.228 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742590648; cv=none; b=LnYzvvcpE6kMk1Gp87D1C8r9YTJNYfGYtaBOmgmIyL5IZc85qPMFrA4fx1UmLcvDMsJaO6EUpdHPenW9CbdqjVtaNHMngVnOdvqmn3OEjx6SHGmurCehCazJcjVoi7ioDfK7xLlp0n8hM0LhazdKyx7Ur6z+190QfPW9Jwc/V5Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742590648; c=relaxed/simple; bh=FqJVruJuk3jZA1jNU+P7yclz+mvpP/olvfNDLk1TT8c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j0ipUg45bVIwBebqKFBuTBNScn2vuc9Yhq0jTj47p9Gmcr6tNBoOYF9YiCdSamZw1geWje9jfqcwTRbGjnFDuN/lnZCFmIqmGpBgz7OQ2/ofTXHOZuiTC2XpoHYdqCjIgQCwCwzluM3S7SNayS0Yji2lJ1NYzV/VthePGjmTdlc= 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=DtTVifs6; arc=none smtp.client-ip=209.85.128.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="DtTVifs6" Received: by mail-yw1-f228.google.com with SMTP id 00721157ae682-6ff0a728a71so1416857b3.1 for ; Fri, 21 Mar 2025 13:57:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1742590645; x=1743195445; 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=Kfs9TktRKcTUn1O+77Hfraf6wVpzVMFzjRcu/Aef4Bk=; b=DtTVifs6R3jjGZjeYT5OIPRiQmch23EDQQxnIzikcAG0XhPhVfHf6NQE/pcM+BV5ko 1tlobc+5YU72mWPzW9fGXfpFkq3ge+fZxyLABlGGNQolwC8hThdymVKxuIay2WztqOFk tolrQIhe4Z3cqR/MZEcuAtOx21+Ip3ClLa2aDIQy6WvGMEhpPU+ICWOWpWIa/KnKiOQw 4+trO03R2KO03EV20xDHChpDS+lOOliJEx2EYd3gTy77M/BVMYHWquZFDv7m5EVMR4na cPCa01s3WS3SKDL74DzD0Tkktanb4kyMdeBxKIpTpfRJYXkohjZcm7OMYp3hk+gz1EsS myDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742590645; x=1743195445; 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=Kfs9TktRKcTUn1O+77Hfraf6wVpzVMFzjRcu/Aef4Bk=; b=XbyUZDmyo+0GjOYNo6CAg0It1/DbpaAoYubohSiGtON3lXM95Q8aO9bXZSA+cV5rn3 TEoLa9t5s34jowgPMD8dNK6ACQqlO9awMLaeKbHQ5PlGvZrxyVFuBR+q8D3RWIcM0vqQ 5dAbfayaIP5DjvGyRMKP/FOF0hQ+FKVAcdzD0ysUiY/u8tAEhixZNZe7OY/3dLj+Mzde 7nsOHbXTwQjrOVdcV2iMtL51k9+83QIKqj4ORQyRO50VtAlbFdpVb1jziL8ECWvVrj56 H9fkvrtRj83xGfcXcZP5SDbURqF7Cis+00W2qyF19XO5Zr5T+u0rZOeIximILHz2CWS0 oOXA== X-Forwarded-Encrypted: i=1; AJvYcCVPQV5KHTUvY6MLU3jxQ69LXtI8vGJrfWmNGtyKesnb542+tOCOEOZ/1WNo9dnP9BBc6PcMLgu3JP8KDaw=@vger.kernel.org X-Gm-Message-State: AOJu0YwORQ193gdjHXtwKPXDwMyd6awRvs+CAnEI8QrIXEdpBRh3lF/k E2h6xRsRC7EtG63vbMvQtNC13g6TOfswJUdCqYse6eTq85ca0E/mc4BVNHkXL+8fFyDSYITPbN2 FJovqgYkxv1YbbtaHdXmhHnGWmOKun7Cj X-Gm-Gg: ASbGncvLtGPJ8C2YTCm/2aniV6awoNfOn8ID2YnhIKApXuFMlziUx8JIN8yfcvQHOHO R1qW8GclkJ3VCgyTYz4BSVwDQ0X5eDedqEfXJuEhGvApjnVYtraOQwsF9x/XCJnDgDFHBVHbAyn Ry9Z8ClOYdWMPpbAKkIf/5py/iBUBXqtJkSc4ykn2nde+hEbOC+P5WM01sIAXaJu94e0sRvkHev CMFuim3LeSO0rY+3A2wFKgIr6PgvlApaJUaO/n+pw/RlwlVmoUMEDh6GNrrqS2R99V6gnDaOzpV vRztsOvapi2Ac0o+Vc6G1Y9KeuPGBxJCR8o/dpy5OJpfguE0 X-Google-Smtp-Source: AGHT+IE3BtRl/WSh6iaNlwOEOXdQObIPCzquvtJGf00g7uu5DR/ectGIv8i7vMguwPF28H34WDvjPk15RDsW X-Received: by 2002:a05:690c:92:b0:6fe:c2e6:bc66 with SMTP id 00721157ae682-700c7681fbfmr8416197b3.2.1742590644709; Fri, 21 Mar 2025 13:57:24 -0700 (PDT) Received: from c7-smtp-2023.dev.purestorage.com ([208.88.159.129]) by smtp-relay.gmail.com with ESMTPS id 00721157ae682-700ba6da1bfsm1624207b3.13.2025.03.21.13.57.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Mar 2025 13:57:24 -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 B9A6C3400FE; Fri, 21 Mar 2025 14:57:23 -0600 (MDT) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id B541AE4195A; Fri, 21 Mar 2025 14:57:23 -0600 (MDT) From: Caleb Sander Mateos To: Keith Busch , Jens Axboe , Christoph Hellwig , Sagi Grimberg Cc: linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, Caleb Sander Mateos Subject: [PATCH v2 1/3] nvme/ioctl: don't warn on vectorized uring_cmd with fixed buffer Date: Fri, 21 Mar 2025 14:57:20 -0600 Message-ID: <20250321205722.3947901-2-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250321205722.3947901-1-csander@purestorage.com> References: <20250321205722.3947901-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 vectorized io_uring NVMe passthru opcodes don't yet support fixed buffers. But since userspace can trigger this condition based on the io_uring SQE parameters, it shouldn't cause a kernel warning. Signed-off-by: Caleb Sander Mateos Fixes: 23fd22e55b76 ("nvme: wire up fixed buffer support for nvme passthrou= gh") Reviewed-by: Christoph Hellwig --- drivers/nvme/host/ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/nvme/host/ioctl.c b/drivers/nvme/host/ioctl.c index 41907b4e1869..6c27d72e8cee 100644 --- a/drivers/nvme/host/ioctl.c +++ b/drivers/nvme/host/ioctl.c @@ -139,11 +139,11 @@ static int nvme_map_user_request(struct request *req,= u64 ubuffer, =20 if (ioucmd && (ioucmd->flags & IORING_URING_CMD_FIXED)) { struct iov_iter iter; =20 /* fixedbufs is only for non-vectored io */ - if (WARN_ON_ONCE(flags & NVME_IOCTL_VEC)) { + if (flags & NVME_IOCTL_VEC) { ret =3D -EINVAL; goto out; } ret =3D io_uring_cmd_import_fixed(ubuffer, bufflen, rq_data_dir(req), &iter, ioucmd); --=20 2.45.2 From nobody Mon Feb 9 07:23:50 2026 Received: from mail-pj1-f99.google.com (mail-pj1-f99.google.com [209.85.216.99]) (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 A3C88230BE9 for ; Fri, 21 Mar 2025 20:57:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.99 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742590677; cv=none; b=ukAYBTHXbx/OQp/Xvpg4kcKqQuyzWz9kmVrWXrW4tRtCnR0KZWE4pZgMbJ7ktUNYBdvtT02PmHmk1aMOcTiJUPfkJpJu558Up/ZtuCHSY/3UDRflHL3Xo0n5Qft+C6GnCkDA7V8Zj4aex2n40+o8tOXspK9GLr88dD2gVfBKlh8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742590677; c=relaxed/simple; bh=yKL7IczPQuQF3SWeOBm0zCzXPd1dogWlb0noBZzcEIc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jb7uMa7BKNVJCK4oP7jimtI0xVbh4zfPitTZUEcTWd78+NIKMxtBCjGZFeixapWhCajhKl6MpIM7hW8LnwoUJxIJqiv1CvGzf37wG0X6eg2K3bQi4dlBUl2faxtPddXQfxclYHDU3shPva0F9hUshB07A9Ju3s35lECwXiYp8gU= 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=A3egmY96; arc=none smtp.client-ip=209.85.216.99 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="A3egmY96" Received: by mail-pj1-f99.google.com with SMTP id 98e67ed59e1d1-2ff73032ac0so608535a91.3 for ; Fri, 21 Mar 2025 13:57:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1742590675; x=1743195475; 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=ZqACgqSPAGulvpdL72lXsG7CJBHtcdgDXf09Xg+OLKQ=; b=A3egmY96xnVfSszRD6ovreu2rfmGBY/orRnNjIHZ6SW2oCi7cimULNl78uOI57ymIY PbL2y776Tn4JI/fuRzFicV340GZ6qPnuAt+k0WymC2JIYngSzdZlS7oS/u+DFXkb9Khi Nk8stAr5jvruOdq0KkS70x0WehismJWS9ZoWpIu9pYrgTO2USYy81XNEu+JrgWkDiiRM /k4ltq0ilLEL11SjgPCzhIS4iFZnvdlv7C3ona+d7maGwZCodumLGrNzp5D4ZZOT0owq uTeoLeRik01XJtsqPl/ej60gIQ5mg7uWXnsHuL6s8pOJY2BZHBbGKkCvd5+1pedQJvfZ 0Hgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742590675; x=1743195475; 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=ZqACgqSPAGulvpdL72lXsG7CJBHtcdgDXf09Xg+OLKQ=; b=IR2FMULNZ2XuJPmUoYehDjHmvlx1TevxkshkwlrxSldXVgPmsZynNS5pMs6GJ+xLu7 wWGrXFViouwe5/t40G3qhUobVs8NVMrE1eCbYk1zcpHIWZa7xeDswMwKuxXiLhYyPER8 Nrizw92k2S/T7qphApSm55mAduIdLSt+hFgITGNKhLsJ7e4xX0KO6d4//vIhB1hX3Pkt PsfB8UDiZ6hwM3kAGkvAw/seG7JDIAJ6Y1bue00kK2BgaOD33BGl/r7BJfgcA3jLWz6l W/NpnMB4Scoht1x2inYdjdzw3czUt46hjNhwxooZ2e73eqXSFfOQzzXA6VU2auyLaz0V KuBw== X-Forwarded-Encrypted: i=1; AJvYcCWZ6GY/6V8uvs+la6taNX9zKusG33vEsDFcnBIm3f18tskterPVhSZlpovEdQxboQox0IzKIs/uZtC0EBw=@vger.kernel.org X-Gm-Message-State: AOJu0YxnqIm835WG7YMAvwVQ1vc01JcIfeZPDPiFB1kPOjVvJgwB7GEw 02AFMmAUn/qVRnkHbqChefEA9PWGrNGVLIf0zplxoRZnB6+FbRbTnN8t3qVPpV9OG2n0h1DKwjW Go6ilXKm7szzcwfA1REpM660QjWw2/INq/PEjfzN7o0Q/tj2u X-Gm-Gg: ASbGncvNz4PRYkND8dj5rplp7AvVhFMTyYdG6bqyJJLbyU+scpX/OTmUD9xiwRFNb68 GIjXDhmzPwcbZ036BAr0x4cXz3UTj8vUORoojc2rhIhVI8hzBAaS42OeuKXIXhY9iapQeOGhM08 dTS4y/n752nrg57FEushfFlPupaf/+3JMlD1eDcDNbOcJFCTT8H20IAtIdMDymXm5fvhJhujFEq QzoB3iGxafM1xp5UodJPvjR71yD9a9AQ0z8rM0Vbfmxq0ZOpaQg5NlrTK+sxGRAR68BaggvlmPS l56oome3cfayDhzOlwdzIna6v28c/++y/g== X-Google-Smtp-Source: AGHT+IEaGairhpn8t9yDvUk8suCFhpcyk6iBi2A9vV17xzcU4/YSuUiQ14iekBObKOIJ+plm9Q03wWYMW1RU X-Received: by 2002:a05:6a20:431b:b0:1ee:e167:1f36 with SMTP id adf61e73a8af0-1fe42f55affmr3471813637.5.1742590674800; Fri, 21 Mar 2025 13:57:54 -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 d2e1a72fcca58-7390602a27csm136934b3a.15.2025.03.21.13.57.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Mar 2025 13:57:54 -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 3402C3402DC; Fri, 21 Mar 2025 14:57:54 -0600 (MDT) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id 28A2DE4195A; Fri, 21 Mar 2025 14:57:24 -0600 (MDT) From: Caleb Sander Mateos To: Keith Busch , Jens Axboe , Christoph Hellwig , Sagi Grimberg Cc: linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, Caleb Sander Mateos Subject: [PATCH v2 2/3] nvme/ioctl: don't call blk_mq_free_request() in nvme_map_user_request() Date: Fri, 21 Mar 2025 14:57:21 -0600 Message-ID: <20250321205722.3947901-3-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250321205722.3947901-1-csander@purestorage.com> References: <20250321205722.3947901-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 --- drivers/nvme/host/ioctl.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/drivers/nvme/host/ioctl.c b/drivers/nvme/host/ioctl.c index 6c27d72e8cee..843371e6e1e2 100644 --- a/drivers/nvme/host/ioctl.c +++ b/drivers/nvme/host/ioctl.c @@ -126,40 +126,38 @@ 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); 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 @@ -172,12 +170,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, @@ -198,11 +194,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); if (ret) - return ret; + goto out_free_req; } =20 bio =3D req->bio; ctrl =3D nvme_req(req)->ctrl; =20 @@ -210,15 +206,16 @@ static int nvme_submit_user_cmd(struct request_queue = *q, ret =3D nvme_execute_rq(req, false); if (result) *result =3D le64_to_cpu(nvme_req(req)->result.u64); if (bio) blk_rq_unmap_user(bio); - blk_mq_free_request(req); =20 if (effects) nvme_passthru_end(ctrl, ns, effects, cmd, 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) { @@ -518,20 +515,24 @@ static int nvme_uring_cmd_io(struct nvme_ctrl *ctrl, = struct nvme_ns *ns, if (d.addr && 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); 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 From nobody Mon Feb 9 07:23:51 2026 Received: from mail-qk1-f225.google.com (mail-qk1-f225.google.com [209.85.222.225]) (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 352F6231A2D for ; Fri, 21 Mar 2025 20:57:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.225 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742590680; cv=none; b=M9X7/aytG7Si0hfN2dE503wwDtplEF5pdgZE7fTnLqg8DjP6i6o2k6G7wJnojuAsHuKBBt0U2BAXLr544UQ/IW1kKOiPNNLrYzggtcoGw8Uc+vL7y4CRBsLH5C7jy5aYPBbOVTjEhjEtiOGTt+FbynhE1wGajPm+Rm3AZ7N4F+0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742590680; c=relaxed/simple; bh=Bm7bJDmAmFwceMS0uipBzo2HfuoD8vWOeeOP+aFj1gs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TcbXhJmrS/R4RIMGCnAQzmCCUjIi5ZEcDiBNtJhtJUJP3x/1MQ3pl+hlqXKMvg0zdaf1JHeHG8bNGAyByLzmtU2WcqtLTELbolwukkAQw2Ynz+4SjWcDC+0qV/PxUjCTEyMexW9PqHLWlxjk446Yc3nh3GMn1uB/0d8dI0RXboI= 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=Mso6vozK; arc=none smtp.client-ip=209.85.222.225 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="Mso6vozK" Received: by mail-qk1-f225.google.com with SMTP id af79cd13be357-7c549d9ecc6so45416085a.1 for ; Fri, 21 Mar 2025 13:57:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1742590676; x=1743195476; 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=BAQa7curMMZokpp1idcLqQ2LV/40Bv1e439+xYRqV5Y=; b=Mso6vozKf+o72ewg9Wd5jdZ2a9eBr4RDr/35fEYzRmtKOmvXBYhnDDwfuq3sIIHzJi vxi6IyD9MajlhkV8QpQD5N/udF706dZUbPOjzFj1GSR+HN0h1Ty04ByTeVM1dHky5J/8 4eE2spqZdRh9Nhv2ekGWoUOOinAxY1RMxg6hP6nhJ5rKqVpJlrk/v1kQPOC+ojHZFqAh RcWqn9/d3+V2nJLPAyk0DMl6JgdNT9FNSNJAMiNQ09ZPYcnvfuahcTzafMJVzB6SflLd YLxmcxZ3btqa67NmUsgx++HLtxX/2H/dRXojMQp4IRdjwrIXE1lKSMCfH7zvj+zQZ/nd pW7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742590676; x=1743195476; 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=BAQa7curMMZokpp1idcLqQ2LV/40Bv1e439+xYRqV5Y=; b=pCkPWl7LOD2I4xwLmz0BQ+RLJ2NHpm27XwJED52+GzBWD6q0qPBZjaNtlkW9/eG3Hn B2BvxYw7j4r/+OUYkwFmQpceKO+nHrz5h/bV1/jPBkZHbUgjRC9fwKPsQkb1b+VeqhSV hTZ4KeEKw/hQo5FI00U0brxjsESWrCb7eHSHsjRlbkoRJjLCCg7Ba/8Tp+Cv2b11QTtk bLd3S74Obn683XkRte78qU4P4KBxowE8O6kRCXm4rrvIWW438zK7JNfA3Fo6reBQpbI0 4t1WVHe9B/jrKqhyXWn+cAyuxrS+mmnmuQu3GlDFoXjR4HH3YMTsIwqEkipkFG2YL2D5 2JEw== X-Forwarded-Encrypted: i=1; AJvYcCXIORxLCizp+rtRqfo5wD4e6EBTxjfMlWO1AN4nq+QfAvzBsQ9++O7z2jXzytYHLXTwHw3RqkmRqMXd4EY=@vger.kernel.org X-Gm-Message-State: AOJu0YzedK2T/R2BVVzq5rZchES9q4Hzb65sMl8kNp6WMhzZcxhOW7/p QG9yHF8uCZSHISdHSNEB9ZUkG4Je2tGCnkwJHrvjPnrd/eMrdHz89rwfFGtu3OLm9+82qTYP9xP 816Sf81j+ua88qhgqfKa5Urh0qO0k1BP7 X-Gm-Gg: ASbGncvqv5FghShGK1KAzpMfv/tbYqhu8mqDYIoITeKn+WX4VigJ1krtLTFNjl/1Wlq G0/P0UeS6SlQ5qgn+ecQY761Ymh7YCvWadoyWmr6ASomE0s8yikqUZFiHXvnku0/cdVHOTTqGFi EgB52cTfWjxJJqpR34oxik2a8XH0uWgZuExmTuoCxh1MONTQrFyf9LdiQgYQ+VZach/RIiTbGSv i2pNZl5hAfkiTHz0GZfsVPZTljvtDw+2PsdveMhglbINlRQCvLvshtDk1f/7eUjt2s4u4OoPXQG jlDfYfoK+7s3dW6E4i60l/Q0vAqouUws5o3RAKmRJ8IifEcn X-Google-Smtp-Source: AGHT+IEoEcywwdrdpsNfxd22W+vQnKfycVeMvEhHj3rSWretVHw8fIWoxN23kfgkBMom47MHPGnXOf15e669 X-Received: by 2002:a05:620a:29c8:b0:7c5:6fee:1634 with SMTP id af79cd13be357-7c5ba12f397mr223670085a.3.1742590676104; Fri, 21 Mar 2025 13:57:56 -0700 (PDT) Received: from c7-smtp-2023.dev.purestorage.com ([208.88.159.129]) by smtp-relay.gmail.com with ESMTPS id af79cd13be357-7c5b931cf93sm13698785a.4.2025.03.21.13.57.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Mar 2025 13:57:56 -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 8F72C3400FE; Fri, 21 Mar 2025 14:57:54 -0600 (MDT) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id 867A8E4195E; Fri, 21 Mar 2025 14:57:24 -0600 (MDT) From: Caleb Sander Mateos To: Keith Busch , Jens Axboe , Christoph Hellwig , Sagi Grimberg Cc: linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, Caleb Sander Mateos Subject: [PATCH v2 3/3] nvme/ioctl: move fixed buffer lookup to nvme_uring_cmd_io() Date: Fri, 21 Mar 2025 14:57:22 -0600 Message-ID: <20250321205722.3947901-4-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250321205722.3947901-1-csander@purestorage.com> References: <20250321205722.3947901-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" nvme_map_user_request() is called from both nvme_submit_user_cmd() and nvme_uring_cmd_io(). But the ioucmd branch is only applicable to nvme_uring_cmd_io(). Move it to nvme_uring_cmd_io() and just pass the resulting iov_iter to nvme_map_user_request(). Signed-off-by: Caleb Sander Mateos --- drivers/nvme/host/ioctl.c | 42 ++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/drivers/nvme/host/ioctl.c b/drivers/nvme/host/ioctl.c index 843371e6e1e2..98489161e029 100644 --- a/drivers/nvme/host/ioctl.c +++ b/drivers/nvme/host/ioctl.c @@ -112,11 +112,11 @@ static struct request *nvme_alloc_user_request(struct= request_queue *q, return req; } =20 static int nvme_map_user_request(struct request *req, u64 ubuffer, unsigned bufflen, void __user *meta_buffer, unsigned meta_len, - struct io_uring_cmd *ioucmd, unsigned int flags) + struct iov_iter *iter, unsigned int flags) { struct request_queue *q =3D req->q; struct nvme_ns *ns =3D q->queuedata; struct block_device *bdev =3D ns ? ns->disk->part0 : NULL; bool supports_metadata =3D bdev && blk_get_integrity(bdev->bd_disk); @@ -134,27 +134,16 @@ static int nvme_map_user_request(struct request *req,= u64 ubuffer, 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; - - /* fixedbufs is only for non-vectored io */ - if (flags & NVME_IOCTL_VEC) - return -EINVAL; - - ret =3D io_uring_cmd_import_fixed(ubuffer, bufflen, - rq_data_dir(req), &iter, ioucmd); - if (ret < 0) - return ret; - ret =3D blk_rq_map_user_iov(q, req, NULL, &iter, GFP_KERNEL); - } else { + if (iter) + 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) return ret; =20 bio =3D req->bio; @@ -511,13 +500,30 @@ static int nvme_uring_cmd_io(struct nvme_ctrl *ctrl, = struct nvme_ns *ns, if (IS_ERR(req)) return PTR_ERR(req); req->timeout =3D d.timeout_ms ? msecs_to_jiffies(d.timeout_ms) : 0; =20 if (d.addr && 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); + struct iov_iter iter; + struct iov_iter *map_iter =3D NULL; + + if (ioucmd->flags & IORING_URING_CMD_FIXED) { + /* fixedbufs is only for non-vectored io */ + if (vec) { + ret =3D -EINVAL; + goto out_free_req; + } + + ret =3D io_uring_cmd_import_fixed(d.addr, d.data_len, + rq_data_dir(req), &iter, ioucmd); + if (ret < 0) + goto out_free_req; + + map_iter =3D &iter; + } + ret =3D nvme_map_user_request(req, d.addr, d.data_len, + nvme_to_user_ptr(d.metadata), d.metadata_len, + map_iter, vec); if (ret) goto out_free_req; } =20 /* to free bio on completion, as req->bio will be null at that time */ --=20 2.45.2