From 4eb53395c4e81e5eadef96c642b5673201b7891a Mon Sep 17 00:00:00 2001 From: Kishore Padmanabha Date: Mon, 6 Jul 2020 13:54:43 +0530 Subject: [PATCH] net/bnxt: use source property for VXLAN encap/decap The vxlan encap and decap flows need to allocate the source record property and populate the action fields during the flow parsing. Signed-off-by: Kishore Padmanabha Reviewed-by: Ajit Khaparde Signed-off-by: Somnath Kotur Signed-off-by: Venkat Duvvuru --- drivers/net/bnxt/tf_ulp/bnxt_ulp.c | 7 ++++++- drivers/net/bnxt/tf_ulp/ulp_rte_parser.c | 10 ++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c index c058611507..fc29ff1591 100644 --- a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c +++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c @@ -103,6 +103,9 @@ ulp_ctx_session_open(struct bnxt *bp, /* EM */ resources->em_cnt[TF_DIR_RX].cnt[TF_EM_TBL_TYPE_EM_RECORD] = 2048; + /* EEM */ + resources->em_cnt[TF_DIR_RX].cnt[TF_EM_TBL_TYPE_TBL_SCOPE] = 1; + /** TX **/ /* Identifiers */ resources->ident_cnt[TF_DIR_TX].cnt[TF_IDENT_TYPE_L2_CTXT] = 8; @@ -127,9 +130,11 @@ ulp_ctx_session_open(struct bnxt *bp, resources->em_cnt[TF_DIR_TX].cnt[TF_EM_TBL_TYPE_EM_RECORD] = 8; /* EEM */ - resources->em_cnt[TF_DIR_RX].cnt[TF_EM_TBL_TYPE_TBL_SCOPE] = 1; resources->em_cnt[TF_DIR_TX].cnt[TF_EM_TBL_TYPE_TBL_SCOPE] = 1; + /* SP */ + resources->tbl_cnt[TF_DIR_TX].cnt[TF_TBL_TYPE_ACT_SP_SMAC_IPV4] = 128; + rc = tf_open_session(&bp->tfp, ¶ms); if (rc) { BNXT_TF_DBG(ERR, "Failed to open TF session - %s, rc = %d\n", diff --git a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c index 073b3537f7..1bf0b76d8d 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c +++ b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c @@ -1058,6 +1058,11 @@ ulp_rte_vxlan_encap_act_handler(const struct rte_flow_action *action_item, eth_spec->dst.addr_bytes, BNXT_ULP_ACT_PROP_SZ_ENCAP_L2_DMAC); + buff = &ap->act_details[BNXT_ULP_ACT_PROP_IDX_ENCAP_L2_SMAC]; + ulp_encap_buffer_copy(buff, + eth_spec->src.addr_bytes, + BNXT_ULP_ACT_PROP_SZ_ENCAP_L2_SMAC); + /* Goto the next item */ if (!ulp_rte_item_skip_void(&item, 1)) return BNXT_TF_RC_ERROR; @@ -1131,6 +1136,11 @@ ulp_rte_vxlan_encap_act_handler(const struct rte_flow_action *action_item, (const uint8_t *)&ipv4_spec->hdr.dst_addr, BNXT_ULP_ENCAP_IPV4_DEST_IP); + buff = &ap->act_details[BNXT_ULP_ACT_PROP_IDX_ENCAP_IP_SRC]; + ulp_encap_buffer_copy(buff, + (const uint8_t *)&ipv4_spec->hdr.src_addr, + BNXT_ULP_ACT_PROP_SZ_ENCAP_IP_SRC); + /* Update the ip size details */ ip_size = tfp_cpu_to_be_32(ip_size); memcpy(&ap->act_details[BNXT_ULP_ACT_PROP_IDX_ENCAP_IP_SZ], -- 2.20.1