]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
nvme-tcp: use bh_lock in data_ready
authorSagi Grimberg <sagi@grimberg.me>
Thu, 30 Apr 2020 20:59:32 +0000 (13:59 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 22 Jun 2020 07:32:41 +0000 (09:32 +0200)
[ Upstream commit 386e5e6e1aa90b479fcf0467935922df8524393d ]

data_ready may be invoked from send context or from
softirq, so need bh locking for that.

Fixes: 3f2304f8c6d6 ("nvme-tcp: add NVMe over TCP host driver")
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/nvme/host/tcp.c

index c15a92163c1f71974b52c1aa6c676009a7b326d8..4862fa962011dc631fe25f6a913ce44f13f00172 100644 (file)
@@ -794,11 +794,11 @@ static void nvme_tcp_data_ready(struct sock *sk)
 {
        struct nvme_tcp_queue *queue;
 
-       read_lock(&sk->sk_callback_lock);
+       read_lock_bh(&sk->sk_callback_lock);
        queue = sk->sk_user_data;
        if (likely(queue && queue->rd_enabled))
                queue_work_on(queue->io_cpu, nvme_tcp_wq, &queue->io_work);
-       read_unlock(&sk->sk_callback_lock);
+       read_unlock_bh(&sk->sk_callback_lock);
 }
 
 static void nvme_tcp_write_space(struct sock *sk)