Skip to contentSkip to conversation

infiniband: i40iw: replace atomic_add_return()

PATCH Applied Yejune Deng 4 participants 4 messages Nov 30, 2020 – Dec 7, 2020 InfiniBand

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 infiniband: i40iw: replace atomic_add_return()

atomic_inc_return() is a little neater

---
 drivers/infiniband/hw/i40iw/i40iw_cm.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/infiniband/hw/i40iw/i40iw_cm.c +3 -3
index 3053c345..26e92ae 100644
@@ -2426,7 +2426,7 @@ static void i40iw_handle_rst_pkt(struct i40iw_cm_node *cm_node,
 		}
 		break;
 	case I40IW_CM_STATE_MPAREQ_RCVD:
-		atomic_add_return(1, &cm_node->passive_state);
+		atomic_inc_return(&cm_node->passive_state);
 		break;
 	case I40IW_CM_STATE_ESTABLISHED:
 	case I40IW_CM_STATE_SYN_RCVD:
@@ -3020,7 +3020,7 @@ static int i40iw_cm_reject(struct i40iw_cm_node *cm_node, const void *pdata, u8
 	i40iw_cleanup_retrans_entry(cm_node);
 
 	if (!loopback) {
-		passive_state = atomic_add_return(1, &cm_node->passive_state);
+		passive_state = atomic_inc_return(&cm_node->passive_state);
 		if (passive_state == I40IW_SEND_RESET_EVENT) {
 			cm_node->state = I40IW_CM_STATE_CLOSED;
 			i40iw_rem_ref_cm_node(cm_node);
@@ -3678,7 +3678,7 @@ int i40iw_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
 		return -EINVAL;
 	}
 
-	passive_state = atomic_add_return(1, &cm_node->passive_state);
+	passive_state = atomic_inc_return(&cm_node->passive_state);
 	if (passive_state == I40IW_SEND_RESET_EVENT) {
 		i40iw_rem_ref_cm_node(cm_node);
 		return -ECONNRESET;
Signature · 1 line
1.9.1
#1 lore raw
Quoted 15 lines

Subject: [PATCH] infiniband: i40iw: replace atomic_add_return()

atomic_inc_return() is a little neater

---
 drivers/infiniband/hw/i40iw/i40iw_cm.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/infiniband/hw/i40iw/i40iw_cm.c +0 -0
index 3053c345..26e92ae 100644

drivers/infiniband/hw/i40iw/i40iw_cm.c static void i40iw_handle_rst_pkt(struct i40iw_cm_node · line 2430

Quoted 6 lines
drivers/infiniband/hw/i40iw/i40iw_cm.c +1 -1
@@ -2426,7 +2426,7 @@ static void i40iw_handle_rst_pkt(struct i40iw_cm_node
 *cm_node,
 		}
 		break;
 	case I40IW_CM_STATE_MPAREQ_RCVD:
-		atomic_add_return(1, &cm_node->passive_state);
+		atomic_inc_return(&cm_node->passive_state);

Just an atomic_inc would suffice here.

drivers/infiniband/hw/i40iw/i40iw_cm.c static int i40iw_cm_reject(struct i40iw_cm_node · line 3024

Quoted 10 lines
drivers/infiniband/hw/i40iw/i40iw_cm.c +0 -0
 		break;
 	case I40IW_CM_STATE_ESTABLISHED:
drivers/infiniband/hw/i40iw/i40iw_cm.c +1 -1
 	case I40IW_CM_STATE_SYN_RCVD:
@@ -3020,7 +3020,7 @@ static int i40iw_cm_reject(struct i40iw_cm_node
 *cm_node, const void *pdata, u8
 	i40iw_cleanup_retrans_entry(cm_node);
 
 	if (!loopback) {
-		passive_state = atomic_add_return(1, &cm_node->passive_state);
+		passive_state = atomic_inc_return(&cm_node->passive_state);

Fine with it as its consistent across i40iw. But aren't there many more instances of this across the tree? Isn't this a choice best left to the developer?

#2 lore raw
Quoted 6 lines · Shiraz
Quoted 6 lines
drivers/infiniband/hw/i40iw/i40iw_cm.c +0 -0
 	case I40IW_CM_STATE_ESTABLISHED:
 	case I40IW_CM_STATE_SYN_RCVD:
@@ -3020,7 +3020,7 @@ static int i40iw_cm_reject(struct i40iw_cm_node
 *cm_node, const void *pdata, u8
 	i40iw_cleanup_retrans_entry(cm_node);
 
Quoted 7 lines

drivers/infiniband/hw/i40iw/i40iw_cm.c static int i40iw_cm_reject(struct i40iw_cm_node *cm_node, const void *pdata, u8 · line 3023

Quoted 3 lines
drivers/infiniband/hw/i40iw/i40iw_cm.c +1 -1
 	if (!loopback) {
-		passive_state = atomic_add_return(1, &cm_node->passive_state);
+		passive_state = atomic_inc_return(&cm_node->passive_state);

Fine with it as its consistent across i40iw. But aren't there many more instances of this across the tree? Isn't this a choice best left to the developer?

I don't think it is a style choice, the narrowest applicable atomic should always be used as a matter of clarity and performance.

Jason