Commit 32bf411d authored by Guvenc Gulce's avatar Guvenc Gulce Committed by Litao Jiao
Browse files

net/smc: Add link counters for IB device ports 

mainline inclusion
from mainline-v5.11-rc1
commit ddc99286
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I78IFM
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=ddc992866f13373e3fd63fd70d9a4452e0d17d69



--------------------------------

Add link counters to the structure of the smc ib device, one counter per
ib port. Increase/decrease the counters as needed in the corresponding
routines.

Signed-off-by: default avatarGuvenc Gulce <guvenc@linux.ibm.com>
Signed-off-by: default avatarKarsten Graul <kgraul@linux.ibm.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarYingyu Zeng <zengyingyu@sangfor.com.cn>
parent 995d4f6d

net/smc/smc_core.c

+13 −0
Original line number Diff line number Diff line
@@ -64,6 +64,16 @@ static inline struct list_head *smc_lgr_list_head(struct smc_link_group *lgr, 
	return &smc_lgr_list.list;

}



static void smc_ibdev_cnt_inc(struct smc_link *lnk)

{

	atomic_inc(&lnk->smcibdev->lnk_cnt_by_port[lnk->ibport - 1]);

}



static void smc_ibdev_cnt_dec(struct smc_link *lnk)

{

	atomic_dec(&lnk->smcibdev->lnk_cnt_by_port[lnk->ibport - 1]);

}



static void smc_lgr_schedule_free_work(struct smc_link_group *lgr)

{

	/* client link group creation always follows the server link group
@@ -321,6 +331,7 @@ int smcr_link_init(struct smc_link_group *lgr, struct smc_link *lnk, 
	lnk->link_idx = link_idx;

	lnk->smcibdev = ini->ib_dev;

	lnk->ibport = ini->ib_port;

	smc_ibdev_cnt_inc(lnk);

	lnk->path_mtu = ini->ib_dev->pattr[ini->ib_port - 1].active_mtu;

	atomic_set(&lnk->conn_cnt, 0);

	smc_llc_link_set_uid(lnk);
@@ -364,6 +375,7 @@ int smcr_link_init(struct smc_link_group *lgr, struct smc_link *lnk, 
clear_llc_lnk:

	smc_llc_link_clear(lnk, false);

out:

	smc_ibdev_cnt_dec(lnk);

	put_device(&ini->ib_dev->ibdev->dev);

	memset(lnk, 0, sizeof(struct smc_link));

	lnk->state = SMC_LNK_UNUSED;
@@ -785,6 +797,7 @@ void __smcr_link_clear(struct smc_link *lnk) 
	smc_ib_destroy_queue_pair(lnk);

	smc_ib_dealloc_protection_domain(lnk);

	smc_wr_free_link_mem(lnk);

	smc_ibdev_cnt_dec(lnk);

	smc_lgr_put(lnk->lgr);  /* lgr_hold in smcr_link_init() */

	memset(lnk, 0, sizeof(struct smc_link));

	lnk->state = SMC_LNK_UNUSED;

net/smc/smc_ib.h

+2 −0
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ struct smc_ib_device { /* ib-device infos for smc */ 
	atomic_t		lnk_cnt;	/* number of links on ibdev */

	wait_queue_head_t	lnks_deleted;	/* wait 4 removal of all links*/

	struct mutex		mutex;		/* protect dev setup+cleanup */

	atomic_t		lnk_cnt_by_port[SMC_MAX_PORTS];

						/* number of links per port */

};



struct smc_buf_desc;