Commit 326ce603 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller

nfp: make sure representors are destroyed before their lower netdev

App start/stop callbacks can perform application initialization.
Unfortunately, flower app started using them for creating and
destroying representors.  This can lead to a situation where
lower vNIC netdev is destroyed while representors still try
to pass traffic.  This will most likely lead to a NULL-dereference
on the lower netdev TX path.

Move the start/stop callbacks, so that representors are created/
destroyed when vNICs are fully initialized.

Fixes: 5de73ee4 ("nfp: general representor implementation")
Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarSimon Horman <simon.horman@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d6e1ab9e
...@@ -456,10 +456,6 @@ static int nfp_net_pf_app_start(struct nfp_pf *pf) ...@@ -456,10 +456,6 @@ static int nfp_net_pf_app_start(struct nfp_pf *pf)
{ {
int err; int err;
err = nfp_net_pf_app_start_ctrl(pf);
if (err)
return err;
err = nfp_app_start(pf->app, pf->ctrl_vnic); err = nfp_app_start(pf->app, pf->ctrl_vnic);
if (err) if (err)
goto err_ctrl_stop; goto err_ctrl_stop;
...@@ -484,7 +480,6 @@ static void nfp_net_pf_app_stop(struct nfp_pf *pf) ...@@ -484,7 +480,6 @@ static void nfp_net_pf_app_stop(struct nfp_pf *pf)
if (pf->num_vfs) if (pf->num_vfs)
nfp_app_sriov_disable(pf->app); nfp_app_sriov_disable(pf->app);
nfp_app_stop(pf->app); nfp_app_stop(pf->app);
nfp_net_pf_app_stop_ctrl(pf);
} }
static void nfp_net_pci_unmap_mem(struct nfp_pf *pf) static void nfp_net_pci_unmap_mem(struct nfp_pf *pf)
...@@ -559,7 +554,7 @@ static int nfp_net_pci_map_mem(struct nfp_pf *pf) ...@@ -559,7 +554,7 @@ static int nfp_net_pci_map_mem(struct nfp_pf *pf)
static void nfp_net_pci_remove_finish(struct nfp_pf *pf) static void nfp_net_pci_remove_finish(struct nfp_pf *pf)
{ {
nfp_net_pf_app_stop(pf); nfp_net_pf_app_stop_ctrl(pf);
/* stop app first, to avoid double free of ctrl vNIC's ddir */ /* stop app first, to avoid double free of ctrl vNIC's ddir */
nfp_net_debugfs_dir_clean(&pf->ddir); nfp_net_debugfs_dir_clean(&pf->ddir);
...@@ -690,6 +685,7 @@ int nfp_net_pci_probe(struct nfp_pf *pf) ...@@ -690,6 +685,7 @@ int nfp_net_pci_probe(struct nfp_pf *pf)
{ {
struct nfp_net_fw_version fw_ver; struct nfp_net_fw_version fw_ver;
u8 __iomem *ctrl_bar, *qc_bar; u8 __iomem *ctrl_bar, *qc_bar;
struct nfp_net *nn;
int stride; int stride;
int err; int err;
...@@ -766,7 +762,7 @@ int nfp_net_pci_probe(struct nfp_pf *pf) ...@@ -766,7 +762,7 @@ int nfp_net_pci_probe(struct nfp_pf *pf)
if (err) if (err)
goto err_free_vnics; goto err_free_vnics;
err = nfp_net_pf_app_start(pf); err = nfp_net_pf_app_start_ctrl(pf);
if (err) if (err)
goto err_free_irqs; goto err_free_irqs;
...@@ -774,12 +770,20 @@ int nfp_net_pci_probe(struct nfp_pf *pf) ...@@ -774,12 +770,20 @@ int nfp_net_pci_probe(struct nfp_pf *pf)
if (err) if (err)
goto err_stop_app; goto err_stop_app;
err = nfp_net_pf_app_start(pf);
if (err)
goto err_clean_vnics;
mutex_unlock(&pf->lock); mutex_unlock(&pf->lock);
return 0; return 0;
err_clean_vnics:
list_for_each_entry(nn, &pf->vnics, vnic_list)
if (nfp_net_is_data_vnic(nn))
nfp_net_pf_clean_vnic(pf, nn);
err_stop_app: err_stop_app:
nfp_net_pf_app_stop(pf); nfp_net_pf_app_stop_ctrl(pf);
err_free_irqs: err_free_irqs:
nfp_net_pf_free_irqs(pf); nfp_net_pf_free_irqs(pf);
err_free_vnics: err_free_vnics:
...@@ -803,6 +807,8 @@ void nfp_net_pci_remove(struct nfp_pf *pf) ...@@ -803,6 +807,8 @@ void nfp_net_pci_remove(struct nfp_pf *pf)
if (list_empty(&pf->vnics)) if (list_empty(&pf->vnics))
goto out; goto out;
nfp_net_pf_app_stop(pf);
list_for_each_entry(nn, &pf->vnics, vnic_list) list_for_each_entry(nn, &pf->vnics, vnic_list)
if (nfp_net_is_data_vnic(nn)) if (nfp_net_is_data_vnic(nn))
nfp_net_pf_clean_vnic(pf, nn); nfp_net_pf_clean_vnic(pf, nn);
......
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