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: Yuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: Ariel Elior <ariele@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c
index 3fa6c2a2a5a9f46ba82c19103c114649af4da238..ebad48a330e73fb493dc55dcd02dbc5df301453b 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c
@@ -1694,16 +1694,12 @@ static int bnx2x_vfop_mbx_qfilters_cmd(struct bnx2x *bp,
        return -ENOMEM;
 }
 
-static void bnx2x_vf_mbx_set_q_filters(struct bnx2x *bp,
-                                      struct bnx2x_virtf *vf,
-                                      struct bnx2x_vf_mbx *mbx)
+static int bnx2x_filters_validate_mac(struct bnx2x *bp,
+                                     struct bnx2x_virtf *vf,
+                                     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 bnx2x_vfop_cmd cmd = {
-               .done = bnx2x_vf_mbx_resp,
-               .block = false,
-       };
+       int rc = 0;
 
        /* 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?
@@ -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",
                                  vf->abs_vfid);
                        vf->op_rc = -EPERM;
+                       rc = -EPERM;
                        goto response;
                }
 
@@ -1726,9 +1723,22 @@ static void bnx2x_vf_mbx_set_q_filters(struct bnx2x *bp,
                                  vf->abs_vfid);
 
                        vf->op_rc = -EPERM;
+                       rc = -EPERM;
                        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 (bulletin->valid_bitmap & 1 << VLAN_VALID) {
                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",
                                          vf->abs_vfid);
                                vf->op_rc = -EPERM;
+                               rc = -EPERM;
                                goto response;
                        }
                }
        }
 
        /* 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;
 
        DP(BNX2X_MSG_IOV, "VF[%d] Q_FILTERS: queue[%d]\n",