Thread (4 messages) 4 messages, 4 authors, 2021-03-18

Re: [PATCH] nvme-tcp: Fix misuse of __smp_processor_id with preemption enabled

From: Yi Zhang <hidden>
Date: 2021-03-16 02:48:29

Thanks.

Tested-by: Yi Zhang <redacted>

On 3/16/21 4:53 AM, Sagi Grimberg wrote:
quoted hunk ↗ jump to hunk
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@grimberg.me>
---
  drivers/nvme/host/tcp.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c
index bd931de44d6c..0ef72568a4dd 100644
--- a/drivers/nvme/host/tcp.c
+++ b/drivers/nvme/host/tcp.c
@@ -287,7 +287,7 @@ static inline void nvme_tcp_queue_request(struct nvme_tcp_request *req,
  	 * 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);

_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help