net/bnxt: check mismatch of control and physical port

During the parsing of the ingress port ignore for a flow, added
check to match the control port and the physical port that is configured
to be ignored. If they do not match then the configuration to setup the
svif ignore shall fail.

Signed-off-by: Kishore Padmanabha <kishore.padmanabha@broadcom.com>
Reviewed-by: Mike Baucom <michael.baucom@broadcom.com>
Reviewed-by: Shahaji Bhosle <sbhosle@broadcom.com>
Acked-by: Ajit Khaparde <ajit.khaparde@broadcom.com>

diff --git a/drivers/net/bnxt/tf_ulp/ulp_port_db.c b/drivers/net/bnxt/tf_ulp/ulp_port_db.c
index 5e7c1d1c17a338a7ce1f5b3e9665c88f03409d49..f8ffb567b5083eb7cb021c862454409af9355aef 100644 (file)
--- a/drivers/net/bnxt/tf_ulp/ulp_port_db.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_port_db.c
@@ -679,3 +679,26 @@ ulp_port_db_parent_vnic_get(struct bnxt_ulp_context *ulp_ctxt,
        }
        return -EINVAL;
 }
+
+/*
+ * Api to get the phy port for a given port id.
+ *
+ * ulp_ctxt [in] Ptr to ulp context
+ * port_id [in] device port id
+ * phy_port [out] phy_port of the dpdk port_id
+ *
+ * Returns 0 on success or negative number on failure.
+ */
+int32_t
+ulp_port_db_phy_port_get(struct bnxt_ulp_context *ulp_ctxt,
+                        uint32_t port_id, uint16_t *phy_port)
+{
+       struct ulp_func_if_info *info;
+
+       info = ulp_port_db_func_if_info_get(ulp_ctxt, port_id);
+       if (info) {
+               *phy_port = info->phy_port_id;
+               return 0;
+       }
+       return -EINVAL;
+}

diff --git a/drivers/net/bnxt/tf_ulp/ulp_port_db.h b/drivers/net/bnxt/tf_ulp/ulp_port_db.h
index 740c186e120638cbd6a2cd22289f7af199a80437..b112f1a21607b10f1db09455965112845248dbd5 100644 (file)
--- a/drivers/net/bnxt/tf_ulp/ulp_port_db.h
+++ b/drivers/net/bnxt/tf_ulp/ulp_port_db.h
@@ -314,4 +314,17 @@ int32_t
 ulp_port_db_parent_vnic_get(struct bnxt_ulp_context *ulp_ctxt,
                            uint32_t port_id, uint8_t **vnic);
 
+/*
+ * Api to get the phy port for a given port id.
+ *
+ * ulp_ctxt [in] Ptr to ulp context
+ * port_id [in] device port id
+ * phy_port [out] phy_port of the dpdk port_id
+ *
+ * Returns 0 on success or negative number on failure.
+ */
+int32_t
+ulp_port_db_phy_port_get(struct bnxt_ulp_context *ulp_ctxt,
+                        uint32_t port_id, uint16_t *phy_port);
+
 #endif /* _ULP_PORT_DB_H_ */

diff --git a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c
index 2ec327923921332240c2fcb3837a89b4da5eb083..f4274dd634eb02ed5ef8b0219a2d32602956ed2a 100644 (file)
--- a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c
@@ -686,6 +686,18 @@ ulp_rte_phy_port_hdr_handler(const struct rte_flow_item *item,
        ULP_COMP_FLD_IDX_WR(params, BNXT_ULP_CF_IDX_SVIF_FLAG,
                            rte_be_to_cpu_16(svif));
        if (!mask) {
+               uint32_t port_id = 0;
+               uint16_t phy_port = 0;
+
+               /* Validate the control port */
+               port_id = ULP_COMP_FLD_IDX_RD(params,
+                                             BNXT_ULP_CF_IDX_DEV_PORT_ID);
+               if (ulp_port_db_phy_port_get(params->ulp_ctx,
+                                            port_id, &phy_port) ||
+                   (uint16_t)port_spec->index != phy_port) {
+                       BNXT_TF_DBG(ERR, "Mismatch of control and phy_port\n");
+                       return BNXT_TF_RC_PARSE_ERR;
+               }
                ULP_BITMAP_SET(params->hdr_bitmap.bits,
                               BNXT_ULP_HDR_BIT_SVIF_IGNORE);
                memset(hdr_field->mask, 0xFF, sizeof(mask));