From: Ajit Khaparde <ajit.khaparde@broadcom.com>
To: dev@dpdk.org
Cc: ferruh.yigit@intel.com
Subject: [dpdk-dev] [PATCH v2 06/15] net/bnxt: fix redirecting traffic to a VF
Date: Tue, 24 Oct 2017 16:19:44 -0500 [thread overview]
Message-ID: <20171024211953.12021-7-ajit.khaparde@broadcom.com> (raw)
In-Reply-To: <20171024211953.12021-1-ajit.khaparde@broadcom.com>
The case to handle redirect a flow to a VF is not handled.
This patch fixes it.
Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
---
drivers/net/bnxt/bnxt_filter.c | 92 +++++++++++++++++++++++++++++++++++++++++-
drivers/net/bnxt/bnxt_filter.h | 2 +
2 files changed, 92 insertions(+), 2 deletions(-)
diff --git a/drivers/net/bnxt/bnxt_filter.c b/drivers/net/bnxt/bnxt_filter.c
index 029a4eb4b..af9ed9a62 100644
--- a/drivers/net/bnxt/bnxt_filter.c
+++ b/drivers/net/bnxt/bnxt_filter.c
@@ -301,7 +301,8 @@ bnxt_filter_type_check(const struct rte_flow_item pattern[],
}
static int
-bnxt_validate_and_parse_flow_type(const struct rte_flow_item pattern[],
+bnxt_validate_and_parse_flow_type(struct bnxt *bp,
+ const struct rte_flow_item pattern[],
struct rte_flow_error *error,
struct bnxt_filter_info *filter)
{
@@ -318,11 +319,14 @@ bnxt_validate_and_parse_flow_type(const struct rte_flow_item pattern[],
const struct rte_flow_item_vxlan *vxlan_mask;
uint8_t vni_mask[] = {0xFF, 0xFF, 0xFF};
uint8_t tni_mask[] = {0xFF, 0xFF, 0xFF};
+ const struct rte_flow_item_vf *vf_spec;
uint32_t tenant_id_be = 0;
bool vni_masked = 0;
bool tni_masked = 0;
+ uint32_t vf = 0;
int use_ntuple;
uint32_t en = 0;
+ int dflt_vnic;
use_ntuple = bnxt_filter_type_check(pattern, error);
RTE_LOG(DEBUG, PMD, "Use NTUPLE %d\n", use_ntuple);
@@ -687,6 +691,40 @@ bnxt_validate_and_parse_flow_type(const struct rte_flow_item pattern[],
CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_NVGRE;
}
break;
+ case RTE_FLOW_ITEM_TYPE_VF:
+ vf_spec = (const struct rte_flow_item_vf *)item->spec;
+ vf = vf_spec->id;
+ if (!BNXT_PF(bp)) {
+ rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ITEM,
+ item,
+ "Configuring on a VF!");
+ return -rte_errno;
+ }
+
+ if (vf >= bp->pdev->max_vfs) {
+ rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ITEM,
+ item,
+ "Incorrect VF id!");
+ return -rte_errno;
+ }
+
+ filter->mirror_vnic_id =
+ dflt_vnic = bnxt_hwrm_func_qcfg_vf_dflt_vnic_id(bp, vf);
+ if (dflt_vnic < 0) {
+ /* This simply indicates there's no driver
+ * loaded. This is not an error.
+ */
+ rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ITEM,
+ item,
+ "Unable to get default VNIC for VF");
+ return -rte_errno;
+ }
+ filter->mirror_vnic_id = dflt_vnic;
+ en |= NTUPLE_FLTR_ALLOC_INPUT_EN_MIRROR_VNIC_ID;
+ break;
default:
break;
}
@@ -781,8 +819,11 @@ bnxt_validate_and_parse_flow(struct rte_eth_dev *dev,
const struct rte_flow_action *act = nxt_non_void_action(actions);
struct bnxt *bp = (struct bnxt *)dev->data->dev_private;
const struct rte_flow_action_queue *act_q;
+ const struct rte_flow_action_vf *act_vf;
struct bnxt_vnic_info *vnic, *vnic0;
struct bnxt_filter_info *filter1;
+ uint32_t vf = 0;
+ int dflt_vnic;
int rc;
if (bp->eth_dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_RSS) {
@@ -794,7 +835,7 @@ bnxt_validate_and_parse_flow(struct rte_eth_dev *dev,
goto ret;
}
- rc = bnxt_validate_and_parse_flow_type(pattern, error, filter);
+ rc = bnxt_validate_and_parse_flow_type(bp, pattern, error, filter);
if (rc != 0)
goto ret;
@@ -860,6 +901,52 @@ bnxt_validate_and_parse_flow(struct rte_eth_dev *dev,
filter->fw_l2_filter_id = filter1->fw_l2_filter_id;
filter->flags = HWRM_CFA_NTUPLE_FILTER_ALLOC_INPUT_FLAGS_METER;
break;
+ case RTE_FLOW_ACTION_TYPE_VF:
+ act_vf = (const struct rte_flow_action_vf *)act->conf;
+ vf = act_vf->id;
+ if (!BNXT_PF(bp)) {
+ rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION,
+ act,
+ "Configuring on a VF!");
+ rc = -rte_errno;
+ goto ret;
+ }
+
+ if (vf >= bp->pdev->max_vfs) {
+ rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION,
+ act,
+ "Incorrect VF id!");
+ rc = -rte_errno;
+ goto ret;
+ }
+
+ filter->mirror_vnic_id =
+ dflt_vnic = bnxt_hwrm_func_qcfg_vf_dflt_vnic_id(bp, vf);
+ if (dflt_vnic < 0) {
+ /* This simply indicates there's no driver loaded.
+ * This is not an error.
+ */
+ rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION,
+ act,
+ "Unable to get default VNIC for VF");
+ rc = -rte_errno;
+ goto ret;
+ }
+ filter->mirror_vnic_id = dflt_vnic;
+ filter->enables |= NTUPLE_FLTR_ALLOC_INPUT_EN_MIRROR_VNIC_ID;
+
+ vnic0 = STAILQ_FIRST(&bp->ff_pool[0]);
+ filter1 = bnxt_get_l2_filter(bp, filter, vnic0);
+ if (filter1 == NULL) {
+ rc = -ENOSPC;
+ goto ret;
+ }
+ filter->fw_l2_filter_id = filter1->fw_l2_filter_id;
+ break;
+
default:
rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ACTION, act,
@@ -868,6 +955,7 @@ bnxt_validate_and_parse_flow(struct rte_eth_dev *dev,
goto ret;
}
+//done:
act = nxt_non_void_action(++act);
if (act->type != RTE_FLOW_ACTION_TYPE_END) {
rte_flow_error_set(error, EINVAL,
diff --git a/drivers/net/bnxt/bnxt_filter.h b/drivers/net/bnxt/bnxt_filter.h
index c47a34193..2591a87e2 100644
--- a/drivers/net/bnxt/bnxt_filter.h
+++ b/drivers/net/bnxt/bnxt_filter.h
@@ -160,4 +160,6 @@ struct bnxt_filter_info *bnxt_get_l2_filter(struct bnxt *bp,
HWRM_CFA_NTUPLE_FILTER_ALLOC_INPUT_IP_ADDR_TYPE_IPV4
#define NTUPLE_FLTR_ALLOC_INPUT_EN_MIRROR_VNIC_ID \
HWRM_CFA_NTUPLE_FILTER_ALLOC_INPUT_ENABLES_MIRROR_VNIC_ID
+#define NTUPLE_FLTR_ALLOC_INPUT_EN_MIRROR_VNIC_ID \
+ HWRM_CFA_NTUPLE_FILTER_ALLOC_INPUT_ENABLES_MIRROR_VNIC_ID
#endif
--
2.13.5 (Apple Git-94)
next prev parent reply other threads:[~2017-10-24 21:20 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-12 17:35 [dpdk-dev] [PATCH 0/3] patchset for bnxt PMD Ajit Khaparde
2017-10-12 17:35 ` [dpdk-dev] [PATCH 1/3] net/bnxt: handle Rx multi queue creation properly Ajit Khaparde
2017-10-12 17:35 ` [dpdk-dev] [PATCH 2/3] net/bnxt: remove redundant code parsing pool_map Ajit Khaparde
2017-10-12 17:35 ` [dpdk-dev] [PATCH 3/3] net/bnxt: update HWRM API to 1.8.2 Ajit Khaparde
2017-10-20 19:28 ` Ferruh Yigit
2017-10-20 19:39 ` Ferruh Yigit
2017-10-24 21:19 ` [dpdk-dev] [PATCH v2 00/15] bnxt patchset Ajit Khaparde
2017-10-24 21:19 ` [dpdk-dev] [PATCH v2 01/15] net/bnxt: update HWRM to 1.8.2 Ajit Khaparde
2017-10-24 22:50 ` Ferruh Yigit
2017-10-24 21:19 ` [dpdk-dev] [PATCH v2 02/15] net/bnxt: fix tx_offload capability Ajit Khaparde
2017-10-24 21:19 ` [dpdk-dev] [PATCH v2 03/15] net/bnxt: fix rx_offload capability Ajit Khaparde
2017-10-24 21:19 ` [dpdk-dev] [PATCH v2 04/15] net/bnxt: handle Rx multi queue creation properly Ajit Khaparde
2017-10-24 21:19 ` [dpdk-dev] [PATCH v2 05/15] net/bnxt: remove redundant code parsing pool_map Ajit Khaparde
2017-10-24 21:19 ` Ajit Khaparde [this message]
2017-10-24 21:19 ` [dpdk-dev] [PATCH v2 07/15] net/bnxt: fix a bad bit shift operation Ajit Khaparde
2017-10-24 21:19 ` [dpdk-dev] [PATCH v2 08/15] net/bnxt: fix a null pointer dereference Ajit Khaparde
2017-10-24 21:19 ` [dpdk-dev] [PATCH v2 09/15] net/bnxt: fix an issue reported by Coverity Ajit Khaparde
2017-10-24 21:19 ` [dpdk-dev] [PATCH v2 10/15] net/bnxt: fix a potential null pointer dereference Ajit Khaparde
2017-10-24 21:19 ` [dpdk-dev] [PATCH v2 11/15] net/bnxt: fix a potential null poiner dereference Ajit Khaparde
2017-10-24 21:19 ` [dpdk-dev] [PATCH v2 12/15] net/bnxt: fix a null pointer deref Ajit Khaparde
2017-10-24 21:19 ` [dpdk-dev] [PATCH v2 13/15] net/bnxt: fix a pointer deref before null check Ajit Khaparde
2017-10-24 21:19 ` [dpdk-dev] [PATCH v2 14/15] net/bnxt: fix an issue reported by Coverity Ajit Khaparde
2017-10-24 21:19 ` [dpdk-dev] [PATCH v2 15/15] net/bnxt: check VLANs from pool_map only for VMDQ Ajit Khaparde
2017-10-24 22:49 ` [dpdk-dev] [PATCH v2 00/15] bnxt patchset Ferruh Yigit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171024211953.12021-7-ajit.khaparde@broadcom.com \
--to=ajit.khaparde@broadcom.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).