hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net/smc: add net device tracker to struct smc_pnetentry 

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Eric Dumazet 2021-12-06 17:30:36 -08:00 committed by Jakub Kicinski
parent 035f1f2b96
commit b60645248a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/smc/smc_pnet.c
View File

@ -64,6 +64,7 @@ struct smc_pnetentry {
struct { struct {
char eth_name[IFNAMSIZ + 1]; char eth_name[IFNAMSIZ + 1];
struct net_device *ndev; struct net_device *ndev;
netdevice_tracker dev_tracker;
}; };
struct { struct {
char ib_name[IB_DEVICE_NAME_MAX + 1]; char ib_name[IB_DEVICE_NAME_MAX + 1];
@ -119,7 +120,7 @@ static int smc_pnet_remove_by_pnetid(struct net *net, char *pnet_name)
smc_pnet_match(pnetelem->pnet_name, pnet_name)) { smc_pnet_match(pnetelem->pnet_name, pnet_name)) {
list_del(&pnetelem->list); list_del(&pnetelem->list);
if (pnetelem->type == SMC_PNET_ETH && pnetelem->ndev) { if (pnetelem->type == SMC_PNET_ETH && pnetelem->ndev) {
dev_put(pnetelem->ndev); dev_put_track(pnetelem->ndev, &pnetelem->dev_tracker);
pr_warn_ratelimited("smc: net device %s " pr_warn_ratelimited("smc: net device %s "
"erased user defined " "erased user defined "
"pnetid %.16s\n", "pnetid %.16s\n",
@ -195,7 +196,7 @@ static int smc_pnet_add_by_ndev(struct net_device *ndev)
list_for_each_entry_safe(pnetelem, tmp_pe, &pnettable->pnetlist, list) { list_for_each_entry_safe(pnetelem, tmp_pe, &pnettable->pnetlist, list) {
if (pnetelem->type == SMC_PNET_ETH && !pnetelem->ndev && if (pnetelem->type == SMC_PNET_ETH && !pnetelem->ndev &&
!strncmp(pnetelem->eth_name, ndev->name, IFNAMSIZ)) { !strncmp(pnetelem->eth_name, ndev->name, IFNAMSIZ)) {
dev_hold(ndev); dev_hold_track(ndev, &pnetelem->dev_tracker, GFP_ATOMIC);
pnetelem->ndev = ndev; pnetelem->ndev = ndev;
rc = 0; rc = 0;
pr_warn_ratelimited("smc: adding net device %s with " pr_warn_ratelimited("smc: adding net device %s with "
@ -226,7 +227,7 @@ static int smc_pnet_remove_by_ndev(struct net_device *ndev)
write_lock(&pnettable->lock); write_lock(&pnettable->lock);
list_for_each_entry_safe(pnetelem, tmp_pe, &pnettable->pnetlist, list) { list_for_each_entry_safe(pnetelem, tmp_pe, &pnettable->pnetlist, list) {
if (pnetelem->type == SMC_PNET_ETH && pnetelem->ndev == ndev) { if (pnetelem->type == SMC_PNET_ETH && pnetelem->ndev == ndev) {
dev_put(pnetelem->ndev); dev_put_track(pnetelem->ndev, &pnetelem->dev_tracker);
pnetelem->ndev = NULL; pnetelem->ndev = NULL;
rc = 0; rc = 0;
pr_warn_ratelimited("smc: removing net device %s with " pr_warn_ratelimited("smc: removing net device %s with "
@ -368,7 +369,7 @@ static int smc_pnet_add_eth(struct smc_pnettable *pnettable, struct net *net,
memcpy(new_pe->pnet_name, pnet_name, SMC_MAX_PNETID_LEN); memcpy(new_pe->pnet_name, pnet_name, SMC_MAX_PNETID_LEN);
strncpy(new_pe->eth_name, eth_name, IFNAMSIZ); strncpy(new_pe->eth_name, eth_name, IFNAMSIZ);
new_pe->ndev = ndev; new_pe->ndev = ndev;
netdev_tracker_alloc(ndev, &new_pe->dev_tracker, GFP_KERNEL);
rc = -EEXIST; rc = -EEXIST;
new_netdev = true; new_netdev = true;
write_lock(&pnettable->lock); write_lock(&pnettable->lock);