From patchwork Mon Mar 7 08:12:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Helin" X-Patchwork-Id: 11135 X-Patchwork-Delegate: bruce.richardson@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id F22F12C6D; Mon, 7 Mar 2016 09:13:02 +0100 (CET) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id EC5B52C6C for ; Mon, 7 Mar 2016 09:13:00 +0100 (CET) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga101.jf.intel.com with ESMTP; 07 Mar 2016 00:12:59 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,550,1449561600"; d="scan'208";a="759393065" Received: from shvmail01.sh.intel.com ([10.239.29.42]) by orsmga003.jf.intel.com with ESMTP; 07 Mar 2016 00:12:59 -0800 Received: from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com [10.239.29.89]) by shvmail01.sh.intel.com with ESMTP id u278CuSk009029; Mon, 7 Mar 2016 16:12:56 +0800 Received: from shecgisg004.sh.intel.com (localhost [127.0.0.1]) by shecgisg004.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP id u278CrtV000317; Mon, 7 Mar 2016 16:12:55 +0800 Received: (from hzhan75@localhost) by shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id u278CrER000313; Mon, 7 Mar 2016 16:12:53 +0800 From: Helin Zhang To: dev@dpdk.org Date: Mon, 7 Mar 2016 16:12:48 +0800 Message-Id: <1457338370-32744-2-git-send-email-helin.zhang@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1457338370-32744-1-git-send-email-helin.zhang@intel.com> References: <1453426623-8696-1-git-send-email-helin.zhang@intel.com> <1457338370-32744-1-git-send-email-helin.zhang@intel.com> Subject: [dpdk-dev] [PATCH v2 1/3] ethdev: add vlan type for setting ether type X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "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 --- 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