lkml.org 
[lkml]   [2021]   [Jan]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 120/152] nvme-tcp: Fix warning with CONFIG_DEBUG_PREEMPT
    Date
    From: Sagi Grimberg <sagi@grimberg.me>

    commit ada831772188192243f9ea437c46e37e97a5975d upstream.

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    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
    @@ -286,7 +286,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 == __smp_processor_id() &&
    sync && empty && mutex_trylock(&queue->send_mutex)) {
    queue->more_requests = !last;
    nvme_tcp_send_all(queue);

    \
     
     \ /
      Last update: 2021-01-18 14:23    [W:4.023 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site