Commit 956e759d authored by Jan Sokolowski's avatar Jan Sokolowski Committed by Tony Nguyen
Browse files

i40e: Fix missing rtnl locking when setting up pf switch 



A recent change that made i40e use new udp_tunnel infrastructure
uses a method that expects to be called under rtnl lock.

However, not all codepaths do the lock prior to calling
i40e_setup_pf_switch.

Fix that by adding additional rtnl locking and unlocking.

Fixes: 40a98cb6 ("i40e: convert to new udp_tunnel infrastructure")
Signed-off-by: default avatarJan Sokolowski <jan.sokolowski@intel.com>
Signed-off-by: default avatarMateusz Palczewski <mateusz.palczewski@intel.com>
Tested-by: default avatarTony Brelinski <tonyx.brelinski@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 26b0ce8d

drivers/net/ethernet/intel/i40e/i40e_main.c

+11 −4
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ static void i40e_vsi_reinit_locked(struct i40e_vsi *vsi); 
static void i40e_handle_reset_warning(struct i40e_pf *pf, bool lock_acquired);

static int i40e_add_vsi(struct i40e_vsi *vsi);

static int i40e_add_veb(struct i40e_veb *veb, struct i40e_vsi *vsi);

static int i40e_setup_pf_switch(struct i40e_pf *pf, bool reinit);

static int i40e_setup_pf_switch(struct i40e_pf *pf, bool reinit, bool lock_acquired);

static int i40e_setup_misc_vector(struct i40e_pf *pf);

static void i40e_determine_queue_usage(struct i40e_pf *pf);

static int i40e_setup_pf_filter_control(struct i40e_pf *pf);
@@ -10571,7 +10571,7 @@ static void i40e_rebuild(struct i40e_pf *pf, bool reinit, bool lock_acquired) 
#endif /* CONFIG_I40E_DCB */

	if (!lock_acquired)

		rtnl_lock();

	ret = i40e_setup_pf_switch(pf, reinit);

	ret = i40e_setup_pf_switch(pf, reinit, true);

	if (ret)

		goto end_unlock;
@@ -14629,10 +14629,11 @@ int i40e_fetch_switch_configuration(struct i40e_pf *pf, bool printconfig) 
 * i40e_setup_pf_switch - Setup the HW switch on startup or after reset

 * @pf: board private structure

 * @reinit: if the Main VSI needs to re-initialized.

 * @lock_acquired: indicates whether or not the lock has been acquired

 *

 * Returns 0 on success, negative value on failure

 **/

static int i40e_setup_pf_switch(struct i40e_pf *pf, bool reinit)

static int i40e_setup_pf_switch(struct i40e_pf *pf, bool reinit, bool lock_acquired)

{

	u16 flags = 0;

	int ret;
@@ -14734,9 +14735,15 @@ static int i40e_setup_pf_switch(struct i40e_pf *pf, bool reinit) 


	i40e_ptp_init(pf);



	if (!lock_acquired)

		rtnl_lock();



	/* repopulate tunnel port filters */

	udp_tunnel_nic_reset_ntf(pf->vsi[pf->lan_vsi]->netdev);



	if (!lock_acquired)

		rtnl_unlock();



	return ret;

}
@@ -15530,7 +15537,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
			pf->flags |= I40E_FLAG_VEB_MODE_ENABLED;

	}

#endif

	err = i40e_setup_pf_switch(pf, false);

	err = i40e_setup_pf_switch(pf, false, false);

	if (err) {

		dev_info(&pdev->dev, "setup_pf_switch failed: %d\n", err);

		goto err_vsis;