This is a note to let you know that I've just added the patch titled
nvme-tcp: fix misuse of __smp_processor_id with preemption enabled
to the 5.11-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-tcp-fix-misuse-of-__smp_processor_id-with-preemption-enabled.patch
and it can be found in the queue-5.11 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From bb83337058a7000644cdeffc67361d2473534756 Mon Sep 17 00:00:00 2001
From: Sagi Grimberg <sagi@xxxxxxxxxxx>
Date: Mon, 15 Mar 2021 13:53:47 -0700
Subject: nvme-tcp: fix misuse of __smp_processor_id with preemption enabled
From: Sagi Grimberg <sagi@xxxxxxxxxxx>
commit bb83337058a7000644cdeffc67361d2473534756 upstream.
For our pure advisory use-case, we only rely on this call as a hint, so
fix the warning complaints of using the smp_processor_id variants with
preemption enabled.
Fixes: db5ad6b7f8cd ("nvme-tcp: try to send request in queue_rq context")
Fixes: ada831772188 ("nvme-tcp: Fix warning with CONFIG_DEBUG_PREEMPT")
Signed-off-by: Sagi Grimberg <sagi@xxxxxxxxxxx>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@xxxxxxx>
Tested-by: Yi Zhang <yi.zhang@xxxxxxxxxx>
Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/nvme/host/tcp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/nvme/host/tcp.c
+++ b/drivers/nvme/host/tcp.c
@@ -287,7 +287,7 @@ static inline void nvme_tcp_queue_reques
* directly, otherwise queue io_work. Also, only do that if we
* are on the same cpu, so we don't introduce contention.
*/
- if (queue->io_cpu == __smp_processor_id() &&
+ if (queue->io_cpu == raw_smp_processor_id() &&
sync && empty && mutex_trylock(&queue->send_mutex)) {
queue->more_requests = !last;
nvme_tcp_send_all(queue);
Patches currently in stable-queue which might be from sagi@xxxxxxxxxxx are
queue-5.11/nvme-tcp-fix-a-null-deref-when-receiving-a-0-length-r2t-pdu.patch
queue-5.11/nvme-tcp-fix-possible-hang-when-failing-to-set-io-queues.patch
queue-5.11/nvme-tcp-fix-misuse-of-__smp_processor_id-with-preemption-enabled.patch
queue-5.11/nvmet-don-t-check-iosqes-iocqes-for-discovery-controllers.patch
