Commit bb833370 authored by Sagi Grimberg's avatar Sagi Grimberg Committed by Christoph Hellwig
Browse files

nvme-tcp: fix misuse of __smp_processor_id with preemption enabled 



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: db5ad6b7 ("nvme-tcp: try to send request in queue_rq context")
Fixes: ada83177 ("nvme-tcp: Fix warning with CONFIG_DEBUG_PREEMPT")
Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Tested-by: default avatarYi Zhang <yi.zhang@redhat.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent fd0823f4

drivers/nvme/host/tcp.c

+1 −1
Original line number Diff line number Diff line
@@ -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);