Commit 31642d28 authored by Przemek Kitszel's avatar Przemek Kitszel Committed by David S. Miller
Browse files

ice: store VF's pci_dev ptr in ice_vf 



Extend struct ice_vf by vfdev.
Calculation of vfdev falls more nicely into ice_create_vf_entries().

Caching of vfdev enables simplification of ice_restore_all_vfs_msi_state().

Reviewed-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Signed-off-by: default avatarPrzemek Kitszel <przemyslaw.kitszel@intel.com>
Co-developed-by: default avatarMateusz Polchlopek <mateusz.polchlopek@intel.com>
Signed-off-by: default avatarMateusz Polchlopek <mateusz.polchlopek@intel.com>
Tested-by: default avatarRafal Romanowski <rafal.romanowski@intel.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9dffb97d

drivers/net/ethernet/intel/ice/ice_main.c

+1 −1
Original line number Diff line number Diff line
@@ -5541,7 +5541,7 @@ static void ice_pci_err_resume(struct pci_dev *pdev) 
		return;

	}



	ice_restore_all_vfs_msi_state(pdev);

	ice_restore_all_vfs_msi_state(pf);



	ice_do_reset(pf, ICE_RESET_PFR);

	ice_service_task_restart(pf);

drivers/net/ethernet/intel/ice/ice_sriov.c

+26 −24
Original line number Diff line number Diff line
@@ -789,14 +789,19 @@ static const struct ice_vf_ops ice_sriov_vf_ops = { 
 */

static int ice_create_vf_entries(struct ice_pf *pf, u16 num_vfs)

{

	struct pci_dev *pdev = pf->pdev;

	struct ice_vfs *vfs = &pf->vfs;

	struct pci_dev *vfdev = NULL;

	struct ice_vf *vf;

	u16 vf_id;

	int err;

	u16 vf_pdev_id;

	int err, pos;



	lockdep_assert_held(&vfs->table_lock);



	for (vf_id = 0; vf_id < num_vfs; vf_id++) {

	pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_SRIOV);

	pci_read_config_word(pdev, pos + PCI_SRIOV_VF_DID, &vf_pdev_id);



	for (u16 vf_id = 0; vf_id < num_vfs; vf_id++) {

		vf = kzalloc(sizeof(*vf), GFP_KERNEL);

		if (!vf) {

			err = -ENOMEM;
@@ -812,11 +817,23 @@ static int ice_create_vf_entries(struct ice_pf *pf, u16 num_vfs) 


		ice_initialize_vf_entry(vf);



		do {

			vfdev = pci_get_device(pdev->vendor, vf_pdev_id, vfdev);

		} while (vfdev && vfdev->physfn != pdev);

		vf->vfdev = vfdev;

		vf->vf_sw_id = pf->first_sw;



		pci_dev_get(vfdev);



		hash_add_rcu(vfs->table, &vf->entry, vf_id);

	}



	/* Decrement of refcount done by pci_get_device() inside the loop does

	 * not touch the last iteration's vfdev, so it has to be done manually

	 * to balance pci_dev_get() added within the loop.

	 */

	pci_dev_put(vfdev);



	return 0;



err_free_entries:
@@ -1709,31 +1726,16 @@ void ice_print_vfs_mdd_events(struct ice_pf *pf) 


/**

 * ice_restore_all_vfs_msi_state - restore VF MSI state after PF FLR

 * @pdev: pointer to a pci_dev structure

 * @pf: pointer to the PF structure

 *

 * Called when recovering from a PF FLR to restore interrupt capability to

 * the VFs.

 */

void ice_restore_all_vfs_msi_state(struct pci_dev *pdev)

void ice_restore_all_vfs_msi_state(struct ice_pf *pf)

{

	u16 vf_id;

	int pos;



	if (!pci_num_vf(pdev))

		return;



	pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_SRIOV);

	if (pos) {

		struct pci_dev *vfdev;

	struct ice_vf *vf;

	u32 bkt;



		pci_read_config_word(pdev, pos + PCI_SRIOV_VF_DID,

				     &vf_id);

		vfdev = pci_get_device(pdev->vendor, vf_id, NULL);

		while (vfdev) {

			if (vfdev->is_virtfn && vfdev->physfn == pdev)

				pci_restore_msi_state(vfdev);

			vfdev = pci_get_device(pdev->vendor, vf_id,

					       vfdev);

		}

	}

	ice_for_each_vf(pf, bkt, vf)

		pci_restore_msi_state(vf->vfdev);

}

drivers/net/ethernet/intel/ice/ice_sriov.h

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ int 
ice_get_vf_cfg(struct net_device *netdev, int vf_id, struct ifla_vf_info *ivi);



void ice_free_vfs(struct ice_pf *pf);

void ice_restore_all_vfs_msi_state(struct pci_dev *pdev);

void ice_restore_all_vfs_msi_state(struct ice_pf *pf);



int

ice_set_vf_port_vlan(struct net_device *netdev, int vf_id, u16 vlan_id, u8 qos,
@@ -67,7 +67,7 @@ static inline 
void ice_vf_lan_overflow_event(struct ice_pf *pf, struct ice_rq_event_info *event) { }

static inline void ice_print_vfs_mdd_events(struct ice_pf *pf) { }

static inline void ice_print_vf_rx_mdd_event(struct ice_vf *vf) { }

static inline void ice_restore_all_vfs_msi_state(struct pci_dev *pdev) { }

static inline void ice_restore_all_vfs_msi_state(struct ice_pf *pf) { }



static inline int

ice_sriov_configure(struct pci_dev __always_unused *pdev,

drivers/net/ethernet/intel/ice/ice_vf_lib.c

+2 −0
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ static void ice_release_vf(struct kref *ref) 
{

	struct ice_vf *vf = container_of(ref, struct ice_vf, refcnt);



	pci_dev_put(vf->vfdev);



	vf->vf_ops->free(vf);

}

drivers/net/ethernet/intel/ice/ice_vf_lib.h

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ struct ice_vf { 
	struct rcu_head rcu;

	struct kref refcnt;

	struct ice_pf *pf;



	struct pci_dev *vfdev;

	/* Used during virtchnl message handling and NDO ops against the VF

	 * that will trigger a VFR

	 */