nfp: make sure to cancel port refresh on the error path

Jakub Kicinski · davem330 · commit ab832b8de405 · 2017-06-09T12:52:07.000-04:00
If very last stages of netdev registering and init fail some
other netdevs and devlink ports may have been visible to user
space before we torn them back down.  In this case there is a
slight chance user may have triggered port refresh.  We need
to make sure the async work is cancelled.

We have to cancel after releasing pf-&gt;lock, so we will always
try to cancel, regardless of which part of probe has failed.

Signed-off-by: Jakub Kicinski &lt;jakub.kicinski@netronome.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c
@@ -813,6 +813,7 @@ int nfp_net_pci_probe(struct nfp_pf *pf)
 	nfp_cpp_area_release_free(pf->data_vnic_bar);
 err_unlock:
 	mutex_unlock(&pf->lock);
+	cancel_work_sync(&pf->port_refresh_work);
 	return err;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -813,6 +813,7 @@ int nfp_net_pci_probe(struct nfp_pf *pf)`
`813`	`813`	`nfp_cpp_area_release_free(pf->data_vnic_bar);`
`814`	`814`	`err_unlock:`
`815`	`815`	`mutex_unlock(&pf->lock);`
	`816`	`+ cancel_work_sync(&pf->port_refresh_work);`
`816`	`817`	`return err;`
`817`	`818`	`}`
`818`	`819`