Message ID | 20200907091711.5980-6-junyux.jiang@intel.com (mailing list archive) |
---|---|
State | Superseded, archived |
Delegated to: | Qi Zhang |
Headers | show |
Series | supports RxDID #22 and FDID | expand |
Context | Check | Description |
---|---|---|
ci/checkpatch | success | coding style OK |
ci/iol-mellanox-Performance | success | Performance Testing PASS |
ci/Intel-compilation | success | Compilation OK |
ci/iol-testing | success | Testing PASS |
ci/iol-broadcom-Functional | success | Functional Testing PASS |
ci/iol-broadcom-Performance | success | Performance Testing PASS |
> -----Original Message----- > From: Jiang, JunyuX <junyux.jiang@intel.com> > Sent: Monday, September 7, 2020 17:17 > To: dev@dpdk.org > Cc: Zhang, Qi Z <qi.z.zhang@intel.com>; Yang, Qiming > <qiming.yang@intel.com>; Sun, GuinanX <guinanx.sun@intel.com> > Subject: [PATCH v2 5/5] net/ice: remove devargs flow-mark-support > > From: Guinan Sun <guinanx.sun@intel.com> > > Remove devargs "flow-mark-support". Please rework the commit log. Mention the reason why you need to delete it and what't the new way to configure flow mark? > > Signed-off-by: Guinan Sun <guinanx.sun@intel.com> > --- > doc/guides/nics/ice.rst | 12 ------------ > drivers/net/ice/ice_ethdev.c | 10 +--------- > drivers/net/ice/ice_ethdev.h | 1 - > drivers/net/ice/ice_rxtx_vec_common.h | 6 ------ > 4 files changed, 1 insertion(+), 28 deletions(-) > > diff --git a/doc/guides/nics/ice.rst b/doc/guides/nics/ice.rst index > 9a9f4a6bb..64b1b13a6 100644 > --- a/doc/guides/nics/ice.rst > +++ b/doc/guides/nics/ice.rst > @@ -75,18 +75,6 @@ Runtime Config Options > > -w 80:00.0,pipeline-mode-support=1 > > -- ``Flow Mark Support`` (default ``0``) > - > - This is a hint to the driver to select the data path that supports flow mark > extraction > - by default. > - NOTE: This is an experimental devarg, it will be removed when any of > below conditions > - is ready. > - 1) all data paths support flow mark (currently vPMD does not) > - 2) a new offload like RTE_DEV_RX_OFFLOAD_FLOW_MARK be introduced > as a standard way to hint. > - Example:: > - > - -w 80:00.0,flow-mark-support=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 8d435e889..cb6882f70 100644 > --- a/drivers/net/ice/ice_ethdev.c > +++ b/drivers/net/ice/ice_ethdev.c > @@ -23,13 +23,11 @@ > /* devargs */ > #define ICE_SAFE_MODE_SUPPORT_ARG "safe-mode-support" > #define ICE_PIPELINE_MODE_SUPPORT_ARG "pipeline-mode-support" > -#define ICE_FLOW_MARK_SUPPORT_ARG "flow-mark-support" > #define ICE_PROTO_XTR_ARG "proto_xtr" > > static const char * const ice_valid_args[] = { > ICE_SAFE_MODE_SUPPORT_ARG, > ICE_PIPELINE_MODE_SUPPORT_ARG, > - ICE_FLOW_MARK_SUPPORT_ARG, > ICE_PROTO_XTR_ARG, > NULL > }; > @@ -1985,11 +1983,6 @@ static int ice_parse_devargs(struct rte_eth_dev > *dev) > if (ret) > goto bail; > > - ret = rte_kvargs_process(kvlist, ICE_FLOW_MARK_SUPPORT_ARG, > - &parse_bool, &ad- > >devargs.flow_mark_support); > - if (ret) > - goto bail; > - > bail: > rte_kvargs_free(kvlist); > return ret; > @@ -5131,8 +5124,7 @@ RTE_PMD_REGISTER_KMOD_DEP(net_ice, "* > igb_uio | uio_pci_generic | vfio-pci"); > RTE_PMD_REGISTER_PARAM_STRING(net_ice, > ICE_PROTO_XTR_ARG > "=[queue:]<vlan|ipv4|ipv6|ipv6_flow|tcp>" > ICE_SAFE_MODE_SUPPORT_ARG "=<0|1>" > - ICE_PIPELINE_MODE_SUPPORT_ARG "=<0|1>" > - ICE_FLOW_MARK_SUPPORT_ARG "=<0|1>"); > + ICE_PIPELINE_MODE_SUPPORT_ARG "=<0|1>"); > > RTE_LOG_REGISTER(ice_logtype_init, pmd.net.ice.init, NOTICE); > RTE_LOG_REGISTER(ice_logtype_driver, pmd.net.ice.driver, NOTICE); diff -- > git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h index > df0d65d8d..d441350e0 100644 > --- a/drivers/net/ice/ice_ethdev.h > +++ b/drivers/net/ice/ice_ethdev.h > @@ -444,7 +444,6 @@ struct ice_devargs { > int safe_mode_support; > uint8_t proto_xtr_dflt; > int pipe_mode_support; > - int flow_mark_support; > uint8_t proto_xtr[ICE_MAX_QUEUE_NUM]; > }; > > diff --git a/drivers/net/ice/ice_rxtx_vec_common.h > b/drivers/net/ice/ice_rxtx_vec_common.h > index 46e3be98a..e2019c8d6 100644 > --- a/drivers/net/ice/ice_rxtx_vec_common.h > +++ b/drivers/net/ice/ice_rxtx_vec_common.h > @@ -270,12 +270,6 @@ ice_rx_vec_dev_check_default(struct rte_eth_dev > *dev) { > int i; > struct ice_rx_queue *rxq; > - struct ice_adapter *ad = > - ICE_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); > - > - /* vPMD does not support flow mark. */ > - if (ad->devargs.flow_mark_support) > - return -1; > > for (i = 0; i < dev->data->nb_rx_queues; i++) { > rxq = dev->data->rx_queues[i]; > -- > 2.17.1
diff --git a/doc/guides/nics/ice.rst b/doc/guides/nics/ice.rst index 9a9f4a6bb..64b1b13a6 100644 --- a/doc/guides/nics/ice.rst +++ b/doc/guides/nics/ice.rst @@ -75,18 +75,6 @@ Runtime Config Options -w 80:00.0,pipeline-mode-support=1 -- ``Flow Mark Support`` (default ``0``) - - This is a hint to the driver to select the data path that supports flow mark extraction - by default. - NOTE: This is an experimental devarg, it will be removed when any of below conditions - is ready. - 1) all data paths support flow mark (currently vPMD does not) - 2) a new offload like RTE_DEV_RX_OFFLOAD_FLOW_MARK be introduced as a standard way to hint. - Example:: - - -w 80:00.0,flow-mark-support=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 8d435e889..cb6882f70 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -23,13 +23,11 @@ /* devargs */ #define ICE_SAFE_MODE_SUPPORT_ARG "safe-mode-support" #define ICE_PIPELINE_MODE_SUPPORT_ARG "pipeline-mode-support" -#define ICE_FLOW_MARK_SUPPORT_ARG "flow-mark-support" #define ICE_PROTO_XTR_ARG "proto_xtr" static const char * const ice_valid_args[] = { ICE_SAFE_MODE_SUPPORT_ARG, ICE_PIPELINE_MODE_SUPPORT_ARG, - ICE_FLOW_MARK_SUPPORT_ARG, ICE_PROTO_XTR_ARG, NULL }; @@ -1985,11 +1983,6 @@ static int ice_parse_devargs(struct rte_eth_dev *dev) if (ret) goto bail; - ret = rte_kvargs_process(kvlist, ICE_FLOW_MARK_SUPPORT_ARG, - &parse_bool, &ad->devargs.flow_mark_support); - if (ret) - goto bail; - bail: rte_kvargs_free(kvlist); return ret; @@ -5131,8 +5124,7 @@ RTE_PMD_REGISTER_KMOD_DEP(net_ice, "* igb_uio | uio_pci_generic | vfio-pci"); RTE_PMD_REGISTER_PARAM_STRING(net_ice, ICE_PROTO_XTR_ARG "=[queue:]<vlan|ipv4|ipv6|ipv6_flow|tcp>" ICE_SAFE_MODE_SUPPORT_ARG "=<0|1>" - ICE_PIPELINE_MODE_SUPPORT_ARG "=<0|1>" - ICE_FLOW_MARK_SUPPORT_ARG "=<0|1>"); + ICE_PIPELINE_MODE_SUPPORT_ARG "=<0|1>"); RTE_LOG_REGISTER(ice_logtype_init, pmd.net.ice.init, NOTICE); RTE_LOG_REGISTER(ice_logtype_driver, pmd.net.ice.driver, NOTICE); diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h index df0d65d8d..d441350e0 100644 --- a/drivers/net/ice/ice_ethdev.h +++ b/drivers/net/ice/ice_ethdev.h @@ -444,7 +444,6 @@ struct ice_devargs { int safe_mode_support; uint8_t proto_xtr_dflt; int pipe_mode_support; - int flow_mark_support; uint8_t proto_xtr[ICE_MAX_QUEUE_NUM]; }; diff --git a/drivers/net/ice/ice_rxtx_vec_common.h b/drivers/net/ice/ice_rxtx_vec_common.h index 46e3be98a..e2019c8d6 100644 --- a/drivers/net/ice/ice_rxtx_vec_common.h +++ b/drivers/net/ice/ice_rxtx_vec_common.h @@ -270,12 +270,6 @@ ice_rx_vec_dev_check_default(struct rte_eth_dev *dev) { int i; struct ice_rx_queue *rxq; - struct ice_adapter *ad = - ICE_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); - - /* vPMD does not support flow mark. */ - if (ad->devargs.flow_mark_support) - return -1; for (i = 0; i < dev->data->nb_rx_queues; i++) { rxq = dev->data->rx_queues[i];