Commit ac1c4e18 authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Keith Busch
Browse files

nvme-tcp: Initialize sk->sk_ll_usec only with NET_RX_BUSY_POLL 



The access to sk->sk_ll_usec should be hidden behind
CONFIG_NET_RX_BUSY_POLL like the definition of sk_ll_usec.

Put access to ->sk_ll_usec behind CONFIG_NET_RX_BUSY_POLL.

Fixes: 1a9460ce ("nvme-tcp: support simple polling")
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent c1ac9a4b

drivers/nvme/host/tcp.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -1386,7 +1386,9 @@ static int nvme_tcp_alloc_queue(struct nvme_ctrl *nctrl, 
	queue->sock->sk->sk_data_ready = nvme_tcp_data_ready;

	queue->sock->sk->sk_data_ready = nvme_tcp_data_ready;

	queue->sock->sk->sk_state_change = nvme_tcp_state_change;

	queue->sock->sk->sk_state_change = nvme_tcp_state_change;

	queue->sock->sk->sk_write_space = nvme_tcp_write_space;

	queue->sock->sk->sk_write_space = nvme_tcp_write_space;

#ifdef CONFIG_NET_RX_BUSY_POLL

	queue->sock->sk->sk_ll_usec = 1;

	queue->sock->sk->sk_ll_usec = 1;

#endif

	write_unlock_bh(&queue->sock->sk->sk_callback_lock);

	write_unlock_bh(&queue->sock->sk->sk_callback_lock);





	return 0;

	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE