From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by dpdk.org (Postfix) with ESMTP id 88FD31D0CF for ; Fri, 6 Apr 2018 15:25:46 +0200 (CEST) Received: by mail-wm0-f68.google.com with SMTP id t67so3572486wmt.0 for ; Fri, 06 Apr 2018 06:25:46 -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=F9SQ+zozBgwVfTJ/Qd8ik4KD6m+SZ/BmwtCt0KfeK18=; b=OBA6NfLsLWrzEC2WRH4dkwDJ76biwun/evkpzLNE+dp9QKEJDcXVMJrtIRJh8239JQ PBE8zPlGnftT3aY7S2OepnX6jXulyhKl5HxudM05I3Oppy05fTckKMWLwGKDOYOo1Rm9 BGwfW6Fa9QG4c4MGfOPF6FjlmatVM9Xg9vtx3/jY/Ss8KvOQ5d2iYDJ2kYsngMeRPTl2 lJIYIIq5pMPvXE0nLq5NZdkkk/Kn66w/yYvQzHmpurziViXAHTQVOP+05JqXFoOVug5A 70OjBQqaGZ6aA36nGDpbmT4H4iPcV1/Wdnb7kXrRDcCpkzxY1jT+GsffkEQjgPQo3um3 LZ6g== 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=F9SQ+zozBgwVfTJ/Qd8ik4KD6m+SZ/BmwtCt0KfeK18=; b=X00cePHNLKsFrX2HuOyR338Zu0QcUw7BE7ZcAwfGEu0JuEjbAM4sdoCzJ2Ccy7o2SG qgh0r5WldMlbudq3/C40g+MJWamAVJBQPlkKuwpPxq8mRDPvsjDsXg+APmFOhYDRw47A vfBZsZ+88dL/8GvD5PKuERqlxlM+vR3t5OVkNNPYWpP351SVRs2pzmfJ9tQBgDL7y/3j +BZhuhatr72bn3uSVz0rKwC4aCHLBTcRYwRZ2/dX1nFrn2QayH6HEuTNLAVS45OLjNqt B7h3V6X17VjZYjTJw3P3g/46lgrPriz7JPMPolQ8xpzuKbWd5EurS69D8caLPe5qs1xv KdKA== X-Gm-Message-State: ALQs6tDFECK/Wy/sY34/KxQ6A3s6WNdp6RNCzhwiVIA6kq4z3V+6aQsb fuZU2LsM0HNLsFSZzRG+Osf1/A== X-Google-Smtp-Source: AIpwx4+hGqcV0PrfZnbKKT0TgfVYkcGaqck3SIimwD3D+lpfPVNnkVXtlhAc9jCQ9dtlMc384nEhhw== X-Received: by 10.28.217.67 with SMTP id q64mr13267449wmg.12.1523021146254; Fri, 06 Apr 2018 06:25:46 -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 m62sm17595605wmc.25.2018.04.06.06.25.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Apr 2018 06:25:45 -0700 (PDT) Date: Fri, 6 Apr 2018 15:25:32 +0200 From: Adrien Mazarguil To: Thomas Monjalon , Ferruh Yigit , dev@dpdk.org Message-ID: <20180406131736.19145-3-adrien.mazarguil@6wind.com> References: <20180404150312.12304-1-adrien.mazarguil@6wind.com> <20180406131736.19145-1-adrien.mazarguil@6wind.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180406131736.19145-1-adrien.mazarguil@6wind.com> X-Mailer: git-send-email 2.11.0 Subject: [dpdk-dev] [PATCH v2 02/15] ethdev: clarify flow API pattern items and actions 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: Fri, 06 Apr 2018 13:25:46 -0000 Although pattern items and actions examples end with "and so on", these lists include all existing definitions and as a result are updated almost every time new types are added. This is cumbersome and pointless. This patch also synchronizes Doxygen and external API documentation wording with a slight clarification regarding meta pattern items. No fundamental API change. Signed-off-by: Adrien Mazarguil --- doc/guides/prog_guide/rte_flow.rst | 23 +++++++++++------------ lib/librte_ether/rte_flow.h | 23 ++++++++++------------- 2 files changed, 21 insertions(+), 25 deletions(-) diff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst index 961943dda..a11ebd617 100644 --- a/doc/guides/prog_guide/rte_flow.rst +++ b/doc/guides/prog_guide/rte_flow.rst @@ -186,12 +186,13 @@ Pattern item Pattern items fall in two categories: -- Matching protocol headers and packet data (ANY, RAW, ETH, VLAN, IPV4, - IPV6, ICMP, UDP, TCP, SCTP, VXLAN, MPLS, GRE, ESP and so on), usually - associated with a specification structure. +- Matching protocol headers and packet data, usually associated with a + specification structure. These must be stacked in the same order as the + protocol layers to match inside packets, starting from the lowest. -- Matching meta-data or affecting pattern processing (END, VOID, INVERT, PF, - VF, PORT and so on), often without a specification structure. +- Matching meta-data or affecting pattern processing, often without a + specification structure. Since they do not match packet contents, their + position in the list is usually not relevant. Item specification structures are used to match specific values among protocol fields (or item properties). Documentation describes for each item @@ -1001,15 +1002,13 @@ to a flow rule. That list is not ordered. They fall in three categories: -- Terminating actions (such as QUEUE, DROP, RSS, PF, VF) that prevent - processing matched packets by subsequent flow rules, unless overridden - with PASSTHRU. +- Terminating actions that prevent processing matched packets by subsequent + flow rules, unless overridden with PASSTHRU. -- Non-terminating actions (PASSTHRU, DUP) that leave matched packets up for - additional processing by subsequent flow rules. +- Non-terminating actions that leave matched packets up for additional + processing by subsequent flow rules. -- Other non-terminating meta actions that do not affect the fate of packets - (END, VOID, MARK, FLAG, COUNT, SECURITY). +- Other non-terminating meta actions that do not affect the fate of packets. When several actions are combined in a flow rule, they should all have different types (e.g. dropping a packet twice is not possible). diff --git a/lib/librte_ether/rte_flow.h b/lib/librte_ether/rte_flow.h index 95799fd9c..36fd38ffa 100644 --- a/lib/librte_ether/rte_flow.h +++ b/lib/librte_ether/rte_flow.h @@ -78,15 +78,13 @@ struct rte_flow_attr { * * Pattern items fall in two categories: * - * - Matching protocol headers and packet data (ANY, RAW, ETH, VLAN, IPV4, - * IPV6, ICMP, UDP, TCP, SCTP, VXLAN and so on), usually associated with a + * - Matching protocol headers and packet data, usually associated with a * specification structure. These must be stacked in the same order as the - * protocol layers to match, starting from the lowest. + * protocol layers to match inside packets, starting from the lowest. * - * - Matching meta-data or affecting pattern processing (END, VOID, INVERT, - * PF, VF, PORT and so on), often without a specification structure. Since - * they do not match packet contents, these can be specified anywhere - * within item lists without affecting others. + * - Matching meta-data or affecting pattern processing, often without a + * specification structure. Since they do not match packet contents, their + * position in the list is usually not relevant. * * See the description of individual types for more information. Those * marked with [META] fall into the second category. @@ -865,15 +863,14 @@ struct rte_flow_item { * * They fall in three categories: * - * - Terminating actions (such as QUEUE, DROP, RSS, PF, VF) that prevent - * processing matched packets by subsequent flow rules, unless overridden - * with PASSTHRU. + * - Terminating actions that prevent processing matched packets by + * subsequent flow rules, unless overridden with PASSTHRU. * - * - Non terminating actions (PASSTHRU, DUP) that leave matched packets up - * for additional processing by subsequent flow rules. + * - Non terminating actions that leave matched packets up for additional + * processing by subsequent flow rules. * * - Other non terminating meta actions that do not affect the fate of - * packets (END, VOID, MARK, FLAG, COUNT). + * packets. * * When several actions are combined in a flow rule, they should all have * different types (e.g. dropping a packet twice is not possible). -- 2.11.0