[PATCH 7/7] nvme-tcp: make softirq_rx the default

Hannes Reinecke
2024-06-26T12:14:18Z

Remove the 'softirq_rx' parameter and make it the default.

Signed-off-by: Hannes Reinecke <hare@kernel.org>
---
drivers/nvme/host/tcp.c | 22 ++--------------------
1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c
index d78cca2f05d4..79fda5ab49ce 100644
--- a/drivers/nvme/host/tcp.c
+++ b/drivers/nvme/host/tcp.c
@@ -46,13 +46,6 @@ static bool wq_unbound;
module_param(wq_unbound, bool, 0644);
MODULE_PARM_DESC(wq_unbound, "Use unbound workqueue for nvme-tcp IO context (default false)");

-/*
- * RX context runs in softirq
- */
-static bool softirq_rx;
-module_param(softirq_rx, bool, 0644);
-MODULE_PARM_DESC(softirq_rx, "nvme-tcp RX context in softirq");
-
/*
* TLS handshake timeout
*/
@@ -998,12 +991,8 @@ static void nvme_tcp_data_ready(struct sock *sk)
read_lock_bh(&sk->sk_callback_lock);
queue = sk->sk_user_data;
if (likely(queue && queue->rd_enabled) &&
- !test_bit(NVME_TCP_Q_POLLING, &queue->flags)) {
- if (softirq_rx)
- nvme_tcp_try_recv_locked(queue);
- else
- queue_work_on(queue->io_cpu, nvme_tcp_wq, &queue->io_work);
- }
+ !test_bit(NVME_TCP_Q_POLLING, &queue->flags))
+ nvme_tcp_try_recv_locked(queue);
read_unlock_bh(&sk->sk_callback_lock);
}

@@ -1319,13 +1308,6 @@ static void nvme_tcp_io_work(struct work_struct *w)
else if (unlikely(result < 0))
break;
}
- if (!softirq_rx) {
- result = nvme_tcp_try_recv(queue);
- if (result > 0)
- pending = true;
- else if (unlikely(result < 0))
- return;
- }
if (!pending || !queue->rd_enabled)
return;

--
2.35.3