This is a note to let you know that I've just added the patch titled
Revert "nvme: use command_id instead of req->tag in trace_nvme_complete_rq()"
to the 5.10-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:
revert-nvme-use-command_id-instead-of-req-tag-in-trace_nvme_complete_rq.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 20ed460e4d6101b7e523c89404573786507fcf84 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxxxxxx>
This reverts commit 706960d328f5bdb1a9cde0b17a98ab84a59eed8e which is
commit 679c54f2de672b7d79d02f8c4ad483ff6dd8ce2e upstream.
It is reported to cause issues.
Reported-by: John Sperbeck <jsperbeck@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20240109181722.228783-1-jsperbeck@xxxxxxxxxx
Cc: Bean Huo <beanhuo@xxxxxxxxxx>
Cc: Christoph Hellwig <hch@xxxxxx>
Cc: Jens Axboe <axboe@xxxxxxxxx>
Cc: Sasha Levin <sashal@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
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;
Patches currently in stable-queue which might be from gregkh@xxxxxxxxxxxxxxxxxxx are
queue-5.10/mmc-sdhci-sprd-fix-emmc-init-failure-after-hw-reset.patch
queue-5.10/mmc-core-cancel-delayed-work-before-releasing-host.patch
queue-5.10/net-tls-update-curr-on-splice-as-well.patch
queue-5.10/mmc-meson-mx-sdhc-fix-initialization-frozen-issue.patch
queue-5.10/mm-fix-unmap_mapping_range-high-bits-shift-bug.patch
queue-5.10/netfilter-nf_tables-reject-tables-of-unsupported-family.patch
queue-5.10/firewire-ohci-suppress-unexpected-system-reboot-in-amd-ryzen-machines-and-asm108x-vt630x-pcie-cards.patch
queue-5.10/x86-kprobes-fix-incorrect-return-address-calculation-in-kprobe_emulate_call_indirect.patch
queue-5.10/alsa-hda-realtek-fix-mute-and-mic-mute-leds-for-hp-probook-440-g6.patch
queue-5.10/revert-nvme-use-command_id-instead-of-req-tag-in-trace_nvme_complete_rq.patch
queue-5.10/ipv6-remove-max_size-check-inline-with-ipv4.patch
queue-5.10/pci-extract-ats-disabling-to-a-helper-function.patch
queue-5.10/i2c-core-fix-atomic-xfer-check-for-non-preempt-config.patch
queue-5.10/block-don-t-invalidate-pagecache-for-invalid-falloc-modes.patch
queue-5.10/pci-disable-ats-for-specific-intel-ipu-e2000-devices.patch
queue-5.10/powerpc-update-ppc_save_regs-to-save-current-r1-in-pt_regs.patch
queue-5.10/drm-qxl-fix-uaf-on-handle-creation.patch
queue-5.10/mmc-rpmb-fixes-pause-retune-on-all-rpmb-partitions.patch
queue-5.10/keys-dns-fix-missing-size-check-of-v1-server-list-header.patch
