* [PATCH 0/2] i40e setting ether type of VLANs
@ 2016-01-22 1:37 Helin Zhang
2016-01-22 1:37 ` [PATCH 1/2] ethdev: add vlan type for setting ether type Helin Zhang
` (2 more replies)
0 siblings, 3 replies; 24+ messages in thread
From: Helin Zhang @ 2016-01-22 1:37 UTC (permalink / raw)
To: dev
It adds setting ether type of single VLAN(inner VLAN) and outer
VLAN for i40e. For ixgbe and e1000/igb, as the external API changed,
it supports setting single VLAN(inner VLAN) only.
Helin Zhang (2):
ethdev: add vlan type for setting ether type
i40e: add VLAN ether type config
app/test-pmd/cmdline.c | 29 ++++++++++++------
app/test-pmd/config.c | 8 ++---
app/test-pmd/testpmd.h | 3 +-
doc/guides/rel_notes/deprecation.rst | 4 +++
doc/guides/rel_notes/release_2_3.rst | 6 ++++
drivers/net/e1000/igb_ethdev.c | 20 +++++++++----
drivers/net/i40e/i40e_ethdev.c | 57 +++++++++++++++++++++++++++++++++---
drivers/net/ixgbe/ixgbe_ethdev.c | 18 +++++++++---
lib/librte_ether/rte_ethdev.c | 5 ++--
lib/librte_ether/rte_ethdev.h | 19 ++++++++++--
10 files changed, 138 insertions(+), 31 deletions(-)
--
2.5.0
^ permalink raw reply [flat|nested] 24+ messages in thread* [PATCH 1/2] ethdev: add vlan type for setting ether type 2016-01-22 1:37 [PATCH 0/2] i40e setting ether type of VLANs Helin Zhang @ 2016-01-22 1:37 ` Helin Zhang 2016-01-22 1:37 ` [PATCH 2/2] i40e: add VLAN ether type config Helin Zhang 2016-03-07 8:12 ` [PATCH v2 0/3] i40e setting ether type of VLANs Helin Zhang 2 siblings, 0 replies; 24+ messages in thread From: Helin Zhang @ 2016-01-22 1:37 UTC (permalink / raw) To: dev In order to set ether type of VLAN for single VLAN, inner and outer VLAN, the VLAN type as an input parameter is added to 'rte_eth_dev_set_vlan_ether_type()'. In addition, corresponding changes in e1000, ixgbe and i40e are also added. Signed-off-by: Helin Zhang <helin.zhang@intel.com> --- app/test-pmd/cmdline.c | 29 ++++++++++++++++++++--------- app/test-pmd/config.c | 8 ++++---- app/test-pmd/testpmd.h | 3 ++- doc/guides/rel_notes/deprecation.rst | 4 ++++ doc/guides/rel_notes/release_2_3.rst | 6 ++++++ drivers/net/e1000/igb_ethdev.c | 20 +++++++++++++++----- drivers/net/i40e/i40e_ethdev.c | 4 +++- drivers/net/ixgbe/ixgbe_ethdev.c | 18 ++++++++++++++---- lib/librte_ether/rte_ethdev.c | 5 +++-- lib/librte_ether/rte_ethdev.h | 19 +++++++++++++++++-- 10 files changed, 88 insertions(+), 28 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 73298c9..ba1650b 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -275,8 +275,8 @@ static void cmd_help_long_parsed(void *parsed_result, " Set the VLAN QinQ (extended queue in queue)" " on a port.\n\n" - "vlan set tpid (value) (port_id)\n" - " Set the outer VLAN TPID for Packet Filtering on" + "vlan set (inner|outer) tpid (value) (port_id)\n" + " Set the VLAN TPID for Packet Filtering on" " a port\n\n" "rx_vlan add (vlan_id|all) (port_id)\n" @@ -295,10 +295,6 @@ static void cmd_help_long_parsed(void *parsed_result, " Remove a vlan_id, to the set of VLAN identifiers" "filtered for VF(s) from port_id.\n\n" - "rx_vlan set tpid (value) (port_id)\n" - " Set the outer VLAN TPID for Packet Filtering on" - " a port\n\n" - "tunnel_filter add (port_id) (outer_mac) (inner_mac) (ip_addr) " "(inner_vlan) (vxlan|nvgre) (filter_type) (tenant_id) (queue_id)\n" " add a tunnel filter of a port.\n\n" @@ -2845,6 +2841,7 @@ cmdline_parse_inst_t cmd_vlan_offload = { struct cmd_vlan_tpid_result { cmdline_fixed_string_t vlan; cmdline_fixed_string_t set; + cmdline_fixed_string_t vlan_type; cmdline_fixed_string_t what; uint16_t tp_id; uint8_t port_id; @@ -2856,8 +2853,17 @@ cmd_vlan_tpid_parsed(void *parsed_result, __attribute__((unused)) void *data) { struct cmd_vlan_tpid_result *res = parsed_result; - vlan_tpid_set(res->port_id, res->tp_id); - return; + enum rte_vlan_type vlan_type; + + if (!strcmp(res->vlan_type, "inner")) + vlan_type = ETH_VLAN_TYPE_INNER; + else if (!strcmp(res->vlan_type, "outer")) + vlan_type = ETH_VLAN_TYPE_OUTER; + else { + printf("Unknown vlan type\n"); + return; + } + vlan_tpid_set(res->port_id, vlan_type, res->tp_id); } cmdline_parse_token_string_t cmd_vlan_tpid_vlan = @@ -2866,6 +2872,9 @@ cmdline_parse_token_string_t cmd_vlan_tpid_vlan = cmdline_parse_token_string_t cmd_vlan_tpid_set = TOKEN_STRING_INITIALIZER(struct cmd_vlan_tpid_result, set, "set"); +cmdline_parse_token_string_t cmd_vlan_type = + TOKEN_STRING_INITIALIZER(struct cmd_vlan_tpid_result, + vlan_type, "inner#outer"); cmdline_parse_token_string_t cmd_vlan_tpid_what = TOKEN_STRING_INITIALIZER(struct cmd_vlan_tpid_result, what, "tpid"); @@ -2879,10 +2888,12 @@ cmdline_parse_token_num_t cmd_vlan_tpid_portid = cmdline_parse_inst_t cmd_vlan_tpid = { .f = cmd_vlan_tpid_parsed, .data = NULL, - .help_str = "set tpid tp_id port_id, set the Outer VLAN Ether type", + .help_str = "set inner|outer tpid tp_id port_id, set the VLAN " + "Ether type", .tokens = { (void *)&cmd_vlan_tpid_vlan, (void *)&cmd_vlan_tpid_set, + (void *)&cmd_vlan_type, (void *)&cmd_vlan_tpid_what, (void *)&cmd_vlan_tpid_tpid, (void *)&cmd_vlan_tpid_portid, diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 7088f6f..537dd0b 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -1821,19 +1821,19 @@ rx_vlan_all_filter_set(portid_t port_id, int on) } void -vlan_tpid_set(portid_t port_id, uint16_t tp_id) +vlan_tpid_set(portid_t port_id, enum rte_vlan_type vlan_type, uint16_t tp_id) { int diag; if (port_id_is_invalid(port_id, ENABLED_WARN)) return; - diag = rte_eth_dev_set_vlan_ether_type(port_id, tp_id); + diag = rte_eth_dev_set_vlan_ether_type(port_id, vlan_type, tp_id); if (diag == 0) return; - printf("tx_vlan_tpid_set(port_pi=%d, tpid=%d) failed " + printf("tx_vlan_tpid_set(port_pi=%d, vlan_type=%d, tpid=%d) failed " "diag=%d\n", - port_id, tp_id, diag); + port_id, vlan_type, tp_id, diag); } void diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index ee7de98..d79d86d 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -507,7 +507,8 @@ void rx_vlan_filter_set(portid_t port_id, int on); void rx_vlan_all_filter_set(portid_t port_id, int on); int rx_vft_set(portid_t port_id, uint16_t vlan_id, int on); void vlan_extend_set(portid_t port_id, int on); -void vlan_tpid_set(portid_t port_id, uint16_t tp_id); +void vlan_tpid_set(portid_t port_id, enum rte_vlan_type vlan_type, + uint16_t tp_id); void tx_vlan_set(portid_t port_id, uint16_t vlan_id); void tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer); void tx_vlan_reset(portid_t port_id); diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index e94d4a2..989db37 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -49,3 +49,7 @@ Deprecation Notices commands (such as RETA update in testpmd). This should impact CMDLINE_PARSE_RESULT_BUFSIZE, STR_TOKEN_SIZE and RDLINE_BUF_SIZE. It should be integrated in release 2.3. + +* ABI changes are planned for ``vlan_tpid_set`` in ethdev structure + of ``eth_dev_ops`` from in release 16.07. Its return value will be changed + from ``void`` to ``int``. diff --git a/doc/guides/rel_notes/release_2_3.rst b/doc/guides/rel_notes/release_2_3.rst index 99de186..1f32401 100644 --- a/doc/guides/rel_notes/release_2_3.rst +++ b/doc/guides/rel_notes/release_2_3.rst @@ -4,6 +4,8 @@ DPDK Release 2.3 New Features ------------ +* **Added modifying ether type of both single and double VLAN for i40e** + Resolved Issues --------------- @@ -35,6 +37,10 @@ Known Issues API Changes ----------- +* The function of ``rte_eth_dev_set_vlan_ether_type()`` now has one more + parameter of ``enum rte_vlan_type`` for configuring single VLAN, inner + or outer VLAN. + ABI Changes ----------- diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c index d1bbcda..b3cec86 100644 --- a/drivers/net/e1000/igb_ethdev.c +++ b/drivers/net/e1000/igb_ethdev.c @@ -125,7 +125,9 @@ static int eth_igb_mtu_set(struct rte_eth_dev *dev, uint16_t mtu); static int eth_igb_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on); -static void eth_igb_vlan_tpid_set(struct rte_eth_dev *dev, uint16_t tpid_id); +static void eth_igb_vlan_tpid_set(struct rte_eth_dev *dev, + enum rte_vlan_type vlan_type, + uint16_t tpid_id); static void eth_igb_vlan_offload_set(struct rte_eth_dev *dev, int mask); static void igb_vlan_hw_filter_enable(struct rte_eth_dev *dev); @@ -2185,14 +2187,22 @@ eth_igb_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) } static void -eth_igb_vlan_tpid_set(struct rte_eth_dev *dev, uint16_t tpid) +eth_igb_vlan_tpid_set(struct rte_eth_dev *dev, enum rte_vlan_type vlan_type, + uint16_t tpid) { struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private); - uint32_t reg = ETHER_TYPE_VLAN ; + uint32_t reg = ETHER_TYPE_VLAN; - reg |= (tpid << 16); - E1000_WRITE_REG(hw, E1000_VET, reg); + switch (vlan_type) { + case ETH_VLAN_TYPE_INNER: + reg |= (tpid << 16); + E1000_WRITE_REG(hw, E1000_VET, reg); + break; + default: + PMD_DRV_LOG(ERR, "Unsupported vlan type %d\n", vlan_type); + break; + } } static void diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index bf6220d..56ed28d 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -299,7 +299,8 @@ static void i40e_dev_info_get(struct rte_eth_dev *dev, static int i40e_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on); -static void i40e_vlan_tpid_set(struct rte_eth_dev *dev, uint16_t tpid); +static void i40e_vlan_tpid_set(struct rte_eth_dev *dev, + enum rte_vlan_type vlan_type, uint16_t tpid); static void i40e_vlan_offload_set(struct rte_eth_dev *dev, int mask); static void i40e_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, @@ -2321,6 +2322,7 @@ i40e_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) static void i40e_vlan_tpid_set(__rte_unused struct rte_eth_dev *dev, + __rte_unused enum rte_vlan_type vlan_type, __rte_unused uint16_t tpid) { PMD_INIT_FUNC_TRACE(); diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index 4c4c6df..20ed5b8 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -172,7 +172,9 @@ static int ixgbe_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu); static int ixgbe_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on); -static void ixgbe_vlan_tpid_set(struct rte_eth_dev *dev, uint16_t tpid_id); +static void ixgbe_vlan_tpid_set(struct rte_eth_dev *dev, + enum rte_vlan_type vlan_type, + uint16_t tpid_id); static void ixgbe_vlan_hw_strip_bitmap_set(struct rte_eth_dev *dev, uint16_t queue, bool on); static void ixgbe_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, @@ -1517,13 +1519,21 @@ ixgbe_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on) } static void -ixgbe_vlan_tpid_set(struct rte_eth_dev *dev, uint16_t tpid) +ixgbe_vlan_tpid_set(struct rte_eth_dev *dev, enum rte_vlan_type vlan_type, + uint16_t tpid) { struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); - /* Only the high 16-bits is valid */ - IXGBE_WRITE_REG(hw, IXGBE_EXVET, tpid << 16); + switch (vlan_type) { + case ETH_VLAN_TYPE_INNER: + /* Only the high 16-bits is valid */ + IXGBE_WRITE_REG(hw, IXGBE_EXVET, tpid << 16); + break; + default: + PMD_DRV_LOG(ERR, "Unsupported vlan type %d\n", vlan_type); + break; + } } void diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index ed971b4..589b7ca 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -1695,14 +1695,15 @@ rte_eth_dev_set_vlan_strip_on_queue(uint8_t port_id, uint16_t rx_queue_id, int o } int -rte_eth_dev_set_vlan_ether_type(uint8_t port_id, uint16_t tpid) +rte_eth_dev_set_vlan_ether_type(uint8_t port_id, enum rte_vlan_type vlan_type, + uint16_t tpid) { struct rte_eth_dev *dev; RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->vlan_tpid_set, -ENOTSUP); - (*dev->dev_ops->vlan_tpid_set)(dev, tpid); + (*dev->dev_ops->vlan_tpid_set)(dev, vlan_type, tpid); return 0; } diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index bada8ad..c047cbe 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -351,6 +351,17 @@ struct rte_eth_rxmode { }; /** + * VLAN types to indicate if it is for single VLAN, inner VLAN or outer VLAN. + * Note that most of time single VLAN is treated the same as inner VLAN. + */ +enum rte_vlan_type { + ETH_VLAN_TYPE_UNKNOWN = 0, + ETH_VLAN_TYPE_INNER, /**< Single VLAN, or inner VLAN. */ + ETH_VLAN_TYPE_OUTER, /**< Outer VLAN. */ + ETH_VLAN_TYPE_MAX, +}; + +/** * A structure used to configure the Receive Side Scaling (RSS) feature * of an Ethernet port. * If not NULL, the *rss_key* pointer of the *rss_conf* structure points @@ -1077,7 +1088,7 @@ typedef int (*vlan_filter_set_t)(struct rte_eth_dev *dev, /**< @internal filtering of a VLAN Tag Identifier by an Ethernet device. */ typedef void (*vlan_tpid_set_t)(struct rte_eth_dev *dev, - uint16_t tpid); + enum rte_vlan_type type, uint16_t tpid); /**< @internal set the outer VLAN-TPID by an Ethernet device. */ typedef void (*vlan_offload_set_t)(struct rte_eth_dev *dev, int mask); @@ -2349,6 +2360,8 @@ extern int rte_eth_dev_set_vlan_strip_on_queue(uint8_t port_id, * * @param port_id * The port identifier of the Ethernet device. + * @vlan_type + * The vlan type. * @param tag_type * The Tag Protocol ID * @return @@ -2356,7 +2369,9 @@ extern int rte_eth_dev_set_vlan_strip_on_queue(uint8_t port_id, * - (-ENOSUP) if hardware-assisted VLAN TPID setup is not supported. * - (-ENODEV) if *port_id* invalid. */ -extern int rte_eth_dev_set_vlan_ether_type(uint8_t port_id, uint16_t tag_type); +extern int rte_eth_dev_set_vlan_ether_type(uint8_t port_id, + enum rte_vlan_type vlan_type, + uint16_t tag_type); /** * Set VLAN offload configuration on an Ethernet device -- 2.5.0 ^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 2/2] i40e: add VLAN ether type config 2016-01-22 1:37 [PATCH 0/2] i40e setting ether type of VLANs Helin Zhang 2016-01-22 1:37 ` [PATCH 1/2] ethdev: add vlan type for setting ether type Helin Zhang @ 2016-01-22 1:37 ` Helin Zhang 2016-03-07 8:12 ` [PATCH v2 0/3] i40e setting ether type of VLANs Helin Zhang 2 siblings, 0 replies; 24+ messages in thread From: Helin Zhang @ 2016-01-22 1:37 UTC (permalink / raw) To: dev It adds the setting VLAN ether type of single VLAN, inner and outer VLAN. Single VLAN is treated as inner VLAN as usual. Signed-off-by: Helin Zhang <helin.zhang@intel.com> --- drivers/net/i40e/i40e_ethdev.c | 55 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 51 insertions(+), 4 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 56ed28d..d97270d 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -273,6 +273,11 @@ #define I40E_INSET_IPV6_TC_MASK 0x0009F00FUL #define I40E_INSET_IPV6_NEXT_HDR_MASK 0x000C00FFUL +#define I40E_GL_SWT_L2TAGCTRL(_i) (0x001C0A70 + ((_i) * 4)) +#define I40E_GL_SWT_L2TAGCTRL_ETHERTYPE_SHIFT 16 +#define I40E_GL_SWT_L2TAGCTRL_ETHERTYPE_MASK \ + I40E_MASK(0xFFFF, I40E_GL_SWT_L2TAGCTRL_ETHERTYPE_SHIFT) + static int eth_i40e_dev_init(struct rte_eth_dev *eth_dev); static int eth_i40e_dev_uninit(struct rte_eth_dev *eth_dev); static int i40e_dev_configure(struct rte_eth_dev *dev); @@ -2321,11 +2326,53 @@ i40e_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) } static void -i40e_vlan_tpid_set(__rte_unused struct rte_eth_dev *dev, - __rte_unused enum rte_vlan_type vlan_type, - __rte_unused uint16_t tpid) +i40e_vlan_tpid_set(struct rte_eth_dev *dev, + enum rte_vlan_type vlan_type, + uint16_t tpid) { - PMD_INIT_FUNC_TRACE(); + struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private); + uint64_t reg_r = 0, reg_w = 0; + uint16_t reg_id = 0; + int ret; + + switch (vlan_type) { + case ETH_VLAN_TYPE_OUTER: + reg_id = 2; + break; + case ETH_VLAN_TYPE_INNER: + reg_id = 3; + break; + default: + PMD_DRV_LOG(ERR, "Unsupported vlan type %d", vlan_type); + return; + } + + ret = i40e_aq_debug_read_register(hw, I40E_GL_SWT_L2TAGCTRL(reg_id), + ®_r, NULL); + if (ret != I40E_SUCCESS) { + PMD_DRV_LOG(ERR, "Fail to debug read from " + "I40E_GL_SWT_L2TAGCTRL[%d]", reg_id); + return; + } + PMD_DRV_LOG(DEBUG, "Debug read from I40E_GL_SWT_L2TAGCTRL[%d]: " + "0x%08"PRIx64"", reg_id, reg_r); + + reg_w = reg_r & (~(I40E_GL_SWT_L2TAGCTRL_ETHERTYPE_MASK)); + reg_w |= ((uint64_t)tpid << I40E_GL_SWT_L2TAGCTRL_ETHERTYPE_SHIFT); + if (reg_r == reg_w) { + PMD_DRV_LOG(DEBUG, "No need to write"); + return; + } + + ret = i40e_aq_debug_write_register(hw, I40E_GL_SWT_L2TAGCTRL(reg_id), + reg_w, NULL); + if (ret != I40E_SUCCESS) { + PMD_DRV_LOG(ERR, "Fail to debug write to " + "I40E_GL_SWT_L2TAGCTRL[%d]", reg_id); + return; + } + PMD_DRV_LOG(DEBUG, "Debug write 0x%08"PRIx64" to " + "I40E_GL_SWT_L2TAGCTRL[%d]", reg_w, reg_id); } static void -- 2.5.0 ^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v2 0/3] i40e setting ether type of VLANs 2016-01-22 1:37 [PATCH 0/2] i40e setting ether type of VLANs Helin Zhang 2016-01-22 1:37 ` [PATCH 1/2] ethdev: add vlan type for setting ether type Helin Zhang 2016-01-22 1:37 ` [PATCH 2/2] i40e: add VLAN ether type config Helin Zhang @ 2016-03-07 8:12 ` Helin Zhang 2016-03-07 8:12 ` [PATCH v2 1/3] ethdev: add vlan type for setting ether type Helin Zhang ` (4 more replies) 2 siblings, 5 replies; 24+ messages in thread From: Helin Zhang @ 2016-03-07 8:12 UTC (permalink / raw) To: dev It adds setting ether type of both single VLAN(inner VLAN) and outer VLAN for i40e. For ixgbe and e1000/igb, it supports setting single VLAN(inner VLAN) only, and can be extended in the future. The patch set was branched off rel_16_04 of repo dpdk-next-net, on below commit. - commit 4ac366ba647909c3b71818f9be9db86ba5e871da nfp: fix non-x86 build v2: - Used RTE_NEXT_ABI to avoid ABI change issue. - Reworked the announcement of ABI change for release 16.07. - Fixed a i40e overflow issue. Helin Zhang (3): ethdev: add vlan type for setting ether type i40e: add VLAN ether type config i40e: fix the overflow issue app/test-pmd/cmdline.c | 29 +++++++++---- app/test-pmd/config.c | 14 +++++-- app/test-pmd/testpmd.h | 3 +- doc/guides/rel_notes/deprecation.rst | 6 +++ doc/guides/rel_notes/release_16_04.rst | 4 ++ drivers/net/e1000/igb_ethdev.c | 26 ++++++++++-- drivers/net/i40e/i40e_ethdev.c | 75 ++++++++++++++++++++++++++++++++-- drivers/net/i40e/i40e_rxtx.c | 4 +- drivers/net/ixgbe/ixgbe_ethdev.c | 25 ++++++++++-- lib/librte_ether/rte_ethdev.c | 12 +++++- lib/librte_ether/rte_ethdev.h | 24 ++++++++++- 11 files changed, 193 insertions(+), 29 deletions(-) -- 2.5.0 ^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v2 1/3] ethdev: add vlan type for setting ether type 2016-03-07 8:12 ` [PATCH v2 0/3] i40e setting ether type of VLANs Helin Zhang @ 2016-03-07 8:12 ` Helin Zhang 2016-03-07 8:12 ` [PATCH v2 2/3] i40e: add VLAN ether type config Helin Zhang ` (3 subsequent siblings) 4 siblings, 0 replies; 24+ messages in thread From: Helin Zhang @ 2016-03-07 8:12 UTC (permalink / raw) To: dev In order to set ether type of VLAN for single VLAN, inner and outer VLAN, the VLAN type as an input parameter is added to 'rte_eth_dev_set_vlan_ether_type()'. In addition, corresponding changes in e1000, ixgbe and i40e are also added. Signed-off-by: Helin Zhang <helin.zhang@intel.com> --- app/test-pmd/cmdline.c | 29 ++++++++++++++++++++--------- app/test-pmd/config.c | 14 +++++++++++--- app/test-pmd/testpmd.h | 3 ++- doc/guides/rel_notes/deprecation.rst | 6 ++++++ doc/guides/rel_notes/release_16_04.rst | 4 ++++ drivers/net/e1000/igb_ethdev.c | 26 +++++++++++++++++++++++--- drivers/net/i40e/i40e_ethdev.c | 9 ++++++++- drivers/net/ixgbe/ixgbe_ethdev.c | 25 ++++++++++++++++++++++--- lib/librte_ether/rte_ethdev.c | 12 ++++++++++-- lib/librte_ether/rte_ethdev.h | 24 ++++++++++++++++++++++-- 10 files changed, 128 insertions(+), 24 deletions(-) v2: - Used RTE_NEXT_ABI to avoid ABI change issue. - Reworked the announcement of ABI change for release 16.07. diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 52e9f5f..39a1202 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -277,8 +277,8 @@ static void cmd_help_long_parsed(void *parsed_result, " Set the VLAN QinQ (extended queue in queue)" " on a port.\n\n" - "vlan set tpid (value) (port_id)\n" - " Set the outer VLAN TPID for Packet Filtering on" + "vlan set (inner|outer) tpid (value) (port_id)\n" + " Set the VLAN TPID for Packet Filtering on" " a port\n\n" "rx_vlan add (vlan_id|all) (port_id)\n" @@ -297,10 +297,6 @@ static void cmd_help_long_parsed(void *parsed_result, " Remove a vlan_id, to the set of VLAN identifiers" "filtered for VF(s) from port_id.\n\n" - "rx_vlan set tpid (value) (port_id)\n" - " Set the outer VLAN TPID for Packet Filtering on" - " a port\n\n" - "tunnel_filter add (port_id) (outer_mac) (inner_mac) (ip_addr) " "(inner_vlan) (vxlan|nvgre) (filter_type) (tenant_id) (queue_id)\n" " add a tunnel filter of a port.\n\n" @@ -2847,6 +2843,7 @@ cmdline_parse_inst_t cmd_vlan_offload = { struct cmd_vlan_tpid_result { cmdline_fixed_string_t vlan; cmdline_fixed_string_t set; + cmdline_fixed_string_t vlan_type; cmdline_fixed_string_t what; uint16_t tp_id; uint8_t port_id; @@ -2858,8 +2855,17 @@ cmd_vlan_tpid_parsed(void *parsed_result, __attribute__((unused)) void *data) { struct cmd_vlan_tpid_result *res = parsed_result; - vlan_tpid_set(res->port_id, res->tp_id); - return; + enum rte_vlan_type vlan_type; + + if (!strcmp(res->vlan_type, "inner")) + vlan_type = ETH_VLAN_TYPE_INNER; + else if (!strcmp(res->vlan_type, "outer")) + vlan_type = ETH_VLAN_TYPE_OUTER; + else { + printf("Unknown vlan type\n"); + return; + } + vlan_tpid_set(res->port_id, vlan_type, res->tp_id); } cmdline_parse_token_string_t cmd_vlan_tpid_vlan = @@ -2868,6 +2874,9 @@ cmdline_parse_token_string_t cmd_vlan_tpid_vlan = cmdline_parse_token_string_t cmd_vlan_tpid_set = TOKEN_STRING_INITIALIZER(struct cmd_vlan_tpid_result, set, "set"); +cmdline_parse_token_string_t cmd_vlan_type = + TOKEN_STRING_INITIALIZER(struct cmd_vlan_tpid_result, + vlan_type, "inner#outer"); cmdline_parse_token_string_t cmd_vlan_tpid_what = TOKEN_STRING_INITIALIZER(struct cmd_vlan_tpid_result, what, "tpid"); @@ -2881,10 +2890,12 @@ cmdline_parse_token_num_t cmd_vlan_tpid_portid = cmdline_parse_inst_t cmd_vlan_tpid = { .f = cmd_vlan_tpid_parsed, .data = NULL, - .help_str = "set tpid tp_id port_id, set the Outer VLAN Ether type", + .help_str = "set inner|outer tpid tp_id port_id, set the VLAN " + "Ether type", .tokens = { (void *)&cmd_vlan_tpid_vlan, (void *)&cmd_vlan_tpid_set, + (void *)&cmd_vlan_type, (void *)&cmd_vlan_tpid_what, (void *)&cmd_vlan_tpid_tpid, (void *)&cmd_vlan_tpid_portid, diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 0062484..db64d57 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -1821,19 +1821,27 @@ rx_vlan_all_filter_set(portid_t port_id, int on) } void -vlan_tpid_set(portid_t port_id, uint16_t tp_id) +vlan_tpid_set(portid_t port_id, enum rte_vlan_type vlan_type, uint16_t tp_id) { int diag; if (port_id_is_invalid(port_id, ENABLED_WARN)) return; +#ifdef RTE_NEXT_ABI + diag = rte_eth_dev_set_vlan_ether_type(port_id, vlan_type, tp_id); +#else + if (vlan_type != ETH_VLAN_TYPE_INNER) { + printf("VLAN type not supported\n"); + return; + } diag = rte_eth_dev_set_vlan_ether_type(port_id, tp_id); +#endif /* RTE_NEXT_ABI */ if (diag == 0) return; - printf("tx_vlan_tpid_set(port_pi=%d, tpid=%d) failed " + printf("tx_vlan_tpid_set(port_pi=%d, vlan_type=%d, tpid=%d) failed " "diag=%d\n", - port_id, tp_id, diag); + port_id, vlan_type, tp_id, diag); } void diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index b618998..0f72ca1 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -508,7 +508,8 @@ void rx_vlan_filter_set(portid_t port_id, int on); void rx_vlan_all_filter_set(portid_t port_id, int on); int rx_vft_set(portid_t port_id, uint16_t vlan_id, int on); void vlan_extend_set(portid_t port_id, int on); -void vlan_tpid_set(portid_t port_id, uint16_t tp_id); +void vlan_tpid_set(portid_t port_id, enum rte_vlan_type vlan_type, + uint16_t tp_id); void tx_vlan_set(portid_t port_id, uint16_t vlan_id); void tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer); void tx_vlan_reset(portid_t port_id); diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index e94d4a2..dd10501 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -49,3 +49,9 @@ Deprecation Notices commands (such as RETA update in testpmd). This should impact CMDLINE_PARSE_RESULT_BUFSIZE, STR_TOKEN_SIZE and RDLINE_BUF_SIZE. It should be integrated in release 2.3. + +* ABI changes are planned for typedef of ``vlan_tpid_set_t``, one more + parameter of ``vlan_type`` will be added, and its return value will be + changed from ``void`` to ``int``, from release 16.07. Thus, ethdev structure + of ``eth_dev_ops`` and interface of ``rte_eth_dev_set_vlan_ether_type`` will + be affected. diff --git a/doc/guides/rel_notes/release_16_04.rst b/doc/guides/rel_notes/release_16_04.rst index 73494f9..d1a3e7e 100644 --- a/doc/guides/rel_notes/release_16_04.rst +++ b/doc/guides/rel_notes/release_16_04.rst @@ -74,6 +74,10 @@ This section should contain new features added in this release. Sample format: * **szedata2: Add functions for setting link up/down.** +* **Added modifying ether type of both single and double VLAN for i40e** + + Macro of RTE_NEXT_ABI was introduced, as ABI change involved. + Resolved Issues --------------- diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c index 41c107d..5b2e381 100644 --- a/drivers/net/e1000/igb_ethdev.c +++ b/drivers/net/e1000/igb_ethdev.c @@ -126,7 +126,11 @@ static int eth_igb_mtu_set(struct rte_eth_dev *dev, uint16_t mtu); static int eth_igb_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on); -static void eth_igb_vlan_tpid_set(struct rte_eth_dev *dev, uint16_t tpid_id); +static void eth_igb_vlan_tpid_set(struct rte_eth_dev *dev, +#ifdef RTE_NEXT_ABI + enum rte_vlan_type vlan_type, +#endif + uint16_t tpid_id); static void eth_igb_vlan_offload_set(struct rte_eth_dev *dev, int mask); static void igb_vlan_hw_filter_enable(struct rte_eth_dev *dev); @@ -2194,14 +2198,30 @@ eth_igb_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) } static void -eth_igb_vlan_tpid_set(struct rte_eth_dev *dev, uint16_t tpid) +eth_igb_vlan_tpid_set(struct rte_eth_dev *dev, +#ifdef RTE_NEXT_ABI + enum rte_vlan_type vlan_type, +#endif + uint16_t tpid) { struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private); - uint32_t reg = ETHER_TYPE_VLAN ; + uint32_t reg = ETHER_TYPE_VLAN; +#ifdef RTE_NEXT_ABI + switch (vlan_type) { + case ETH_VLAN_TYPE_INNER: + reg |= (tpid << 16); + E1000_WRITE_REG(hw, E1000_VET, reg); + break; + default: + PMD_DRV_LOG(ERR, "Unsupported vlan type %d\n", vlan_type); + break; + } +#else reg |= (tpid << 16); E1000_WRITE_REG(hw, E1000_VET, reg); +#endif /* RTE_NEXT_ABI */ } static void diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index c86febc..1da5690 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -299,7 +299,11 @@ static void i40e_dev_info_get(struct rte_eth_dev *dev, static int i40e_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on); -static void i40e_vlan_tpid_set(struct rte_eth_dev *dev, uint16_t tpid); +static void i40e_vlan_tpid_set(struct rte_eth_dev *dev, +#ifdef RTE_NEXT_ABI + enum rte_vlan_type vlan_type, +#endif + uint16_t tpid); static void i40e_vlan_offload_set(struct rte_eth_dev *dev, int mask); static void i40e_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, @@ -2321,6 +2325,9 @@ i40e_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) static void i40e_vlan_tpid_set(__rte_unused struct rte_eth_dev *dev, +#ifdef RTE_NEXT_ABI + __rte_unused enum rte_vlan_type vlan_type, +#endif __rte_unused uint16_t tpid) { PMD_INIT_FUNC_TRACE(); diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index 2d8eaac..a2175a0 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -172,7 +172,11 @@ static int ixgbe_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu); static int ixgbe_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on); -static void ixgbe_vlan_tpid_set(struct rte_eth_dev *dev, uint16_t tpid_id); +static void ixgbe_vlan_tpid_set(struct rte_eth_dev *dev, +#ifdef RTE_NEXT_ABI + enum rte_vlan_type vlan_type, +#endif + uint16_t tpid_id); static void ixgbe_vlan_hw_strip_bitmap_set(struct rte_eth_dev *dev, uint16_t queue, bool on); static void ixgbe_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, @@ -1519,13 +1523,28 @@ ixgbe_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on) } static void -ixgbe_vlan_tpid_set(struct rte_eth_dev *dev, uint16_t tpid) +ixgbe_vlan_tpid_set(struct rte_eth_dev *dev, +#ifdef RTE_NEXT_ABI + enum rte_vlan_type vlan_type, +#endif + uint16_t tpid) { struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); - /* Only the high 16-bits is valid */ +#ifdef RTE_NEXT_ABI + switch (vlan_type) { + case ETH_VLAN_TYPE_INNER: + /* Only the high 16-bits is valid */ + IXGBE_WRITE_REG(hw, IXGBE_EXVET, tpid << 16); + break; + default: + PMD_DRV_LOG(ERR, "Unsupported vlan type %d\n", vlan_type); + break; + } +#else IXGBE_WRITE_REG(hw, IXGBE_EXVET, tpid << 16); +#endif /* RTE_NEXT_ABI */ } void diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index a6e83c1..3337321 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -1697,14 +1697,22 @@ rte_eth_dev_set_vlan_strip_on_queue(uint8_t port_id, uint16_t rx_queue_id, int o } int -rte_eth_dev_set_vlan_ether_type(uint8_t port_id, uint16_t tpid) +rte_eth_dev_set_vlan_ether_type(uint8_t port_id, +#ifdef RTE_NEXT_ABI + enum rte_vlan_type vlan_type, +#endif + uint16_t tpid) { struct rte_eth_dev *dev; RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->vlan_tpid_set, -ENOTSUP); - (*dev->dev_ops->vlan_tpid_set)(dev, tpid); + (*dev->dev_ops->vlan_tpid_set)(dev, +#ifdef RTE_NEXT_ABI + vlan_type, +#endif + tpid); return 0; } diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index e2893ba..f8d49af 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -351,6 +351,17 @@ struct rte_eth_rxmode { }; /** + * VLAN types to indicate if it is for single VLAN, inner VLAN or outer VLAN. + * Note that most of time single VLAN is treated the same as inner VLAN. + */ +enum rte_vlan_type { + ETH_VLAN_TYPE_UNKNOWN = 0, + ETH_VLAN_TYPE_INNER, /**< Single VLAN, or inner VLAN. */ + ETH_VLAN_TYPE_OUTER, /**< Outer VLAN. */ + ETH_VLAN_TYPE_MAX, +}; + +/** * A structure used to configure the Receive Side Scaling (RSS) feature * of an Ethernet port. * If not NULL, the *rss_key* pointer of the *rss_conf* structure points @@ -1077,7 +1088,10 @@ typedef int (*vlan_filter_set_t)(struct rte_eth_dev *dev, /**< @internal filtering of a VLAN Tag Identifier by an Ethernet device. */ typedef void (*vlan_tpid_set_t)(struct rte_eth_dev *dev, - uint16_t tpid); +#ifdef RTE_NEXT_ABI + enum rte_vlan_type type, +#endif + uint16_t tpid); /**< @internal set the outer VLAN-TPID by an Ethernet device. */ typedef void (*vlan_offload_set_t)(struct rte_eth_dev *dev, int mask); @@ -2346,6 +2360,8 @@ int rte_eth_dev_set_vlan_strip_on_queue(uint8_t port_id, uint16_t rx_queue_id, * * @param port_id * The port identifier of the Ethernet device. + * @vlan_type + * The vlan type. * @param tag_type * The Tag Protocol ID * @return @@ -2353,7 +2369,11 @@ int rte_eth_dev_set_vlan_strip_on_queue(uint8_t port_id, uint16_t rx_queue_id, * - (-ENOSUP) if hardware-assisted VLAN TPID setup is not supported. * - (-ENODEV) if *port_id* invalid. */ -int rte_eth_dev_set_vlan_ether_type(uint8_t port_id, uint16_t tag_type); +int rte_eth_dev_set_vlan_ether_type(uint8_t port_id, +#ifdef RTE_NEXT_ABI + enum rte_vlan_type vlan_type, +#endif + uint16_t tag_type); /** * Set VLAN offload configuration on an Ethernet device -- 2.5.0 ^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v2 2/3] i40e: add VLAN ether type config 2016-03-07 8:12 ` [PATCH v2 0/3] i40e setting ether type of VLANs Helin Zhang 2016-03-07 8:12 ` [PATCH v2 1/3] ethdev: add vlan type for setting ether type Helin Zhang @ 2016-03-07 8:12 ` Helin Zhang 2016-03-07 8:12 ` [PATCH v2 3/3] i40e: fix the overflow issue Helin Zhang ` (2 subsequent siblings) 4 siblings, 0 replies; 24+ messages in thread From: Helin Zhang @ 2016-03-07 8:12 UTC (permalink / raw) To: dev It adds the setting VLAN ether type of single VLAN, inner and outer VLAN. Single VLAN is treated as inner VLAN as usual. Signed-off-by: Helin Zhang <helin.zhang@intel.com> --- drivers/net/i40e/i40e_ethdev.c | 68 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 64 insertions(+), 4 deletions(-) v2: - Used RTE_NEXT_ABI to avoid ABI change issue. diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 1da5690..a5b9289 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -273,6 +273,11 @@ #define I40E_INSET_IPV6_TC_MASK 0x0009F00FUL #define I40E_INSET_IPV6_NEXT_HDR_MASK 0x000C00FFUL +#define I40E_GL_SWT_L2TAGCTRL(_i) (0x001C0A70 + ((_i) * 4)) +#define I40E_GL_SWT_L2TAGCTRL_ETHERTYPE_SHIFT 16 +#define I40E_GL_SWT_L2TAGCTRL_ETHERTYPE_MASK \ + I40E_MASK(0xFFFF, I40E_GL_SWT_L2TAGCTRL_ETHERTYPE_SHIFT) + static int eth_i40e_dev_init(struct rte_eth_dev *eth_dev); static int eth_i40e_dev_uninit(struct rte_eth_dev *eth_dev); static int i40e_dev_configure(struct rte_eth_dev *dev); @@ -2324,13 +2329,58 @@ i40e_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) } static void -i40e_vlan_tpid_set(__rte_unused struct rte_eth_dev *dev, +i40e_vlan_tpid_set(struct rte_eth_dev *dev, #ifdef RTE_NEXT_ABI - __rte_unused enum rte_vlan_type vlan_type, + enum rte_vlan_type vlan_type, #endif - __rte_unused uint16_t tpid) + uint16_t tpid) { - PMD_INIT_FUNC_TRACE(); + struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private); + uint64_t reg_r = 0, reg_w = 0; + uint16_t reg_id = 0; + int ret; + +#ifdef RTE_NEXT_ABI + switch (vlan_type) { + case ETH_VLAN_TYPE_OUTER: + reg_id = 2; + break; + case ETH_VLAN_TYPE_INNER: + reg_id = 3; + break; + default: + PMD_DRV_LOG(ERR, "Unsupported vlan type %d", vlan_type); + return; + } +#else + reg_id = 3; +#endif /* RTE_NEXT_ABI */ + + ret = i40e_aq_debug_read_register(hw, I40E_GL_SWT_L2TAGCTRL(reg_id), + ®_r, NULL); + if (ret != I40E_SUCCESS) { + PMD_DRV_LOG(ERR, "Fail to debug read from " + "I40E_GL_SWT_L2TAGCTRL[%d]", reg_id); + return; + } + PMD_DRV_LOG(DEBUG, "Debug read from I40E_GL_SWT_L2TAGCTRL[%d]: " + "0x%08"PRIx64"", reg_id, reg_r); + + reg_w = reg_r & (~(I40E_GL_SWT_L2TAGCTRL_ETHERTYPE_MASK)); + reg_w |= ((uint64_t)tpid << I40E_GL_SWT_L2TAGCTRL_ETHERTYPE_SHIFT); + if (reg_r == reg_w) { + PMD_DRV_LOG(DEBUG, "No need to write"); + return; + } + ret = i40e_aq_debug_write_register(hw, I40E_GL_SWT_L2TAGCTRL(reg_id), + reg_w, NULL); + if (ret != I40E_SUCCESS) { + PMD_DRV_LOG(ERR, "Fail to debug write to " + "I40E_GL_SWT_L2TAGCTRL[%d]", reg_id); + return; + } + PMD_DRV_LOG(DEBUG, "Debug write 0x%08"PRIx64" to " + "I40E_GL_SWT_L2TAGCTRL[%d]", reg_w, reg_id); } static void @@ -7345,11 +7395,21 @@ i40e_dev_filter_ctrl(struct rte_eth_dev *dev, static void i40e_hw_init(struct i40e_hw *hw) { + struct rte_eth_dev *dev = ((struct i40e_adapter *)(hw->back))->eth_dev; + /* clear the PF Queue Filter control register */ I40E_WRITE_REG(hw, I40E_PFQF_CTL_0, 0); /* Disable symmetric hash per port */ i40e_set_symmetric_hash_enable_per_port(hw, 0); + + /* Set the global registers with default ether type value */ +#ifdef RTE_NEXT_ABI + i40e_vlan_tpid_set(dev, ETH_VLAN_TYPE_OUTER, ETHER_TYPE_VLAN); + i40e_vlan_tpid_set(dev, ETH_VLAN_TYPE_INNER, ETHER_TYPE_VLAN); +#else + i40e_vlan_tpid_set(dev, ETHER_TYPE_VLAN); +#endif /* RTE_NEXT_ABI */ } enum i40e_filter_pctype -- 2.5.0 ^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v2 3/3] i40e: fix the overflow issue 2016-03-07 8:12 ` [PATCH v2 0/3] i40e setting ether type of VLANs Helin Zhang 2016-03-07 8:12 ` [PATCH v2 1/3] ethdev: add vlan type for setting ether type Helin Zhang 2016-03-07 8:12 ` [PATCH v2 2/3] i40e: add VLAN ether type config Helin Zhang @ 2016-03-07 8:12 ` Helin Zhang 2016-03-07 9:28 ` [PATCH v2 0/3] i40e setting ether type of VLANs Thomas Monjalon 2016-03-10 16:36 ` [PATCH v3 0/2] " Helin Zhang 4 siblings, 0 replies; 24+ messages in thread From: Helin Zhang @ 2016-03-07 8:12 UTC (permalink / raw) To: dev The array 'ptype_table' was defined in depth of 'UINT8_MAX' which is 255, while the querying index could be from 0 to 255. The issue can be fixed with expanding the array to one more element. Fixes: 9571ea028489 ("i40e: replace some offload flags with unified packet type") Signed-off-by: Helin Zhang <helin.zhang@intel.com> --- drivers/net/i40e/i40e_rxtx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index d5c4031..ac44901 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -198,7 +198,7 @@ i40e_get_iee15888_flags(struct rte_mbuf *mb, uint64_t qword) static inline uint32_t i40e_rxd_pkt_type_mapping(uint8_t ptype) { - static const uint32_t ptype_table[UINT8_MAX] __rte_cache_aligned = { + static const uint32_t type_table[UINT8_MAX + 1] __rte_cache_aligned = { /* L2 types */ /* [0] reserved */ [1] = RTE_PTYPE_L2_ETHER, @@ -724,7 +724,7 @@ i40e_rxd_pkt_type_mapping(uint8_t ptype) /* All others reserved */ }; - return ptype_table[ptype]; + return type_table[ptype]; } #define I40E_RX_DESC_EXT_STATUS_FLEXBH_MASK 0x03 -- 2.5.0 ^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [PATCH v2 0/3] i40e setting ether type of VLANs 2016-03-07 8:12 ` [PATCH v2 0/3] i40e setting ether type of VLANs Helin Zhang ` (2 preceding siblings ...) 2016-03-07 8:12 ` [PATCH v2 3/3] i40e: fix the overflow issue Helin Zhang @ 2016-03-07 9:28 ` Thomas Monjalon 2016-03-09 15:20 ` Zhang, Helin 2016-03-10 16:36 ` [PATCH v3 0/2] " Helin Zhang 4 siblings, 1 reply; 24+ messages in thread From: Thomas Monjalon @ 2016-03-07 9:28 UTC (permalink / raw) To: Helin Zhang; +Cc: dev 2016-03-07 16:12, Helin Zhang: > The patch set was branched off rel_16_04 of repo dpdk-next-net, > on below commit. > - commit 4ac366ba647909c3b71818f9be9db86ba5e871da > nfp: fix non-x86 build Currently, changes on ethdev are directly applied on dpdk.git. > v2: > - Used RTE_NEXT_ABI to avoid ABI change issue. RTE_NEXT_ABI must be used only when it is really too difficult to keep the compatibility with librte_compat. Here you are just adding a parameter to some functions, so you should try versionning the functions with the help of macros in librte_compat. About the API change, you want to be able to insert a QinQ inner-vlan, right? The current comment of rte_eth_dev_set_vlan_ether_type is: * Set the Outer VLAN Ether Type by an Ethernet device, it can be inserted to * the VLAN Header. This is a register setup available on some Intel NIC, not * but all, please check the data sheet for availability. 2 comments: - you haven't changed "Outer VLAN" so the API description is wrong - it is announced as something Intel-specific About the new enum: + * VLAN types to indicate if it is for single VLAN, inner VLAN or outer VLAN. + * Note that most of time single VLAN is treated the same as inner VLAN. You cannot say "most of time" in an API. More generally, I am not convinced by the current VLAN API that you are extending. Why this function is not merged with rte_eth_dev_set_vlan_pvid? ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH v2 0/3] i40e setting ether type of VLANs 2016-03-07 9:28 ` [PATCH v2 0/3] i40e setting ether type of VLANs Thomas Monjalon @ 2016-03-09 15:20 ` Zhang, Helin 0 siblings, 0 replies; 24+ messages in thread From: Zhang, Helin @ 2016-03-09 15:20 UTC (permalink / raw) To: Thomas Monjalon; +Cc: dev@dpdk.org > -----Original Message----- > From: Thomas Monjalon [mailto:thomas.monjalon@6wind.com] > Sent: Monday, March 7, 2016 5:29 PM > To: Zhang, Helin > Cc: dev@dpdk.org > Subject: Re: [dpdk-dev] [PATCH v2 0/3] i40e setting ether type of VLANs > > 2016-03-07 16:12, Helin Zhang: > > The patch set was branched off rel_16_04 of repo dpdk-next-net, on > > below commit. > > - commit 4ac366ba647909c3b71818f9be9db86ba5e871da > > nfp: fix non-x86 build > > Currently, changes on ethdev are directly applied on dpdk.git. Won't it be reviewed by Bruce, and applied on his maintainer branch first? > > > v2: > > - Used RTE_NEXT_ABI to avoid ABI change issue. > > RTE_NEXT_ABI must be used only when it is really too difficult to keep the > compatibility with librte_compat. > Here you are just adding a parameter to some functions, so you should try > versionning the functions with the help of macros in librte_compat. Let me think it a little bit more. I don't think I have understood that versioning quite well. > > About the API change, you want to be able to insert a QinQ inner-vlan, right? No, I just want to configure the ether type of vlan the hardware can recognize, but not to insert a vlan. > The current comment of rte_eth_dev_set_vlan_ether_type is: > * Set the Outer VLAN Ether Type by an Ethernet device, it can be inserted to > * the VLAN Header. This is a register setup available on some Intel NIC, not > * but all, please check the data sheet for availability. Yes, I agree with you the comments should be reworked. > > 2 comments: > - you haven't changed "Outer VLAN" so the API description is wrong > - it is announced as something Intel-specific > > About the new enum: > + * VLAN types to indicate if it is for single VLAN, inner VLAN or outer VLAN. > + * Note that most of time single VLAN is treated the same as inner VLAN. > > You cannot say "most of time" in an API. Accepted. > > More generally, I am not convinced by the current VLAN API that you are > extending. > Why this function is not merged with rte_eth_dev_set_vlan_pvid? No, they are different. I am trying to configure the hardware recognized ether type of both inner and outer vlan, but not to configure the vlan itself. ^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v3 0/2] i40e setting ether type of VLANs 2016-03-07 8:12 ` [PATCH v2 0/3] i40e setting ether type of VLANs Helin Zhang ` (3 preceding siblings ...) 2016-03-07 9:28 ` [PATCH v2 0/3] i40e setting ether type of VLANs Thomas Monjalon @ 2016-03-10 16:36 ` Helin Zhang 2016-03-10 16:36 ` [PATCH v3 1/2] ethdev: add vlan type for setting ether type Helin Zhang ` (3 more replies) 4 siblings, 4 replies; 24+ messages in thread From: Helin Zhang @ 2016-03-10 16:36 UTC (permalink / raw) To: dev It adds setting ether type of both single VLAN(inner VLAN) and outer VLAN for i40e. For ixgbe and e1000/igb, it supports setting single VLAN(inner VLAN) only, and can be extended in the future. The patch set was branched off rel_16_04 of repo dpdk-next-net, on below commit. commit 5cfa5d194a8a45176e70af05719f7e3b136868be Author: Zhe Tao <zhe.tao@intel.com> Date: Thu Mar 10 15:26:22 2016 +0000 ixgbe: fix ixgbevf RX/TX function assignment v3: - Used versioning mechanism to avoid ABI issue. - re-organized the patch set. v2: - Used RTE_NEXT_ABI to avoid ABI change issue. - Reworked the announcement of ABI change for release 16.07. - Fixed a i40e overflow issue. Helin Zhang (2): ethdev: add vlan type for setting ether type i40e: fix the overflow issue app/test-pmd/cmdline.c | 30 +++++++++++----- app/test-pmd/config.c | 9 ++--- app/test-pmd/testpmd.h | 3 +- doc/guides/rel_notes/release_16_04.rst | 4 +++ drivers/net/e1000/igb_ethdev.c | 21 +++++++++--- drivers/net/i40e/i40e_ethdev.c | 63 +++++++++++++++++++++++++++++++--- drivers/net/i40e/i40e_rxtx.c | 4 +-- drivers/net/ixgbe/ixgbe_ethdev.c | 19 +++++++--- lib/librte_ether/rte_ethdev.c | 25 ++++++++++++-- lib/librte_ether/rte_ethdev.h | 23 +++++++++++-- lib/librte_ether/rte_ether_version.map | 7 ++++ 11 files changed, 175 insertions(+), 33 deletions(-) -- 2.5.0 ^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v3 1/2] ethdev: add vlan type for setting ether type 2016-03-10 16:36 ` [PATCH v3 0/2] " Helin Zhang @ 2016-03-10 16:36 ` Helin Zhang 2016-03-10 16:36 ` [PATCH v3 2/2] i40e: fix the overflow issue Helin Zhang ` (2 subsequent siblings) 3 siblings, 0 replies; 24+ messages in thread From: Helin Zhang @ 2016-03-10 16:36 UTC (permalink / raw) To: dev In order to set ether type of VLAN for single VLAN, inner and outer VLAN, the VLAN type as an input parameter is added to 'rte_eth_dev_set_vlan_ether_type()'. In addition, corresponding changes in e1000, ixgbe and i40e are also added. Signed-off-by: Helin Zhang <helin.zhang@intel.com> --- app/test-pmd/cmdline.c | 30 +++++++++++----- app/test-pmd/config.c | 9 ++--- app/test-pmd/testpmd.h | 3 +- doc/guides/rel_notes/release_16_04.rst | 4 +++ drivers/net/e1000/igb_ethdev.c | 21 +++++++++--- drivers/net/i40e/i40e_ethdev.c | 63 +++++++++++++++++++++++++++++++--- drivers/net/ixgbe/ixgbe_ethdev.c | 19 +++++++--- lib/librte_ether/rte_ethdev.c | 25 ++++++++++++-- lib/librte_ether/rte_ethdev.h | 23 +++++++++++-- lib/librte_ether/rte_ether_version.map | 7 ++++ 10 files changed, 173 insertions(+), 31 deletions(-) v3: - Used versioning mechanism to avoid ABI issue. - re-organized the patch set. v2: - Used RTE_NEXT_ABI to avoid ABI change issue. - Reworked the announcement of ABI change for release 16.07. diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 52e9f5f..1eeb8a8 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -277,8 +277,8 @@ static void cmd_help_long_parsed(void *parsed_result, " Set the VLAN QinQ (extended queue in queue)" " on a port.\n\n" - "vlan set tpid (value) (port_id)\n" - " Set the outer VLAN TPID for Packet Filtering on" + "vlan set (inner|outer) tpid (value) (port_id)\n" + " Set the VLAN TPID for Packet Filtering on" " a port\n\n" "rx_vlan add (vlan_id|all) (port_id)\n" @@ -297,10 +297,6 @@ static void cmd_help_long_parsed(void *parsed_result, " Remove a vlan_id, to the set of VLAN identifiers" "filtered for VF(s) from port_id.\n\n" - "rx_vlan set tpid (value) (port_id)\n" - " Set the outer VLAN TPID for Packet Filtering on" - " a port\n\n" - "tunnel_filter add (port_id) (outer_mac) (inner_mac) (ip_addr) " "(inner_vlan) (vxlan|nvgre) (filter_type) (tenant_id) (queue_id)\n" " add a tunnel filter of a port.\n\n" @@ -2747,6 +2743,7 @@ cmdline_parse_inst_t cmd_rx_vlan_filter_all = { struct cmd_vlan_offload_result { cmdline_fixed_string_t vlan; cmdline_fixed_string_t set; + cmdline_fixed_string_t vlan_type; cmdline_fixed_string_t what; cmdline_fixed_string_t on; cmdline_fixed_string_t port_id; @@ -2847,6 +2844,7 @@ cmdline_parse_inst_t cmd_vlan_offload = { struct cmd_vlan_tpid_result { cmdline_fixed_string_t vlan; cmdline_fixed_string_t set; + cmdline_fixed_string_t vlan_type; cmdline_fixed_string_t what; uint16_t tp_id; uint8_t port_id; @@ -2858,8 +2856,17 @@ cmd_vlan_tpid_parsed(void *parsed_result, __attribute__((unused)) void *data) { struct cmd_vlan_tpid_result *res = parsed_result; - vlan_tpid_set(res->port_id, res->tp_id); - return; + enum rte_vlan_type vlan_type; + + if (!strcmp(res->vlan_type, "inner")) + vlan_type = ETH_VLAN_TYPE_INNER; + else if (!strcmp(res->vlan_type, "outer")) + vlan_type = ETH_VLAN_TYPE_OUTER; + else { + printf("Unknown vlan type\n"); + return; + } + vlan_tpid_set(res->port_id, vlan_type, res->tp_id); } cmdline_parse_token_string_t cmd_vlan_tpid_vlan = @@ -2868,6 +2875,9 @@ cmdline_parse_token_string_t cmd_vlan_tpid_vlan = cmdline_parse_token_string_t cmd_vlan_tpid_set = TOKEN_STRING_INITIALIZER(struct cmd_vlan_tpid_result, set, "set"); +cmdline_parse_token_string_t cmd_vlan_type = + TOKEN_STRING_INITIALIZER(struct cmd_vlan_tpid_result, + vlan_type, "inner#outer"); cmdline_parse_token_string_t cmd_vlan_tpid_what = TOKEN_STRING_INITIALIZER(struct cmd_vlan_tpid_result, what, "tpid"); @@ -2881,10 +2891,12 @@ cmdline_parse_token_num_t cmd_vlan_tpid_portid = cmdline_parse_inst_t cmd_vlan_tpid = { .f = cmd_vlan_tpid_parsed, .data = NULL, - .help_str = "set tpid tp_id port_id, set the Outer VLAN Ether type", + .help_str = "set inner|outer tpid tp_id port_id, set the VLAN " + "Ether type", .tokens = { (void *)&cmd_vlan_tpid_vlan, (void *)&cmd_vlan_tpid_set, + (void *)&cmd_vlan_type, (void *)&cmd_vlan_tpid_what, (void *)&cmd_vlan_tpid_tpid, (void *)&cmd_vlan_tpid_portid, diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 0062484..5bb09a5 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -1821,19 +1821,20 @@ rx_vlan_all_filter_set(portid_t port_id, int on) } void -vlan_tpid_set(portid_t port_id, uint16_t tp_id) +vlan_tpid_set(portid_t port_id, enum rte_vlan_type vlan_type, uint16_t tp_id) { int diag; + if (port_id_is_invalid(port_id, ENABLED_WARN)) return; - diag = rte_eth_dev_set_vlan_ether_type(port_id, tp_id); + diag = rte_eth_dev_set_vlan_ether_type(port_id, vlan_type, tp_id); if (diag == 0) return; - printf("tx_vlan_tpid_set(port_pi=%d, tpid=%d) failed " + printf("tx_vlan_tpid_set(port_pi=%d, vlan_type=%d, tpid=%d) failed " "diag=%d\n", - port_id, tp_id, diag); + port_id, vlan_type, tp_id, diag); } void diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index b618998..0f72ca1 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -508,7 +508,8 @@ void rx_vlan_filter_set(portid_t port_id, int on); void rx_vlan_all_filter_set(portid_t port_id, int on); int rx_vft_set(portid_t port_id, uint16_t vlan_id, int on); void vlan_extend_set(portid_t port_id, int on); -void vlan_tpid_set(portid_t port_id, uint16_t tp_id); +void vlan_tpid_set(portid_t port_id, enum rte_vlan_type vlan_type, + uint16_t tp_id); void tx_vlan_set(portid_t port_id, uint16_t vlan_id); void tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer); void tx_vlan_reset(portid_t port_id); diff --git a/doc/guides/rel_notes/release_16_04.rst b/doc/guides/rel_notes/release_16_04.rst index 5abf48a..4729019 100644 --- a/doc/guides/rel_notes/release_16_04.rst +++ b/doc/guides/rel_notes/release_16_04.rst @@ -119,6 +119,10 @@ This section should contain new features added in this release. Sample format: Only available with Mellanox OFED >= 3.2. +* **Added modifying ether type of both single and double VLAN for i40e** + + Macro of RTE_NEXT_ABI was introduced, as ABI change involved. + Resolved Issues --------------- diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c index 41c107d..36d50c9 100644 --- a/drivers/net/e1000/igb_ethdev.c +++ b/drivers/net/e1000/igb_ethdev.c @@ -126,7 +126,9 @@ static int eth_igb_mtu_set(struct rte_eth_dev *dev, uint16_t mtu); static int eth_igb_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on); -static void eth_igb_vlan_tpid_set(struct rte_eth_dev *dev, uint16_t tpid_id); +static void eth_igb_vlan_tpid_set(struct rte_eth_dev *dev, + enum rte_vlan_type vlan_type, + uint16_t tpid_id); static void eth_igb_vlan_offload_set(struct rte_eth_dev *dev, int mask); static void igb_vlan_hw_filter_enable(struct rte_eth_dev *dev); @@ -2194,14 +2196,23 @@ eth_igb_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) } static void -eth_igb_vlan_tpid_set(struct rte_eth_dev *dev, uint16_t tpid) +eth_igb_vlan_tpid_set(struct rte_eth_dev *dev, + enum rte_vlan_type vlan_type, + uint16_t tpid) { struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private); - uint32_t reg = ETHER_TYPE_VLAN ; + uint32_t reg = ETHER_TYPE_VLAN; - reg |= (tpid << 16); - E1000_WRITE_REG(hw, E1000_VET, reg); + switch (vlan_type) { + case ETH_VLAN_TYPE_INNER: + reg |= (tpid << 16); + E1000_WRITE_REG(hw, E1000_VET, reg); + break; + default: + PMD_DRV_LOG(ERR, "Unsupported vlan type %d\n", vlan_type); + break; + } } static void diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 0c87ec1..e3fc0bc 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -266,6 +266,11 @@ #define I40E_INSET_IPV6_TC_MASK 0x0009F00FUL #define I40E_INSET_IPV6_NEXT_HDR_MASK 0x000C00FFUL +#define I40E_GL_SWT_L2TAGCTRL(_i) (0x001C0A70 + ((_i) * 4)) +#define I40E_GL_SWT_L2TAGCTRL_ETHERTYPE_SHIFT 16 +#define I40E_GL_SWT_L2TAGCTRL_ETHERTYPE_MASK \ + I40E_MASK(0xFFFF, I40E_GL_SWT_L2TAGCTRL_ETHERTYPE_SHIFT) + static int eth_i40e_dev_init(struct rte_eth_dev *eth_dev); static int eth_i40e_dev_uninit(struct rte_eth_dev *eth_dev); static int i40e_dev_configure(struct rte_eth_dev *dev); @@ -292,7 +297,9 @@ static void i40e_dev_info_get(struct rte_eth_dev *dev, static int i40e_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on); -static void i40e_vlan_tpid_set(struct rte_eth_dev *dev, uint16_t tpid); +static void i40e_vlan_tpid_set(struct rte_eth_dev *dev, + enum rte_vlan_type vlan_type, + uint16_t tpid); static void i40e_vlan_offload_set(struct rte_eth_dev *dev, int mask); static void i40e_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, @@ -2313,10 +2320,52 @@ i40e_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) } static void -i40e_vlan_tpid_set(__rte_unused struct rte_eth_dev *dev, - __rte_unused uint16_t tpid) +i40e_vlan_tpid_set(struct rte_eth_dev *dev, + enum rte_vlan_type vlan_type, + uint16_t tpid) { - PMD_INIT_FUNC_TRACE(); + struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private); + uint64_t reg_r = 0, reg_w = 0; + uint16_t reg_id = 0; + int ret; + + switch (vlan_type) { + case ETH_VLAN_TYPE_OUTER: + reg_id = 2; + break; + case ETH_VLAN_TYPE_INNER: + reg_id = 3; + break; + default: + PMD_DRV_LOG(ERR, "Unsupported vlan type %d", vlan_type); + return; + } + ret = i40e_aq_debug_read_register(hw, I40E_GL_SWT_L2TAGCTRL(reg_id), + ®_r, NULL); + if (ret != I40E_SUCCESS) { + PMD_DRV_LOG(ERR, "Fail to debug read from " + "I40E_GL_SWT_L2TAGCTRL[%d]", reg_id); + return; + } + PMD_DRV_LOG(DEBUG, "Debug read from I40E_GL_SWT_L2TAGCTRL[%d]: " + "0x%08"PRIx64"", reg_id, reg_r); + + reg_w = reg_r & (~(I40E_GL_SWT_L2TAGCTRL_ETHERTYPE_MASK)); + reg_w |= ((uint64_t)tpid << I40E_GL_SWT_L2TAGCTRL_ETHERTYPE_SHIFT); + if (reg_r == reg_w) { + PMD_DRV_LOG(DEBUG, "No need to write"); + return; + } + + ret = i40e_aq_debug_write_register(hw, I40E_GL_SWT_L2TAGCTRL(reg_id), + reg_w, NULL); + if (ret != I40E_SUCCESS) { + PMD_DRV_LOG(ERR, "Fail to debug write to " + "I40E_GL_SWT_L2TAGCTRL[%d]", reg_id); + return; + } + PMD_DRV_LOG(DEBUG, "Debug write 0x%08"PRIx64" to " + "I40E_GL_SWT_L2TAGCTRL[%d]", reg_w, reg_id); } static void @@ -7332,11 +7381,17 @@ i40e_dev_filter_ctrl(struct rte_eth_dev *dev, static void i40e_hw_init(struct i40e_hw *hw) { + struct rte_eth_dev *dev = ((struct i40e_adapter *)(hw->back))->eth_dev; + /* clear the PF Queue Filter control register */ i40e_write_rx_ctl(hw, I40E_PFQF_CTL_0, 0); /* Disable symmetric hash per port */ i40e_set_symmetric_hash_enable_per_port(hw, 0); + + /* Set the global registers with default ether type value */ + i40e_vlan_tpid_set(dev, ETH_VLAN_TYPE_OUTER, ETHER_TYPE_VLAN); + i40e_vlan_tpid_set(dev, ETH_VLAN_TYPE_INNER, ETHER_TYPE_VLAN); } enum i40e_filter_pctype diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index a9a1583..ce3ce9f 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -178,7 +178,9 @@ static int ixgbe_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu); static int ixgbe_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on); -static void ixgbe_vlan_tpid_set(struct rte_eth_dev *dev, uint16_t tpid_id); +static void ixgbe_vlan_tpid_set(struct rte_eth_dev *dev, + enum rte_vlan_type vlan_type, + uint16_t tpid_id); static void ixgbe_vlan_hw_strip_bitmap_set(struct rte_eth_dev *dev, uint16_t queue, bool on); static void ixgbe_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, @@ -1543,13 +1545,22 @@ ixgbe_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on) } static void -ixgbe_vlan_tpid_set(struct rte_eth_dev *dev, uint16_t tpid) +ixgbe_vlan_tpid_set(struct rte_eth_dev *dev, + enum rte_vlan_type vlan_type, + uint16_t tpid) { struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); - /* Only the high 16-bits is valid */ - IXGBE_WRITE_REG(hw, IXGBE_EXVET, tpid << 16); + switch (vlan_type) { + case ETH_VLAN_TYPE_INNER: + /* Only the high 16-bits is valid */ + IXGBE_WRITE_REG(hw, IXGBE_EXVET, tpid << 16); + break; + default: + PMD_DRV_LOG(ERR, "Unsupported vlan type %d\n", vlan_type); + break; + } } void diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index a6e83c1..bb0c3eb 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -65,6 +65,7 @@ #include <rte_errno.h> #include <rte_spinlock.h> #include <rte_string_fns.h> +#include <rte_compat.h> #include "rte_ether.h" #include "rte_ethdev.h" @@ -1697,17 +1698,37 @@ rte_eth_dev_set_vlan_strip_on_queue(uint8_t port_id, uint16_t rx_queue_id, int o } int -rte_eth_dev_set_vlan_ether_type(uint8_t port_id, uint16_t tpid) +rte_eth_dev_set_vlan_ether_type_v22(uint8_t port_id, uint16_t tpid) { struct rte_eth_dev *dev; RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->vlan_tpid_set, -ENOTSUP); - (*dev->dev_ops->vlan_tpid_set)(dev, tpid); + (*dev->dev_ops->vlan_tpid_set)(dev, ETH_VLAN_TYPE_INNER, tpid); return 0; } +VERSION_SYMBOL(rte_eth_dev_set_vlan_ether_type, _v22, 2.2); + +int +rte_eth_dev_set_vlan_ether_type_v1604(uint8_t port_id, + enum rte_vlan_type vlan_type, + uint16_t tpid) +{ + struct rte_eth_dev *dev; + + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); + dev = &rte_eth_devices[port_id]; + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->vlan_tpid_set, -ENOTSUP); + (*dev->dev_ops->vlan_tpid_set)(dev, vlan_type, tpid); + + return 0; +} +BIND_DEFAULT_SYMBOL(rte_eth_dev_set_vlan_ether_type, _v1604, 16.04); +MAP_STATIC_SYMBOL(int rte_eth_dev_set_vlan_ether_type(uint8_t port_id, + enum rte_vlan_type vlan_type, uint16_t tpid), + rte_eth_dev_set_vlan_ether_type_v1604); int rte_eth_dev_set_vlan_offload(uint8_t port_id, int offload_mask) diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index e2893ba..21db144 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -351,6 +351,17 @@ struct rte_eth_rxmode { }; /** + * VLAN types to indicate if it is for single VLAN, inner VLAN or outer VLAN. + * Note that single VLAN is treated the same as inner VLAN. + */ +enum rte_vlan_type { + ETH_VLAN_TYPE_UNKNOWN = 0, + ETH_VLAN_TYPE_INNER, /**< Single VLAN, or inner VLAN. */ + ETH_VLAN_TYPE_OUTER, /**< Outer VLAN. */ + ETH_VLAN_TYPE_MAX, +}; + +/** * A structure used to configure the Receive Side Scaling (RSS) feature * of an Ethernet port. * If not NULL, the *rss_key* pointer of the *rss_conf* structure points @@ -1077,7 +1088,7 @@ typedef int (*vlan_filter_set_t)(struct rte_eth_dev *dev, /**< @internal filtering of a VLAN Tag Identifier by an Ethernet device. */ typedef void (*vlan_tpid_set_t)(struct rte_eth_dev *dev, - uint16_t tpid); + enum rte_vlan_type type, uint16_t tpid); /**< @internal set the outer VLAN-TPID by an Ethernet device. */ typedef void (*vlan_offload_set_t)(struct rte_eth_dev *dev, int mask); @@ -2346,6 +2357,8 @@ int rte_eth_dev_set_vlan_strip_on_queue(uint8_t port_id, uint16_t rx_queue_id, * * @param port_id * The port identifier of the Ethernet device. + * @vlan_type + * The vlan type. * @param tag_type * The Tag Protocol ID * @return @@ -2353,7 +2366,13 @@ int rte_eth_dev_set_vlan_strip_on_queue(uint8_t port_id, uint16_t rx_queue_id, * - (-ENOSUP) if hardware-assisted VLAN TPID setup is not supported. * - (-ENODEV) if *port_id* invalid. */ -int rte_eth_dev_set_vlan_ether_type(uint8_t port_id, uint16_t tag_type); +int rte_eth_dev_set_vlan_ether_type(uint8_t port_id, + enum rte_vlan_type vlan_type, + uint16_t tag_type); +int rte_eth_dev_set_vlan_ether_type_v22(uint8_t port_id, uint16_t tag_type); +int rte_eth_dev_set_vlan_ether_type_v1604(uint8_t port_id, + enum rte_vlan_type vlan_type, + uint16_t tag_type); /** * Set VLAN offload configuration on an Ethernet device diff --git a/lib/librte_ether/rte_ether_version.map b/lib/librte_ether/rte_ether_version.map index d8db24d..6098de5 100644 --- a/lib/librte_ether/rte_ether_version.map +++ b/lib/librte_ether/rte_ether_version.map @@ -117,3 +117,10 @@ DPDK_2.2 { local: *; }; + +DPDK_16.04 { + global: + + rte_eth_dev_set_vlan_ether_type; + +} DPDK_2.2; -- 2.5.0 ^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v3 2/2] i40e: fix the overflow issue 2016-03-10 16:36 ` [PATCH v3 0/2] " Helin Zhang 2016-03-10 16:36 ` [PATCH v3 1/2] ethdev: add vlan type for setting ether type Helin Zhang @ 2016-03-10 16:36 ` Helin Zhang 2016-03-11 2:36 ` [PATCH v3 0/2] i40e setting ether type of VLANs Lu, Wenzhuo 2016-03-11 8:49 ` [PATCH v4 " Helin Zhang 3 siblings, 0 replies; 24+ messages in thread From: Helin Zhang @ 2016-03-10 16:36 UTC (permalink / raw) To: dev The array 'ptype_table' was defined in depth of 'UINT8_MAX' which is 255, while the querying index could be from 0 to 255. The issue can be fixed with expanding the array to one more element. Fixes: 9571ea028489 ("i40e: replace some offload flags with unified packet type") Signed-off-by: Helin Zhang <helin.zhang@intel.com> --- drivers/net/i40e/i40e_rxtx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index f8efdce..e0c9bb6 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -198,7 +198,7 @@ i40e_get_iee15888_flags(struct rte_mbuf *mb, uint64_t qword) static inline uint32_t i40e_rxd_pkt_type_mapping(uint8_t ptype) { - static const uint32_t ptype_table[UINT8_MAX] __rte_cache_aligned = { + static const uint32_t type_table[UINT8_MAX + 1] __rte_cache_aligned = { /* L2 types */ /* [0] reserved */ [1] = RTE_PTYPE_L2_ETHER, @@ -724,7 +724,7 @@ i40e_rxd_pkt_type_mapping(uint8_t ptype) /* All others reserved */ }; - return ptype_table[ptype]; + return type_table[ptype]; } #define I40E_RX_DESC_EXT_STATUS_FLEXBH_MASK 0x03 -- 2.5.0 ^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [PATCH v3 0/2] i40e setting ether type of VLANs 2016-03-10 16:36 ` [PATCH v3 0/2] " Helin Zhang 2016-03-10 16:36 ` [PATCH v3 1/2] ethdev: add vlan type for setting ether type Helin Zhang 2016-03-10 16:36 ` [PATCH v3 2/2] i40e: fix the overflow issue Helin Zhang @ 2016-03-11 2:36 ` Lu, Wenzhuo 2016-03-11 8:49 ` [PATCH v4 " Helin Zhang 3 siblings, 0 replies; 24+ messages in thread From: Lu, Wenzhuo @ 2016-03-11 2:36 UTC (permalink / raw) To: Zhang, Helin, dev@dpdk.org Hi, > -----Original Message----- > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Helin Zhang > Sent: Friday, March 11, 2016 12:37 AM > To: dev@dpdk.org > Subject: [dpdk-dev] [PATCH v3 0/2] i40e setting ether type of VLANs > > It adds setting ether type of both single VLAN(inner VLAN) and outer VLAN > for i40e. For ixgbe and e1000/igb, it supports setting single VLAN(inner VLAN) > only, and can be extended in the future. > > The patch set was branched off rel_16_04 of repo dpdk-next-net, on below > commit. > commit 5cfa5d194a8a45176e70af05719f7e3b136868be > Author: Zhe Tao <zhe.tao@intel.com> > Date: Thu Mar 10 15:26:22 2016 +0000 > ixgbe: fix ixgbevf RX/TX function assignment > > v3: > - Used versioning mechanism to avoid ABI issue. > - re-organized the patch set. > > v2: > - Used RTE_NEXT_ABI to avoid ABI change issue. > - Reworked the announcement of ABI change for release 16.07. > - Fixed a i40e overflow issue. > > Helin Zhang (2): > ethdev: add vlan type for setting ether type > i40e: fix the overflow issue > > app/test-pmd/cmdline.c | 30 +++++++++++----- > app/test-pmd/config.c | 9 ++--- > app/test-pmd/testpmd.h | 3 +- > doc/guides/rel_notes/release_16_04.rst | 4 +++ > drivers/net/e1000/igb_ethdev.c | 21 +++++++++--- > drivers/net/i40e/i40e_ethdev.c | 63 > +++++++++++++++++++++++++++++++--- > drivers/net/i40e/i40e_rxtx.c | 4 +-- > drivers/net/ixgbe/ixgbe_ethdev.c | 19 +++++++--- > lib/librte_ether/rte_ethdev.c | 25 ++++++++++++-- > lib/librte_ether/rte_ethdev.h | 23 +++++++++++-- > lib/librte_ether/rte_ether_version.map | 7 ++++ > 11 files changed, 175 insertions(+), 33 deletions(-) Acked-by: Wenzhuo Lu <wenzhuo.lu@intel.com> If you can update the doc/guides/testpmd_app_ug/testpmd_funcs.rst for the CLI change. > > -- > 2.5.0 ^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v4 0/2] i40e setting ether type of VLANs 2016-03-10 16:36 ` [PATCH v3 0/2] " Helin Zhang ` (2 preceding siblings ...) 2016-03-11 2:36 ` [PATCH v3 0/2] i40e setting ether type of VLANs Lu, Wenzhuo @ 2016-03-11 8:49 ` Helin Zhang 2016-03-11 8:49 ` [PATCH v4 1/2] ethdev: add vlan type for setting ether type Helin Zhang ` (2 more replies) 3 siblings, 3 replies; 24+ messages in thread From: Helin Zhang @ 2016-03-11 8:49 UTC (permalink / raw) To: dev It adds setting ether type of both single VLAN(inner VLAN) and outer VLAN for i40e. For ixgbe and e1000/igb, it supports setting single VLAN(inner VLAN) only, and can be extended in the future. The patch set was branched off rel_16_04 of repo dpdk-next-net, on below commit. commit 5721e6447b5c20208a32c919a509e89d78c3e68d Author: Robin Jarry <robin.jarry@6wind.com> Date: Thu Mar 3 15:27:40 2016 +0100 mlx4: ensure number of RX queues is a power of 2 v4: - Updated the doc of testpmd guide. v3: - Used versioning mechanism to avoid ABI issue. - Re-organized the patch set. v2: - Used RTE_NEXT_ABI to avoid ABI change issue. - Reworked the announcement of ABI change for release 16.07. - Fixed a i40e overflow issue. Helin Zhang (2): ethdev: add vlan type for setting ether type i40e: fix the overflow issue app/test-pmd/cmdline.c | 30 +++++++++----- app/test-pmd/config.c | 9 +++-- app/test-pmd/testpmd.h | 3 +- doc/guides/rel_notes/release_16_04.rst | 4 ++ doc/guides/testpmd_app_ug/testpmd_funcs.rst | 11 +---- drivers/net/e1000/igb_ethdev.c | 21 +++++++--- drivers/net/i40e/i40e_ethdev.c | 63 +++++++++++++++++++++++++++-- drivers/net/i40e/i40e_rxtx.c | 4 +- drivers/net/ixgbe/ixgbe_ethdev.c | 19 +++++++-- lib/librte_ether/rte_ethdev.c | 25 +++++++++++- lib/librte_ether/rte_ethdev.h | 23 ++++++++++- lib/librte_ether/rte_ether_version.map | 7 ++++ 12 files changed, 177 insertions(+), 42 deletions(-) -- 2.5.0 ^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v4 1/2] ethdev: add vlan type for setting ether type 2016-03-11 8:49 ` [PATCH v4 " Helin Zhang @ 2016-03-11 8:49 ` Helin Zhang 2016-03-11 11:19 ` Panu Matilainen 2016-03-11 8:49 ` [PATCH v4 2/2] i40e: fix the overflow issue Helin Zhang 2016-03-11 16:50 ` [PATCH v5 0/2] i40e setting ether type of VLANs Helin Zhang 2 siblings, 1 reply; 24+ messages in thread From: Helin Zhang @ 2016-03-11 8:49 UTC (permalink / raw) To: dev In order to set ether type of VLAN for single VLAN, inner and outer VLAN, the VLAN type as an input parameter is added to 'rte_eth_dev_set_vlan_ether_type()'. In addition, corresponding changes in e1000, ixgbe and i40e are also added. Signed-off-by: Helin Zhang <helin.zhang@intel.com> Acked-by: Wenzhuo Lu <wenzhuo.lu@intel.com> --- app/test-pmd/cmdline.c | 30 +++++++++----- app/test-pmd/config.c | 9 +++-- app/test-pmd/testpmd.h | 3 +- doc/guides/rel_notes/release_16_04.rst | 4 ++ doc/guides/testpmd_app_ug/testpmd_funcs.rst | 11 +---- drivers/net/e1000/igb_ethdev.c | 21 +++++++--- drivers/net/i40e/i40e_ethdev.c | 63 +++++++++++++++++++++++++++-- drivers/net/ixgbe/ixgbe_ethdev.c | 19 +++++++-- lib/librte_ether/rte_ethdev.c | 25 +++++++++++- lib/librte_ether/rte_ethdev.h | 23 ++++++++++- lib/librte_ether/rte_ether_version.map | 7 ++++ 11 files changed, 175 insertions(+), 40 deletions(-) v4: - Updated the doc of testpmd guide. v3: - Used versioning mechanism to avoid ABI issue. - Re-organized the patch set. v2: - Used RTE_NEXT_ABI to avoid ABI change issue. - Reworked the announcement of ABI change for release 16.07. diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 52e9f5f..1eeb8a8 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -277,8 +277,8 @@ static void cmd_help_long_parsed(void *parsed_result, " Set the VLAN QinQ (extended queue in queue)" " on a port.\n\n" - "vlan set tpid (value) (port_id)\n" - " Set the outer VLAN TPID for Packet Filtering on" + "vlan set (inner|outer) tpid (value) (port_id)\n" + " Set the VLAN TPID for Packet Filtering on" " a port\n\n" "rx_vlan add (vlan_id|all) (port_id)\n" @@ -297,10 +297,6 @@ static void cmd_help_long_parsed(void *parsed_result, " Remove a vlan_id, to the set of VLAN identifiers" "filtered for VF(s) from port_id.\n\n" - "rx_vlan set tpid (value) (port_id)\n" - " Set the outer VLAN TPID for Packet Filtering on" - " a port\n\n" - "tunnel_filter add (port_id) (outer_mac) (inner_mac) (ip_addr) " "(inner_vlan) (vxlan|nvgre) (filter_type) (tenant_id) (queue_id)\n" " add a tunnel filter of a port.\n\n" @@ -2747,6 +2743,7 @@ cmdline_parse_inst_t cmd_rx_vlan_filter_all = { struct cmd_vlan_offload_result { cmdline_fixed_string_t vlan; cmdline_fixed_string_t set; + cmdline_fixed_string_t vlan_type; cmdline_fixed_string_t what; cmdline_fixed_string_t on; cmdline_fixed_string_t port_id; @@ -2847,6 +2844,7 @@ cmdline_parse_inst_t cmd_vlan_offload = { struct cmd_vlan_tpid_result { cmdline_fixed_string_t vlan; cmdline_fixed_string_t set; + cmdline_fixed_string_t vlan_type; cmdline_fixed_string_t what; uint16_t tp_id; uint8_t port_id; @@ -2858,8 +2856,17 @@ cmd_vlan_tpid_parsed(void *parsed_result, __attribute__((unused)) void *data) { struct cmd_vlan_tpid_result *res = parsed_result; - vlan_tpid_set(res->port_id, res->tp_id); - return; + enum rte_vlan_type vlan_type; + + if (!strcmp(res->vlan_type, "inner")) + vlan_type = ETH_VLAN_TYPE_INNER; + else if (!strcmp(res->vlan_type, "outer")) + vlan_type = ETH_VLAN_TYPE_OUTER; + else { + printf("Unknown vlan type\n"); + return; + } + vlan_tpid_set(res->port_id, vlan_type, res->tp_id); } cmdline_parse_token_string_t cmd_vlan_tpid_vlan = @@ -2868,6 +2875,9 @@ cmdline_parse_token_string_t cmd_vlan_tpid_vlan = cmdline_parse_token_string_t cmd_vlan_tpid_set = TOKEN_STRING_INITIALIZER(struct cmd_vlan_tpid_result, set, "set"); +cmdline_parse_token_string_t cmd_vlan_type = + TOKEN_STRING_INITIALIZER(struct cmd_vlan_tpid_result, + vlan_type, "inner#outer"); cmdline_parse_token_string_t cmd_vlan_tpid_what = TOKEN_STRING_INITIALIZER(struct cmd_vlan_tpid_result, what, "tpid"); @@ -2881,10 +2891,12 @@ cmdline_parse_token_num_t cmd_vlan_tpid_portid = cmdline_parse_inst_t cmd_vlan_tpid = { .f = cmd_vlan_tpid_parsed, .data = NULL, - .help_str = "set tpid tp_id port_id, set the Outer VLAN Ether type", + .help_str = "set inner|outer tpid tp_id port_id, set the VLAN " + "Ether type", .tokens = { (void *)&cmd_vlan_tpid_vlan, (void *)&cmd_vlan_tpid_set, + (void *)&cmd_vlan_type, (void *)&cmd_vlan_tpid_what, (void *)&cmd_vlan_tpid_tpid, (void *)&cmd_vlan_tpid_portid, diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 0062484..5bb09a5 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -1821,19 +1821,20 @@ rx_vlan_all_filter_set(portid_t port_id, int on) } void -vlan_tpid_set(portid_t port_id, uint16_t tp_id) +vlan_tpid_set(portid_t port_id, enum rte_vlan_type vlan_type, uint16_t tp_id) { int diag; + if (port_id_is_invalid(port_id, ENABLED_WARN)) return; - diag = rte_eth_dev_set_vlan_ether_type(port_id, tp_id); + diag = rte_eth_dev_set_vlan_ether_type(port_id, vlan_type, tp_id); if (diag == 0) return; - printf("tx_vlan_tpid_set(port_pi=%d, tpid=%d) failed " + printf("tx_vlan_tpid_set(port_pi=%d, vlan_type=%d, tpid=%d) failed " "diag=%d\n", - port_id, tp_id, diag); + port_id, vlan_type, tp_id, diag); } void diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index b618998..0f72ca1 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -508,7 +508,8 @@ void rx_vlan_filter_set(portid_t port_id, int on); void rx_vlan_all_filter_set(portid_t port_id, int on); int rx_vft_set(portid_t port_id, uint16_t vlan_id, int on); void vlan_extend_set(portid_t port_id, int on); -void vlan_tpid_set(portid_t port_id, uint16_t tp_id); +void vlan_tpid_set(portid_t port_id, enum rte_vlan_type vlan_type, + uint16_t tp_id); void tx_vlan_set(portid_t port_id, uint16_t vlan_id); void tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer); void tx_vlan_reset(portid_t port_id); diff --git a/doc/guides/rel_notes/release_16_04.rst b/doc/guides/rel_notes/release_16_04.rst index 7c09fef..c6e5ef0 100644 --- a/doc/guides/rel_notes/release_16_04.rst +++ b/doc/guides/rel_notes/release_16_04.rst @@ -125,6 +125,10 @@ This section should contain new features added in this release. Sample format: Af_packet device can now be detached using API, like other PMD devices. +* **Added modifying ether type of both single and double VLAN for i40e** + + Versioning mechanism was introduced, to avoid any ABI issue. + Resolved Issues --------------- diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index a520cc5..e2b2224 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -498,9 +498,9 @@ Set the VLAN QinQ (extended queue in queue) on for a port:: vlan set tpid ~~~~~~~~~~~~~ -Set the outer VLAN TPID for packet filtering on a port:: +Set the inner or outer VLAN TPID for packet filtering on a port:: - testpmd> vlan set tpid (value) (port_id) + testpmd> vlan set (inner|outer) tpid (value) (port_id) .. note:: @@ -540,13 +540,6 @@ Remove a VLAN ID, from the set of VLAN identifiers filtered for VF(s) for port I testpmd> rx_vlan rm (vlan_id) port (port_id) vf (vf_mask) -rx_vlan set tpid -~~~~~~~~~~~~~~~~ - -Set the outer VLAN TPID for packet filtering on a port:: - - testpmd> rx_vlan set tpid (value) (port_id) - tunnel_filter add ~~~~~~~~~~~~~~~~~ diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c index f889876..4549e0a 100644 --- a/drivers/net/e1000/igb_ethdev.c +++ b/drivers/net/e1000/igb_ethdev.c @@ -126,7 +126,9 @@ static int eth_igb_mtu_set(struct rte_eth_dev *dev, uint16_t mtu); static int eth_igb_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on); -static void eth_igb_vlan_tpid_set(struct rte_eth_dev *dev, uint16_t tpid_id); +static void eth_igb_vlan_tpid_set(struct rte_eth_dev *dev, + enum rte_vlan_type vlan_type, + uint16_t tpid_id); static void eth_igb_vlan_offload_set(struct rte_eth_dev *dev, int mask); static void igb_vlan_hw_filter_enable(struct rte_eth_dev *dev); @@ -2194,14 +2196,23 @@ eth_igb_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) } static void -eth_igb_vlan_tpid_set(struct rte_eth_dev *dev, uint16_t tpid) +eth_igb_vlan_tpid_set(struct rte_eth_dev *dev, + enum rte_vlan_type vlan_type, + uint16_t tpid) { struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private); - uint32_t reg = ETHER_TYPE_VLAN ; + uint32_t reg = ETHER_TYPE_VLAN; - reg |= (tpid << 16); - E1000_WRITE_REG(hw, E1000_VET, reg); + switch (vlan_type) { + case ETH_VLAN_TYPE_INNER: + reg |= (tpid << 16); + E1000_WRITE_REG(hw, E1000_VET, reg); + break; + default: + PMD_DRV_LOG(ERR, "Unsupported vlan type %d\n", vlan_type); + break; + } } static void diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 0c87ec1..e3fc0bc 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -266,6 +266,11 @@ #define I40E_INSET_IPV6_TC_MASK 0x0009F00FUL #define I40E_INSET_IPV6_NEXT_HDR_MASK 0x000C00FFUL +#define I40E_GL_SWT_L2TAGCTRL(_i) (0x001C0A70 + ((_i) * 4)) +#define I40E_GL_SWT_L2TAGCTRL_ETHERTYPE_SHIFT 16 +#define I40E_GL_SWT_L2TAGCTRL_ETHERTYPE_MASK \ + I40E_MASK(0xFFFF, I40E_GL_SWT_L2TAGCTRL_ETHERTYPE_SHIFT) + static int eth_i40e_dev_init(struct rte_eth_dev *eth_dev); static int eth_i40e_dev_uninit(struct rte_eth_dev *eth_dev); static int i40e_dev_configure(struct rte_eth_dev *dev); @@ -292,7 +297,9 @@ static void i40e_dev_info_get(struct rte_eth_dev *dev, static int i40e_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on); -static void i40e_vlan_tpid_set(struct rte_eth_dev *dev, uint16_t tpid); +static void i40e_vlan_tpid_set(struct rte_eth_dev *dev, + enum rte_vlan_type vlan_type, + uint16_t tpid); static void i40e_vlan_offload_set(struct rte_eth_dev *dev, int mask); static void i40e_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, @@ -2313,10 +2320,52 @@ i40e_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) } static void -i40e_vlan_tpid_set(__rte_unused struct rte_eth_dev *dev, - __rte_unused uint16_t tpid) +i40e_vlan_tpid_set(struct rte_eth_dev *dev, + enum rte_vlan_type vlan_type, + uint16_t tpid) { - PMD_INIT_FUNC_TRACE(); + struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private); + uint64_t reg_r = 0, reg_w = 0; + uint16_t reg_id = 0; + int ret; + + switch (vlan_type) { + case ETH_VLAN_TYPE_OUTER: + reg_id = 2; + break; + case ETH_VLAN_TYPE_INNER: + reg_id = 3; + break; + default: + PMD_DRV_LOG(ERR, "Unsupported vlan type %d", vlan_type); + return; + } + ret = i40e_aq_debug_read_register(hw, I40E_GL_SWT_L2TAGCTRL(reg_id), + ®_r, NULL); + if (ret != I40E_SUCCESS) { + PMD_DRV_LOG(ERR, "Fail to debug read from " + "I40E_GL_SWT_L2TAGCTRL[%d]", reg_id); + return; + } + PMD_DRV_LOG(DEBUG, "Debug read from I40E_GL_SWT_L2TAGCTRL[%d]: " + "0x%08"PRIx64"", reg_id, reg_r); + + reg_w = reg_r & (~(I40E_GL_SWT_L2TAGCTRL_ETHERTYPE_MASK)); + reg_w |= ((uint64_t)tpid << I40E_GL_SWT_L2TAGCTRL_ETHERTYPE_SHIFT); + if (reg_r == reg_w) { + PMD_DRV_LOG(DEBUG, "No need to write"); + return; + } + + ret = i40e_aq_debug_write_register(hw, I40E_GL_SWT_L2TAGCTRL(reg_id), + reg_w, NULL); + if (ret != I40E_SUCCESS) { + PMD_DRV_LOG(ERR, "Fail to debug write to " + "I40E_GL_SWT_L2TAGCTRL[%d]", reg_id); + return; + } + PMD_DRV_LOG(DEBUG, "Debug write 0x%08"PRIx64" to " + "I40E_GL_SWT_L2TAGCTRL[%d]", reg_w, reg_id); } static void @@ -7332,11 +7381,17 @@ i40e_dev_filter_ctrl(struct rte_eth_dev *dev, static void i40e_hw_init(struct i40e_hw *hw) { + struct rte_eth_dev *dev = ((struct i40e_adapter *)(hw->back))->eth_dev; + /* clear the PF Queue Filter control register */ i40e_write_rx_ctl(hw, I40E_PFQF_CTL_0, 0); /* Disable symmetric hash per port */ i40e_set_symmetric_hash_enable_per_port(hw, 0); + + /* Set the global registers with default ether type value */ + i40e_vlan_tpid_set(dev, ETH_VLAN_TYPE_OUTER, ETHER_TYPE_VLAN); + i40e_vlan_tpid_set(dev, ETH_VLAN_TYPE_INNER, ETHER_TYPE_VLAN); } enum i40e_filter_pctype diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index a9a1583..ce3ce9f 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -178,7 +178,9 @@ static int ixgbe_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu); static int ixgbe_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on); -static void ixgbe_vlan_tpid_set(struct rte_eth_dev *dev, uint16_t tpid_id); +static void ixgbe_vlan_tpid_set(struct rte_eth_dev *dev, + enum rte_vlan_type vlan_type, + uint16_t tpid_id); static void ixgbe_vlan_hw_strip_bitmap_set(struct rte_eth_dev *dev, uint16_t queue, bool on); static void ixgbe_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, @@ -1543,13 +1545,22 @@ ixgbe_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on) } static void -ixgbe_vlan_tpid_set(struct rte_eth_dev *dev, uint16_t tpid) +ixgbe_vlan_tpid_set(struct rte_eth_dev *dev, + enum rte_vlan_type vlan_type, + uint16_t tpid) { struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); - /* Only the high 16-bits is valid */ - IXGBE_WRITE_REG(hw, IXGBE_EXVET, tpid << 16); + switch (vlan_type) { + case ETH_VLAN_TYPE_INNER: + /* Only the high 16-bits is valid */ + IXGBE_WRITE_REG(hw, IXGBE_EXVET, tpid << 16); + break; + default: + PMD_DRV_LOG(ERR, "Unsupported vlan type %d\n", vlan_type); + break; + } } void diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index a6e83c1..bb0c3eb 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -65,6 +65,7 @@ #include <rte_errno.h> #include <rte_spinlock.h> #include <rte_string_fns.h> +#include <rte_compat.h> #include "rte_ether.h" #include "rte_ethdev.h" @@ -1697,17 +1698,37 @@ rte_eth_dev_set_vlan_strip_on_queue(uint8_t port_id, uint16_t rx_queue_id, int o } int -rte_eth_dev_set_vlan_ether_type(uint8_t port_id, uint16_t tpid) +rte_eth_dev_set_vlan_ether_type_v22(uint8_t port_id, uint16_t tpid) { struct rte_eth_dev *dev; RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->vlan_tpid_set, -ENOTSUP); - (*dev->dev_ops->vlan_tpid_set)(dev, tpid); + (*dev->dev_ops->vlan_tpid_set)(dev, ETH_VLAN_TYPE_INNER, tpid); return 0; } +VERSION_SYMBOL(rte_eth_dev_set_vlan_ether_type, _v22, 2.2); + +int +rte_eth_dev_set_vlan_ether_type_v1604(uint8_t port_id, + enum rte_vlan_type vlan_type, + uint16_t tpid) +{ + struct rte_eth_dev *dev; + + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); + dev = &rte_eth_devices[port_id]; + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->vlan_tpid_set, -ENOTSUP); + (*dev->dev_ops->vlan_tpid_set)(dev, vlan_type, tpid); + + return 0; +} +BIND_DEFAULT_SYMBOL(rte_eth_dev_set_vlan_ether_type, _v1604, 16.04); +MAP_STATIC_SYMBOL(int rte_eth_dev_set_vlan_ether_type(uint8_t port_id, + enum rte_vlan_type vlan_type, uint16_t tpid), + rte_eth_dev_set_vlan_ether_type_v1604); int rte_eth_dev_set_vlan_offload(uint8_t port_id, int offload_mask) diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index e2893ba..21db144 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -351,6 +351,17 @@ struct rte_eth_rxmode { }; /** + * VLAN types to indicate if it is for single VLAN, inner VLAN or outer VLAN. + * Note that single VLAN is treated the same as inner VLAN. + */ +enum rte_vlan_type { + ETH_VLAN_TYPE_UNKNOWN = 0, + ETH_VLAN_TYPE_INNER, /**< Single VLAN, or inner VLAN. */ + ETH_VLAN_TYPE_OUTER, /**< Outer VLAN. */ + ETH_VLAN_TYPE_MAX, +}; + +/** * A structure used to configure the Receive Side Scaling (RSS) feature * of an Ethernet port. * If not NULL, the *rss_key* pointer of the *rss_conf* structure points @@ -1077,7 +1088,7 @@ typedef int (*vlan_filter_set_t)(struct rte_eth_dev *dev, /**< @internal filtering of a VLAN Tag Identifier by an Ethernet device. */ typedef void (*vlan_tpid_set_t)(struct rte_eth_dev *dev, - uint16_t tpid); + enum rte_vlan_type type, uint16_t tpid); /**< @internal set the outer VLAN-TPID by an Ethernet device. */ typedef void (*vlan_offload_set_t)(struct rte_eth_dev *dev, int mask); @@ -2346,6 +2357,8 @@ int rte_eth_dev_set_vlan_strip_on_queue(uint8_t port_id, uint16_t rx_queue_id, * * @param port_id * The port identifier of the Ethernet device. + * @vlan_type + * The vlan type. * @param tag_type * The Tag Protocol ID * @return @@ -2353,7 +2366,13 @@ int rte_eth_dev_set_vlan_strip_on_queue(uint8_t port_id, uint16_t rx_queue_id, * - (-ENOSUP) if hardware-assisted VLAN TPID setup is not supported. * - (-ENODEV) if *port_id* invalid. */ -int rte_eth_dev_set_vlan_ether_type(uint8_t port_id, uint16_t tag_type); +int rte_eth_dev_set_vlan_ether_type(uint8_t port_id, + enum rte_vlan_type vlan_type, + uint16_t tag_type); +int rte_eth_dev_set_vlan_ether_type_v22(uint8_t port_id, uint16_t tag_type); +int rte_eth_dev_set_vlan_ether_type_v1604(uint8_t port_id, + enum rte_vlan_type vlan_type, + uint16_t tag_type); /** * Set VLAN offload configuration on an Ethernet device diff --git a/lib/librte_ether/rte_ether_version.map b/lib/librte_ether/rte_ether_version.map index d8db24d..6098de5 100644 --- a/lib/librte_ether/rte_ether_version.map +++ b/lib/librte_ether/rte_ether_version.map @@ -117,3 +117,10 @@ DPDK_2.2 { local: *; }; + +DPDK_16.04 { + global: + + rte_eth_dev_set_vlan_ether_type; + +} DPDK_2.2; -- 2.5.0 ^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [PATCH v4 1/2] ethdev: add vlan type for setting ether type 2016-03-11 8:49 ` [PATCH v4 1/2] ethdev: add vlan type for setting ether type Helin Zhang @ 2016-03-11 11:19 ` Panu Matilainen 2016-03-11 11:20 ` Thomas Monjalon 0 siblings, 1 reply; 24+ messages in thread From: Panu Matilainen @ 2016-03-11 11:19 UTC (permalink / raw) To: Helin Zhang, dev On 03/11/2016 10:49 AM, Helin Zhang wrote: > In order to set ether type of VLAN for single VLAN, inner > and outer VLAN, the VLAN type as an input parameter is added > to 'rte_eth_dev_set_vlan_ether_type()'. > In addition, corresponding changes in e1000, ixgbe and i40e > are also added. > > Signed-off-by: Helin Zhang <helin.zhang@intel.com> > Acked-by: Wenzhuo Lu <wenzhuo.lu@intel.com> > --- > app/test-pmd/cmdline.c | 30 +++++++++----- > app/test-pmd/config.c | 9 +++-- > app/test-pmd/testpmd.h | 3 +- > doc/guides/rel_notes/release_16_04.rst | 4 ++ > doc/guides/testpmd_app_ug/testpmd_funcs.rst | 11 +---- > drivers/net/e1000/igb_ethdev.c | 21 +++++++--- > drivers/net/i40e/i40e_ethdev.c | 63 +++++++++++++++++++++++++++-- > drivers/net/ixgbe/ixgbe_ethdev.c | 19 +++++++-- > lib/librte_ether/rte_ethdev.c | 25 +++++++++++- > lib/librte_ether/rte_ethdev.h | 23 ++++++++++- > lib/librte_ether/rte_ether_version.map | 7 ++++ > 11 files changed, 175 insertions(+), 40 deletions(-) > > v4: > - Updated the doc of testpmd guide. > > v3: > - Used versioning mechanism to avoid ABI issue. > - Re-organized the patch set. > > v2: > - Used RTE_NEXT_ABI to avoid ABI change issue. > - Reworked the announcement of ABI change for release 16.07. > [...] > @@ -1077,7 +1088,7 @@ typedef int (*vlan_filter_set_t)(struct rte_eth_dev *dev, > /**< @internal filtering of a VLAN Tag Identifier by an Ethernet device. */ > > typedef void (*vlan_tpid_set_t)(struct rte_eth_dev *dev, > - uint16_t tpid); > + enum rte_vlan_type type, uint16_t tpid); > /**< @internal set the outer VLAN-TPID by an Ethernet device. */ > > typedef void (*vlan_offload_set_t)(struct rte_eth_dev *dev, int mask); > @@ -2346,6 +2357,8 @@ int rte_eth_dev_set_vlan_strip_on_queue(uint8_t port_id, uint16_t rx_queue_id, > * > * @param port_id > * The port identifier of the Ethernet device. > + * @vlan_type > + * The vlan type. > * @param tag_type > * The Tag Protocol ID > * @return > @@ -2353,7 +2366,13 @@ int rte_eth_dev_set_vlan_strip_on_queue(uint8_t port_id, uint16_t rx_queue_id, > * - (-ENOSUP) if hardware-assisted VLAN TPID setup is not supported. > * - (-ENODEV) if *port_id* invalid. > */ > -int rte_eth_dev_set_vlan_ether_type(uint8_t port_id, uint16_t tag_type); > +int rte_eth_dev_set_vlan_ether_type(uint8_t port_id, > + enum rte_vlan_type vlan_type, > + uint16_t tag_type); > +int rte_eth_dev_set_vlan_ether_type_v22(uint8_t port_id, uint16_t tag_type); > +int rte_eth_dev_set_vlan_ether_type_v1604(uint8_t port_id, > + enum rte_vlan_type vlan_type, > + uint16_t tag_type); > > /** > * Set VLAN offload configuration on an Ethernet device Its nice to see people actually trying to be compatible on occasion :) However in this case there's not much point in doing so, because libethdev ABI has already been broken in this cycle: http://dpdk.org/browse/dpdk/commit/?id=cfd2279ea6299826fe992028f1dffaf9fa7e7d0a In other words, the compatibility versions can never get invoked because all software built against libethdev needs to be rebuilt anyway because of the soname bump. Just drop the compat versions, no point carrying around something that cannot possibly get used. - Panu - ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH v4 1/2] ethdev: add vlan type for setting ether type 2016-03-11 11:19 ` Panu Matilainen @ 2016-03-11 11:20 ` Thomas Monjalon 2016-03-11 14:17 ` Zhang, Helin 0 siblings, 1 reply; 24+ messages in thread From: Thomas Monjalon @ 2016-03-11 11:20 UTC (permalink / raw) To: Panu Matilainen, Helin Zhang; +Cc: dev 2016-03-11 13:19, Panu Matilainen: > On 03/11/2016 10:49 AM, Helin Zhang wrote: > > -int rte_eth_dev_set_vlan_ether_type(uint8_t port_id, uint16_t tag_type); > > +int rte_eth_dev_set_vlan_ether_type(uint8_t port_id, > > + enum rte_vlan_type vlan_type, > > + uint16_t tag_type); > > +int rte_eth_dev_set_vlan_ether_type_v22(uint8_t port_id, uint16_t tag_type); > > +int rte_eth_dev_set_vlan_ether_type_v1604(uint8_t port_id, > > + enum rte_vlan_type vlan_type, > > + uint16_t tag_type); > > > > /** > > * Set VLAN offload configuration on an Ethernet device > > Its nice to see people actually trying to be compatible on occasion :) > > However in this case there's not much point in doing so, because > libethdev ABI has already been broken in this cycle: > http://dpdk.org/browse/dpdk/commit/?id=cfd2279ea6299826fe992028f1dffaf9fa7e7d0a > > In other words, the compatibility versions can never get invoked because > all software built against libethdev needs to be rebuilt anyway because > of the soname bump. Just drop the compat versions, no point carrying > around something that cannot possibly get used. Oh yes, you are right. Sorry Helin for having required that extra work. On the good side, you have learnt how to do it ;) ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH v4 1/2] ethdev: add vlan type for setting ether type 2016-03-11 11:20 ` Thomas Monjalon @ 2016-03-11 14:17 ` Zhang, Helin 2016-03-11 14:20 ` Thomas Monjalon 0 siblings, 1 reply; 24+ messages in thread From: Zhang, Helin @ 2016-03-11 14:17 UTC (permalink / raw) To: Thomas Monjalon, Panu Matilainen; +Cc: dev@dpdk.org > -----Original Message----- > From: Thomas Monjalon [mailto:thomas.monjalon@6wind.com] > Sent: Friday, March 11, 2016 7:20 PM > To: Panu Matilainen; Zhang, Helin > Cc: dev@dpdk.org > Subject: Re: [dpdk-dev] [PATCH v4 1/2] ethdev: add vlan type for setting ether > type > > 2016-03-11 13:19, Panu Matilainen: > > On 03/11/2016 10:49 AM, Helin Zhang wrote: > > > -int rte_eth_dev_set_vlan_ether_type(uint8_t port_id, uint16_t > > > tag_type); > > > +int rte_eth_dev_set_vlan_ether_type(uint8_t port_id, > > > + enum rte_vlan_type vlan_type, > > > + uint16_t tag_type); > > > +int rte_eth_dev_set_vlan_ether_type_v22(uint8_t port_id, uint16_t > > > +tag_type); int rte_eth_dev_set_vlan_ether_type_v1604(uint8_t port_id, > > > + enum rte_vlan_type vlan_type, > > > + uint16_t tag_type); > > > > > > /** > > > * Set VLAN offload configuration on an Ethernet device > > > > Its nice to see people actually trying to be compatible on occasion :) > > > > However in this case there's not much point in doing so, because > > libethdev ABI has already been broken in this cycle: > > http://dpdk.org/browse/dpdk/commit/?id=cfd2279ea6299826fe992028f1dffaf > > 9fa7e7d0a > > > > In other words, the compatibility versions can never get invoked > > because all software built against libethdev needs to be rebuilt > > anyway because of the soname bump. Just drop the compat versions, no > > point carrying around something that cannot possibly get used. > > Oh yes, you are right. > Sorry Helin for having required that extra work. > On the good side, you have learnt how to do it ;) Yes, as Thomas said, at leat l know how to do that, and the extra work was not too big. Thomas, Panu, thank you very much for the great comments! Thomas, does that mean I just need to work out a new version and just let the ABI changes as is. No ABI annoucenment will be requried? No RTE_NEXT_ABI will be used? Regards, Helin ^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH v4 1/2] ethdev: add vlan type for setting ether type 2016-03-11 14:17 ` Zhang, Helin @ 2016-03-11 14:20 ` Thomas Monjalon 0 siblings, 0 replies; 24+ messages in thread From: Thomas Monjalon @ 2016-03-11 14:20 UTC (permalink / raw) To: Zhang, Helin; +Cc: dev 2016-03-11 14:17, Zhang, Helin: > > > -----Original Message----- > > From: Thomas Monjalon [mailto:thomas.monjalon@6wind.com] > > Sent: Friday, March 11, 2016 7:20 PM > > To: Panu Matilainen; Zhang, Helin > > Cc: dev@dpdk.org > > Subject: Re: [dpdk-dev] [PATCH v4 1/2] ethdev: add vlan type for setting ether > > type > > > > 2016-03-11 13:19, Panu Matilainen: > > > On 03/11/2016 10:49 AM, Helin Zhang wrote: > > > > -int rte_eth_dev_set_vlan_ether_type(uint8_t port_id, uint16_t > > > > tag_type); > > > > +int rte_eth_dev_set_vlan_ether_type(uint8_t port_id, > > > > + enum rte_vlan_type vlan_type, > > > > + uint16_t tag_type); > > > > +int rte_eth_dev_set_vlan_ether_type_v22(uint8_t port_id, uint16_t > > > > +tag_type); int rte_eth_dev_set_vlan_ether_type_v1604(uint8_t port_id, > > > > + enum rte_vlan_type vlan_type, > > > > + uint16_t tag_type); > > > > > > > > /** > > > > * Set VLAN offload configuration on an Ethernet device > > > > > > Its nice to see people actually trying to be compatible on occasion :) > > > > > > However in this case there's not much point in doing so, because > > > libethdev ABI has already been broken in this cycle: > > > http://dpdk.org/browse/dpdk/commit/?id=cfd2279ea6299826fe992028f1dffaf > > > 9fa7e7d0a > > > > > > In other words, the compatibility versions can never get invoked > > > because all software built against libethdev needs to be rebuilt > > > anyway because of the soname bump. Just drop the compat versions, no > > > point carrying around something that cannot possibly get used. > > > > Oh yes, you are right. > > Sorry Helin for having required that extra work. > > On the good side, you have learnt how to do it ;) > > Yes, as Thomas said, at leat l know how to do that, and the extra work was not too big. > Thomas, Panu, thank you very much for the great comments! > > Thomas, does that mean I just need to work out a new version and just let the ABI > changes as is. No ABI annoucenment will be requried? No RTE_NEXT_ABI will be used? You just need an entry in "API changes" section of the release notes. You can state that this API change imply an ABI change. Thanks ^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v4 2/2] i40e: fix the overflow issue 2016-03-11 8:49 ` [PATCH v4 " Helin Zhang 2016-03-11 8:49 ` [PATCH v4 1/2] ethdev: add vlan type for setting ether type Helin Zhang @ 2016-03-11 8:49 ` Helin Zhang 2016-03-11 16:50 ` [PATCH v5 0/2] i40e setting ether type of VLANs Helin Zhang 2 siblings, 0 replies; 24+ messages in thread From: Helin Zhang @ 2016-03-11 8:49 UTC (permalink / raw) To: dev The array 'ptype_table' was defined in depth of 'UINT8_MAX' which is 255, while the querying index could be from 0 to 255. The issue can be fixed with expanding the array to one more element. Fixes: 9571ea028489 ("i40e: replace some offload flags with unified packet type") Signed-off-by: Helin Zhang <helin.zhang@intel.com> Acked-by: Wenzhuo Lu <wenzhuo.lu@intel.com> --- drivers/net/i40e/i40e_rxtx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index f8efdce..e0c9bb6 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -198,7 +198,7 @@ i40e_get_iee15888_flags(struct rte_mbuf *mb, uint64_t qword) static inline uint32_t i40e_rxd_pkt_type_mapping(uint8_t ptype) { - static const uint32_t ptype_table[UINT8_MAX] __rte_cache_aligned = { + static const uint32_t type_table[UINT8_MAX + 1] __rte_cache_aligned = { /* L2 types */ /* [0] reserved */ [1] = RTE_PTYPE_L2_ETHER, @@ -724,7 +724,7 @@ i40e_rxd_pkt_type_mapping(uint8_t ptype) /* All others reserved */ }; - return ptype_table[ptype]; + return type_table[ptype]; } #define I40E_RX_DESC_EXT_STATUS_FLEXBH_MASK 0x03 -- 2.5.0 ^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v5 0/2] i40e setting ether type of VLANs 2016-03-11 8:49 ` [PATCH v4 " Helin Zhang 2016-03-11 8:49 ` [PATCH v4 1/2] ethdev: add vlan type for setting ether type Helin Zhang 2016-03-11 8:49 ` [PATCH v4 2/2] i40e: fix the overflow issue Helin Zhang @ 2016-03-11 16:50 ` Helin Zhang 2016-03-11 16:50 ` [PATCH v5 1/2] ethdev: add vlan type for setting ether type Helin Zhang ` (2 more replies) 2 siblings, 3 replies; 24+ messages in thread From: Helin Zhang @ 2016-03-11 16:50 UTC (permalink / raw) To: dev It adds setting ether type of both single VLAN(inner VLAN) and outer VLAN for i40e. For ixgbe and e1000/igb, it supports setting single VLAN(inner VLAN) only, and can be extended in the future. The patch set was branched off rel_16_04 of repo dpdk-next-net, on below commit. commit 5721e6447b5c20208a32c919a509e89d78c3e68d Author: Robin Jarry <robin.jarry@6wind.com> Date: Thu Mar 3 15:27:40 2016 +0100 mlx4: ensure number of RX queues is a power of 2 v5: - Removed the versioning mechanism, as ABI broken is already there allowed. v4: - Updated the doc of testpmd guide. v3: - Used versioning mechanism to avoid ABI issue. - Re-organized the patch set. v2: - Used RTE_NEXT_ABI to avoid ABI change issue. - Reworked the announcement of ABI change for release 16.07. - Fixed a i40e overflow issue. Helin Zhang (2): ethdev: add vlan type for setting ether type i40e: fix the overflow issue app/test-pmd/cmdline.c | 30 +++++++---- app/test-pmd/config.c | 9 ++-- app/test-pmd/testpmd.h | 3 +- doc/guides/rel_notes/release_16_04.rst | 5 ++ doc/guides/testpmd_app_ug/testpmd_funcs.rst | 11 +--- drivers/net/e1000/igb_ethdev.c | 27 +++++++--- drivers/net/i40e/i40e_ethdev.c | 79 +++++++++++++++++++++++++++-- drivers/net/i40e/i40e_rxtx.c | 4 +- drivers/net/ixgbe/ixgbe_ethdev.c | 25 +++++++-- lib/librte_ether/rte_ethdev.c | 7 +-- lib/librte_ether/rte_ethdev.h | 21 ++++++-- lib/librte_ether/rte_ether_version.map | 7 +++ 12 files changed, 181 insertions(+), 47 deletions(-) -- 2.5.0 ^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v5 1/2] ethdev: add vlan type for setting ether type 2016-03-11 16:50 ` [PATCH v5 0/2] i40e setting ether type of VLANs Helin Zhang @ 2016-03-11 16:50 ` Helin Zhang 2016-03-11 16:50 ` [PATCH v5 2/2] i40e: fix the overflow issue Helin Zhang 2016-03-11 20:20 ` [PATCH v5 0/2] i40e setting ether type of VLANs Thomas Monjalon 2 siblings, 0 replies; 24+ messages in thread From: Helin Zhang @ 2016-03-11 16:50 UTC (permalink / raw) To: dev In order to set ether type of VLAN for single VLAN, inner and outer VLAN, the VLAN type as an input parameter is added to 'rte_eth_dev_set_vlan_ether_type()'. In addition, corresponding changes in e1000, ixgbe and i40e are also added. Signed-off-by: Helin Zhang <helin.zhang@intel.com> Acked-by: Wenzhuo Lu <wenzhuo.lu@intel.com> --- app/test-pmd/cmdline.c | 30 +++++++---- app/test-pmd/config.c | 9 ++-- app/test-pmd/testpmd.h | 3 +- doc/guides/rel_notes/release_16_04.rst | 5 ++ doc/guides/testpmd_app_ug/testpmd_funcs.rst | 11 +--- drivers/net/e1000/igb_ethdev.c | 27 +++++++--- drivers/net/i40e/i40e_ethdev.c | 79 +++++++++++++++++++++++++++-- drivers/net/ixgbe/ixgbe_ethdev.c | 25 +++++++-- lib/librte_ether/rte_ethdev.c | 7 +-- lib/librte_ether/rte_ethdev.h | 21 ++++++-- lib/librte_ether/rte_ether_version.map | 7 +++ 11 files changed, 179 insertions(+), 45 deletions(-) v5: - Removed the versioning mechanism, as ABI broken is already there allowed. v4: - Updated the doc of testpmd guide. v3: - Used versioning mechanism to avoid ABI issue. - Re-organized the patch set. v2: - Used RTE_NEXT_ABI to avoid ABI change issue. - Reworked the announcement of ABI change for release 16.07. diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 52e9f5f..1eeb8a8 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -277,8 +277,8 @@ static void cmd_help_long_parsed(void *parsed_result, " Set the VLAN QinQ (extended queue in queue)" " on a port.\n\n" - "vlan set tpid (value) (port_id)\n" - " Set the outer VLAN TPID for Packet Filtering on" + "vlan set (inner|outer) tpid (value) (port_id)\n" + " Set the VLAN TPID for Packet Filtering on" " a port\n\n" "rx_vlan add (vlan_id|all) (port_id)\n" @@ -297,10 +297,6 @@ static void cmd_help_long_parsed(void *parsed_result, " Remove a vlan_id, to the set of VLAN identifiers" "filtered for VF(s) from port_id.\n\n" - "rx_vlan set tpid (value) (port_id)\n" - " Set the outer VLAN TPID for Packet Filtering on" - " a port\n\n" - "tunnel_filter add (port_id) (outer_mac) (inner_mac) (ip_addr) " "(inner_vlan) (vxlan|nvgre) (filter_type) (tenant_id) (queue_id)\n" " add a tunnel filter of a port.\n\n" @@ -2747,6 +2743,7 @@ cmdline_parse_inst_t cmd_rx_vlan_filter_all = { struct cmd_vlan_offload_result { cmdline_fixed_string_t vlan; cmdline_fixed_string_t set; + cmdline_fixed_string_t vlan_type; cmdline_fixed_string_t what; cmdline_fixed_string_t on; cmdline_fixed_string_t port_id; @@ -2847,6 +2844,7 @@ cmdline_parse_inst_t cmd_vlan_offload = { struct cmd_vlan_tpid_result { cmdline_fixed_string_t vlan; cmdline_fixed_string_t set; + cmdline_fixed_string_t vlan_type; cmdline_fixed_string_t what; uint16_t tp_id; uint8_t port_id; @@ -2858,8 +2856,17 @@ cmd_vlan_tpid_parsed(void *parsed_result, __attribute__((unused)) void *data) { struct cmd_vlan_tpid_result *res = parsed_result; - vlan_tpid_set(res->port_id, res->tp_id); - return; + enum rte_vlan_type vlan_type; + + if (!strcmp(res->vlan_type, "inner")) + vlan_type = ETH_VLAN_TYPE_INNER; + else if (!strcmp(res->vlan_type, "outer")) + vlan_type = ETH_VLAN_TYPE_OUTER; + else { + printf("Unknown vlan type\n"); + return; + } + vlan_tpid_set(res->port_id, vlan_type, res->tp_id); } cmdline_parse_token_string_t cmd_vlan_tpid_vlan = @@ -2868,6 +2875,9 @@ cmdline_parse_token_string_t cmd_vlan_tpid_vlan = cmdline_parse_token_string_t cmd_vlan_tpid_set = TOKEN_STRING_INITIALIZER(struct cmd_vlan_tpid_result, set, "set"); +cmdline_parse_token_string_t cmd_vlan_type = + TOKEN_STRING_INITIALIZER(struct cmd_vlan_tpid_result, + vlan_type, "inner#outer"); cmdline_parse_token_string_t cmd_vlan_tpid_what = TOKEN_STRING_INITIALIZER(struct cmd_vlan_tpid_result, what, "tpid"); @@ -2881,10 +2891,12 @@ cmdline_parse_token_num_t cmd_vlan_tpid_portid = cmdline_parse_inst_t cmd_vlan_tpid = { .f = cmd_vlan_tpid_parsed, .data = NULL, - .help_str = "set tpid tp_id port_id, set the Outer VLAN Ether type", + .help_str = "set inner|outer tpid tp_id port_id, set the VLAN " + "Ether type", .tokens = { (void *)&cmd_vlan_tpid_vlan, (void *)&cmd_vlan_tpid_set, + (void *)&cmd_vlan_type, (void *)&cmd_vlan_tpid_what, (void *)&cmd_vlan_tpid_tpid, (void *)&cmd_vlan_tpid_portid, diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 0062484..5bb09a5 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -1821,19 +1821,20 @@ rx_vlan_all_filter_set(portid_t port_id, int on) } void -vlan_tpid_set(portid_t port_id, uint16_t tp_id) +vlan_tpid_set(portid_t port_id, enum rte_vlan_type vlan_type, uint16_t tp_id) { int diag; + if (port_id_is_invalid(port_id, ENABLED_WARN)) return; - diag = rte_eth_dev_set_vlan_ether_type(port_id, tp_id); + diag = rte_eth_dev_set_vlan_ether_type(port_id, vlan_type, tp_id); if (diag == 0) return; - printf("tx_vlan_tpid_set(port_pi=%d, tpid=%d) failed " + printf("tx_vlan_tpid_set(port_pi=%d, vlan_type=%d, tpid=%d) failed " "diag=%d\n", - port_id, tp_id, diag); + port_id, vlan_type, tp_id, diag); } void diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index b618998..0f72ca1 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -508,7 +508,8 @@ void rx_vlan_filter_set(portid_t port_id, int on); void rx_vlan_all_filter_set(portid_t port_id, int on); int rx_vft_set(portid_t port_id, uint16_t vlan_id, int on); void vlan_extend_set(portid_t port_id, int on); -void vlan_tpid_set(portid_t port_id, uint16_t tp_id); +void vlan_tpid_set(portid_t port_id, enum rte_vlan_type vlan_type, + uint16_t tp_id); void tx_vlan_set(portid_t port_id, uint16_t vlan_id); void tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer); void tx_vlan_reset(portid_t port_id); diff --git a/doc/guides/rel_notes/release_16_04.rst b/doc/guides/rel_notes/release_16_04.rst index 7c09fef..077f67b 100644 --- a/doc/guides/rel_notes/release_16_04.rst +++ b/doc/guides/rel_notes/release_16_04.rst @@ -125,6 +125,8 @@ This section should contain new features added in this release. Sample format: Af_packet device can now be detached using API, like other PMD devices. +* **Added modifying ether type of both single and double VLAN for i40e** + Resolved Issues --------------- @@ -256,6 +258,9 @@ This section should contain API changes. Sample format: * Af_packet device init function is no longer public. Device should be attached with API. +* Add one more parameter for ethdev public interface + of ``rte_eth_dev_set_vlan_ether_type``. + ABI Changes ----------- diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index a520cc5..e2b2224 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -498,9 +498,9 @@ Set the VLAN QinQ (extended queue in queue) on for a port:: vlan set tpid ~~~~~~~~~~~~~ -Set the outer VLAN TPID for packet filtering on a port:: +Set the inner or outer VLAN TPID for packet filtering on a port:: - testpmd> vlan set tpid (value) (port_id) + testpmd> vlan set (inner|outer) tpid (value) (port_id) .. note:: @@ -540,13 +540,6 @@ Remove a VLAN ID, from the set of VLAN identifiers filtered for VF(s) for port I testpmd> rx_vlan rm (vlan_id) port (port_id) vf (vf_mask) -rx_vlan set tpid -~~~~~~~~~~~~~~~~ - -Set the outer VLAN TPID for packet filtering on a port:: - - testpmd> rx_vlan set tpid (value) (port_id) - tunnel_filter add ~~~~~~~~~~~~~~~~~ diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c index f889876..9a34d01 100644 --- a/drivers/net/e1000/igb_ethdev.c +++ b/drivers/net/e1000/igb_ethdev.c @@ -126,7 +126,9 @@ static int eth_igb_mtu_set(struct rte_eth_dev *dev, uint16_t mtu); static int eth_igb_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on); -static void eth_igb_vlan_tpid_set(struct rte_eth_dev *dev, uint16_t tpid_id); +static int eth_igb_vlan_tpid_set(struct rte_eth_dev *dev, + enum rte_vlan_type vlan_type, + uint16_t tpid_id); static void eth_igb_vlan_offload_set(struct rte_eth_dev *dev, int mask); static void igb_vlan_hw_filter_enable(struct rte_eth_dev *dev); @@ -2193,15 +2195,28 @@ eth_igb_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) return 0; } -static void -eth_igb_vlan_tpid_set(struct rte_eth_dev *dev, uint16_t tpid) +static int +eth_igb_vlan_tpid_set(struct rte_eth_dev *dev, + enum rte_vlan_type vlan_type, + uint16_t tpid) { struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private); - uint32_t reg = ETHER_TYPE_VLAN ; + uint32_t reg = ETHER_TYPE_VLAN; + int ret = 0; + + switch (vlan_type) { + case ETH_VLAN_TYPE_INNER: + reg |= (tpid << 16); + E1000_WRITE_REG(hw, E1000_VET, reg); + break; + default: + ret = -EINVAL; + PMD_DRV_LOG(ERR, "Unsupported vlan type %d\n", vlan_type); + break; + } - reg |= (tpid << 16); - E1000_WRITE_REG(hw, E1000_VET, reg); + return ret; } static void diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 0c87ec1..7605a68 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -266,6 +266,11 @@ #define I40E_INSET_IPV6_TC_MASK 0x0009F00FUL #define I40E_INSET_IPV6_NEXT_HDR_MASK 0x000C00FFUL +#define I40E_GL_SWT_L2TAGCTRL(_i) (0x001C0A70 + ((_i) * 4)) +#define I40E_GL_SWT_L2TAGCTRL_ETHERTYPE_SHIFT 16 +#define I40E_GL_SWT_L2TAGCTRL_ETHERTYPE_MASK \ + I40E_MASK(0xFFFF, I40E_GL_SWT_L2TAGCTRL_ETHERTYPE_SHIFT) + static int eth_i40e_dev_init(struct rte_eth_dev *eth_dev); static int eth_i40e_dev_uninit(struct rte_eth_dev *eth_dev); static int i40e_dev_configure(struct rte_eth_dev *dev); @@ -292,7 +297,9 @@ static void i40e_dev_info_get(struct rte_eth_dev *dev, static int i40e_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on); -static void i40e_vlan_tpid_set(struct rte_eth_dev *dev, uint16_t tpid); +static int i40e_vlan_tpid_set(struct rte_eth_dev *dev, + enum rte_vlan_type vlan_type, + uint16_t tpid); static void i40e_vlan_offload_set(struct rte_eth_dev *dev, int mask); static void i40e_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, @@ -865,6 +872,20 @@ eth_i40e_dev_init(struct rte_eth_dev *dev) hw->fc.requested_mode = I40E_FC_NONE; i40e_set_fc(hw, &aq_fail, TRUE); + /* Set the global registers with default ether type value */ + ret = i40e_vlan_tpid_set(dev, ETH_VLAN_TYPE_OUTER, ETHER_TYPE_VLAN); + if (ret != I40E_SUCCESS) { + PMD_INIT_LOG(ERR, "Failed to set the default outer " + "VLAN ether type"); + goto err_setup_pf_switch; + } + ret = i40e_vlan_tpid_set(dev, ETH_VLAN_TYPE_INNER, ETHER_TYPE_VLAN); + if (ret != I40E_SUCCESS) { + PMD_INIT_LOG(ERR, "Failed to set the default outer " + "VLAN ether type"); + goto err_setup_pf_switch; + } + /* PF setup, which includes VSI setup */ ret = i40e_pf_setup(pf); if (ret) { @@ -2312,11 +2333,59 @@ i40e_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) return i40e_vsi_delete_vlan(vsi, vlan_id); } -static void -i40e_vlan_tpid_set(__rte_unused struct rte_eth_dev *dev, - __rte_unused uint16_t tpid) +static int +i40e_vlan_tpid_set(struct rte_eth_dev *dev, + enum rte_vlan_type vlan_type, + uint16_t tpid) { - PMD_INIT_FUNC_TRACE(); + struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private); + uint64_t reg_r = 0, reg_w = 0; + uint16_t reg_id = 0; + int ret = 0; + + switch (vlan_type) { + case ETH_VLAN_TYPE_OUTER: + reg_id = 2; + break; + case ETH_VLAN_TYPE_INNER: + reg_id = 3; + break; + default: + ret = -EINVAL; + PMD_DRV_LOG(ERR, "Unsupported vlan type %d", vlan_type); + return ret; + } + ret = i40e_aq_debug_read_register(hw, I40E_GL_SWT_L2TAGCTRL(reg_id), + ®_r, NULL); + if (ret != I40E_SUCCESS) { + PMD_DRV_LOG(ERR, "Fail to debug read from " + "I40E_GL_SWT_L2TAGCTRL[%d]", reg_id); + ret = -EIO; + return ret; + } + PMD_DRV_LOG(DEBUG, "Debug read from I40E_GL_SWT_L2TAGCTRL[%d]: " + "0x%08"PRIx64"", reg_id, reg_r); + + reg_w = reg_r & (~(I40E_GL_SWT_L2TAGCTRL_ETHERTYPE_MASK)); + reg_w |= ((uint64_t)tpid << I40E_GL_SWT_L2TAGCTRL_ETHERTYPE_SHIFT); + if (reg_r == reg_w) { + ret = 0; + PMD_DRV_LOG(DEBUG, "No need to write"); + return ret; + } + + ret = i40e_aq_debug_write_register(hw, I40E_GL_SWT_L2TAGCTRL(reg_id), + reg_w, NULL); + if (ret != I40E_SUCCESS) { + ret = -EIO; + PMD_DRV_LOG(ERR, "Fail to debug write to " + "I40E_GL_SWT_L2TAGCTRL[%d]", reg_id); + return ret; + } + PMD_DRV_LOG(DEBUG, "Debug write 0x%08"PRIx64" to " + "I40E_GL_SWT_L2TAGCTRL[%d]", reg_w, reg_id); + + return ret; } static void diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index a9a1583..0dc050d 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -178,7 +178,9 @@ static int ixgbe_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu); static int ixgbe_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on); -static void ixgbe_vlan_tpid_set(struct rte_eth_dev *dev, uint16_t tpid_id); +static int ixgbe_vlan_tpid_set(struct rte_eth_dev *dev, + enum rte_vlan_type vlan_type, + uint16_t tpid_id); static void ixgbe_vlan_hw_strip_bitmap_set(struct rte_eth_dev *dev, uint16_t queue, bool on); static void ixgbe_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, @@ -1542,14 +1544,27 @@ ixgbe_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on) ixgbe_vlan_hw_strip_disable(dev, queue); } -static void -ixgbe_vlan_tpid_set(struct rte_eth_dev *dev, uint16_t tpid) +static int +ixgbe_vlan_tpid_set(struct rte_eth_dev *dev, + enum rte_vlan_type vlan_type, + uint16_t tpid) { struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); + int ret = 0; + + switch (vlan_type) { + case ETH_VLAN_TYPE_INNER: + /* Only the high 16-bits is valid */ + IXGBE_WRITE_REG(hw, IXGBE_EXVET, tpid << 16); + break; + default: + ret = -EINVAL; + PMD_DRV_LOG(ERR, "Unsupported vlan type %d\n", vlan_type); + break; + } - /* Only the high 16-bits is valid */ - IXGBE_WRITE_REG(hw, IXGBE_EXVET, tpid << 16); + return ret; } void diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index a6e83c1..dedb36a 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -1697,16 +1697,17 @@ rte_eth_dev_set_vlan_strip_on_queue(uint8_t port_id, uint16_t rx_queue_id, int o } int -rte_eth_dev_set_vlan_ether_type(uint8_t port_id, uint16_t tpid) +rte_eth_dev_set_vlan_ether_type(uint8_t port_id, + enum rte_vlan_type vlan_type, + uint16_t tpid) { struct rte_eth_dev *dev; RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); dev = &rte_eth_devices[port_id]; RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->vlan_tpid_set, -ENOTSUP); - (*dev->dev_ops->vlan_tpid_set)(dev, tpid); - return 0; + return (*dev->dev_ops->vlan_tpid_set)(dev, vlan_type, tpid); } int diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index e2893ba..bc3f42e 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -351,6 +351,17 @@ struct rte_eth_rxmode { }; /** + * VLAN types to indicate if it is for single VLAN, inner VLAN or outer VLAN. + * Note that single VLAN is treated the same as inner VLAN. + */ +enum rte_vlan_type { + ETH_VLAN_TYPE_UNKNOWN = 0, + ETH_VLAN_TYPE_INNER, /**< Single VLAN, or inner VLAN. */ + ETH_VLAN_TYPE_OUTER, /**< Outer VLAN. */ + ETH_VLAN_TYPE_MAX, +}; + +/** * A structure used to configure the Receive Side Scaling (RSS) feature * of an Ethernet port. * If not NULL, the *rss_key* pointer of the *rss_conf* structure points @@ -1076,8 +1087,8 @@ typedef int (*vlan_filter_set_t)(struct rte_eth_dev *dev, int on); /**< @internal filtering of a VLAN Tag Identifier by an Ethernet device. */ -typedef void (*vlan_tpid_set_t)(struct rte_eth_dev *dev, - uint16_t tpid); +typedef int (*vlan_tpid_set_t)(struct rte_eth_dev *dev, + enum rte_vlan_type type, uint16_t tpid); /**< @internal set the outer VLAN-TPID by an Ethernet device. */ typedef void (*vlan_offload_set_t)(struct rte_eth_dev *dev, int mask); @@ -2346,6 +2357,8 @@ int rte_eth_dev_set_vlan_strip_on_queue(uint8_t port_id, uint16_t rx_queue_id, * * @param port_id * The port identifier of the Ethernet device. + * @vlan_type + * The vlan type. * @param tag_type * The Tag Protocol ID * @return @@ -2353,7 +2366,9 @@ int rte_eth_dev_set_vlan_strip_on_queue(uint8_t port_id, uint16_t rx_queue_id, * - (-ENOSUP) if hardware-assisted VLAN TPID setup is not supported. * - (-ENODEV) if *port_id* invalid. */ -int rte_eth_dev_set_vlan_ether_type(uint8_t port_id, uint16_t tag_type); +int rte_eth_dev_set_vlan_ether_type(uint8_t port_id, + enum rte_vlan_type vlan_type, + uint16_t tag_type); /** * Set VLAN offload configuration on an Ethernet device diff --git a/lib/librte_ether/rte_ether_version.map b/lib/librte_ether/rte_ether_version.map index d8db24d..6098de5 100644 --- a/lib/librte_ether/rte_ether_version.map +++ b/lib/librte_ether/rte_ether_version.map @@ -117,3 +117,10 @@ DPDK_2.2 { local: *; }; + +DPDK_16.04 { + global: + + rte_eth_dev_set_vlan_ether_type; + +} DPDK_2.2; -- 2.5.0 ^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v5 2/2] i40e: fix the overflow issue 2016-03-11 16:50 ` [PATCH v5 0/2] i40e setting ether type of VLANs Helin Zhang 2016-03-11 16:50 ` [PATCH v5 1/2] ethdev: add vlan type for setting ether type Helin Zhang @ 2016-03-11 16:50 ` Helin Zhang 2016-03-11 20:20 ` [PATCH v5 0/2] i40e setting ether type of VLANs Thomas Monjalon 2 siblings, 0 replies; 24+ messages in thread From: Helin Zhang @ 2016-03-11 16:50 UTC (permalink / raw) To: dev The array 'ptype_table' was defined in depth of 'UINT8_MAX' which is 255, while the querying index could be from 0 to 255. The issue can be fixed with expanding the array to one more element. Fixes: 9571ea028489 ("i40e: replace some offload flags with unified packet type") Signed-off-by: Helin Zhang <helin.zhang@intel.com> Acked-by: Wenzhuo Lu <wenzhuo.lu@intel.com> --- drivers/net/i40e/i40e_rxtx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index f8efdce..e0c9bb6 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -198,7 +198,7 @@ i40e_get_iee15888_flags(struct rte_mbuf *mb, uint64_t qword) static inline uint32_t i40e_rxd_pkt_type_mapping(uint8_t ptype) { - static const uint32_t ptype_table[UINT8_MAX] __rte_cache_aligned = { + static const uint32_t type_table[UINT8_MAX + 1] __rte_cache_aligned = { /* L2 types */ /* [0] reserved */ [1] = RTE_PTYPE_L2_ETHER, @@ -724,7 +724,7 @@ i40e_rxd_pkt_type_mapping(uint8_t ptype) /* All others reserved */ }; - return ptype_table[ptype]; + return type_table[ptype]; } #define I40E_RX_DESC_EXT_STATUS_FLEXBH_MASK 0x03 -- 2.5.0 ^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [PATCH v5 0/2] i40e setting ether type of VLANs 2016-03-11 16:50 ` [PATCH v5 0/2] i40e setting ether type of VLANs Helin Zhang 2016-03-11 16:50 ` [PATCH v5 1/2] ethdev: add vlan type for setting ether type Helin Zhang 2016-03-11 16:50 ` [PATCH v5 2/2] i40e: fix the overflow issue Helin Zhang @ 2016-03-11 20:20 ` Thomas Monjalon 2 siblings, 0 replies; 24+ messages in thread From: Thomas Monjalon @ 2016-03-11 20:20 UTC (permalink / raw) To: Helin Zhang; +Cc: dev 2016-03-12 00:50, Helin Zhang: > It adds setting ether type of both single VLAN(inner VLAN) and > outer VLAN for i40e. For ixgbe and e1000/igb, it supports setting > single VLAN(inner VLAN) only, and can be extended in the future. Applied with a small doxygen fix, thanks ^ permalink raw reply [flat|nested] 24+ messages in thread
end of thread, other threads:[~2016-03-11 20:22 UTC | newest] Thread overview: 24+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-01-22 1:37 [PATCH 0/2] i40e setting ether type of VLANs Helin Zhang 2016-01-22 1:37 ` [PATCH 1/2] ethdev: add vlan type for setting ether type Helin Zhang 2016-01-22 1:37 ` [PATCH 2/2] i40e: add VLAN ether type config Helin Zhang 2016-03-07 8:12 ` [PATCH v2 0/3] i40e setting ether type of VLANs Helin Zhang 2016-03-07 8:12 ` [PATCH v2 1/3] ethdev: add vlan type for setting ether type Helin Zhang 2016-03-07 8:12 ` [PATCH v2 2/3] i40e: add VLAN ether type config Helin Zhang 2016-03-07 8:12 ` [PATCH v2 3/3] i40e: fix the overflow issue Helin Zhang 2016-03-07 9:28 ` [PATCH v2 0/3] i40e setting ether type of VLANs Thomas Monjalon 2016-03-09 15:20 ` Zhang, Helin 2016-03-10 16:36 ` [PATCH v3 0/2] " Helin Zhang 2016-03-10 16:36 ` [PATCH v3 1/2] ethdev: add vlan type for setting ether type Helin Zhang 2016-03-10 16:36 ` [PATCH v3 2/2] i40e: fix the overflow issue Helin Zhang 2016-03-11 2:36 ` [PATCH v3 0/2] i40e setting ether type of VLANs Lu, Wenzhuo 2016-03-11 8:49 ` [PATCH v4 " Helin Zhang 2016-03-11 8:49 ` [PATCH v4 1/2] ethdev: add vlan type for setting ether type Helin Zhang 2016-03-11 11:19 ` Panu Matilainen 2016-03-11 11:20 ` Thomas Monjalon 2016-03-11 14:17 ` Zhang, Helin 2016-03-11 14:20 ` Thomas Monjalon 2016-03-11 8:49 ` [PATCH v4 2/2] i40e: fix the overflow issue Helin Zhang 2016-03-11 16:50 ` [PATCH v5 0/2] i40e setting ether type of VLANs Helin Zhang 2016-03-11 16:50 ` [PATCH v5 1/2] ethdev: add vlan type for setting ether type Helin Zhang 2016-03-11 16:50 ` [PATCH v5 2/2] i40e: fix the overflow issue Helin Zhang 2016-03-11 20:20 ` [PATCH v5 0/2] i40e setting ether type of VLANs Thomas Monjalon
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.