From: "ke1x.zhang" <ke1x.zh...@intel.com>
This patch adds support to disable mac filter which will
be used by ice driver when setting dpdk_devargs config
field in the TRex config file.
Mac filter is not disabled in default.
Signed-off-by: ke1x.zhang <ke1x.zh...@intel.com>
---
doc/guides/nics/ice.rst | 11 +++++++++++
drivers/net/ice/ice_ethdev.c | 13 +++++++++++++
drivers/net/ice/ice_ethdev.h | 1 +
drivers/net/ice/ice_generic_flow.c | 15 +++++++++++++++
4 files changed, 40 insertions(+)
diff --git a/doc/guides/nics/ice.rst b/doc/guides/nics/ice.rst
index ce075e067c..18b4d12048 100644
--- a/doc/guides/nics/ice.rst
+++ b/doc/guides/nics/ice.rst
@@ -105,6 +105,17 @@ Runtime Config Options
-a 80:00.0,pipeline-mode-support=1
+- ``Disable Mac Filter Support`` (default ``0``)
+
+ Add the feature that support to disable mac filter which will be used by ice
driver
+ when setting dpdk_devargs config field in the TRex config file.
+
+ Mac filter is not disabled in default, user can choose to disable the mac
filter
+ by setting ``devargs`` parameter ``mac-filter-disable``,
+ for example::
+
+ -a 80:00.0,mac-filter-disable=1
+
- ``Protocol extraction for per queue``
Configure the RX queues to do protocol extraction into mbuf for protocol
diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index 0bc739daf0..0c9f66eb88 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -28,6 +28,7 @@
/* devargs */
#define ICE_SAFE_MODE_SUPPORT_ARG "safe-mode-support"
#define ICE_PIPELINE_MODE_SUPPORT_ARG "pipeline-mode-support"
+#define ICE_MAC_FILTER_DISABLE "mac-filter-disable"
#define ICE_PROTO_XTR_ARG "proto_xtr"
#define ICE_FIELD_OFFS_ARG "field_offs"
#define ICE_FIELD_NAME_ARG "field_name"
@@ -49,6 +50,7 @@ static const char * const ice_valid_args[] = {
ICE_HW_DEBUG_MASK_ARG,
ICE_ONE_PPS_OUT_ARG,
ICE_RX_LOW_LATENCY_ARG,
+ ICE_MAC_FILTER_DISABLE,
NULL
};
@@ -962,8 +964,13 @@ ice_add_mac_filter(struct ice_vsi *vsi, struct
rte_ether_addr *mac_addr)
struct ice_mac_filter *f;
struct LIST_HEAD_TYPE list_head;
struct ice_hw *hw = ICE_VSI_TO_HW(vsi);
+ struct ice_adapter *ad = (struct ice_adapter *)hw->back;
int ret = 0;
+ if (ad->devargs.mac_filter_disable == 1) {
+ PMD_DRV_LOG(ERR, "This MAC filter is disabled.");
+ return 0;
+ }
/* If it's added and configured, return */
f = ice_find_mac_filter(vsi, mac_addr);
if (f) {
@@ -2075,6 +2082,11 @@ static int ice_parse_devargs(struct rte_eth_dev *dev)
if (ret)
goto bail;
+ ret = rte_kvargs_process(kvlist, ICE_MAC_FILTER_DISABLE,
+ &parse_bool, &ad->devargs.mac_filter_disable);
+ if (ret)
+ goto bail;
+
ret = rte_kvargs_process(kvlist, ICE_HW_DEBUG_MASK_ARG,
&parse_u64, &ad->hw.debug_mask);
if (ret)
@@ -6050,6 +6062,7 @@ RTE_PMD_REGISTER_PARAM_STRING(net_ice,
ICE_PROTO_XTR_ARG
"=[queue:]<vlan|ipv4|ipv6|ipv6_flow|tcp|ip_offset>"
ICE_SAFE_MODE_SUPPORT_ARG "=<0|1>"
ICE_PIPELINE_MODE_SUPPORT_ARG "=<0|1>"
+ ICE_MAC_FILTER_DISABLE "=<0|1>"
ICE_RX_LOW_LATENCY_ARG "=<0|1>");
RTE_LOG_REGISTER_SUFFIX(ice_logtype_init, init, NOTICE);
diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h
index c8311be179..b4036d5fb0 100644
--- a/drivers/net/ice/ice_ethdev.h
+++ b/drivers/net/ice/ice_ethdev.h
@@ -563,6 +563,7 @@ struct ice_devargs {
int safe_mode_support;
uint8_t proto_xtr_dflt;
int pipe_mode_support;
+ uint8_t mac_filter_disable;
uint8_t proto_xtr[ICE_MAX_QUEUE_NUM];
uint8_t pin_idx;
uint8_t pps_out_ena;
diff --git a/drivers/net/ice/ice_generic_flow.c
b/drivers/net/ice/ice_generic_flow.c
index d496c28dec..bca38f5a52 100644
--- a/drivers/net/ice/ice_generic_flow.c
+++ b/drivers/net/ice/ice_generic_flow.c
@@ -2464,6 +2464,8 @@ ice_flow_create(struct rte_eth_dev *dev,
struct rte_flow_error *error)
{
struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
+ struct ice_adapter *ad =
+ ICE_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
struct rte_flow *flow = NULL;
int ret;
struct ice_flow_engine *engine = NULL;
@@ -2476,6 +2478,14 @@ ice_flow_create(struct rte_eth_dev *dev,
return flow;
}
+ if (ad->devargs.mac_filter_disable == 1) {
+ if ((pattern[0].type == RTE_FLOW_ITEM_TYPE_ANY)
+ && (actions[0].type == RTE_FLOW_ACTION_TYPE_DROP)) {
+ flow->rule = NULL;
+ return flow;
+ }
+ }
+
rte_spinlock_lock(&pf->flow_ops_lock);
ret = ice_flow_process_filter(dev, flow, attr, pattern, actions,
@@ -2506,6 +2516,11 @@ ice_flow_destroy(struct rte_eth_dev *dev,
ICE_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
int ret = 0;
+ if ((ad->devargs.mac_filter_disable == 1)
+ && (flow->rule == NULL)) {
+ return 0;
+ }
+
if (!flow || !flow->engine || !flow->engine->destroy) {
rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_HANDLE,
--
2.34.1
