Patch "nvme: fix error-handling for io_uring nvme-passthrough" has been added to the 6.1-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    nvme: fix error-handling for io_uring nvme-passthrough

to the 6.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     nvme-fix-error-handling-for-io_uring-nvme-passthroug.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 939f52cda3d6f05a0dcbfbbdfa7f6378eb95d8e0
Author: Anuj Gupta <anuj20.g@xxxxxxxxxxx>
Date:   Thu Oct 19 00:54:30 2023 +0530

    nvme: fix error-handling for io_uring nvme-passthrough
    
    [ Upstream commit 1147dd0503564fa0e03489a039f9e0c748a03db4 ]
    
    Driver may return an error before submitting the command to the device.
    Ensure that such error is propagated up.
    
    Fixes: 456cba386e94 ("nvme: wire-up uring-cmd support for io-passthru on char-device.")
    Signed-off-by: Anuj Gupta <anuj20.g@xxxxxxxxxxx>
    Signed-off-by: Kanchan Joshi <joshi.k@xxxxxxxxxxx>
    Reviewed-by: Niklas Cassel <niklas.cassel@xxxxxxx>
    Reviewed-by: Christoph Hellwig <hch@xxxxxx>
    Signed-off-by: Keith Busch <kbusch@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/nvme/host/ioctl.c b/drivers/nvme/host/ioctl.c
index b33004a4bcb5a..91e6d03475798 100644
--- a/drivers/nvme/host/ioctl.c
+++ b/drivers/nvme/host/ioctl.c
@@ -435,10 +435,13 @@ static enum rq_end_io_ret nvme_uring_cmd_end_io(struct request *req,
 	void *cookie = READ_ONCE(ioucmd->cookie);
 
 	req->bio = pdu->bio;
-	if (nvme_req(req)->flags & NVME_REQ_CANCELLED)
+	if (nvme_req(req)->flags & NVME_REQ_CANCELLED) {
 		pdu->nvme_status = -EINTR;
-	else
+	} else {
 		pdu->nvme_status = nvme_req(req)->status;
+		if (!pdu->nvme_status)
+			pdu->nvme_status = blk_status_to_errno(err);
+	}
 	pdu->u.result = le64_to_cpu(nvme_req(req)->result.u64);
 
 	/*



[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux