Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/64256/?format=api
{ "id": 64256, "url": "http://patches.dpdk.org/api/patches/64256/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200107003735.96055-7-ajit.khaparde@broadcom.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20200107003735.96055-7-ajit.khaparde@broadcom.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200107003735.96055-7-ajit.khaparde@broadcom.com", "date": "2020-01-07T00:37:34", "name": "[v3,6/7] net/bnxt: add support for flow mark action", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "768501b393bf4609925c4495116cc978cbea6364", "submitter": { "id": 501, "url": "http://patches.dpdk.org/api/people/501/?format=api", "name": "Ajit Khaparde", "email": "ajit.khaparde@broadcom.com" }, "delegate": { "id": 1766, "url": "http://patches.dpdk.org/api/users/1766/?format=api", "username": "ajitkhaparde", "first_name": "Ajit", "last_name": "Khaparde", "email": "ajit.khaparde@broadcom.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20200107003735.96055-7-ajit.khaparde@broadcom.com/mbox/", "series": [ { "id": 7997, "url": "http://patches.dpdk.org/api/series/7997/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=7997", "date": "2020-01-07T00:37:28", "name": "bnxt patchset", "version": 3, "mbox": "http://patches.dpdk.org/series/7997/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/64256/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/64256/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 20D6EA04F6;\n\tTue, 7 Jan 2020 01:38:46 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 1E5D21D8D4;\n\tTue, 7 Jan 2020 01:37:56 +0100 (CET)", "from rnd-relay.smtp.broadcom.com (rnd-relay.smtp.broadcom.com\n [192.19.229.170]) by dpdk.org (Postfix) with ESMTP id BC68F1D70F\n for <dev@dpdk.org>; Tue, 7 Jan 2020 01:37:42 +0100 (CET)", "from mail-irv-17.broadcom.com (mail-irv-17.lvn.broadcom.net\n [10.75.242.48])\n by rnd-relay.smtp.broadcom.com (Postfix) with ESMTP id C7B6530C2D9;\n Mon, 6 Jan 2020 16:31:49 -0800 (PST)", "from C02VPB22HTD6.wifi.broadcom.net (c02vpb22htd6.wifi.broadcom.net\n [10.69.74.102])\n by mail-irv-17.broadcom.com (Postfix) with ESMTP id E17D514008B;\n Mon, 6 Jan 2020 16:37:38 -0800 (PST)" ], "DKIM-Filter": "OpenDKIM Filter v2.10.3 rnd-relay.smtp.broadcom.com C7B6530C2D9", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com;\n s=dkimrelay; t=1578357109;\n bh=HBXRDoBxhI8Ba7vtZM28bLUTB5oQtrkUdwCvB9NdYg8=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=EkkCHlizmeahCUMBCEdmwEljt4LclP+R0Q5ZEL5+wRYHK5eKFN7ocC0t45u4QIjNt\n bZN3hiux+keWZmPFQVKkZUp4d0F6vtiG5h1QXZcEDq1U5Za+uz86NcN6/GNOUUN+KV\n HNKgpmooD9hjifxBvYUNa0I/3ews8Isb2MvzZEZs=", "From": "Ajit Khaparde <ajit.khaparde@broadcom.com>", "To": "dev@dpdk.org", "Cc": "ferruh.yigit@intel.com,\n\tLance Richardson <lance.richardson@broadcom.com>", "Date": "Mon, 6 Jan 2020 16:37:34 -0800", "Message-Id": "<20200107003735.96055-7-ajit.khaparde@broadcom.com>", "X-Mailer": "git-send-email 2.21.0 (Apple Git-122.2)", "In-Reply-To": "<20200107003735.96055-1-ajit.khaparde@broadcom.com>", "References": "<20191221022937.54397-1-ajit.khaparde@broadcom.com>\n <20200107003735.96055-1-ajit.khaparde@broadcom.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v3 6/7] net/bnxt: add support for flow mark action", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Add support for RTE_FLOW_ACTION_TYPE_MARK.\nUse the flow_id provided by FW during flow creation to lookup the\nmark id provided by the application.\n\nSigned-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>\nReviewed-by: Lance Richardson <lance.richardson@broadcom.com>\n---\n drivers/net/bnxt/bnxt.h | 5 +++\n drivers/net/bnxt/bnxt_ethdev.c | 16 ++++++++-\n drivers/net/bnxt/bnxt_filter.h | 3 ++\n drivers/net/bnxt/bnxt_flow.c | 66 ++++++++++++++++++++++++++++------\n drivers/net/bnxt/bnxt_hwrm.c | 2 ++\n drivers/net/bnxt/bnxt_rxr.c | 41 ++++++++++++++++++++-\n drivers/net/bnxt/bnxt_rxr.h | 11 ++++++\n 7 files changed, 132 insertions(+), 12 deletions(-)", "diff": "diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h\nindex ab0b8dde1..21ca059b8 100644\n--- a/drivers/net/bnxt/bnxt.h\n+++ b/drivers/net/bnxt/bnxt.h\n@@ -515,6 +515,7 @@ struct bnxt {\n #define BNXT_FLAG_INIT_DONE\t\t\tBIT(21)\n #define BNXT_FLAG_FW_CAP_ONE_STEP_TX_TS\t\tBIT(22)\n #define BNXT_FLAG_ADV_FLOW_MGMT\t\t\tBIT(23)\n+#define BNXT_FLAG_RX_VECTOR_PKT_MODE\t\tBIT(24)\n #define BNXT_PF(bp)\t\t(!((bp)->flags & BNXT_FLAG_VF))\n #define BNXT_VF(bp)\t\t((bp)->flags & BNXT_FLAG_VF)\n #define BNXT_NPAR(bp)\t\t((bp)->port_partition_type)\n@@ -654,6 +655,10 @@ struct bnxt {\n \n \t/* Struct to hold adapter error recovery related info */\n \tstruct bnxt_error_recovery_info *recovery_info;\n+#define BNXT_MARK_TABLE_SZ\t(sizeof(uint32_t) * 64 * 1024)\n+/* TCAM and EM should be 16-bit only. Other modes not supported. */\n+#define BNXT_FLOW_ID_MASK\t0x0000ffff\n+\tuint32_t\t\t*mark_table;\n };\n \n int bnxt_mtu_set_op(struct rte_eth_dev *eth_dev, uint16_t new_mtu);\ndiff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c\nindex 88df82b86..7b5df9ac1 100644\n--- a/drivers/net/bnxt/bnxt_ethdev.c\n+++ b/drivers/net/bnxt/bnxt_ethdev.c\n@@ -458,6 +458,10 @@ static int bnxt_init_chip(struct bnxt *bp)\n \t}\n \tbnxt_print_link_info(bp->eth_dev);\n \n+\tbp->mark_table = rte_zmalloc(\"bnxt_mark_table\", BNXT_MARK_TABLE_SZ, 0);\n+\tif (!bp->mark_table)\n+\t\tPMD_DRV_LOG(ERR, \"Allocation of mark table failed\\n\");\n+\n \treturn 0;\n \n err_free:\n@@ -740,8 +744,10 @@ static int bnxt_scattered_rx(struct rte_eth_dev *eth_dev)\n }\n \n static eth_rx_burst_t\n-bnxt_receive_function(__rte_unused struct rte_eth_dev *eth_dev)\n+bnxt_receive_function(struct rte_eth_dev *eth_dev)\n {\n+\tstruct bnxt *bp = eth_dev->data->dev_private;\n+\n #ifdef RTE_ARCH_X86\n #ifndef RTE_LIBRTE_IEEE1588\n \t/*\n@@ -762,6 +768,7 @@ bnxt_receive_function(__rte_unused struct rte_eth_dev *eth_dev)\n \t\tDEV_RX_OFFLOAD_VLAN_FILTER))) {\n \t\tPMD_DRV_LOG(INFO, \"Using vector mode receive for port %d\\n\",\n \t\t\t eth_dev->data->port_id);\n+\t\tbp->flags |= BNXT_FLAG_RX_VECTOR_PKT_MODE;\n \t\treturn bnxt_recv_pkts_vec;\n \t}\n \tPMD_DRV_LOG(INFO, \"Vector mode receive disabled for port %d\\n\",\n@@ -773,6 +780,7 @@ bnxt_receive_function(__rte_unused struct rte_eth_dev *eth_dev)\n \t\t eth_dev->data->dev_conf.rxmode.offloads);\n #endif\n #endif\n+\tbp->flags &= ~BNXT_FLAG_RX_VECTOR_PKT_MODE;\n \treturn bnxt_recv_pkts;\n }\n \n@@ -956,6 +964,8 @@ static void bnxt_dev_stop_op(struct rte_eth_dev *eth_dev)\n \tbnxt_int_handler(eth_dev);\n \tbnxt_shutdown_nic(bp);\n \tbnxt_hwrm_if_change(bp, 0);\n+\tmemset(bp->mark_table, 0, BNXT_MARK_TABLE_SZ);\n+\tbp->flags &= ~BNXT_FLAG_RX_VECTOR_PKT_MODE;\n \tbp->dev_stopped = 1;\n \tbp->rx_cosq_cnt = 0;\n }\n@@ -976,6 +986,9 @@ static void bnxt_dev_close_op(struct rte_eth_dev *eth_dev)\n \t\tbp->grp_info = NULL;\n \t}\n \n+\trte_free(bp->mark_table);\n+\tbp->mark_table = NULL;\n+\n \tbnxt_dev_uninit(eth_dev);\n }\n \n@@ -4775,6 +4788,7 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev)\n \tbp = eth_dev->data->dev_private;\n \n \tbp->dev_stopped = 1;\n+\tbp->flags &= ~BNXT_FLAG_RX_VECTOR_PKT_MODE;\n \n \tif (bnxt_vf_pciid(pci_dev->id.device_id))\n \t\tbp->flags |= BNXT_FLAG_VF;\ndiff --git a/drivers/net/bnxt/bnxt_filter.h b/drivers/net/bnxt/bnxt_filter.h\nindex fc40f112b..8f8a4c13b 100644\n--- a/drivers/net/bnxt/bnxt_filter.h\n+++ b/drivers/net/bnxt/bnxt_filter.h\n@@ -23,9 +23,11 @@ struct bnxt;\n #define BNXT_FLOW_L2_INNER_DST_VALID_FLAG\tBIT(4)\n #define BNXT_FLOW_L2_DROP_FLAG\t\t\tBIT(5)\n #define BNXT_FLOW_PARSE_INNER_FLAG\t\tBIT(6)\n+#define BNXT_FLOW_MARK_FLAG\t\t\tBIT(7)\n \n struct bnxt_filter_info {\n \tSTAILQ_ENTRY(bnxt_filter_info)\tnext;\n+\tuint32_t\t\tflow_id;\n \tuint64_t\t\tfw_l2_filter_id;\n \tstruct bnxt_filter_info *matching_l2_fltr_ptr;\n \tuint64_t\t\tfw_em_filter_id;\n@@ -81,6 +83,7 @@ struct bnxt_filter_info {\n \t * to remember which vnic it was created on\n \t */\n \tstruct\t\t\tbnxt_vnic_info *vnic;\n+\tuint32_t\t\tmark;\n };\n \n struct bnxt_filter_info *bnxt_alloc_filter(struct bnxt *bp);\ndiff --git a/drivers/net/bnxt/bnxt_flow.c b/drivers/net/bnxt/bnxt_flow.c\nindex 2bd492ea3..707aedcec 100644\n--- a/drivers/net/bnxt/bnxt_flow.c\n+++ b/drivers/net/bnxt/bnxt_flow.c\n@@ -994,6 +994,7 @@ bnxt_update_filter_flags_en(struct bnxt_filter_info *filter,\n \t}\n \tfilter->fw_l2_filter_id = filter1->fw_l2_filter_id;\n \tfilter->l2_ref_cnt = filter1->l2_ref_cnt;\n+\tfilter->flow_id = filter1->flow_id;\n \tPMD_DRV_LOG(DEBUG,\n \t\t\"l2_filter: %p fw_l2_filter_id %\" PRIx64 \" l2_ref_cnt %u\\n\",\n \t\tfilter1, filter->fw_l2_filter_id, filter->l2_ref_cnt);\n@@ -1036,6 +1037,8 @@ bnxt_validate_and_parse_flow(struct rte_eth_dev *dev,\n \t\tfilter->flags = HWRM_CFA_EM_FLOW_ALLOC_INPUT_FLAGS_PATH_RX;\n \n \tuse_ntuple = bnxt_filter_type_check(pattern, error);\n+\n+start:\n \tswitch (act->type) {\n \tcase RTE_FLOW_ACTION_TYPE_QUEUE:\n \t\t/* Allow this flow. Redirect to a VNIC. */\n@@ -1191,6 +1194,7 @@ bnxt_validate_and_parse_flow(struct rte_eth_dev *dev,\n \t\t}\n \n \t\tfilter->fw_l2_filter_id = filter1->fw_l2_filter_id;\n+\t\tfilter->flow_id = filter1->flow_id;\n \t\tfilter->flags = HWRM_CFA_NTUPLE_FILTER_ALLOC_INPUT_FLAGS_METER;\n \t\tbreak;\n \tcase RTE_FLOW_ACTION_TYPE_VF:\n@@ -1259,6 +1263,7 @@ bnxt_validate_and_parse_flow(struct rte_eth_dev *dev,\n \t\t}\n \n \t\tfilter->fw_l2_filter_id = filter1->fw_l2_filter_id;\n+\t\tfilter->flow_id = filter1->flow_id;\n \t\tbreak;\n \tcase RTE_FLOW_ACTION_TYPE_RSS:\n \t\trss = (const struct rte_flow_action_rss *)act->conf;\n@@ -1422,6 +1427,34 @@ bnxt_validate_and_parse_flow(struct rte_eth_dev *dev,\n \t\tPMD_DRV_LOG(DEBUG, \"L2 filter created\\n\");\n \t\tbnxt_update_filter_flags_en(filter, filter1, use_ntuple);\n \t\tbreak;\n+\tcase RTE_FLOW_ACTION_TYPE_MARK:\n+\t\tif (bp->flags & BNXT_FLAG_RX_VECTOR_PKT_MODE) {\n+\t\t\tPMD_DRV_LOG(DEBUG,\n+\t\t\t\t \"Disable vector processing for mark\\n\");\n+\t\t\trte_flow_error_set(error,\n+\t\t\t\t\t ENOTSUP,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION,\n+\t\t\t\t\t act,\n+\t\t\t\t\t \"Disable vector processing for mark\");\n+\t\t\trc = -rte_errno;\n+\t\t\tgoto ret;\n+\t\t}\n+\n+\t\tif (bp->mark_table == NULL) {\n+\t\t\trte_flow_error_set(error,\n+\t\t\t\t\t ENOMEM,\n+\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION,\n+\t\t\t\t\t act,\n+\t\t\t\t\t \"Mark table not allocated.\");\n+\t\t\trc = -rte_errno;\n+\t\t\tgoto ret;\n+\t\t}\n+\n+\t\tfilter->valid_flags |= BNXT_FLOW_MARK_FLAG;\n+\t\tfilter->mark = ((const struct rte_flow_action_mark *)\n+\t\t\t\tact->conf)->id;\n+\t\tPMD_DRV_LOG(DEBUG, \"Mark the flow %d\\n\", filter->mark);\n+\t\tbreak;\n \tdefault:\n \t\trte_flow_error_set(error,\n \t\t\t\t EINVAL,\n@@ -1434,20 +1467,17 @@ bnxt_validate_and_parse_flow(struct rte_eth_dev *dev,\n \n done:\n \tact = bnxt_flow_non_void_action(++act);\n-\tif (act->type != RTE_FLOW_ACTION_TYPE_END) {\n-\t\trte_flow_error_set(error,\n-\t\t\t\t EINVAL,\n-\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION,\n-\t\t\t\t act,\n-\t\t\t\t \"Invalid action.\");\n-\t\trc = -rte_errno;\n-\t\tgoto ret;\n-\t}\n+\twhile (act->type != RTE_FLOW_ACTION_TYPE_END)\n+\t\tgoto start;\n \n \treturn rc;\n ret:\n \n-\t//TODO: Cleanup according to ACTION TYPE.\n+\tif (filter1) {\n+\t\tbnxt_hwrm_clear_l2_filter(bp, filter1);\n+\t\tbnxt_free_filter(bp, filter1);\n+\t}\n+\n \tif (rte_errno) {\n \t\tif (vnic && STAILQ_EMPTY(&vnic->filter))\n \t\t\tvnic->rx_queue_cnt = 0;\n@@ -1759,6 +1789,17 @@ bnxt_flow_create(struct rte_eth_dev *dev,\n \t\tSTAILQ_INSERT_TAIL(&vnic->filter, filter, next);\n \t\tPMD_DRV_LOG(DEBUG, \"Successfully created flow.\\n\");\n \t\tSTAILQ_INSERT_TAIL(&vnic->flow_list, flow, next);\n+\t\tif (filter->valid_flags & BNXT_FLOW_MARK_FLAG) {\n+\t\t\tPMD_DRV_LOG(DEBUG,\n+\t\t\t\t \"Mark action: mark id 0x%x, flow id 0x%x\\n\",\n+\t\t\t\t filter->mark, filter->flow_id);\n+\n+\t\t\t/* TCAM and EM should be 16-bit only.\n+\t\t\t * Other modes not supported.\n+\t\t\t */\n+\t\t\tbp->mark_table[filter->flow_id & BNXT_FLOW_ID_MASK] =\n+\t\t\t\tfilter->mark;\n+\t\t}\n \t\tbnxt_release_flow_lock(bp);\n \t\treturn flow;\n \t}\n@@ -1850,6 +1891,11 @@ _bnxt_flow_destroy(struct bnxt *bp,\n \tif (ret == 0)\n \t\tPMD_DRV_LOG(ERR, \"Could not find matching flow\\n\");\n \n+\tif (filter->valid_flags & BNXT_FLOW_MARK_FLAG) {\n+\t\tbp->mark_table[filter->flow_id & BNXT_FLOW_ID_MASK] = 0;\n+\t\tfilter->flow_id = 0;\n+\t}\n+\n \tif (filter->filter_type == HWRM_CFA_EM_FILTER)\n \t\tret = bnxt_hwrm_clear_em_filter(bp, filter);\n \tif (filter->filter_type == HWRM_CFA_NTUPLE_FILTER)\ndiff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c\nindex 8178213e5..50272dcf7 100644\n--- a/drivers/net/bnxt/bnxt_hwrm.c\n+++ b/drivers/net/bnxt/bnxt_hwrm.c\n@@ -485,6 +485,7 @@ int bnxt_hwrm_set_l2_filter(struct bnxt *bp,\n \tHWRM_CHECK_RESULT();\n \n \tfilter->fw_l2_filter_id = rte_le_to_cpu_64(resp->l2_filter_id);\n+\tfilter->flow_id = rte_le_to_cpu_32(resp->flow_id);\n \tHWRM_UNLOCK();\n \n \treturn rc;\n@@ -4321,6 +4322,7 @@ int bnxt_hwrm_set_ntuple_filter(struct bnxt *bp,\n \tHWRM_CHECK_RESULT();\n \n \tfilter->fw_ntuple_filter_id = rte_le_to_cpu_64(resp->ntuple_filter_id);\n+\tfilter->flow_id = rte_le_to_cpu_32(resp->flow_id);\n \tHWRM_UNLOCK();\n \n \treturn rc;\ndiff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c\nindex 3b713c242..1ae0c3c38 100644\n--- a/drivers/net/bnxt/bnxt_rxr.c\n+++ b/drivers/net/bnxt/bnxt_rxr.c\n@@ -489,7 +489,8 @@ static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt,\n \t\tmbuf->hash.rss = rxcmp->rss_hash;\n \t\tmbuf->ol_flags |= PKT_RX_RSS_HASH;\n \t} else {\n-\t\tmbuf->hash.fdir.id = rxcmp1->cfa_code;\n+\t\tmbuf->hash.fdir.id = bnxt_get_cfa_code_or_mark_id(rxq->bp,\n+\t\t\t\t\t\t\t\t rxcmp1);\n \t\tmbuf->ol_flags |= PKT_RX_FDIR | PKT_RX_FDIR_ID;\n \t}\n #ifdef RTE_LIBRTE_IEEE1588\n@@ -895,3 +896,41 @@ int bnxt_init_one_rx_ring(struct bnxt_rx_queue *rxq)\n \n \treturn 0;\n }\n+\n+uint32_t bnxt_get_cfa_code_or_mark_id(struct bnxt *bp,\n+\t\t\t\t struct rx_pkt_cmpl_hi *rxcmp1)\n+{\n+\tuint32_t cfa_code = 0;\n+\tuint8_t meta_fmt = 0;\n+\tuint16_t flags2 = 0;\n+\tuint32_t meta = 0;\n+\n+\tcfa_code = rte_le_to_cpu_16(rxcmp1->cfa_code);\n+\tif (!cfa_code)\n+\t\treturn 0;\n+\n+\tif (cfa_code && !bp->mark_table[cfa_code])\n+\t\treturn cfa_code;\n+\n+\tflags2 = rte_le_to_cpu_16(rxcmp1->flags2);\n+\tmeta = rte_le_to_cpu_32(rxcmp1->metadata);\n+\tif (meta) {\n+\t\tmeta >>= BNXT_RX_META_CFA_CODE_SHIFT;\n+\n+\t\t/*\n+\t\t * The flags field holds extra bits of info from [6:4]\n+\t\t * which indicate if the flow is in TCAM or EM or EEM\n+\t\t */\n+\t\tmeta_fmt = (flags2 & BNXT_CFA_META_FMT_MASK) >>\n+\t\t\t BNXT_CFA_META_FMT_SHFT;\n+\n+\t\t/*\n+\t\t * meta_fmt == 4 => 'b100 => 'b10x => EM.\n+\t\t * meta_fmt == 5 => 'b101 => 'b10x => EM + VLAN\n+\t\t * meta_fmt == 6 => 'b110 => 'b11x => EEM\n+\t\t * meta_fmt == 7 => 'b111 => 'b11x => EEM + VLAN.\n+\t\t */\n+\t\tmeta_fmt >>= BNXT_CFA_META_FMT_EM_EEM_SHFT;\n+\t}\n+\treturn bp->mark_table[cfa_code];\n+}\ndiff --git a/drivers/net/bnxt/bnxt_rxr.h b/drivers/net/bnxt/bnxt_rxr.h\nindex 76bf88d70..bf860020c 100644\n--- a/drivers/net/bnxt/bnxt_rxr.h\n+++ b/drivers/net/bnxt/bnxt_rxr.h\n@@ -226,4 +226,15 @@ uint16_t bnxt_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts,\n int bnxt_rxq_vec_setup(struct bnxt_rx_queue *rxq);\n #endif\n \n+uint32_t bnxt_get_cfa_code_or_mark_id(struct bnxt *bp,\n+\t\t\t\t struct rx_pkt_cmpl_hi *rxcmp1);\n+#define BNXT_RX_META_CFA_CODE_SHIFT\t\t19\n+#define BNXT_CFA_CODE_META_SHIFT\t\t16\n+#define BNXT_RX_META_CFA_CODE_INT_ACT_REC_BIT\t0x8000000\n+#define BNXT_RX_META_CFA_CODE_EEM_BIT\t\t0x4000000\n+#define BNXT_CFA_META_FMT_MASK\t\t\t0x70\n+#define BNXT_CFA_META_FMT_SHFT\t\t\t4\n+#define BNXT_CFA_META_FMT_EM_EEM_SHFT\t\t1\n+#define BNXT_CFA_META_FMT_EEM\t\t\t3\n+\n #endif\n", "prefixes": [ "v3", "6/7" ] }