From: Sasha Levin Date: Fri, 23 May 2025 12:21:38 +0000 (-0400) Subject: Drop nvme-map-uring_cmd-data-even-if-address-is-0.patch X-Git-Tag: v6.12.31~83 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dde29203f2aaf921c75748c79a8b7bf25a90a5b7;p=thirdparty%2Fkernel%2Fstable-queue.git Drop nvme-map-uring_cmd-data-even-if-address-is-0.patch Signed-off-by: Sasha Levin --- diff --git a/queue-6.1/nvme-map-uring_cmd-data-even-if-address-is-0.patch b/queue-6.1/nvme-map-uring_cmd-data-even-if-address-is-0.patch deleted file mode 100644 index 55d9ac20f3..0000000000 --- a/queue-6.1/nvme-map-uring_cmd-data-even-if-address-is-0.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 27830dd6c989d97ca4f589fee5ddf90e62e6b5e1 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 27 Feb 2025 14:39:13 -0800 -Subject: nvme: map uring_cmd data even if address is 0 - -From: Xinyu Zhang - -[ Upstream commit 99fde895ff56ac2241e7b7b4566731d72f2fdaa7 ] - -When using kernel registered bvec fixed buffers, the "address" is -actually the offset into the bvec rather than userspace address. -Therefore it can be 0. - -We can skip checking whether the address is NULL before mapping -uring_cmd data. Bad userspace address will be handled properly later when -the user buffer is imported. - -With this patch, we will be able to use the kernel registered bvec fixed -buffers in io_uring NVMe passthru with ublk zero-copy support. - -Reviewed-by: Caleb Sander Mateos -Reviewed-by: Jens Axboe -Reviewed-by: Ming Lei -Signed-off-by: Xinyu Zhang -Signed-off-by: Keith Busch -Link: https://lore.kernel.org/r/20250227223916.143006-4-kbusch@meta.com -Signed-off-by: Jens Axboe -Signed-off-by: Sasha Levin ---- - 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 acf73a91e87e7..0d84acbdbf6b0 100644 ---- a/drivers/nvme/host/ioctl.c -+++ b/drivers/nvme/host/ioctl.c -@@ -541,7 +541,7 @@ static int nvme_uring_cmd_io(struct nvme_ctrl *ctrl, struct nvme_ns *ns, - return PTR_ERR(req); - req->timeout = d.timeout_ms ? msecs_to_jiffies(d.timeout_ms) : 0; - -- if (d.addr && d.data_len) { -+ if (d.data_len) { - ret = nvme_map_user_request(req, d.addr, - d.data_len, nvme_to_user_ptr(d.metadata), - d.metadata_len, 0, &meta, ioucmd, vec); --- -2.39.5 - diff --git a/queue-6.1/series b/queue-6.1/series index 740b85ec1a..985e06d26d 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -126,7 +126,6 @@ soc-apple-rtkit-use-high-prio-work-queue.patch soc-apple-rtkit-implement-oslog-buffers-properly.patch pci-brcmstb-expand-inbound-window-size-up-to-64gb.patch pci-brcmstb-add-a-softdep-to-mip-msi-x-driver.patch -nvme-map-uring_cmd-data-even-if-address-is-0.patch firmware-arm_ffa-set-dma_mask-for-ffa-devices.patch net-mlx5-avoid-report-two-health-errors-on-same-synd.patch selftests-net-have-gro.sh-t-return-a-correct-exit-co.patch diff --git a/queue-6.12/nvme-map-uring_cmd-data-even-if-address-is-0.patch b/queue-6.12/nvme-map-uring_cmd-data-even-if-address-is-0.patch deleted file mode 100644 index fb58d15d26..0000000000 --- a/queue-6.12/nvme-map-uring_cmd-data-even-if-address-is-0.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 507ae214217d2abf9346d8e9f5360bd0eb9635c5 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 27 Feb 2025 14:39:13 -0800 -Subject: nvme: map uring_cmd data even if address is 0 - -From: Xinyu Zhang - -[ Upstream commit 99fde895ff56ac2241e7b7b4566731d72f2fdaa7 ] - -When using kernel registered bvec fixed buffers, the "address" is -actually the offset into the bvec rather than userspace address. -Therefore it can be 0. - -We can skip checking whether the address is NULL before mapping -uring_cmd data. Bad userspace address will be handled properly later when -the user buffer is imported. - -With this patch, we will be able to use the kernel registered bvec fixed -buffers in io_uring NVMe passthru with ublk zero-copy support. - -Reviewed-by: Caleb Sander Mateos -Reviewed-by: Jens Axboe -Reviewed-by: Ming Lei -Signed-off-by: Xinyu Zhang -Signed-off-by: Keith Busch -Link: https://lore.kernel.org/r/20250227223916.143006-4-kbusch@meta.com -Signed-off-by: Jens Axboe -Signed-off-by: Sasha Levin ---- - 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 a1b3c538a4bd2..d128e6cf6f1b0 100644 ---- a/drivers/nvme/host/ioctl.c -+++ b/drivers/nvme/host/ioctl.c -@@ -515,7 +515,7 @@ static int nvme_uring_cmd_io(struct nvme_ctrl *ctrl, struct nvme_ns *ns, - return PTR_ERR(req); - req->timeout = d.timeout_ms ? msecs_to_jiffies(d.timeout_ms) : 0; - -- if (d.addr && d.data_len) { -+ if (d.data_len) { - ret = nvme_map_user_request(req, d.addr, - d.data_len, nvme_to_user_ptr(d.metadata), - d.metadata_len, 0, ioucmd, vec); --- -2.39.5 - diff --git a/queue-6.12/series b/queue-6.12/series index c38d565477..23713080c1 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -273,7 +273,6 @@ soc-apple-rtkit-implement-oslog-buffers-properly.patch wifi-ath12k-report-proper-tx-completion-status-to-ma.patch pci-brcmstb-expand-inbound-window-size-up-to-64gb.patch pci-brcmstb-add-a-softdep-to-mip-msi-x-driver.patch -nvme-map-uring_cmd-data-even-if-address-is-0.patch firmware-arm_ffa-set-dma_mask-for-ffa-devices.patch drm-xe-vf-retry-sending-mmio-request-to-guc-on-timeo.patch drm-xe-pf-create-a-link-between-pf-and-vf-devices.patch diff --git a/queue-6.14/nvme-map-uring_cmd-data-even-if-address-is-0.patch b/queue-6.14/nvme-map-uring_cmd-data-even-if-address-is-0.patch deleted file mode 100644 index 722bee7706..0000000000 --- a/queue-6.14/nvme-map-uring_cmd-data-even-if-address-is-0.patch +++ /dev/null @@ -1,48 +0,0 @@ -From f2bb98e26000a4275706bb5c26b02be15ae41e5f Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 27 Feb 2025 14:39:13 -0800 -Subject: nvme: map uring_cmd data even if address is 0 - -From: Xinyu Zhang - -[ Upstream commit 99fde895ff56ac2241e7b7b4566731d72f2fdaa7 ] - -When using kernel registered bvec fixed buffers, the "address" is -actually the offset into the bvec rather than userspace address. -Therefore it can be 0. - -We can skip checking whether the address is NULL before mapping -uring_cmd data. Bad userspace address will be handled properly later when -the user buffer is imported. - -With this patch, we will be able to use the kernel registered bvec fixed -buffers in io_uring NVMe passthru with ublk zero-copy support. - -Reviewed-by: Caleb Sander Mateos -Reviewed-by: Jens Axboe -Reviewed-by: Ming Lei -Signed-off-by: Xinyu Zhang -Signed-off-by: Keith Busch -Link: https://lore.kernel.org/r/20250227223916.143006-4-kbusch@meta.com -Signed-off-by: Jens Axboe -Signed-off-by: Sasha Levin ---- - 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 fed6b29098ad3..11509ffd28fb5 100644 ---- a/drivers/nvme/host/ioctl.c -+++ b/drivers/nvme/host/ioctl.c -@@ -514,7 +514,7 @@ static int nvme_uring_cmd_io(struct nvme_ctrl *ctrl, struct nvme_ns *ns, - return PTR_ERR(req); - req->timeout = d.timeout_ms ? msecs_to_jiffies(d.timeout_ms) : 0; - -- if (d.addr && d.data_len) { -+ if (d.data_len) { - ret = nvme_map_user_request(req, d.addr, - d.data_len, nvme_to_user_ptr(d.metadata), - d.metadata_len, ioucmd, vec); --- -2.39.5 - diff --git a/queue-6.14/series b/queue-6.14/series index 3e09d8b505..956b662ffc 100644 --- a/queue-6.14/series +++ b/queue-6.14/series @@ -331,7 +331,6 @@ soc-apple-rtkit-implement-oslog-buffers-properly.patch wifi-ath12k-report-proper-tx-completion-status-to-ma.patch pci-brcmstb-expand-inbound-window-size-up-to-64gb.patch pci-brcmstb-add-a-softdep-to-mip-msi-x-driver.patch -nvme-map-uring_cmd-data-even-if-address-is-0.patch firmware-arm_ffa-set-dma_mask-for-ffa-devices.patch drm-xe-vf-retry-sending-mmio-request-to-guc-on-timeo.patch drm-xe-pf-create-a-link-between-pf-and-vf-devices.patch diff --git a/queue-6.6/nvme-map-uring_cmd-data-even-if-address-is-0.patch b/queue-6.6/nvme-map-uring_cmd-data-even-if-address-is-0.patch deleted file mode 100644 index 871e0d1857..0000000000 --- a/queue-6.6/nvme-map-uring_cmd-data-even-if-address-is-0.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 3a7a1c26111bbdc05abbf63eb0b23015f6328e57 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 27 Feb 2025 14:39:13 -0800 -Subject: nvme: map uring_cmd data even if address is 0 - -From: Xinyu Zhang - -[ Upstream commit 99fde895ff56ac2241e7b7b4566731d72f2fdaa7 ] - -When using kernel registered bvec fixed buffers, the "address" is -actually the offset into the bvec rather than userspace address. -Therefore it can be 0. - -We can skip checking whether the address is NULL before mapping -uring_cmd data. Bad userspace address will be handled properly later when -the user buffer is imported. - -With this patch, we will be able to use the kernel registered bvec fixed -buffers in io_uring NVMe passthru with ublk zero-copy support. - -Reviewed-by: Caleb Sander Mateos -Reviewed-by: Jens Axboe -Reviewed-by: Ming Lei -Signed-off-by: Xinyu Zhang -Signed-off-by: Keith Busch -Link: https://lore.kernel.org/r/20250227223916.143006-4-kbusch@meta.com -Signed-off-by: Jens Axboe -Signed-off-by: Sasha Levin ---- - 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 4ce31f9f06947..83908f2dd07fe 100644 ---- a/drivers/nvme/host/ioctl.c -+++ b/drivers/nvme/host/ioctl.c -@@ -618,7 +618,7 @@ static int nvme_uring_cmd_io(struct nvme_ctrl *ctrl, struct nvme_ns *ns, - return PTR_ERR(req); - req->timeout = d.timeout_ms ? msecs_to_jiffies(d.timeout_ms) : 0; - -- if (d.addr && d.data_len) { -+ if (d.data_len) { - ret = nvme_map_user_request(req, d.addr, - d.data_len, nvme_to_user_ptr(d.metadata), - d.metadata_len, 0, &meta, ioucmd, vec); --- -2.39.5 - diff --git a/queue-6.6/series b/queue-6.6/series index dd0a0bee38..4e82d1eaf7 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -170,7 +170,6 @@ soc-apple-rtkit-implement-oslog-buffers-properly.patch wifi-ath12k-report-proper-tx-completion-status-to-ma.patch pci-brcmstb-expand-inbound-window-size-up-to-64gb.patch pci-brcmstb-add-a-softdep-to-mip-msi-x-driver.patch -nvme-map-uring_cmd-data-even-if-address-is-0.patch firmware-arm_ffa-set-dma_mask-for-ffa-devices.patch net-mlx5-avoid-report-two-health-errors-on-same-synd.patch selftests-net-have-gro.sh-t-return-a-correct-exit-co.patch