Commit fdff704d authored by Karsten Graul's avatar Karsten Graul Committed by David S. Miller

net/smc: rework pnet table to support SMC-R failover

The pnet table stored pnet ids in the smc device structures. When a
device is going down its smc device structure is freed, and when the
device is brought online again it no longer has a pnet id set.
Rework the pnet table implementation to store the device name with their
assigned pnet id and apply the pnet id to devices when they are
registered.
Signed-off-by: default avatarKarsten Graul <kgraul@linux.ibm.com>
Reviewed-by: default avatarUrsula Braun <ubraun@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 21615efa
...@@ -579,8 +579,9 @@ static void smc_ib_add_dev(struct ib_device *ibdev) ...@@ -579,8 +579,9 @@ static void smc_ib_add_dev(struct ib_device *ibdev)
i++) { i++) {
set_bit(i, &smcibdev->port_event_mask); set_bit(i, &smcibdev->port_event_mask);
/* determine pnetids of the port */ /* determine pnetids of the port */
smc_pnetid_by_dev_port(ibdev->dev.parent, i, if (smc_pnetid_by_dev_port(ibdev->dev.parent, i,
smcibdev->pnetid[i]); smcibdev->pnetid[i]))
smc_pnetid_by_table_ib(smcibdev, i + 1);
} }
schedule_work(&smcibdev->port_event_work); schedule_work(&smcibdev->port_event_work);
} }
......
...@@ -296,7 +296,8 @@ struct smcd_dev *smcd_alloc_dev(struct device *parent, const char *name, ...@@ -296,7 +296,8 @@ struct smcd_dev *smcd_alloc_dev(struct device *parent, const char *name,
device_initialize(&smcd->dev); device_initialize(&smcd->dev);
dev_set_name(&smcd->dev, name); dev_set_name(&smcd->dev, name);
smcd->ops = ops; smcd->ops = ops;
smc_pnetid_by_dev_port(parent, 0, smcd->pnetid); if (smc_pnetid_by_dev_port(parent, 0, smcd->pnetid))
smc_pnetid_by_table_smcd(smcd);
spin_lock_init(&smcd->lock); spin_lock_init(&smcd->lock);
spin_lock_init(&smcd->lgr_lock); spin_lock_init(&smcd->lgr_lock);
......
This diff is collapsed.
...@@ -46,5 +46,7 @@ void smc_pnet_exit(void); ...@@ -46,5 +46,7 @@ void smc_pnet_exit(void);
void smc_pnet_net_exit(struct net *net); void smc_pnet_net_exit(struct net *net);
void smc_pnet_find_roce_resource(struct sock *sk, struct smc_init_info *ini); void smc_pnet_find_roce_resource(struct sock *sk, struct smc_init_info *ini);
void smc_pnet_find_ism_resource(struct sock *sk, struct smc_init_info *ini); void smc_pnet_find_ism_resource(struct sock *sk, struct smc_init_info *ini);
int smc_pnetid_by_table_ib(struct smc_ib_device *smcibdev, u8 ib_port);
int smc_pnetid_by_table_smcd(struct smcd_dev *smcd);
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment