ethdev: fix QinQ strip offload support
PATCH 1/1 ethdev: fix QinQ strip offload support
From: Vivek Sharma <[email protected]>
Enable missing support for QinQ strip rx offload
in vlan offload set/get methods.
--- lib/librte_ethdev/rte_ethdev.c | 17 +++++++++++++++++ lib/librte_ethdev/rte_ethdev.h | 5 ++++- 2 files changed, 21 insertions(+), 1 deletion(-)
lib/librte_ethdev/rte_ethdev.c +17 -0
@@ -2770,6 +2770,19 @@ rte_eth_dev_set_vlan_offload(uint16_t port_id, int offload_mask) mask |=ETH_VLAN_EXTEND_MASK ; } + cur = !!(offload_mask Ð_QINQ_STRIP_OFFLOAD ); + org = !!(dev->data->dev_conf.rxmode.offloads & +DEV_RX_OFFLOAD_QINQ_STRIP ); +if (cur != org) { +if (cur) + dev->data->dev_conf.rxmode.offloads |= +DEV_RX_OFFLOAD_QINQ_STRIP ; +else + dev->data->dev_conf.rxmode.offloads &= + ~DEV_RX_OFFLOAD_QINQ_STRIP ; + mask |=ETH_QINQ_STRIP_MASK ; + } +/*no change*/ if (mask ==0 )return ret;
@@ -2805,6 +2818,10 @@ rte_eth_dev_get_vlan_offload(uint16_t port_id) DEV_RX_OFFLOAD_VLAN_EXTEND) ret |= ETH_VLAN_EXTEND_OFFLOAD; +if (dev->data->dev_conf.rxmode.offloads & +DEV_RX_OFFLOAD_QINQ_STRIP ) + ret |=DEV_RX_OFFLOAD_QINQ_STRIP ; +return ret; }
lib/librte_ethdev/rte_ethdev.h +4 -1
@@ -550,11 +550,13 @@ struct rte_eth_rss_conf {#define ETH_VLAN_STRIP_OFFLOAD 0x0001/**< VLAN Strip On/Off */ #define ETH_VLAN_FILTER_OFFLOAD 0x0002/**< VLAN Filter On/Off */ #define ETH_VLAN_EXTEND_OFFLOAD 0x0004/**< VLAN Extend On/Off */ +#define ETH_QINQ_STRIP_OFFLOAD 0x0008/**< QINQ Strip On/Off */ /* Definitions used for mask VLAN setting */ #define ETH_VLAN_STRIP_MASK 0x0001/**< VLAN Strip setting mask */ #define ETH_VLAN_FILTER_MASK 0x0002/**< VLAN Filter setting mask*/ #define ETH_VLAN_EXTEND_MASK 0x0004/**< VLAN Extend setting mask*/ +#define ETH_QINQ_STRIP_MASK 0x0008/**< QINQ Strip setting mask */ #define ETH_VLAN_ID_MAX 0x0FFF/**< VLAN ID is in lower 12 bits*/ /* Definitions used for receive MAC address */
@@ -965,7 +967,8 @@ struct rte_eth_conf { DEV_RX_OFFLOAD_TCP_CKSUM)#define DEV_RX_OFFLOAD_VLAN (DEV_RX_OFFLOAD_VLAN_STRIP | \ DEV_RX_OFFLOAD_VLAN_FILTER | \ - DEV_RX_OFFLOAD_VLAN_EXTEND) + DEV_RX_OFFLOAD_VLAN_EXTEND | \ + DEV_RX_OFFLOAD_QINQ_STRIP)/* * If new Rx offload capabilities are defined, they also must be
Signature · 1 line
2.7.4
Quoted 5 lines · On Sun, 14 Apr 2019 16:41:42 +0530 <[email protected]> wrote:
lib/librte_ethdev/rte_ethdev.c +4
-0+ cur = !!(offload_mask Ð_QINQ_STRIP_OFFLOAD ); + org = !!(dev->data->dev_conf.rxmode.offloads & +DEV_RX_OFFLOAD_QINQ_STRIP ); +if (cur != org) {
lib/librte_ethdev/rte_ethdev.c rte_eth_dev_set_vlan_offload(uint16_t port_id, int offload_mask) · line 2786
Quoted 10 lines
lib/librte_ethdev/rte_ethdev.c +9
-0+if (cur) + dev->data->dev_conf.rxmode.offloads |= +DEV_RX_OFFLOAD_QINQ_STRIP ; +else + dev->data->dev_conf.rxmode.offloads &= + ~DEV_RX_OFFLOAD_QINQ_STRIP ; + mask |=ETH_QINQ_STRIP_MASK ; + } +/*no change*/
Using a local (pointer) variable for dev->data->dev_conf.rxmode.offloads would make the code more readable and lines shorter.
Quoted 2 lines
Using a local (pointer) variable for
dev->data->dev_conf.rxmode.offloadswould make the code more readable and lines shorter.
+1
PATCH v2 1/1 ethdev: fix QinQ strip offload support
In reply to [email protected]From: Vivek Sharma <[email protected]>
Enable missing support for QinQ strip rx offload
in vlan offload set/get methods.
---
v2:
* Use pointer to dereference dev->data->dev_conf.rxmode.offloads
lib/librte_ethdev/rte_ethdev.c | 55 +++++++++++++++++++++++------------------- lib/librte_ethdev/rte_ethdev.h | 5 +++- 2 files changed, 34 insertions(+), 26 deletions(-)
lib/librte_ethdev/rte_ethdev.c +30 -25
@@ -2723,53 +2723,56 @@ rte_eth_dev_set_vlan_offload(uint16_t port_id, int offload_mask)int mask =0 ;int cur, org =0 ;uint64_t orig_offloads; +uint64_t *dev_offloads;RTE_ETH_VALID_PORTID_OR_ERR_RET (port_id, -ENODEV ); dev = &rte_eth_devices[port_id];/* save original values in case of failure */ orig_offloads = dev->data->dev_conf.rxmode.offloads; + dev_offloads = &dev->data->dev_conf.rxmode.offloads;/*check which option changed by application*/ cur = !!(offload_mask Ð_VLAN_STRIP_OFFLOAD ); - org = !!(dev->data->dev_conf.rxmode.offloads & -DEV_RX_OFFLOAD_VLAN_STRIP ); + org = !!(*dev_offloads &DEV_RX_OFFLOAD_VLAN_STRIP );if (cur != org) {if (cur) - dev->data->dev_conf.rxmode.offloads |= -DEV_RX_OFFLOAD_VLAN_STRIP ; + *dev_offloads |=DEV_RX_OFFLOAD_VLAN_STRIP ;else - dev->data->dev_conf.rxmode.offloads &= - ~DEV_RX_OFFLOAD_VLAN_STRIP ; + *dev_offloads &= ~DEV_RX_OFFLOAD_VLAN_STRIP ; mask |=ETH_VLAN_STRIP_MASK ; } cur = !!(offload_mask Ð_VLAN_FILTER_OFFLOAD ); - org = !!(dev->data->dev_conf.rxmode.offloads & -DEV_RX_OFFLOAD_VLAN_FILTER ); + org = !!(*dev_offloads &DEV_RX_OFFLOAD_VLAN_FILTER );if (cur != org) {if (cur) - dev->data->dev_conf.rxmode.offloads |= -DEV_RX_OFFLOAD_VLAN_FILTER ; + *dev_offloads |=DEV_RX_OFFLOAD_VLAN_FILTER ;else - dev->data->dev_conf.rxmode.offloads &= - ~DEV_RX_OFFLOAD_VLAN_FILTER ; + *dev_offloads &= ~DEV_RX_OFFLOAD_VLAN_FILTER ; mask |=ETH_VLAN_FILTER_MASK ; } cur = !!(offload_mask Ð_VLAN_EXTEND_OFFLOAD ); - org = !!(dev->data->dev_conf.rxmode.offloads & -DEV_RX_OFFLOAD_VLAN_EXTEND ); + org = !!(*dev_offloads &DEV_RX_OFFLOAD_VLAN_EXTEND );if (cur != org) {if (cur) - dev->data->dev_conf.rxmode.offloads |= -DEV_RX_OFFLOAD_VLAN_EXTEND ; + *dev_offloads |=DEV_RX_OFFLOAD_VLAN_EXTEND ;else - dev->data->dev_conf.rxmode.offloads &= - ~DEV_RX_OFFLOAD_VLAN_EXTEND ; + *dev_offloads &= ~DEV_RX_OFFLOAD_VLAN_EXTEND ; mask |=ETH_VLAN_EXTEND_MASK ; } + cur = !!(offload_mask Ð_QINQ_STRIP_OFFLOAD ); + org = !!(*dev_offloads &DEV_RX_OFFLOAD_QINQ_STRIP ); +if (cur != org) { +if (cur) + *dev_offloads |=DEV_RX_OFFLOAD_QINQ_STRIP ; +else + *dev_offloads &= ~DEV_RX_OFFLOAD_QINQ_STRIP ; + mask |=ETH_QINQ_STRIP_MASK ; + } +/*no change*/ if (mask ==0 )return ret;
@@ -2778,7 +2781,7 @@ rte_eth_dev_set_vlan_offload(uint16_t port_id, int offload_mask) ret = (*dev->dev_ops->vlan_offload_set)(dev, mask);if (ret) {/* hit an error restore original values */ - dev->data->dev_conf.rxmode.offloads = orig_offloads; + *dev_offloads = orig_offloads; }return eth_err (port_id, ret);
@@ -2788,23 +2791,25 @@ int rte_eth_dev_get_vlan_offload(uint16_t port_id) {struct rte_eth_dev *dev; +uint64_t *dev_offloads;int ret =0 ;RTE_ETH_VALID_PORTID_OR_ERR_RET (port_id, -ENODEV ); dev = &rte_eth_devices[port_id]; + dev_offloads = &dev->data->dev_conf.rxmode.offloads; -if (dev->data->dev_conf.rxmode.offloads & -DEV_RX_OFFLOAD_VLAN_STRIP ) +if (*dev_offloads &DEV_RX_OFFLOAD_VLAN_STRIP ) ret |=ETH_VLAN_STRIP_OFFLOAD ; -if (dev->data->dev_conf.rxmode.offloads & -DEV_RX_OFFLOAD_VLAN_FILTER ) +if (*dev_offloads &DEV_RX_OFFLOAD_VLAN_FILTER ) ret |=ETH_VLAN_FILTER_OFFLOAD ; -if (dev->data->dev_conf.rxmode.offloads & -DEV_RX_OFFLOAD_VLAN_EXTEND ) +if (*dev_offloads &DEV_RX_OFFLOAD_VLAN_EXTEND ) ret |=ETH_VLAN_EXTEND_OFFLOAD ; +if (*dev_offloads &DEV_RX_OFFLOAD_QINQ_STRIP ) + ret |=DEV_RX_OFFLOAD_QINQ_STRIP ; +return ret; }
lib/librte_ethdev/rte_ethdev.h +4 -1
@@ -550,11 +550,13 @@ struct rte_eth_rss_conf {#define ETH_VLAN_STRIP_OFFLOAD 0x0001/**< VLAN Strip On/Off */ #define ETH_VLAN_FILTER_OFFLOAD 0x0002/**< VLAN Filter On/Off */ #define ETH_VLAN_EXTEND_OFFLOAD 0x0004/**< VLAN Extend On/Off */ +#define ETH_QINQ_STRIP_OFFLOAD 0x0008/**< QINQ Strip On/Off */ /* Definitions used for mask VLAN setting */ #define ETH_VLAN_STRIP_MASK 0x0001/**< VLAN Strip setting mask */ #define ETH_VLAN_FILTER_MASK 0x0002/**< VLAN Filter setting mask*/ #define ETH_VLAN_EXTEND_MASK 0x0004/**< VLAN Extend setting mask*/ +#define ETH_QINQ_STRIP_MASK 0x0008/**< QINQ Strip setting mask */ #define ETH_VLAN_ID_MAX 0x0FFF/**< VLAN ID is in lower 12 bits*/ /* Definitions used for receive MAC address */
@@ -965,7 +967,8 @@ struct rte_eth_conf { DEV_RX_OFFLOAD_TCP_CKSUM)#define DEV_RX_OFFLOAD_VLAN (DEV_RX_OFFLOAD_VLAN_STRIP | \ DEV_RX_OFFLOAD_VLAN_FILTER | \ - DEV_RX_OFFLOAD_VLAN_EXTEND) + DEV_RX_OFFLOAD_VLAN_EXTEND | \ + DEV_RX_OFFLOAD_QINQ_STRIP)/* * If new Rx offload capabilities are defined, they also must be
Signature · 1 line
2.7.4
17/04/2019 09:40, [email protected]:
Quoted 7 lines
From: Vivek Sharma <[email protected]>
Enable missing support for QinQ strip rx offload
in vlan offload set/get methods.Fixes cc9d0456b870 ("i40e: support double vlan stripping and insertion")
Not sure it is a fix.
The commit mentioned above allows some kind of offload config. You are extending the offload config with support in rte_eth_dev_set_vlan_offload().
Quoted 5 lines
Quoted 5 lines
From: Vivek Sharma <[email protected]>
Enable missing support for QinQ strip rx offload
in vlan offload set/get methods.
Quoted 7 lines
Quoted 2 lines
Fixes cc9d0456b870 ("i40e: support double vlan stripping and insertion")Not sure it is a fix.
The commit mentioned above allows some kind of offload config. You are extending the offload config with support inrte_eth_dev_set_vlan_offload().
DEV_RX_OFFLOAD_QINQ_STRIP was introduced in cc9d0456b870 ("i40e: support double vlan stripping and insertion"). But, the means to utilize this capability by enabling this rx offload for an ethdev was missing from the patch. The current patch fixes that missing functionality so that user can enable QinQ strip rx offload for capable devices.
18/04/2019 09:38, Vivek Kumar Sharma:
Quoted 8 lines
Quoted 7 lines
Quoted 7 lines
From: Vivek Sharma <[email protected]>
Enable missing support for QinQ strip rx offload
in vlan offload set/get methods.Fixes cc9d0456b870 ("i40e: support double vlan stripping and insertion")
Quoted 6 lines
Quoted 4 lines
Not sure it is a fix.
The commit mentioned above allows some kind of offload config. You are extending the offload config with support inrte_eth_dev_set_vlan_offload().
DEV_RX_OFFLOAD_QINQ_STRIPwas introduced incc9d0456b870("i40e: support double vlan stripping and insertion"). But, the means to utilize this capability by enabling this rx offload for an ethdev was missing from the patch. The current patch fixes that missing functionality so that user can enable QinQ strip rx offload for capable devices.
It was possible to utilize the offload by setting the flag in mbuf. You are adding a way to configure it at port level. So it is not a fix.
PATCH v3 1/1 ethdev: support QinQ strip dynamic configuration
In reply to [email protected]From: Vivek Sharma <[email protected]>
Enable missing support for runtime configuration (setting/getting) of QinQ strip rx offload for a given ethdev.
---
v3:
* Make patch as 'non-fix'.
v2:
* Use pointer to dereference dev->data->dev_conf.rxmode.offloads.
lib/librte_ethdev/rte_ethdev.c | 55 +++++++++++++++++++++++------------------- lib/librte_ethdev/rte_ethdev.h | 5 +++- 2 files changed, 34 insertions(+), 26 deletions(-)
lib/librte_ethdev/rte_ethdev.c +30 -25
@@ -2723,53 +2723,56 @@ rte_eth_dev_set_vlan_offload(uint16_t port_id, int offload_mask)int mask =0 ;int cur, org =0 ;uint64_t orig_offloads; +uint64_t *dev_offloads;RTE_ETH_VALID_PORTID_OR_ERR_RET (port_id, -ENODEV ); dev = &rte_eth_devices[port_id];/* save original values in case of failure */ orig_offloads = dev->data->dev_conf.rxmode.offloads; + dev_offloads = &dev->data->dev_conf.rxmode.offloads;/*check which option changed by application*/ cur = !!(offload_mask Ð_VLAN_STRIP_OFFLOAD ); - org = !!(dev->data->dev_conf.rxmode.offloads & -DEV_RX_OFFLOAD_VLAN_STRIP ); + org = !!(*dev_offloads &DEV_RX_OFFLOAD_VLAN_STRIP );if (cur != org) {if (cur) - dev->data->dev_conf.rxmode.offloads |= -DEV_RX_OFFLOAD_VLAN_STRIP ; + *dev_offloads |=DEV_RX_OFFLOAD_VLAN_STRIP ;else - dev->data->dev_conf.rxmode.offloads &= - ~DEV_RX_OFFLOAD_VLAN_STRIP ; + *dev_offloads &= ~DEV_RX_OFFLOAD_VLAN_STRIP ; mask |=ETH_VLAN_STRIP_MASK ; } cur = !!(offload_mask Ð_VLAN_FILTER_OFFLOAD ); - org = !!(dev->data->dev_conf.rxmode.offloads & -DEV_RX_OFFLOAD_VLAN_FILTER ); + org = !!(*dev_offloads &DEV_RX_OFFLOAD_VLAN_FILTER );if (cur != org) {if (cur) - dev->data->dev_conf.rxmode.offloads |= -DEV_RX_OFFLOAD_VLAN_FILTER ; + *dev_offloads |=DEV_RX_OFFLOAD_VLAN_FILTER ;else - dev->data->dev_conf.rxmode.offloads &= - ~DEV_RX_OFFLOAD_VLAN_FILTER ; + *dev_offloads &= ~DEV_RX_OFFLOAD_VLAN_FILTER ; mask |=ETH_VLAN_FILTER_MASK ; } cur = !!(offload_mask Ð_VLAN_EXTEND_OFFLOAD ); - org = !!(dev->data->dev_conf.rxmode.offloads & -DEV_RX_OFFLOAD_VLAN_EXTEND ); + org = !!(*dev_offloads &DEV_RX_OFFLOAD_VLAN_EXTEND );if (cur != org) {if (cur) - dev->data->dev_conf.rxmode.offloads |= -DEV_RX_OFFLOAD_VLAN_EXTEND ; + *dev_offloads |=DEV_RX_OFFLOAD_VLAN_EXTEND ;else - dev->data->dev_conf.rxmode.offloads &= - ~DEV_RX_OFFLOAD_VLAN_EXTEND ; + *dev_offloads &= ~DEV_RX_OFFLOAD_VLAN_EXTEND ; mask |=ETH_VLAN_EXTEND_MASK ; } + cur = !!(offload_mask Ð_QINQ_STRIP_OFFLOAD ); + org = !!(*dev_offloads &DEV_RX_OFFLOAD_QINQ_STRIP ); +if (cur != org) { +if (cur) + *dev_offloads |=DEV_RX_OFFLOAD_QINQ_STRIP ; +else + *dev_offloads &= ~DEV_RX_OFFLOAD_QINQ_STRIP ; + mask |=ETH_QINQ_STRIP_MASK ; + } +/*no change*/ if (mask ==0 )return ret;
@@ -2778,7 +2781,7 @@ rte_eth_dev_set_vlan_offload(uint16_t port_id, int offload_mask) ret = (*dev->dev_ops->vlan_offload_set)(dev, mask);if (ret) {/* hit an error restore original values */ - dev->data->dev_conf.rxmode.offloads = orig_offloads; + *dev_offloads = orig_offloads; }return eth_err (port_id, ret);
@@ -2788,23 +2791,25 @@ int rte_eth_dev_get_vlan_offload(uint16_t port_id) {struct rte_eth_dev *dev; +uint64_t *dev_offloads;int ret =0 ;RTE_ETH_VALID_PORTID_OR_ERR_RET (port_id, -ENODEV ); dev = &rte_eth_devices[port_id]; + dev_offloads = &dev->data->dev_conf.rxmode.offloads; -if (dev->data->dev_conf.rxmode.offloads & -DEV_RX_OFFLOAD_VLAN_STRIP ) +if (*dev_offloads &DEV_RX_OFFLOAD_VLAN_STRIP ) ret |=ETH_VLAN_STRIP_OFFLOAD ; -if (dev->data->dev_conf.rxmode.offloads & -DEV_RX_OFFLOAD_VLAN_FILTER ) +if (*dev_offloads &DEV_RX_OFFLOAD_VLAN_FILTER ) ret |=ETH_VLAN_FILTER_OFFLOAD ; -if (dev->data->dev_conf.rxmode.offloads & -DEV_RX_OFFLOAD_VLAN_EXTEND ) +if (*dev_offloads &DEV_RX_OFFLOAD_VLAN_EXTEND ) ret |=ETH_VLAN_EXTEND_OFFLOAD ; +if (*dev_offloads &DEV_RX_OFFLOAD_QINQ_STRIP ) + ret |=DEV_RX_OFFLOAD_QINQ_STRIP ; +return ret; }
lib/librte_ethdev/rte_ethdev.h +4 -1
@@ -550,11 +550,13 @@ struct rte_eth_rss_conf {#define ETH_VLAN_STRIP_OFFLOAD 0x0001/**< VLAN Strip On/Off */ #define ETH_VLAN_FILTER_OFFLOAD 0x0002/**< VLAN Filter On/Off */ #define ETH_VLAN_EXTEND_OFFLOAD 0x0004/**< VLAN Extend On/Off */ +#define ETH_QINQ_STRIP_OFFLOAD 0x0008/**< QINQ Strip On/Off */ /* Definitions used for mask VLAN setting */ #define ETH_VLAN_STRIP_MASK 0x0001/**< VLAN Strip setting mask */ #define ETH_VLAN_FILTER_MASK 0x0002/**< VLAN Filter setting mask*/ #define ETH_VLAN_EXTEND_MASK 0x0004/**< VLAN Extend setting mask*/ +#define ETH_QINQ_STRIP_MASK 0x0008/**< QINQ Strip setting mask */ #define ETH_VLAN_ID_MAX 0x0FFF/**< VLAN ID is in lower 12 bits*/ /* Definitions used for receive MAC address */
@@ -965,7 +967,8 @@ struct rte_eth_conf { DEV_RX_OFFLOAD_TCP_CKSUM)#define DEV_RX_OFFLOAD_VLAN (DEV_RX_OFFLOAD_VLAN_STRIP | \ DEV_RX_OFFLOAD_VLAN_FILTER | \ - DEV_RX_OFFLOAD_VLAN_EXTEND) + DEV_RX_OFFLOAD_VLAN_EXTEND | \ + DEV_RX_OFFLOAD_QINQ_STRIP)/* * If new Rx offload capabilities are defined, they also must be
Signature · 1 line
2.7.4
Re: [dpdk-dev] [PATCH v3] ethdev: support QinQ strip dynamic configuration
Quoted 6 lines · On 4/19/2019 6:59 AM, [email protected] wrote:
From: Vivek Sharma <[email protected]>
Enable missing support for runtime configuration (setting/getting) of QinQ strip rx offload for a given ethdev.
Signed-off-by Vivek Sharma <[email protected]>
<...>
Quoted 6 lines
lib/librte_ethdev/rte_ethdev.h +0
-0@@ -550,11 +550,13 @@ struct rte_eth_rss_conf {#define ETH_VLAN_STRIP_OFFLOAD 0x0001/**< VLAN Strip On/Off */
lib/librte_ethdev/rte_ethdev.h struct rte_eth_rss_conf { · line 560
Quoted 10 lines
lib/librte_ethdev/rte_ethdev.h +2
-0#define ETH_VLAN_FILTER_OFFLOAD 0x0002/**< VLAN Filter On/Off */ #define ETH_VLAN_EXTEND_OFFLOAD 0x0004/**< VLAN Extend On/Off */ +#define ETH_QINQ_STRIP_OFFLOAD 0x0008/**< QINQ Strip On/Off */ /* Definitions used for mask VLAN setting */ #define ETH_VLAN_STRIP_MASK 0x0001/**< VLAN Strip setting mask */ #define ETH_VLAN_FILTER_MASK 0x0002/**< VLAN Filter setting mask*/ #define ETH_VLAN_EXTEND_MASK 0x0004/**< VLAN Extend setting mask*/ +#define ETH_QINQ_STRIP_MASK 0x0008/**< QINQ Strip setting mask */ #define ETH_VLAN_ID_MAX 0x0FFF/**< VLAN ID is in lower 12 bits*/
On its own patch looks ok but a few high level questions:
1- Why we need this interim defines, instead of using actual offload values? Although changing this will be API/ABI breakage.
2- Why we have specific function to set vlan offloads, for other offloads the way is stop device and reconfigure it with new offload flags.
3- If devices can change offload configuration dynamically, do we need a generic API to alter the offload configs? (similar to these vlan APIs but more generic)?
Related to the patch, what do you think about following options:
a)
- Get this patch
- Send a deprecation notice for 1) in this release
- Next release remove these flags, which will be practically reverse this patch and more
b)
- Send a deprecation notice for 1) in this release
- Next release update the APIs and a smaller/different version of this patch will be required.
Re: [dpdk-dev] [PATCH v3] ethdev: support QinQ strip dynamic configuration
Quoted 27 lines · Ferruh Yigit
Quoted 6 lines · On 4/19/2019 6:59 AM, [email protected] wrote:
From: Vivek Sharma <[email protected]>
Enable missing support for runtime configuration (setting/getting) of QinQ strip rx offload for a given ethdev.
Signed-off-by Vivek Sharma <[email protected]><...>
Quoted 6 lines
lib/librte_ethdev/rte_ethdev.h +0
-0@@ -550,11 +550,13 @@ struct rte_eth_rss_conf {#define ETH_VLAN_STRIP_OFFLOAD 0x0001/**< VLAN Strip On/Off */ lib/librte_ethdev/rte_ethdev.h struct rte_eth_rss_conf { · line 560
Quoted 10 lines
lib/librte_ethdev/rte_ethdev.h +2
-0#define ETH_VLAN_FILTER_OFFLOAD 0x0002/**< VLAN Filter On/Off */ #define ETH_VLAN_EXTEND_OFFLOAD 0x0004/**< VLAN Extend On/Off */ +#define ETH_QINQ_STRIP_OFFLOAD 0x0008/**< QINQ Strip On/Off */ /* Definitions used for mask VLAN setting */ #define ETH_VLAN_STRIP_MASK 0x0001/**< VLAN Strip setting mask */ #define ETH_VLAN_FILTER_MASK 0x0002/**< VLAN Filter setting mask*/ #define ETH_VLAN_EXTEND_MASK 0x0004/**< VLAN Extend setting mask*/ +#define ETH_QINQ_STRIP_MASK 0x0008/**< QINQ Strip setting mask */ #define ETH_VLAN_ID_MAX 0x0FFF/**< VLAN ID is in lower 12 bits*/ On its own patch looks ok but a few high level questions:
Quoted 8 lines
1- Why we need this interim defines, instead of using actual offload values? Although changing this will be API/ABI breakage.
2- Why we have specific function to set vlan offloads, for other offloads the way is stop device and reconfigure it with new offload flags.
3- If devices can change offload configuration dynamically, do we need a generic API to alter the offload configs? (similar to these vlan APIs but more generic)?
If dynamic switching of offloads is really required, I think it would be good if it is unified. If so, we can deprecate rte_eth_dev_{s,g}et_vlan_offload() and implement it using the new one to remove the old one from driver interface at least.
It requires reporting of dynamically switchable offloads on device and queue level. Or just dynamically switchable offloads in assumption that if the offload is supported on queue level and dynamically switchable, it is dynamically switchable on queue level.
Quoted 11 lines
Related to the patch, what do you think about following options:
a)
- Get this patch
- Send a deprecation notice for 1) in this release
- Next release remove these flags, which will be practically reverse this patch and moreb)
- Send a deprecation notice for 1) in this release
- Next release update the APIs and a smaller/different version of this patch will be required.
I'm OK with both options, but I think it would be fair to go (a) to avoid postponing of the feature too long.
The patch itself should update rte_eth_dev_{s,g}et_vlan_offload() descriptions which enumerate switchable offloads.
Andrew.
Re: [dpdk-dev] [PATCH v3] ethdev: support QinQ strip dynamic configuration
Quoted 37 lines · Andrew Rybchenko
Quoted 27 lines · Ferruh Yigit
Quoted 6 lines · On 4/19/2019 6:59 AM, [email protected] wrote:
From: Vivek Sharma <[email protected]>
Enable missing support for runtime configuration (setting/getting) of QinQ strip rx offload for a given ethdev.
Signed-off-by Vivek Sharma <[email protected]><...>
Quoted 6 lines
lib/librte_ethdev/rte_ethdev.h +0
-0@@ -550,11 +550,13 @@ struct rte_eth_rss_conf {#define ETH_VLAN_STRIP_OFFLOAD 0x0001/**< VLAN Strip On/Off */ lib/librte_ethdev/rte_ethdev.h struct rte_eth_rss_conf { · line 560
Quoted 10 lines
lib/librte_ethdev/rte_ethdev.h +2
-0#define ETH_VLAN_FILTER_OFFLOAD 0x0002/**< VLAN Filter On/Off */ #define ETH_VLAN_EXTEND_OFFLOAD 0x0004/**< VLAN Extend On/Off */ +#define ETH_QINQ_STRIP_OFFLOAD 0x0008/**< QINQ Strip On/Off */ /* Definitions used for mask VLAN setting */ #define ETH_VLAN_STRIP_MASK 0x0001/**< VLAN Strip setting mask */ #define ETH_VLAN_FILTER_MASK 0x0002/**< VLAN Filter setting mask*/ #define ETH_VLAN_EXTEND_MASK 0x0004/**< VLAN Extend setting mask*/ +#define ETH_QINQ_STRIP_MASK 0x0008/**< QINQ Strip setting mask */ #define ETH_VLAN_ID_MAX 0x0FFF/**< VLAN ID is in lower 12 bits*/ On its own patch looks ok but a few high level questions:
Quoted 8 lines
1- Why we need this interim defines, instead of using actual offload values? Although changing this will be API/ABI breakage.
2- Why we have specific function to set vlan offloads, for other offloads the way is stop device and reconfigure it with new offload flags.
3- If devices can change offload configuration dynamically, do we need a generic API to alter the offload configs? (similar to these vlan APIs but more generic)?
Quoted 8 lines
If dynamic switching of offloads is really required, I think it would be good if it is unified. If so, we can deprecate rte_eth_dev_{s,g}et_vlan_offload() and implement it using the new one to remove the old one from driver interface at least.
It requires reporting of dynamically switchable offloads on device and queue level. Or just dynamically switchable offloads in assumption that if the offload is supported on queue level and dynamically switchable, it is dynamically switchable on queue level.
Not sure if "dynamic switching of offloads" required, but I agree we may need to add "dynamically switchable offload" reporting for that.
Quoted 8 lines
Quoted 8 lines
Related to the patch, what do you think about following options:
a)
- Get this patch
- Send a deprecation notice for 1) in this release
- Next release remove these flags, which will be practically reverse this patch and more
Quoted 7 lines
Quoted 4 lines
b)
- Send a deprecation notice for 1) in this release
- Next release update the APIs and a smaller/different version of this patch will be required.I'm OK with both options, but I think it would be fair to go (a) to avoid postponing of the feature too long.
OK
Quoted 3 lines
The patch itself should update rte_eth_dev_{s,g}et_vlan_offload() descriptions which enumerate switchable offloads.
+1
@Vivek, can you please send a new version with this update?
PATCH v4 1/1 ethdev: support QinQ strip dynamic configuration
In reply to [email protected]From: Vivek Sharma <[email protected]>
Enable missing support for runtime configuration (setting/getting) of QinQ strip rx offload for a given ethdev.
---
v4:
* Update vlan offload set/get functions description.
v3:
* Make patch as 'non-fix'.
v2:
* Use pointer to dereference dev->data->dev_conf.rxmode.offloads.
lib/librte_ethdev/rte_ethdev.c | 55 +++++++++++++++++++++++------------------- lib/librte_ethdev/rte_ethdev.h | 7 +++++- 2 files changed, 36 insertions(+), 26 deletions(-)
lib/librte_ethdev/rte_ethdev.c +30 -25
@@ -2733,53 +2733,56 @@ rte_eth_dev_set_vlan_offload(uint16_t port_id, int offload_mask)int mask =0 ;int cur, org =0 ;uint64_t orig_offloads; +uint64_t *dev_offloads;RTE_ETH_VALID_PORTID_OR_ERR_RET (port_id, -ENODEV ); dev = &rte_eth_devices[port_id];/* save original values in case of failure */ orig_offloads = dev->data->dev_conf.rxmode.offloads; + dev_offloads = &dev->data->dev_conf.rxmode.offloads;/*check which option changed by application*/ cur = !!(offload_mask Ð_VLAN_STRIP_OFFLOAD ); - org = !!(dev->data->dev_conf.rxmode.offloads & -DEV_RX_OFFLOAD_VLAN_STRIP ); + org = !!(*dev_offloads &DEV_RX_OFFLOAD_VLAN_STRIP );if (cur != org) {if (cur) - dev->data->dev_conf.rxmode.offloads |= -DEV_RX_OFFLOAD_VLAN_STRIP ; + *dev_offloads |=DEV_RX_OFFLOAD_VLAN_STRIP ;else - dev->data->dev_conf.rxmode.offloads &= - ~DEV_RX_OFFLOAD_VLAN_STRIP ; + *dev_offloads &= ~DEV_RX_OFFLOAD_VLAN_STRIP ; mask |=ETH_VLAN_STRIP_MASK ; } cur = !!(offload_mask Ð_VLAN_FILTER_OFFLOAD ); - org = !!(dev->data->dev_conf.rxmode.offloads & -DEV_RX_OFFLOAD_VLAN_FILTER ); + org = !!(*dev_offloads &DEV_RX_OFFLOAD_VLAN_FILTER );if (cur != org) {if (cur) - dev->data->dev_conf.rxmode.offloads |= -DEV_RX_OFFLOAD_VLAN_FILTER ; + *dev_offloads |=DEV_RX_OFFLOAD_VLAN_FILTER ;else - dev->data->dev_conf.rxmode.offloads &= - ~DEV_RX_OFFLOAD_VLAN_FILTER ; + *dev_offloads &= ~DEV_RX_OFFLOAD_VLAN_FILTER ; mask |=ETH_VLAN_FILTER_MASK ; } cur = !!(offload_mask Ð_VLAN_EXTEND_OFFLOAD ); - org = !!(dev->data->dev_conf.rxmode.offloads & -DEV_RX_OFFLOAD_VLAN_EXTEND ); + org = !!(*dev_offloads &DEV_RX_OFFLOAD_VLAN_EXTEND );if (cur != org) {if (cur) - dev->data->dev_conf.rxmode.offloads |= -DEV_RX_OFFLOAD_VLAN_EXTEND ; + *dev_offloads |=DEV_RX_OFFLOAD_VLAN_EXTEND ;else - dev->data->dev_conf.rxmode.offloads &= - ~DEV_RX_OFFLOAD_VLAN_EXTEND ; + *dev_offloads &= ~DEV_RX_OFFLOAD_VLAN_EXTEND ; mask |=ETH_VLAN_EXTEND_MASK ; } + cur = !!(offload_mask Ð_QINQ_STRIP_OFFLOAD ); + org = !!(*dev_offloads &DEV_RX_OFFLOAD_QINQ_STRIP ); +if (cur != org) { +if (cur) + *dev_offloads |=DEV_RX_OFFLOAD_QINQ_STRIP ; +else + *dev_offloads &= ~DEV_RX_OFFLOAD_QINQ_STRIP ; + mask |=ETH_QINQ_STRIP_MASK ; + } +/*no change*/ if (mask ==0 )return ret;
@@ -2788,7 +2791,7 @@ rte_eth_dev_set_vlan_offload(uint16_t port_id, int offload_mask) ret = (*dev->dev_ops->vlan_offload_set)(dev, mask);if (ret) {/* hit an error restore original values */ - dev->data->dev_conf.rxmode.offloads = orig_offloads; + *dev_offloads = orig_offloads; }return eth_err (port_id, ret);
@@ -2798,23 +2801,25 @@ int rte_eth_dev_get_vlan_offload(uint16_t port_id) {struct rte_eth_dev *dev; +uint64_t *dev_offloads;int ret =0 ;RTE_ETH_VALID_PORTID_OR_ERR_RET (port_id, -ENODEV ); dev = &rte_eth_devices[port_id]; + dev_offloads = &dev->data->dev_conf.rxmode.offloads; -if (dev->data->dev_conf.rxmode.offloads & -DEV_RX_OFFLOAD_VLAN_STRIP ) +if (*dev_offloads &DEV_RX_OFFLOAD_VLAN_STRIP ) ret |=ETH_VLAN_STRIP_OFFLOAD ; -if (dev->data->dev_conf.rxmode.offloads & -DEV_RX_OFFLOAD_VLAN_FILTER ) +if (*dev_offloads &DEV_RX_OFFLOAD_VLAN_FILTER ) ret |=ETH_VLAN_FILTER_OFFLOAD ; -if (dev->data->dev_conf.rxmode.offloads & -DEV_RX_OFFLOAD_VLAN_EXTEND ) +if (*dev_offloads &DEV_RX_OFFLOAD_VLAN_EXTEND ) ret |=ETH_VLAN_EXTEND_OFFLOAD ; +if (*dev_offloads &DEV_RX_OFFLOAD_QINQ_STRIP ) + ret |=DEV_RX_OFFLOAD_QINQ_STRIP ; +return ret; }
lib/librte_ethdev/rte_ethdev.h +6 -1
@@ -584,11 +584,13 @@ struct rte_eth_rss_conf {#define ETH_VLAN_STRIP_OFFLOAD 0x0001/**< VLAN Strip On/Off */ #define ETH_VLAN_FILTER_OFFLOAD 0x0002/**< VLAN Filter On/Off */ #define ETH_VLAN_EXTEND_OFFLOAD 0x0004/**< VLAN Extend On/Off */ +#define ETH_QINQ_STRIP_OFFLOAD 0x0008/**< QINQ Strip On/Off */ /* Definitions used for mask VLAN setting */ #define ETH_VLAN_STRIP_MASK 0x0001/**< VLAN Strip setting mask */ #define ETH_VLAN_FILTER_MASK 0x0002/**< VLAN Filter setting mask*/ #define ETH_VLAN_EXTEND_MASK 0x0004/**< VLAN Extend setting mask*/ +#define ETH_QINQ_STRIP_MASK 0x0008/**< QINQ Strip setting mask */ #define ETH_VLAN_ID_MAX 0x0FFF/**< VLAN ID is in lower 12 bits*/ /* Definitions used for receive MAC address */
@@ -1017,7 +1019,8 @@ struct rte_eth_conf { DEV_RX_OFFLOAD_TCP_CKSUM)#define DEV_RX_OFFLOAD_VLAN (DEV_RX_OFFLOAD_VLAN_STRIP | \ DEV_RX_OFFLOAD_VLAN_FILTER | \ - DEV_RX_OFFLOAD_VLAN_EXTEND) + DEV_RX_OFFLOAD_VLAN_EXTEND | \ + DEV_RX_OFFLOAD_QINQ_STRIP)/* * If new Rx offload capabilities are defined, they also must be
@@ -2540,6 +2543,7 @@ int rte_eth_dev_set_vlan_ether_type(uint16_t port_id,* ETH_VLAN_STRIP_OFFLOAD * ETH_VLAN_FILTER_OFFLOAD * ETH_VLAN_EXTEND_OFFLOAD +* ETH_QINQ_STRIP_OFFLOAD * @return * - (0) if successful. * - (-ENOSUP) if hardware-assisted VLAN filtering not configured.
@@ -2558,6 +2562,7 @@ int rte_eth_dev_set_vlan_offload(uint16_t port_id, int offload_mask);* ETH_VLAN_STRIP_OFFLOAD * ETH_VLAN_FILTER_OFFLOAD * ETH_VLAN_EXTEND_OFFLOAD +* ETH_QINQ_STRIP_OFFLOAD * - (-ENODEV) if *port_id* invalid. */ int rte_eth_dev_get_vlan_offload (uint16_t port_id);
Signature · 1 line
2.7.4
Re: [dpdk-dev] [PATCH v4] ethdev: support QinQ strip dynamic configuration
Quoted 6 lines · On 7/2/2019 4:37 AM, [email protected] wrote:
From: Vivek Sharma <[email protected]>
Enable missing support for runtime configuration (setting/getting) of QinQ strip rx offload for a given ethdev.
Signed-off-by Vivek Sharma <[email protected]>
Hi Andrew,
As far as I understand you were OK with the patch after change, can I add your ack?
Re: [dpdk-dev] [PATCH v4] ethdev: support QinQ strip dynamic configuration
Quoted 10 lines · Ferruh Yigit
Quoted 6 lines · On 7/2/2019 4:37 AM, [email protected] wrote:
From: Vivek Sharma <[email protected]>
Enable missing support for runtime configuration (setting/getting) of QinQ strip rx offload for a given ethdev.
Signed-off-by Vivek Sharma <[email protected]>Hi Andrew,
As far as I understand you were OK with the patch after change, can I add your ack?
Yes, please. I've tried to find some time to double-check consistency vs supported offloads and error reporting, but have not found time yet to do it. Let's apply and I'll keep it in mind to take a look later.
Thanks,
Andrew.
Re: [dpdk-dev] [PATCH v4] ethdev: support QinQ strip dynamic configuration
In reply to [email protected]Quoted 6 lines · On 7/2/2019 4:37 AM, [email protected] wrote:
From: Vivek Sharma <[email protected]>
Enable missing support for runtime configuration (setting/getting) of QinQ strip rx offload for a given ethdev.
Signed-off-by Vivek Sharma <[email protected]>
Ferruh Yigit
AppliedRe: [dpdk-dev] [PATCH v4] ethdev: support QinQ strip dynamic configuration
Quoted 12 lines · Ferruh Yigit
Quoted 6 lines · On 7/2/2019 4:37 AM, [email protected] wrote:
From: Vivek Sharma <[email protected]>
Enable missing support for runtime configuration (setting/getting) of QinQ strip rx offload for a given ethdev.
Signed-off-by Vivek Sharma <[email protected]>Acked-by Andrew Rybchenko <[email protected]>Reviewed-by Ferruh Yigit <[email protected]>
Applied to dpdk-next-net/master, thanks.
(s/review/apply, wrong tag sent)