The tx_vlan set and tx_qinq set commands only accepted VLAN ID in range [0, 4095]. This prevented users from setting 802.1p priority and CFI bits when using hardware VLAN insertion.
Since mbuf vlan_tci field already supports full 16-bit VLAN Tag Control Information (TCI), relax the validation for TX paths to allow priority and CFI bits. The vlan_id parameter now accepts: - Bits 0-11: VLAN ID (0-4095) - Bit 12: CFI (Canonical Format Indicator) - Bits 13-15: Priority (0-7, 802.1p CoS) Suggested-by: Stephen Hemminger <[email protected]> Suggested-by: fengchengwen <[email protected]> Signed-off-by: Xingui Yang <[email protected]> --- v2: - Removed --enable-vlan-priority option and global variable as suggested by Stephen Hemminger. The feature is now always enabled for TX paths - RX VLAN filter continues to enforce strict VLAN ID validation as suggested by fengchengwen - Added documentation updates for testpmd_funcs.rst and release notes app/test-pmd/config.c | 13 ++++++++----- doc/guides/rel_notes/release_26_07.rst | 7 +++++++ doc/guides/testpmd_app_ug/testpmd_funcs.rst | 17 ++++++++++++++--- 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 9d457ca88e..38758f9c05 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -1241,8 +1241,11 @@ void print_valid_ports(void) } static int -vlan_id_is_invalid(uint16_t vlan_id) +vlan_id_is_invalid(uint16_t vlan_id, bool is_tx) { + if (is_tx) + return 0; + if (vlan_id < 4096) return 0; fprintf(stderr, "Invalid vlan_id %d (must be < 4096)\n", vlan_id); @@ -6876,7 +6879,7 @@ rx_vft_set(portid_t port_id, uint16_t vlan_id, int on) if (port_id_is_invalid(port_id, ENABLED_WARN)) return 1; - if (vlan_id_is_invalid(vlan_id)) + if (vlan_id_is_invalid(vlan_id, false)) return 1; diag = rte_eth_dev_vlan_filter(port_id, vlan_id, on); if (diag == 0) @@ -6923,7 +6926,7 @@ tx_vlan_set(portid_t port_id, uint16_t vlan_id) struct rte_eth_dev_info dev_info; int ret; - if (vlan_id_is_invalid(vlan_id)) + if (vlan_id_is_invalid(vlan_id, true)) return; if (ports[port_id].dev_conf.txmode.offloads & @@ -6954,9 +6957,9 @@ tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer) struct rte_eth_dev_info dev_info; int ret; - if (vlan_id_is_invalid(vlan_id)) + if (vlan_id_is_invalid(vlan_id, true)) return; - if (vlan_id_is_invalid(vlan_id_outer)) + if (vlan_id_is_invalid(vlan_id_outer, true)) return; ret = eth_dev_info_get_print_err(port_id, &dev_info); diff --git a/doc/guides/rel_notes/release_26_07.rst b/doc/guides/rel_notes/release_26_07.rst index 5d7aa8d1bf..e382c7f407 100644 --- a/doc/guides/rel_notes/release_26_07.rst +++ b/doc/guides/rel_notes/release_26_07.rst @@ -150,6 +150,13 @@ New Features * Added ``eof`` devarg to use link state to signal end of receive file input. * Added unit test suite. +* **Added VLAN priority support in testpmd.** + + Added support for setting VLAN priority and CFI bits in ``tx_vlan set`` + and ``tx_qinq set`` commands. The ``vlan_tci`` parameter now accepts the + full 16-bit VLAN Tag Control Information (TCI) format, which includes + priority (bits 13-15), CFI (bit 12), and VLAN ID (bits 0-11). + * **Added AI review helpers.** Added AGENTS.md file for AI review diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index f0f2b0758b..b967810b10 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -1120,15 +1120,26 @@ tx_vlan set Set hardware insertion of VLAN IDs in packets sent on a port:: - testpmd> tx_vlan set (port_id) vlan_id[, vlan_id_outer] + testpmd> tx_vlan set (port_id) vlan_tci[, vlan_tci_outer] + +The ``vlan_tci`` parameter accepts the full 16-bit VLAN Tag Control Information (TCI) +format, which includes: + +* Bits 0-11: VLAN ID (0-4095) +* Bit 12: CFI (Canonical Format Indicator) +* Bits 13-15: Priority (0-7, 802.1p CoS) For example, set a single VLAN ID (5) insertion on port 0:: - tx_vlan set 0 5 + testpmd> tx_vlan set 0 5 + +Or, set a VLAN ID with priority (priority=3, VLAN ID=6) insertion on port 0:: + + testpmd> tx_vlan set 0 0x6006 Or, set double VLAN ID (inner: 2, outer: 3) insertion on port 1:: - tx_vlan set 1 2 3 + testpmd> tx_vlan set 1 2 3 tx_vlan set pvid -- 2.43.0
