[PATCH v4 29/40] net: smc: optimize smc_wr_tx_get_free_slot_index()

From: Yury Norov
Date: Thu Jun 20 2024 - 14:07:34 EST


Simplify the function by using find_and_set_bit() and make it a simple
almost one-liner.

While here, drop explicit initialization of *idx, because it's already
initialized by the caller in case of ENOLINK, or set properly with
->wr_tx_mask, if nothing is found, in case of EBUSY.

CC: Tony Lu <tonylu@xxxxxxxxxxxxxxxxx>
Signed-off-by: Yury Norov <yury.norov@xxxxxxxxx>
Reviewed-by: Alexandra Winter <wintera@xxxxxxxxxxxxx>
Reviewed-by: Wen Gu <guwen@xxxxxxxxxxxxxxxxx>
---
net/smc/smc_wr.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/net/smc/smc_wr.c b/net/smc/smc_wr.c
index 0021065a600a..941c2434a021 100644
--- a/net/smc/smc_wr.c
+++ b/net/smc/smc_wr.c
@@ -23,6 +23,7 @@
*/

#include <linux/atomic.h>
+#include <linux/find_atomic.h>
#include <linux/hashtable.h>
#include <linux/wait.h>
#include <rdma/ib_verbs.h>
@@ -170,15 +171,11 @@ void smc_wr_tx_cq_handler(struct ib_cq *ib_cq, void *cq_context)

static inline int smc_wr_tx_get_free_slot_index(struct smc_link *link, u32 *idx)
{
- *idx = link->wr_tx_cnt;
if (!smc_link_sendable(link))
return -ENOLINK;
- for_each_clear_bit(*idx, link->wr_tx_mask, link->wr_tx_cnt) {
- if (!test_and_set_bit(*idx, link->wr_tx_mask))
- return 0;
- }
- *idx = link->wr_tx_cnt;
- return -EBUSY;
+
+ *idx = find_and_set_bit(link->wr_tx_mask, link->wr_tx_cnt);
+ return *idx < link->wr_tx_cnt ? 0 : -EBUSY;
}

/**
--
2.43.0