Merge branch 'smc-r-fixes'

davem330 · davem330 · commit 6eadb0b3d085 · 2023-09-10T19:31:43.000+01:00
Guangguan Wang says:

====================
Two fixes for SMC-R
====================

Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/net/smc/smc_core.c b/net/smc/smc_core.c
@@ -1662,6 +1662,7 @@ void smcr_port_add(struct smc_ib_device *smcibdev, u8 ibport)
 {
 	struct smc_link_group *lgr, *n;
 
+	spin_lock_bh(&smc_lgr_list.lock);
 	list_for_each_entry_safe(lgr, n, &smc_lgr_list.list, list) {
 		struct smc_link *link;
 
@@ -1680,6 +1681,7 @@ void smcr_port_add(struct smc_ib_device *smcibdev, u8 ibport)
 		if (link)
 			smc_llc_add_link_local(link);
 	}
+	spin_unlock_bh(&smc_lgr_list.lock);
 }
 
 /* link is down - switch connections to alternate link,
diff --git a/net/smc/smc_stats.h b/net/smc/smc_stats.h
@@ -243,8 +243,9 @@ while (0)
 #define SMC_STAT_SERV_SUCC_INC(net, _ini) \
 do { \
 	typeof(_ini) i = (_ini); \
-	bool is_v2 = (i->smcd_version & SMC_V2); \
 	bool is_smcd = (i->is_smcd); \
+	u8 version = is_smcd ? i->smcd_version : i->smcr_version; \
+	bool is_v2 = (version & SMC_V2); \
 	typeof(net->smc.smc_stats) smc_stats = (net)->smc.smc_stats; \
 	if (is_v2 && is_smcd) \
 		this_cpu_inc(smc_stats->smc[SMC_TYPE_D].srv_v2_succ_cnt); \

Original file line number	Diff line number	Diff line change
`@@ -1662,6 +1662,7 @@ void smcr_port_add(struct smc_ib_device *smcibdev, u8 ibport)`
`1662`	`1662`	`{`
`1663`	`1663`	`struct smc_link_group lgr, n;`
`1664`	`1664`
	`1665`	`+ spin_lock_bh(&smc_lgr_list.lock);`
`1665`	`1666`	`list_for_each_entry_safe(lgr, n, &smc_lgr_list.list, list) {`
`1666`	`1667`	`struct smc_link *link;`
`1667`	`1668`
`@@ -1680,6 +1681,7 @@ void smcr_port_add(struct smc_ib_device *smcibdev, u8 ibport)`
`1680`	`1681`	`if (link)`
`1681`	`1682`	`smc_llc_add_link_local(link);`
`1682`	`1683`	`}`
	`1684`	`+ spin_unlock_bh(&smc_lgr_list.lock);`
`1683`	`1685`	`}`
`1684`	`1686`
`1685`	`1687`	`/* link is down - switch connections to alternate link,`