Commit b7fac08d authored by Ivan Vecera's avatar Ivan Vecera Committed by Tony Nguyen
Browse files

i40e: Add helpers to find VSI and VEB by SEID and use them 



Add two helpers i40e_(veb|vsi)_get_by_seid() to find corresponding
VEB or VSI by their SEID value and use these helpers to replace
existing open-coded loops.

Reviewed-by: default avatarWojciech Drewek <wojciech.drewek@intel.com>
Signed-off-by: default avatarIvan Vecera <ivecera@redhat.com>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent b1f1b46f

drivers/net/ethernet/intel/i40e/i40e.h

+36 −0
Original line number Diff line number Diff line
@@ -1355,4 +1355,40 @@ static inline struct i40e_pf *i40e_hw_to_pf(struct i40e_hw *hw) 


struct device *i40e_hw_to_dev(struct i40e_hw *hw);



/**

 * i40e_pf_get_vsi_by_seid - find VSI by SEID

 * @pf: pointer to a PF

 * @seid: SEID of the VSI

 **/

static inline struct i40e_vsi *

i40e_pf_get_vsi_by_seid(struct i40e_pf *pf, u16 seid)

{

	struct i40e_vsi *vsi;

	int i;



	i40e_pf_for_each_vsi(pf, i, vsi)

		if (vsi->seid == seid)

			return vsi;



	return NULL;

}



/**

 * i40e_pf_get_veb_by_seid - find VEB by SEID

 * @pf: pointer to a PF

 * @seid: SEID of the VSI

 **/

static inline struct i40e_veb *

i40e_pf_get_veb_by_seid(struct i40e_pf *pf, u16 seid)

{

	struct i40e_veb *veb;

	int i;



	i40e_pf_for_each_veb(pf, i, veb)

		if (veb->seid == seid)

			return veb;



	return NULL;

}



#endif /* _I40E_H_ */

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

+5 −33
Original line number Diff line number Diff line
@@ -24,37 +24,13 @@ enum ring_type { 
 **/

static struct i40e_vsi *i40e_dbg_find_vsi(struct i40e_pf *pf, int seid)

{

	struct i40e_vsi *vsi;

	int i;



	if (seid < 0) {

		dev_info(&pf->pdev->dev, "%d: bad seid\n", seid);



		return NULL;

	}



	i40e_pf_for_each_vsi(pf, i, vsi)

		if (vsi->seid == seid)

			return vsi;



	return NULL;

}



/**

 * i40e_dbg_find_veb - searches for the veb with the given seid

 * @pf: the PF structure to search for the veb

 * @seid: seid of the veb it is searching for

 **/

static struct i40e_veb *i40e_dbg_find_veb(struct i40e_pf *pf, int seid)

{

	struct i40e_veb *veb;

	int i;



	i40e_pf_for_each_veb(pf, i, veb)

		if (veb->seid == seid)

			return veb;



	return NULL;

	return i40e_pf_get_vsi_by_seid(pf, seid);

}



/**************************************************************
@@ -701,7 +677,7 @@ static void i40e_dbg_dump_veb_seid(struct i40e_pf *pf, int seid) 
{

	struct i40e_veb *veb;



	veb = i40e_dbg_find_veb(pf, seid);

	veb = i40e_pf_get_veb_by_seid(pf, seid);

	if (!veb) {

		dev_info(&pf->pdev->dev, "can't find veb %d\n", seid);

		return;
@@ -853,7 +829,7 @@ static ssize_t i40e_dbg_command_write(struct file *filp, 


	} else if (strncmp(cmd_buf, "add relay", 9) == 0) {

		struct i40e_veb *veb;

		int uplink_seid, i;

		int uplink_seid;



		cnt = sscanf(&cmd_buf[9], "%i %i", &uplink_seid, &vsi_seid);

		if (cnt != 2) {
@@ -875,12 +851,8 @@ static ssize_t i40e_dbg_command_write(struct file *filp, 
			goto command_write_done;

		}



		i40e_pf_for_each_veb(pf, i, veb)

			if (veb->seid == uplink_seid)

				break;



		if (i >= I40E_MAX_VEB && uplink_seid != 0 &&

		    uplink_seid != pf->mac_seid) {

		veb = i40e_pf_get_veb_by_seid(pf, uplink_seid);

		if (!veb && uplink_seid != 0 && uplink_seid != pf->mac_seid) {

			dev_info(&pf->pdev->dev,

				 "add relay: relay uplink %d not found\n",

				 uplink_seid);

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

+27 −53
Original line number Diff line number Diff line
@@ -13106,18 +13106,14 @@ static int i40e_ndo_bridge_setlink(struct net_device *dev, 
	struct i40e_pf *pf = vsi->back;

	struct nlattr *attr, *br_spec;

	struct i40e_veb *veb;

	int i, rem;

	int rem;



	/* Only for PF VSI for now */

	if (vsi->seid != pf->vsi[pf->lan_vsi]->seid)

		return -EOPNOTSUPP;



	/* Find the HW bridge for PF VSI */

	i40e_pf_for_each_veb(pf, i, veb)

		if (veb->seid == vsi->uplink_seid)

			break;

	if (i == I40E_MAX_VEB)

		veb = NULL; /* No VEB found */

	veb = i40e_pf_get_veb_by_seid(pf, vsi->uplink_seid);



	br_spec = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg), IFLA_AF_SPEC);

	if (!br_spec)
@@ -13182,18 +13178,15 @@ static int i40e_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq, 
	struct i40e_netdev_priv *np = netdev_priv(dev);

	struct i40e_vsi *vsi = np->vsi;

	struct i40e_pf *pf = vsi->back;

	struct i40e_veb *veb = NULL;

	int i;

	struct i40e_veb *veb;



	/* Only for PF VSI for now */

	if (vsi->seid != pf->vsi[pf->lan_vsi]->seid)

		return -EOPNOTSUPP;



	/* Find the HW bridge for the PF VSI */

	i40e_pf_for_each_veb(pf, i, veb)

		if (veb->seid == vsi->uplink_seid)

			break;

	if (i == I40E_MAX_VEB)

	veb = i40e_pf_get_veb_by_seid(pf, vsi->uplink_seid);

	if (!veb)

		return 0;



	return ndo_dflt_bridge_getlink(skb, pid, seq, dev, veb->bridge_mode,
@@ -14368,8 +14361,8 @@ struct i40e_vsi *i40e_vsi_setup(struct i40e_pf *pf, u8 type, 
	struct i40e_vsi *vsi = NULL;

	struct i40e_veb *veb = NULL;

	u16 alloc_queue_pairs;

	int ret, i;

	int v_idx;

	int ret;



	/* The requested uplink_seid must be either

	 *     - the PF's port seid
@@ -14384,18 +14377,10 @@ struct i40e_vsi *i40e_vsi_setup(struct i40e_pf *pf, u8 type, 
	 *

	 * Find which uplink_seid we were given and create a new VEB if needed

	 */

	i40e_pf_for_each_veb(pf, i, veb)

		if (veb->seid == uplink_seid)

			break;

	if (i == I40E_MAX_VEB)

		veb = NULL;



	veb = i40e_pf_get_veb_by_seid(pf, uplink_seid);

	if (!veb && uplink_seid != pf->mac_seid) {

		i40e_pf_for_each_vsi(pf, i, vsi)

			if (vsi->seid == uplink_seid)

				break;



		if (i == pf->num_alloc_vsi) {

		vsi = i40e_pf_get_vsi_by_seid(pf, uplink_seid);

		if (!vsi) {

			dev_info(&pf->pdev->dev, "no such uplink_seid %d\n",

				 uplink_seid);

			return NULL;
@@ -14423,10 +14408,8 @@ struct i40e_vsi *i40e_vsi_setup(struct i40e_pf *pf, u8 type, 
			}

			i40e_config_bridge_mode(veb);

		}

		i40e_pf_for_each_veb(pf, i, veb)

			if (veb->seid == vsi->uplink_seid)

				break;

		if (i == I40E_MAX_VEB) {

		veb = i40e_pf_get_veb_by_seid(pf, vsi->uplink_seid);

		if (!veb) {

			dev_info(&pf->pdev->dev, "couldn't add VEB\n");

			return NULL;

		}
@@ -14820,8 +14803,8 @@ struct i40e_veb *i40e_veb_setup(struct i40e_pf *pf, u16 flags, 
				u8 enabled_tc)

{

	struct i40e_veb *veb, *uplink_veb = NULL;

	struct i40e_vsi *vsi;

	int vsi_idx, veb_idx;

	struct i40e_vsi *vsi = NULL;

	int veb_idx;

	int ret;



	/* if one seid is 0, the other must be 0 to create a floating relay */
@@ -14834,23 +14817,16 @@ struct i40e_veb *i40e_veb_setup(struct i40e_pf *pf, u16 flags, 
	}



	/* make sure there is such a vsi and uplink */

	i40e_pf_for_each_vsi(pf, vsi_idx, vsi)

		if (vsi->seid == vsi_seid)

			break;



	if (vsi_idx == pf->num_alloc_vsi && vsi_seid != 0) {

		dev_info(&pf->pdev->dev, "vsi seid %d not found\n",

	if (vsi_seid) {

		vsi = i40e_pf_get_vsi_by_seid(pf, vsi_seid);

		if (!vsi) {

			dev_err(&pf->pdev->dev, "vsi seid %d not found\n",

				vsi_seid);

			return NULL;

		}



	if (uplink_seid && uplink_seid != pf->mac_seid) {

		i40e_pf_for_each_veb(pf, veb_idx, veb) {

			if (veb->seid == uplink_seid) {

				uplink_veb = veb;

				break;

			}

	}

	if (uplink_seid && uplink_seid != pf->mac_seid) {

		uplink_veb = i40e_pf_get_veb_by_seid(pf, uplink_seid);

		if (!uplink_veb) {

			dev_info(&pf->pdev->dev,

				 "uplink seid %d not found\n", uplink_seid);
@@ -14872,7 +14848,8 @@ struct i40e_veb *i40e_veb_setup(struct i40e_pf *pf, u16 flags, 
	ret = i40e_add_veb(veb, vsi);

	if (ret)

		goto err_veb;

	if (vsi_idx == pf->lan_vsi)



	if (vsi && vsi->idx == pf->lan_vsi)

		pf->lan_veb = veb->idx;



	return veb;
@@ -14919,13 +14896,10 @@ static void i40e_setup_pf_switch_element(struct i40e_pf *pf, 
			int v;



			/* find existing or else empty VEB */

			i40e_pf_for_each_veb(pf, v, veb)

				if (veb->seid == seid) {

					pf->lan_veb = v;

					break;

				}



			if (pf->lan_veb >= I40E_MAX_VEB) {

			veb = i40e_pf_get_veb_by_seid(pf, seid);

			if (veb) {

				pf->lan_veb = veb->idx;

			} else {

				v = i40e_veb_mem_alloc(pf);

				if (v < 0)

					break;