nvme-tcp: use bh_lock in data_ready

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

Fixes: 3f2304f8c6 ("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>
This commit is contained in:
Sagi Grimberg 2020-04-30 13:59:32 -07:00 committed by Jens Axboe
parent 2a5bcfdd41
commit 386e5e6e1a

View File

@ -794,11 +794,11 @@ static void nvme_tcp_data_ready(struct sock *sk)
{ {
struct nvme_tcp_queue *queue; struct nvme_tcp_queue *queue;
read_lock(&sk->sk_callback_lock); read_lock_bh(&sk->sk_callback_lock);
queue = sk->sk_user_data; queue = sk->sk_user_data;
if (likely(queue && queue->rd_enabled)) if (likely(queue && queue->rd_enabled))
queue_work_on(queue->io_cpu, nvme_tcp_wq, &queue->io_work); 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) static void nvme_tcp_write_space(struct sock *sk)