diff options
| author |   Sagi Grimberg <sagi@grimberg.me> | 2021-01-13 14:03:04 -0800 |
|---|---|---|
| committer |   Christoph Hellwig <hch@lst.de> | 2021-01-14 20:27:35 +0100 |
| commit | ada831772188192243f9ea437c46e37e97a5975d (patch) | |
| tree | 4fd443a9649a16cd4925800b29e1b710c7a52c27 /drivers | |
| parent | nvmet-rdma: Fix NULL deref when setting pi_enable and traddr INADDR_ANY (diff) | |
| download | linux-dev-ada831772188192243f9ea437c46e37e97a5975d.tar.xz linux-dev-ada831772188192243f9ea437c46e37e97a5975d.zip | |
nvme-tcp: Fix warning with CONFIG_DEBUG_PREEMPT
We shouldn't call smp_processor_id() in a preemptible
context, but this is advisory at best, so instead
call __smp_processor_id().
Fixes: db5ad6b7f8cd ("nvme-tcp: try to send request in queue_rq context")
Reported-by: Or Gerlitz <gerlitz.or@gmail.com>
Reported-by: Yi Zhang <yi.zhang@redhat.com>
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/nvme/host/tcp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index 979ee31b8dd1..b2e0865785ef 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -286,7 +286,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 == __smp_processor_id() && sync && empty && mutex_trylock(&queue->send_mutex)) { queue->more_requests = !last; nvme_tcp_send_all(queue); |