Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba72f32c authored by Yuval Mintz's avatar Yuval Mintz Committed by David S. Miller
Browse files

bnx2x: Semantic Validate vlan/mac changes 



This is purely semantic - break the flow in which PF validates the VF
classification filtering requirement is valid into several sub-functions
for better readable code.

Signed-off-by: default avatarYuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: default avatarAriel Elior <ariele@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f96d8d85

drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c

+42 −9
Original line number Original line Diff line number Diff line
@@ -1694,16 +1694,12 @@ static int bnx2x_vfop_mbx_qfilters_cmd(struct bnx2x *bp, 
	return -ENOMEM;

	return -ENOMEM;

}

}





static void bnx2x_vf_mbx_set_q_filters(struct bnx2x *bp,

static int bnx2x_filters_validate_mac(struct bnx2x *bp,

				      struct bnx2x_virtf *vf,

				      struct bnx2x_virtf *vf,

				       struct bnx2x_vf_mbx *mbx)

				      struct vfpf_set_q_filters_tlv *filters)

{

{

	struct vfpf_set_q_filters_tlv *filters = &mbx->msg->req.set_q_filters;

	struct pf_vf_bulletin_content *bulletin = BP_VF_BULLETIN(bp, vf->index);

	struct pf_vf_bulletin_content *bulletin = BP_VF_BULLETIN(bp, vf->index);

	struct bnx2x_vfop_cmd cmd = {

	int rc = 0;

		.done = bnx2x_vf_mbx_resp,

		.block = false,

	};





	/* if a mac was already set for this VF via the set vf mac ndo, we only

	/* if a mac was already set for this VF via the set vf mac ndo, we only

	 * accept mac configurations of that mac. Why accept them at all?

	 * accept mac configurations of that mac. Why accept them at all?
@@ -1716,6 +1712,7 @@ static void bnx2x_vf_mbx_set_q_filters(struct bnx2x *bp, 
			BNX2X_ERR("VF[%d] requested the addition of multiple macs after set_vf_mac ndo was called\n",

			BNX2X_ERR("VF[%d] requested the addition of multiple macs after set_vf_mac ndo was called\n",

				  vf->abs_vfid);

				  vf->abs_vfid);

			vf->op_rc = -EPERM;

			vf->op_rc = -EPERM;

			rc = -EPERM;

			goto response;

			goto response;

		}

		}
@@ -1726,9 +1723,22 @@ static void bnx2x_vf_mbx_set_q_filters(struct bnx2x *bp, 
				  vf->abs_vfid);

				  vf->abs_vfid);





			vf->op_rc = -EPERM;

			vf->op_rc = -EPERM;

			rc = -EPERM;

			goto response;

			goto response;

		}

		}

	}

	}



response:

	return rc;

}



static int bnx2x_filters_validate_vlan(struct bnx2x *bp,

				       struct bnx2x_virtf *vf,

				       struct vfpf_set_q_filters_tlv *filters)

{

	struct pf_vf_bulletin_content *bulletin = BP_VF_BULLETIN(bp, vf->index);

	int rc = 0;



	/* if vlan was set by hypervisor we don't allow guest to config vlan */

	/* if vlan was set by hypervisor we don't allow guest to config vlan */

	if (bulletin->valid_bitmap & 1 << VLAN_VALID) {

	if (bulletin->valid_bitmap & 1 << VLAN_VALID) {

		int i;

		int i;
@@ -1740,13 +1750,36 @@ static void bnx2x_vf_mbx_set_q_filters(struct bnx2x *bp, 
				BNX2X_ERR("VF[%d] attempted to configure vlan but one was already set by Hypervisor. Aborting request\n",

				BNX2X_ERR("VF[%d] attempted to configure vlan but one was already set by Hypervisor. Aborting request\n",

					  vf->abs_vfid);

					  vf->abs_vfid);

				vf->op_rc = -EPERM;

				vf->op_rc = -EPERM;

				rc = -EPERM;

				goto response;

				goto response;

			}

			}

		}

		}

	}

	}





	/* verify vf_qid */

	/* verify vf_qid */

	if (filters->vf_qid > vf_rxq_count(vf))

	if (filters->vf_qid > vf_rxq_count(vf)) {

		rc = -EPERM;

		goto response;

	}



response:

	return rc;

}



static void bnx2x_vf_mbx_set_q_filters(struct bnx2x *bp,

				       struct bnx2x_virtf *vf,

				       struct bnx2x_vf_mbx *mbx)

{

	struct vfpf_set_q_filters_tlv *filters = &mbx->msg->req.set_q_filters;

	struct bnx2x_vfop_cmd cmd = {

		.done = bnx2x_vf_mbx_resp,

		.block = false,

	};



	if (bnx2x_filters_validate_mac(bp, vf, filters))

		goto response;



	if (bnx2x_filters_validate_vlan(bp, vf, filters))

		goto response;

		goto response;





	DP(BNX2X_MSG_IOV, "VF[%d] Q_FILTERS: queue[%d]\n",

	DP(BNX2X_MSG_IOV, "VF[%d] Q_FILTERS: queue[%d]\n",