5.10-stable patches

added patches:
	revert-nvme-use-command_id-instead-of-req-tag-in-trace_nvme_complete_rq.patch

diff --git a/queue-5.10/revert-nvme-use-command_id-instead-of-req-tag-in-trace_nvme_complete_rq.patch b/queue-5.10/revert-nvme-use-command_id-instead-of-req-tag-in-trace_nvme_complete_rq.patch
new file mode 100644 (file)
index 0000000..5820291
--- /dev/null
+++ b/queue-5.10/revert-nvme-use-command_id-instead-of-req-tag-in-trace_nvme_complete_rq.patch
@@ -0,0 +1,34 @@
+From 20ed460e4d6101b7e523c89404573786507fcf84 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Sat, 13 Jan 2024 10:32:55 +0100
+Subject: Revert "nvme: use command_id instead of req->tag in trace_nvme_complete_rq()"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit 706960d328f5bdb1a9cde0b17a98ab84a59eed8e which is
+commit 679c54f2de672b7d79d02f8c4ad483ff6dd8ce2e upstream.
+
+It is reported to cause issues.
+
+Reported-by: John Sperbeck <jsperbeck@google.com>
+Link: https://lore.kernel.org/r/20240109181722.228783-1-jsperbeck@google.com
+Cc: Bean Huo <beanhuo@micron.com>
+Cc: Christoph Hellwig <hch@lst.de>
+Cc: Jens Axboe <axboe@kernel.dk>
+Cc: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/nvme/host/trace.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/nvme/host/trace.h
++++ b/drivers/nvme/host/trace.h
+@@ -98,7 +98,7 @@ TRACE_EVENT(nvme_complete_rq,
+           TP_fast_assign(
+               __entry->ctrl_id = nvme_req(req)->ctrl->instance;
+               __entry->qid = nvme_req_qid(req);
+-              __entry->cid = nvme_req(req)->cmd->common.command_id;
++              __entry->cid = req->tag;
+               __entry->result = le64_to_cpu(nvme_req(req)->result.u64);
+               __entry->retries = nvme_req(req)->retries;
+               __entry->flags = nvme_req(req)->flags;

diff --git a/queue-5.10/series b/queue-5.10/series
index 85123fa4b62af476cfa22ccfd2b98e1721204a47..96a5cf435b4235457cd6e57da68cda377b639e38 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -40,3 +40,4 @@ drm-qxl-fix-uaf-on-handle-creation.patch
 netfilter-nf_tables-reject-tables-of-unsupported-family.patch
 pci-extract-ats-disabling-to-a-helper-function.patch
 pci-disable-ats-for-specific-intel-ipu-e2000-devices.patch
+revert-nvme-use-command_id-instead-of-req-tag-in-trace_nvme_complete_rq.patch