From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by dpdk.org (Postfix) with ESMTP id 9741C1B03D for ; Tue, 10 Apr 2018 18:37:18 +0200 (CEST) Received: by mail-wr0-f196.google.com with SMTP id m13so13465670wrj.5 for ; Tue, 10 Apr 2018 09:37:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=3FQFP6oTpM0F0wtDx0gyjHYL5KUqJCYc3RvuhHbFrt8=; b=gP9+H2vIhXt3FcIelN7e9N7A6GNHTwDVElnprkCz8RD5v35Th4LyYqTNlQOYgl+iH0 +we3nH0IwGjrCDbutRa8zFFvFMHHAqYi7t/DApTihrMQOXSvwnBcxUXUUNHDmC079auV gi3arN2mA5FGfT3rj9B8K3g+L6ep8+LNdLJhWTNG8hHyYq83Pof6QpuWK0EAMtnCN46p DA8vVP5GRDEsU6lDYdU4nWZO855h3aB9hLqkAFLv2FdOPXizM6LAfozk6fgqv9JpUZDn DLBzbDRrzq0PNKzEr8uCCe1RIo8GI/+jyIQfvN5q79McXsWWvc6NFFjPLP6iRznx13Le lJ9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=3FQFP6oTpM0F0wtDx0gyjHYL5KUqJCYc3RvuhHbFrt8=; b=meBocqR+ctsuEi+g6ELRivLzVIJjIhb38ebYgBAzioKyTdPx+X76p3KLKv/P2oWSck F6MSwFp5/FAiwxup6RsndY6zTICnDFM1G0AuDo5DwfjIdIUMaVT/L3SwbpqHjs/AKtll /EBxasX2/98bItJQn74FylV51V/n26WP44kS84UoR9zo1q+jNvQbbO4pc9rtvNZaxa5q jyhIujapJgd2NA1mWTLdMKshniOJGi/8J/AzHH9Vtwa5mgIs4bcUDOXJs1ljfYyQoL80 7KTlce7oZfU7eN1JxuIilbQmbBp7wk345r/j8bM9xF5nttmDmqyQRpTUVC8di1VmOv34 RGZA== X-Gm-Message-State: ALQs6tDwpGqlx3Qfau7bA9O1fhUo7XPUy0LU5yuJpGN5BAer69glDQvA ZL8/F/ga/UixB7E63zX+utjUeq6I X-Google-Smtp-Source: AIpwx48R9jCSeURk5TjOTlvJIrSoIXx2/7nLEEi02Vz3EJ/XQ+fxPWiGxRpFixQqU2vIf9CErxQgUw== X-Received: by 10.223.209.194 with SMTP id m2mr942223wri.214.1523378238211; Tue, 10 Apr 2018 09:37:18 -0700 (PDT) Received: from 6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id u44sm2925811wrb.67.2018.04.10.09.37.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Apr 2018 09:37:17 -0700 (PDT) Date: Tue, 10 Apr 2018 18:37:04 +0200 From: Adrien Mazarguil To: Thomas Monjalon , Ferruh Yigit , dev@dpdk.org Message-ID: <20180410162022.9101-15-adrien.mazarguil@6wind.com> References: <20180406131736.19145-1-adrien.mazarguil@6wind.com> <20180410162022.9101-1-adrien.mazarguil@6wind.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180410162022.9101-1-adrien.mazarguil@6wind.com> X-Mailer: git-send-email 2.11.0 Subject: [dpdk-dev] [PATCH v3 14/16] ethdev: rename physical port item in flow API X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Apr 2018 16:37:18 -0000 While RTE_FLOW_ITEM_TYPE_PORT refers to physical ports of the underlying device using specific identifiers, these are often confused with DPDK port IDs exposed to applications in the global name space. Since this pattern item is seldom used, rename it RTE_FLOW_ITEM_PHY_PORT for better clarity. No ABI impact. Signed-off-by: Adrien Mazarguil --- app/test-pmd/cmdline_flow.c | 27 +++++++++++---------- app/test-pmd/config.c | 2 +- doc/guides/prog_guide/rte_flow.rst | 22 ++++++++--------- doc/guides/testpmd_app_ug/testpmd_funcs.rst | 2 +- lib/librte_ether/rte_flow.c | 2 +- lib/librte_ether/rte_flow.h | 31 ++++++++++-------------- 6 files changed, 41 insertions(+), 45 deletions(-) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index af0631036..a0dbec119 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -87,8 +87,8 @@ enum index { ITEM_PF, ITEM_VF, ITEM_VF_ID, - ITEM_PORT, - ITEM_PORT_INDEX, + ITEM_PHY_PORT, + ITEM_PHY_PORT_INDEX, ITEM_RAW, ITEM_RAW_RELATIVE, ITEM_RAW_SEARCH, @@ -441,7 +441,7 @@ static const enum index next_item[] = { ITEM_ANY, ITEM_PF, ITEM_VF, - ITEM_PORT, + ITEM_PHY_PORT, ITEM_RAW, ITEM_ETH, ITEM_VLAN, @@ -482,8 +482,8 @@ static const enum index item_vf[] = { ZERO, }; -static const enum index item_port[] = { - ITEM_PORT_INDEX, +static const enum index item_phy_port[] = { + ITEM_PHY_PORT_INDEX, ITEM_NEXT, ZERO, }; @@ -1059,18 +1059,19 @@ static const struct token token_list[] = { .next = NEXT(item_vf, NEXT_ENTRY(UNSIGNED), item_param), .args = ARGS(ARGS_ENTRY(struct rte_flow_item_vf, id)), }, - [ITEM_PORT] = { - .name = "port", - .help = "device-specific physical port index to use", - .priv = PRIV_ITEM(PORT, sizeof(struct rte_flow_item_port)), - .next = NEXT(item_port), + [ITEM_PHY_PORT] = { + .name = "phy_port", + .help = "match traffic from/to a specific physical port", + .priv = PRIV_ITEM(PHY_PORT, + sizeof(struct rte_flow_item_phy_port)), + .next = NEXT(item_phy_port), .call = parse_vc, }, - [ITEM_PORT_INDEX] = { + [ITEM_PHY_PORT_INDEX] = { .name = "index", .help = "physical port index", - .next = NEXT(item_port, NEXT_ENTRY(UNSIGNED), item_param), - .args = ARGS(ARGS_ENTRY(struct rte_flow_item_port, index)), + .next = NEXT(item_phy_port, NEXT_ENTRY(UNSIGNED), item_param), + .args = ARGS(ARGS_ENTRY(struct rte_flow_item_phy_port, index)), }, [ITEM_RAW] = { .name = "raw", diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 49ef87782..9f968919e 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -960,7 +960,7 @@ static const struct { MK_FLOW_ITEM(ANY, sizeof(struct rte_flow_item_any)), MK_FLOW_ITEM(PF, 0), MK_FLOW_ITEM(VF, sizeof(struct rte_flow_item_vf)), - MK_FLOW_ITEM(PORT, sizeof(struct rte_flow_item_port)), + MK_FLOW_ITEM(PHY_PORT, sizeof(struct rte_flow_item_phy_port)), MK_FLOW_ITEM(RAW, sizeof(struct rte_flow_item_raw)), MK_FLOW_ITEM(ETH, sizeof(struct rte_flow_item_eth)), MK_FLOW_ITEM(VLAN, sizeof(struct rte_flow_item_vlan)), diff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst index a0a124aa2..4e053c24b 100644 --- a/doc/guides/prog_guide/rte_flow.rst +++ b/doc/guides/prog_guide/rte_flow.rst @@ -195,8 +195,8 @@ When supported, this effectively enables an application to reroute traffic not necessarily intended for it (e.g. coming from or addressed to different physical ports, VFs or applications) at the device level. -It complements the behavior of some pattern items such as `Item: PORT`_ and -is meaningless without them. +It complements the behavior of some pattern items such as `Item: PHY_PORT`_ +and is meaningless without them. When transferring flow rules, **ingress** and **egress** attributes (`Attribute: Traffic direction`_) keep their original meaning, as if @@ -583,15 +583,15 @@ separate entities, should be addressed through their own DPDK port IDs. | ``mask`` | ``id`` | zeroed to match any VF ID | +----------+----------+---------------------------+ -Item: ``PORT`` -^^^^^^^^^^^^^^ +Item: ``PHY_PORT`` +^^^^^^^^^^^^^^^^^^ -Matches packets coming from the specified physical port of the underlying -device. +Matches traffic originating from (ingress) or going to (egress) a physical +port of the underlying device. -The first PORT item overrides the physical port normally associated with the -specified DPDK input port (port_id). This item can be provided several times -to match additional physical ports. +The first PHY_PORT item overrides the physical port normally associated with +the specified DPDK input port (port_id). This item can be provided several +times to match additional physical ports. Note that physical ports are not necessarily tied to DPDK input ports (port_id) when those are not under DPDK control. Possible values are @@ -603,9 +603,9 @@ associated with a port_id should be retrieved by other means. - Default ``mask`` matches any port index. -.. _table_rte_flow_item_port: +.. _table_rte_flow_item_phy_port: -.. table:: PORT +.. table:: PHY_PORT +----------+-----------+--------------------------------+ | Field | Subfield | Value | diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index af37c3d82..a2bbd1930 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -3208,7 +3208,7 @@ This section lists supported pattern items and their attributes, if any. - ``id {unsigned}``: VF ID. -- ``port``: device-specific physical port index to use. +- ``phy_port``: match traffic from/to a specific physical port. - ``index {unsigned}``: physical port index. diff --git a/lib/librte_ether/rte_flow.c b/lib/librte_ether/rte_flow.c index 1f247d656..6d4d7f5ed 100644 --- a/lib/librte_ether/rte_flow.c +++ b/lib/librte_ether/rte_flow.c @@ -38,7 +38,7 @@ static const struct rte_flow_desc_data rte_flow_desc_item[] = { MK_FLOW_ITEM(ANY, sizeof(struct rte_flow_item_any)), MK_FLOW_ITEM(PF, 0), MK_FLOW_ITEM(VF, sizeof(struct rte_flow_item_vf)), - MK_FLOW_ITEM(PORT, sizeof(struct rte_flow_item_port)), + MK_FLOW_ITEM(PHY_PORT, sizeof(struct rte_flow_item_phy_port)), MK_FLOW_ITEM(RAW, sizeof(struct rte_flow_item_raw)), MK_FLOW_ITEM(ETH, sizeof(struct rte_flow_item_eth)), MK_FLOW_ITEM(VLAN, sizeof(struct rte_flow_item_vlan)), diff --git a/lib/librte_ether/rte_flow.h b/lib/librte_ether/rte_flow.h index f3db2ec01..ed211a8eb 100644 --- a/lib/librte_ether/rte_flow.h +++ b/lib/librte_ether/rte_flow.h @@ -84,7 +84,7 @@ struct rte_flow_attr { * applications) at the device level. * * It complements the behavior of some pattern items such as - * RTE_FLOW_ITEM_TYPE_PORT and is meaningless without them. + * RTE_FLOW_ITEM_TYPE_PHY_PORT and is meaningless without them. * * When transferring flow rules, ingress and egress attributes keep * their original meaning, as if processing traffic emitted or @@ -172,17 +172,12 @@ enum rte_flow_item_type { /** * [META] * - * Matches packets coming from the specified physical port of the - * underlying device. - * - * The first PORT item overrides the physical port normally - * associated with the specified DPDK input port (port_id). This - * item can be provided several times to match additional physical - * ports. + * Matches traffic originating from (ingress) or going to (egress) a + * physical port of the underlying device. * - * See struct rte_flow_item_port. + * See struct rte_flow_item_phy_port. */ - RTE_FLOW_ITEM_TYPE_PORT, + RTE_FLOW_ITEM_TYPE_PHY_PORT, /** * Matches a byte string of a given length at a given offset. @@ -388,13 +383,13 @@ static const struct rte_flow_item_vf rte_flow_item_vf_mask = { #endif /** - * RTE_FLOW_ITEM_TYPE_PORT + * RTE_FLOW_ITEM_TYPE_PHY_PORT * - * Matches packets coming from the specified physical port of the underlying - * device. + * Matches traffic originating from (ingress) or going to (egress) a + * physical port of the underlying device. * - * The first PORT item overrides the physical port normally associated with - * the specified DPDK input port (port_id). This item can be provided + * The first PHY_PORT item overrides the physical port normally associated + * with the specified DPDK input port (port_id). This item can be provided * several times to match additional physical ports. * * Note that physical ports are not necessarily tied to DPDK input ports @@ -407,13 +402,13 @@ static const struct rte_flow_item_vf rte_flow_item_vf_mask = { * * A zeroed mask can be used to match any port index. */ -struct rte_flow_item_port { +struct rte_flow_item_phy_port { uint32_t index; /**< Physical port index. */ }; -/** Default mask for RTE_FLOW_ITEM_TYPE_PORT. */ +/** Default mask for RTE_FLOW_ITEM_TYPE_PHY_PORT. */ #ifndef __cplusplus -static const struct rte_flow_item_port rte_flow_item_port_mask = { +static const struct rte_flow_item_phy_port rte_flow_item_phy_port_mask = { .index = 0x00000000, }; #endif -- 2.11.0