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

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

net/smc/smc_ib.c

+3 −2
Original line number Diff line number Diff line
@@ -579,8 +579,9 @@ static void smc_ib_add_dev(struct ib_device *ibdev) 
	     i++) {

		set_bit(i, &smcibdev->port_event_mask);

		/* determine pnetids of the port */

		smc_pnetid_by_dev_port(ibdev->dev.parent, i,

				       smcibdev->pnetid[i]);

		if (smc_pnetid_by_dev_port(ibdev->dev.parent, i,

					   smcibdev->pnetid[i]))

			smc_pnetid_by_table_ib(smcibdev, i + 1);

	}

	schedule_work(&smcibdev->port_event_work);

}

net/smc/smc_ism.c

+2 −1
Original line number Diff line number Diff line
@@ -296,7 +296,8 @@ struct smcd_dev *smcd_alloc_dev(struct device *parent, const char *name, 
	device_initialize(&smcd->dev);

	dev_set_name(&smcd->dev, name);

	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->lgr_lock);

net/smc/smc_pnet.c

+312 −227

File changed.

Preview size limit exceeded, changes collapsed.

net/smc/smc_pnet.h

+2 −0
Original line number Diff line number Diff line
@@ -46,5 +46,7 @@ void smc_pnet_exit(void); 
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_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

CRA Git | Maintained and supported by SUSTech CRA and CCSE