From patchwork Wed Dec 13 13:00:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 121766 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp5439844qgn; Wed, 13 Dec 2017 05:01:16 -0800 (PST) X-Google-Smtp-Source: ACJfBovbbOv/zlEWANoSCQDFv8qtz3Y5QUK5K6ds9JUt8ZAKY2tBNgy4SFagCDKYZ85phYyTv3Sk X-Received: by 10.200.38.33 with SMTP id u30mr11254105qtu.197.1513170076743; Wed, 13 Dec 2017 05:01:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513170076; cv=none; d=google.com; s=arc-20160816; b=beUxhAiwk9ppVG6EmVZUZO26ESriS8YC4b9E6+o4rjPKqR43FeGkqg+oJkBMUe8Ags LaPqOgmRqnzVWQEzYsrdaSCmVvVdhDe/DbzzJ9OJVDGzOBmlXIm4pI/FgtfwnHRxqBz+ 0mQSvAg2VtPDiQyZI/4V3ks59r9J9SKQcoaOuSL4BMZK9Mkp6NmHUSK+9KOglG3L1pEy BIuWZ0BqSiRY/YPFDAdVgaHww0hGIauBiNO6Uixydz+vR2NNYpL/IyOJVh6uoR9sZdTa A1jDUueZBKqAiGC9O6Y6MmJuyy06W+nNf6YIoJYAVjaupz7dPX8LllNkLm3uQchdcpOI sutA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=IrPByqZoVg1NXnaEOxb/niEmM6n/rbxm8TMgrB8c96k=; b=wZj3kfyW8R8bMTYxr5ImiH2fab1Qt4L3qNGflHFDiYaeKENlKviehnpmUKeJN/xgv8 a6Pp62YrzIHN8RlUuuPPtXAcJSYSwDTfSD0YftCiOxouds/ErqkEqgV2/UnrHyBm6bYV 6LYzdIRI+BiEJ+eICRi9eIBLaGfP+BiAufE6mrMjiSbA2+Qb8x4mh5Ct7+0mXks0Y+fQ t46VMwAp2e5nBDGgtQos+OhMpZnBpoyztTKtwLhLu9RDXNoN7kh8LnSdjH9ZD2ixiEWT 0DDdY6RARw+ORb3mOHjv3mrmD7wc/jewBFEH1fIwMK4kzGyE5gw1KdkC4/r+cHBc7r8f kBew== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id 1si1763847qkh.355.2017.12.13.05.01.16; Wed, 13 Dec 2017 05:01:16 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 68D7260732; Wed, 13 Dec 2017 13:01:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-5.4 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id D13DD6086F; Wed, 13 Dec 2017 13:00:36 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 243F0607FB; Wed, 13 Dec 2017 13:00:31 +0000 (UTC) Received: from forward103p.mail.yandex.net (forward103p.mail.yandex.net [77.88.28.106]) by lists.linaro.org (Postfix) with ESMTPS id C400960655 for ; Wed, 13 Dec 2017 13:00:24 +0000 (UTC) Received: from mxback14j.mail.yandex.net (mxback14j.mail.yandex.net [IPv6:2a02:6b8:0:1619::90]) by forward103p.mail.yandex.net (Yandex) with ESMTP id 548D02183E9F for ; Wed, 13 Dec 2017 16:00:23 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback14j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id rmdTZQgEvH-0NZ8TJqO; Wed, 13 Dec 2017 16:00:23 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id ZKo7wGnMCt-0GUa95pw; Wed, 13 Dec 2017 16:00:16 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Wed, 13 Dec 2017 16:00:04 +0300 Message-Id: <1513170009-9281-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513170009-9281-1-git-send-email-odpbot@yandex.ru> References: <1513170009-9281-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 338 Subject: [lng-odp] [PATCH API-NEXT v1 1/6] api: pktio: start switching to using odp_proto_layer_t X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov Instead of using separate odp_pktio_parser_layer_t switch to using odp_proto_layer_t. Deprecate old enum and values. For now do not put them under ODP_DEPRECATED_API to let the rest of ODP code to adapt. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 338 (lumag:pktio_parse_layer) ** https://github.com/Linaro/odp/pull/338 ** Patch: https://github.com/Linaro/odp/pull/338.patch ** Base sha: d96a8207591fbcaac25b79286d7d72a537354c1f ** Merge commit sha: 874b90ec6730e9189edd69774044ef32d7f0d95f **/ include/odp/api/spec/packet_io.h | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/include/odp/api/spec/packet_io.h b/include/odp/api/spec/packet_io.h index a3312d280..bf30877f5 100644 --- a/include/odp/api/spec/packet_io.h +++ b/include/odp/api/spec/packet_io.h @@ -272,8 +272,8 @@ typedef struct odp_pktio_param_t { * not checked. * * IPv4 checksum checking may be enabled only when parsing level is - * ODP_PKTIO_PARSER_LAYER_L3 or higher. Similarly, L4 level checksum checking - * may be enabled only with parsing level ODP_PKTIO_PARSER_LAYER_L4 or higher. + * ODP_PROTO_LAYER_L3 or higher. Similarly, L4 level checksum checking + * may be enabled only with parsing level ODP_PROTO_LAYER_L4 or higher. * * Whether checksum checking was done and whether a checksum was correct * can be queried for each received packet with odp_packet_l3_chksum_status() @@ -405,24 +405,30 @@ typedef union odp_pktout_config_opt_t { /** * Parser layers + * + * @deprecated Use odp_proto_layer_t instead */ -typedef enum odp_pktio_parser_layer_t { - /** No layers */ - ODP_PKTIO_PARSER_LAYER_NONE = ODP_PROTO_LAYER_NONE, +typedef odp_proto_layer_t odp_pktio_parser_layer_t; - /** Layer L2 protocols (Ethernet, VLAN, ARP, etc) */ - ODP_PKTIO_PARSER_LAYER_L2 = ODP_PROTO_LAYER_L2, +/** No layers + * @deprecated Use ODP_PROTO_LAYER_NONE, instead */ +#define ODP_PKTIO_PARSER_LAYER_NONE ODP_PROTO_LAYER_NONE - /** Layer L3 protocols (IPv4, IPv6, ICMP, IPsec, etc) */ - ODP_PKTIO_PARSER_LAYER_L3 = ODP_PROTO_LAYER_L3, +/** Layer L2 protocols (Ethernet, VLAN, ARP, etc) + * @deprecated Use ODP_PROTO_LAYER_L2, instead */ +#define ODP_PKTIO_PARSER_LAYER_L2 ODP_PROTO_LAYER_L2 - /** Layer L4 protocols (UDP, TCP, SCTP) */ - ODP_PKTIO_PARSER_LAYER_L4 = ODP_PROTO_LAYER_L4, +/** Layer L3 protocols (IPv4, IPv6, ICMP, IPsec, etc) + * @deprecated Use ODP_PROTO_LAYER_L3, instead */ +#define ODP_PKTIO_PARSER_LAYER_L3 ODP_PROTO_LAYER_L3 - /** All layers */ - ODP_PKTIO_PARSER_LAYER_ALL = ODP_PROTO_LAYER_ALL +/** Layer L4 protocols (UDP, TCP, SCTP) + * @deprecated Use ODP_PROTO_LAYER_L4, instead */ +#define ODP_PKTIO_PARSER_LAYER_L4 ODP_PROTO_LAYER_L4 -} odp_pktio_parser_layer_t; +/** All layers + * @deprecated Use ODP_PROTO_LAYER_ALL instead */ +#define ODP_PKTIO_PARSER_LAYER_ALL ODP_PROTO_LAYER_ALL /** * Parser configuration @@ -436,8 +442,8 @@ typedef struct odp_pktio_parser_config_t { * set. In addition, offset (and pointer) to the next layer is set. * Other layer/protocol specific metadata have undefined values. * - * The default value is ODP_PKTIO_PARSER_LAYER_ALL. */ - odp_pktio_parser_layer_t layer; + * The default value is ODP_PROTO_LAYER_ALL. */ + odp_proto_layer_t layer; } odp_pktio_parser_config_t; From patchwork Wed Dec 13 13:00:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 121767 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp5441498qgn; Wed, 13 Dec 2017 05:02:15 -0800 (PST) X-Google-Smtp-Source: ACJfBotXuHutyexmIElW+Czq5PPyNuYbx+0wYwcGHJQFTn0mbG2xvkssMdSV16OPq033vSFhOw90 X-Received: by 10.237.60.206 with SMTP id e14mr11021710qtf.157.1513170135471; Wed, 13 Dec 2017 05:02:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513170135; cv=none; d=google.com; s=arc-20160816; b=u2GFC79KhbtlyPAf3VZpJ6Wf8s0YwsRuCGBbIgE9Z1iM8kdzt/AKKEpIlLAuylsus6 cCjXQA0ZBoMakx29mGkTNc32HYw+AOu/LzKNeYMTvQ9y6b2APn9FT8RBsY636n70DYP4 3KCgmcoQ7T9DEaPdaM639Jnkv7omqUvddv7Uafk0WvsIRWtG2NUNNFwpd9eeraBt5V+B hRi4wDB9+Q1PxdW7RTjqWAFCTaEuTdUEISHZwulBqLpiPTUcbVAdzbL47DMRxYSE1Ng0 Ai+jtcyamaN5v8t8wpQxMAgJDJZc2kdiLHivGhtq2Q27WrGmWidBTTSzqH4EFO4xnTkC fRhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=GuVPJQ9162iAWn5WjfRSU1qcC0X4AwkByQKPZ9JE1+Q=; b=Kqs3pph28FT1V3RvKS8WetKJ3Vp/4+yDdO5iLFzyQyhcnRF77+6VXNmVEBkB3LEEWg Edg8lajFAkInidqMuMJs77jaY/4mjfXA2jhORnPv9trzeYmnQYvUnBb8TuuiC5H8zzAM zpY3/uE8HYeQsntmk4WXwIfUBDmKPGogS8nG5aEIdErsE79WgDrLWIzTHVsYzEWVvjPJ OXBOfd8/ik67JS/2suw2QoIcVUCQom5k6bZJXu3zYHgXOxIWPrV9ZDVrXFSI7bTbRJy5 xGcUBMd3uIkXXd5uWTFFOk6S8QFgLdstfMYjMEU/P7/AodSzfXtgnXzrxyPWJnkK0+JT J8Hg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id q54si1830516qtf.201.2017.12.13.05.02.12; Wed, 13 Dec 2017 05:02:15 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 39C0E608EE; Wed, 13 Dec 2017 13:02:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id A732260732; Wed, 13 Dec 2017 13:01:18 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 2B52060902; Wed, 13 Dec 2017 13:01:11 +0000 (UTC) Received: from forward102p.mail.yandex.net (forward102p.mail.yandex.net [77.88.28.102]) by lists.linaro.org (Postfix) with ESMTPS id 7A0E860655 for ; Wed, 13 Dec 2017 13:00:34 +0000 (UTC) Received: from mxback11g.mail.yandex.net (mxback11g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:90]) by forward102p.mail.yandex.net (Yandex) with ESMTP id 11B264300D2F for ; Wed, 13 Dec 2017 16:00:30 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback11g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 5AlbawAMrc-0UZKklJA; Wed, 13 Dec 2017 16:00:30 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id ZKo7wGnMCt-0NUOF9TV; Wed, 13 Dec 2017 16:00:23 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Wed, 13 Dec 2017 16:00:05 +0300 Message-Id: <1513170009-9281-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513170009-9281-1-git-send-email-odpbot@yandex.ru> References: <1513170009-9281-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 338 Subject: [lng-odp] [PATCH API-NEXT v1 2/6] linux-gen: adapt to odp_pktio_parser_layer_t removal X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 338 (lumag:pktio_parse_layer) ** https://github.com/Linaro/odp/pull/338 ** Patch: https://github.com/Linaro/odp/pull/338.patch ** Base sha: d96a8207591fbcaac25b79286d7d72a537354c1f ** Merge commit sha: 874b90ec6730e9189edd69774044ef32d7f0d95f **/ platform/linux-generic/include/odp_packet_internal.h | 4 ++-- platform/linux-generic/odp_classification.c | 2 +- platform/linux-generic/odp_ipsec.c | 14 +++++++------- platform/linux-generic/odp_packet.c | 10 +++++----- platform/linux-generic/odp_packet_io.c | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index a16ec3161..40f3edc1e 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -296,11 +296,11 @@ int packet_alloc_multi(odp_pool_t pool_hdl, uint32_t len, /* Perform packet parse up to a given protocol layer */ int packet_parse_layer(odp_packet_hdr_t *pkt_hdr, - odp_pktio_parser_layer_t layer); + odp_proto_layer_t layer); /* Perform L3 and L4 parsing up to a given protocol layer */ int packet_parse_l3_l4(odp_packet_hdr_t *pkt_hdr, - odp_pktio_parser_layer_t layer, + odp_proto_layer_t layer, uint32_t l3_offset, uint16_t ethtype); diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 025f12593..276430923 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -973,7 +973,7 @@ int cls_classify_packet(pktio_entry_t *entry, const uint8_t *base, packet_set_len(pkt_hdr, pkt_len); packet_parse_common(&pkt_hdr->p, base, pkt_len, seg_len, - ODP_PKTIO_PARSER_LAYER_ALL); + ODP_PROTO_LAYER_ALL); cos = cls_select_cos(entry, base, pkt_hdr); if (cos == NULL) diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index 8735e6052..61ce48758 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -200,22 +200,22 @@ static const uint8_t ipsec_padding[255] = { 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff, }; -static inline odp_pktio_parser_layer_t parse_layer(odp_ipsec_proto_layer_t l) +static inline odp_proto_layer_t parse_layer(odp_ipsec_proto_layer_t l) { switch (l) { case ODP_IPSEC_LAYER_NONE: - return ODP_PKTIO_PARSER_LAYER_NONE; + return ODP_PROTO_LAYER_NONE; case ODP_IPSEC_LAYER_L2: - return ODP_PKTIO_PARSER_LAYER_L2; + return ODP_PROTO_LAYER_L2; case ODP_IPSEC_LAYER_L3: - return ODP_PKTIO_PARSER_LAYER_L3; + return ODP_PROTO_LAYER_L3; case ODP_IPSEC_LAYER_L4: - return ODP_PKTIO_PARSER_LAYER_L4; + return ODP_PROTO_LAYER_L4; case ODP_IPSEC_LAYER_ALL: - return ODP_PKTIO_PARSER_LAYER_ALL; + return ODP_PROTO_LAYER_ALL; } - return ODP_PKTIO_PARSER_LAYER_NONE; + return ODP_PROTO_LAYER_NONE; } static ipsec_sa_t *ipsec_in_single(odp_packet_t pkt, diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 5b5a9827c..50e8aa068 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -2200,7 +2200,7 @@ int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr, prs->l3_offset = offset; - if (layer <= ODP_PKTIO_PARSER_LAYER_L2) + if (layer <= ODP_PROTO_LAYER_L2) return prs->error_flags.all != 0; /* Set l3 flag only for known ethtypes */ @@ -2231,7 +2231,7 @@ int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr, ip_proto = 255; /* Reserved invalid by IANA */ } - if (layer == ODP_PKTIO_PARSER_LAYER_L3) + if (layer == ODP_PROTO_LAYER_L3) return prs->error_flags.all != 0; /* Set l4 flag only for known ip_proto */ @@ -2303,7 +2303,7 @@ int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, parseptr = ptr; offset = 0; - if (layer == ODP_PKTIO_PARSER_LAYER_NONE) + if (layer == ODP_PROTO_LAYER_NONE) return 0; /* Assume valid L2 header, no CRC/FCS check in SW */ @@ -2322,7 +2322,7 @@ int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, * Simple packet parser */ int packet_parse_layer(odp_packet_hdr_t *pkt_hdr, - odp_pktio_parser_layer_t layer) + odp_proto_layer_t layer) { uint32_t seg_len = packet_first_seg_len(pkt_hdr); void *base = packet_data(pkt_hdr); @@ -2332,7 +2332,7 @@ int packet_parse_layer(odp_packet_hdr_t *pkt_hdr, } int packet_parse_l3_l4(odp_packet_hdr_t *pkt_hdr, - odp_pktio_parser_layer_t layer, + odp_proto_layer_t layer, uint32_t l3_offset, uint16_t ethtype) { diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index aa6cdb068..ffbc73b26 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -998,7 +998,7 @@ void odp_pktio_config_init(odp_pktio_config_t *config) { memset(config, 0, sizeof(odp_pktio_config_t)); - config->parser.layer = ODP_PKTIO_PARSER_LAYER_ALL; + config->parser.layer = ODP_PROTO_LAYER_ALL; } int odp_pktio_info(odp_pktio_t hdl, odp_pktio_info_t *info) @@ -1203,7 +1203,7 @@ int odp_pktio_capability(odp_pktio_t pktio, odp_pktio_capability_t *capa) /* The same parser is used for all pktios */ if (ret == 0) - capa->config.parser.layer = ODP_PKTIO_PARSER_LAYER_ALL; + capa->config.parser.layer = ODP_PROTO_LAYER_ALL; return ret; } From patchwork Wed Dec 13 13:00:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 121769 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp5444997qgn; Wed, 13 Dec 2017 05:04:25 -0800 (PST) X-Google-Smtp-Source: ACJfBosx81Et8AskQ79Ieu55YjQFuKybZrJLv1Cc2eThY1lZtBpTHSt4aqc8hsdRTl14YRy2P57U X-Received: by 10.37.198.194 with SMTP id k185mr1563933ybf.136.1513170265203; Wed, 13 Dec 2017 05:04:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513170265; cv=none; d=google.com; s=arc-20160816; b=if3gWY4fWMBxngPgGZaSSnKONY58+LNgV3ND1G4Yz6L+cinpSxv83lSYjs/dYOXPge RIyk+qFqAnHklbScr4Cv/KqdijetcYrpbUZWqv8hEOhOHSdFPe2awQl7DQwFm5ZHu9nN 1LvJYOpZMLkdaYl7tVR0AFFY3a8i9znl6a/fHEvt4cNYD3mTASuKePOMXczB5DOvJpeA Dp2RjbdJk1+rbVFRt69hWrHJhej545+Tf5ejd3UwClSvLxAk7nkO1bs45kil9cMBdf7V Ii0dNndYkNMgRKAo4zj5ZqWHftZuNAeXY1KY3eeStpV+BLG2Oox3qpEalKlxTMjJJzVK GvvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=JLinCVNFBOcVALeCoxMweCkVZp0ot5hD7i8gwnv3eyI=; b=ZYBzFLj9TxGGzEkn2h9iomdjLWujdPzAT0H8qhxfrXHTjK4dD25/iohE/LsDL+e+9F MeC/zHDzGhMIbjF2/oXspBtbYQieMkfa/H4VGRTMW6Ry43tgDCfPc85QJomZ8qSUBDhQ mDCoG8OIuTStrrPbTJVUxo+zfZ+3JHGnqR5q974mR+SSudbqLonWzYn8cBkdGTkhC4gN F0KMQVjycmS5WZkU3tnJN4Lsdv3tBPkQ9aRYzOAY0xfLCy2IPAURoMPeryXDJLuh7hJ/ xdzgoSdVIVIzPeoWepExOc5kv0ZDX1a854E++FKFArMltPMEq9jXSrPF+dp6ZYJdUPVQ oPnw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id e44si1817313qtf.10.2017.12.13.05.04.24; Wed, 13 Dec 2017 05:04:25 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id CD15C607C5; Wed, 13 Dec 2017 13:04:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 141516088A; Wed, 13 Dec 2017 13:02:19 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 6218960888; Wed, 13 Dec 2017 13:02:03 +0000 (UTC) Received: from forward105j.mail.yandex.net (forward105j.mail.yandex.net [5.45.198.248]) by lists.linaro.org (Postfix) with ESMTPS id 1F2A1607C5 for ; Wed, 13 Dec 2017 13:00:38 +0000 (UTC) Received: from mxback2j.mail.yandex.net (mxback2j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10b]) by forward105j.mail.yandex.net (Yandex) with ESMTP id 8E853184775 for ; Wed, 13 Dec 2017 16:00:36 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback2j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id vcycusfZTE-0aZ4Hj3M; Wed, 13 Dec 2017 16:00:36 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id ZKo7wGnMCt-0UUCCNXJ; Wed, 13 Dec 2017 16:00:30 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Wed, 13 Dec 2017 16:00:06 +0300 Message-Id: <1513170009-9281-4-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513170009-9281-1-git-send-email-odpbot@yandex.ru> References: <1513170009-9281-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 338 Subject: [lng-odp] [PATCH API-NEXT v1 3/6] validation: use odp_proto_layer_t instead of odp_pktio_parser_layer_t X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 338 (lumag:pktio_parse_layer) ** https://github.com/Linaro/odp/pull/338 ** Patch: https://github.com/Linaro/odp/pull/338.patch ** Base sha: d96a8207591fbcaac25b79286d7d72a537354c1f ** Merge commit sha: 874b90ec6730e9189edd69774044ef32d7f0d95f **/ test/validation/api/ipsec/ipsec.c | 2 +- test/validation/api/pktio/parser.c | 2 +- test/validation/api/pktio/pktio.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c index 7b39c2c5a..b99bee94e 100644 --- a/test/validation/api/ipsec/ipsec.c +++ b/test/validation/api/ipsec/ipsec.c @@ -84,7 +84,7 @@ static int pktio_start(odp_pktio_t pktio, odp_bool_t in, odp_bool_t out) return 0; odp_pktio_config_init(&config); - config.parser.layer = ODP_PKTIO_PARSER_LAYER_ALL; + config.parser.layer = ODP_PROTO_LAYER_ALL; config.inbound_ipsec = in; config.outbound_ipsec = out; diff --git a/test/validation/api/pktio/parser.c b/test/validation/api/pktio/parser.c index 66e726d09..1788d4d64 100644 --- a/test/validation/api/pktio/parser.c +++ b/test/validation/api/pktio/parser.c @@ -122,7 +122,7 @@ static odp_pktio_t create_pktio(int iface_idx, odp_pool_t pool) } odp_pktio_config_init(&config); - config.parser.layer = ODP_PKTIO_PARSER_LAYER_ALL; + config.parser.layer = ODP_PROTO_LAYER_ALL; if (odp_pktio_config(pktio, &config)) { printf("Error: failed to configure %s\n", iface); return ODP_PKTIO_INVALID; diff --git a/test/validation/api/pktio/pktio.c b/test/validation/api/pktio/pktio.c index 39451de3b..a6820a1de 100644 --- a/test/validation/api/pktio/pktio.c +++ b/test/validation/api/pktio/pktio.c @@ -1230,7 +1230,7 @@ void pktio_test_pktio_config(void) odp_pktio_config_init(&config); - CU_ASSERT(config.parser.layer == ODP_PKTIO_PARSER_LAYER_ALL); + CU_ASSERT(config.parser.layer == ODP_PROTO_LAYER_ALL); CU_ASSERT(odp_pktio_config(pktio, NULL) == 0); From patchwork Wed Dec 13 13:00:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 121770 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp5445240qgn; Wed, 13 Dec 2017 05:04:34 -0800 (PST) X-Google-Smtp-Source: ACJfBovEpE9A9Sb7Qwje9Wxnf4ScLTM0N0VjNTcA2T5HaEZvkO4LMm6vm5oLdKY6UjC9oini1PWE X-Received: by 10.55.170.130 with SMTP id t124mr10447199qke.84.1513170274374; Wed, 13 Dec 2017 05:04:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513170274; cv=none; d=google.com; s=arc-20160816; b=BeViL0l1a++NeehdrE2gR/PbInaIIGQYNSYALCLB6fe9X3Pv3FfOVyurp3oXqsGq5c 7XdDSJmGI80G0+hTAGsu06P1BBPoKJSRbRd9PRwEHUBgN6Wg9V34BcBBm2wQJHDm2dnp RMQsPBlHhBwQ34evlttk1cMnJ9tObW4KfhZIe98GLzaDwCaP2vkjbECLYycIZMC19izm Vew+813Ml0GFFbgAaVw1DZNrC84tpcUk0oFZLo5psxfQ3ELJYVX5b06N8EyhQbvYFYz1 xRW1vBd5K7Cb847gWxyk5z35I13TzXVtQfmr8rLQAe1SClPFUyLQat3W59QDgN++Nb2I LXRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=C1X+onpzIcdSX7Eg00oTOyWzkny3Ck3SEmTdVoLlxZg=; b=sHqoPEgahAQLPEDKt9CWaIzPfp7swiYv2ztZaQa5LYZMrh1YDBPDvVbW6etX58JRPA bgm4vnre14og3u2Ovz/3KDg9B2SwjbKn+yzHIoIJ8O25yJCeqkWJ/1IIpBcbYXvjmaTI jmhftq0rPDYpiDErIRnsGm12SDFA3sQhFBfx6Vk9O7BuvGjGPHdResakYM+nc4jWPdqT LR/04nt72g2Qk8MjoruPSChXua+n+m+K9D26h9aVY5EVcfR23tDHMN6W9W2tghhsbu5A ltBEtgFZpBUGRvHSeMO1AghLUMs/e8I2DAz6Hp1euXMIZS9XF2yrXqQEGbb7tohKx58c EmRg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id o25si2059066qkh.28.2017.12.13.05.04.33; Wed, 13 Dec 2017 05:04:34 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id D5D0F60800; Wed, 13 Dec 2017 13:04:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 4E79460927; Wed, 13 Dec 2017 13:02:24 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 76388607C5; Wed, 13 Dec 2017 13:02:05 +0000 (UTC) Received: from forward100j.mail.yandex.net (forward100j.mail.yandex.net [5.45.198.240]) by lists.linaro.org (Postfix) with ESMTPS id 2552A608F6 for ; Wed, 13 Dec 2017 13:00:53 +0000 (UTC) Received: from mxback12j.mail.yandex.net (mxback12j.mail.yandex.net [IPv6:2a02:6b8:0:1619::87]) by forward100j.mail.yandex.net (Yandex) with ESMTP id 33A145D840BD for ; Wed, 13 Dec 2017 16:00:43 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback12j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id tclxAYeKYC-0hjekrDo; Wed, 13 Dec 2017 16:00:43 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id ZKo7wGnMCt-0aUOoEAE; Wed, 13 Dec 2017 16:00:36 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Wed, 13 Dec 2017 16:00:07 +0300 Message-Id: <1513170009-9281-5-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513170009-9281-1-git-send-email-odpbot@yandex.ru> References: <1513170009-9281-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 338 Subject: [lng-odp] [PATCH API-NEXT v1 4/6] performance: use odp_proto_layer_t instead of odp_pktio_parser_layer_t X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 338 (lumag:pktio_parse_layer) ** https://github.com/Linaro/odp/pull/338 ** Patch: https://github.com/Linaro/odp/pull/338.patch ** Base sha: d96a8207591fbcaac25b79286d7d72a537354c1f ** Merge commit sha: 874b90ec6730e9189edd69774044ef32d7f0d95f **/ test/performance/odp_l2fwd.c | 4 ++-- test/performance/odp_pktio_ordered.c | 2 +- test/performance/odp_pktio_perf.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/performance/odp_l2fwd.c b/test/performance/odp_l2fwd.c index 0ebb0dd17..27b299399 100644 --- a/test/performance/odp_l2fwd.c +++ b/test/performance/odp_l2fwd.c @@ -737,8 +737,8 @@ static int create_pktio(const char *dev, int idx, int num_rx, int num_tx, odp_pktio_config_init(&config); config.parser.layer = gbl_args->appl.extra_check ? - ODP_PKTIO_PARSER_LAYER_ALL : - ODP_PKTIO_PARSER_LAYER_NONE; + ODP_PROTO_LAYER_ALL : + ODP_PROTO_LAYER_NONE; if (gbl_args->appl.chksum) { printf("Checksum offload enabled\n"); diff --git a/test/performance/odp_pktio_ordered.c b/test/performance/odp_pktio_ordered.c index ed4e2e8e4..2248eb2fd 100644 --- a/test/performance/odp_pktio_ordered.c +++ b/test/performance/odp_pktio_ordered.c @@ -618,7 +618,7 @@ static int create_pktio(const char *dev, int idx, int num_rx, int num_tx, } odp_pktio_config_init(&config); - config.parser.layer = ODP_PKTIO_PARSER_LAYER_L2; + config.parser.layer = ODP_PROTO_LAYER_L2; odp_pktio_config(pktio, &config); odp_pktin_queue_param_init(&pktin_param); diff --git a/test/performance/odp_pktio_perf.c b/test/performance/odp_pktio_perf.c index a4599de62..4c09b12e4 100644 --- a/test/performance/odp_pktio_perf.c +++ b/test/performance/odp_pktio_perf.c @@ -797,7 +797,7 @@ static int test_init(void) * affects scalability. */ odp_pktio_config_init(&cfg); - cfg.parser.layer = ODP_PKTIO_PARSER_LAYER_NONE; + cfg.parser.layer = ODP_PROTO_LAYER_NONE; odp_pktio_config(gbl_args->pktio_rx, &cfg); if (gbl_args->args.num_ifaces > 1) { From patchwork Wed Dec 13 13:00:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 121768 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp5444143qgn; Wed, 13 Dec 2017 05:03:51 -0800 (PST) X-Google-Smtp-Source: ACJfBov6zIoqTg61YlKHd2MFHSWifHTpTzENlM9A9/3npOLOG0JqtnAtSf6aPzHQNELuAEAv2HL2 X-Received: by 10.55.170.130 with SMTP id t124mr10443539qke.84.1513170231424; Wed, 13 Dec 2017 05:03:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513170231; cv=none; d=google.com; s=arc-20160816; b=cOKqfhLidD6TCSxyqpcw6vr60x2vnNhoqeAGHMo/EMki8O6Y5rpz+20uiquiC5gRe3 NZlFi7Jhjxf9MDbyXKjZPmJnwCkWQWRd27Ym8XBCytVcB4KKoRb6zZLwB8asdXot9foR 3TDlIWD9pMGPPJ5MvnAFKIe8cafPK0legVSW079LgP3CKoQyGa535pK0R3O1IMEWjEI7 H59bGoEVENAKi3iGfMvbEbK4bN5dfr3LszdstnRT6u25qxaiozLQRshFOlO7B5Ltv2zD PbDbw0XxE1jseDRofSOVYM4A4JhiLuoKbAwgvBzHx7kxKM4HUS4B0VuD/Q623TbXXyVi 8Jqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=NXdQ+8ieyoOFfNbMyb7vqvl2bUBs+z1bgBZLoyRi+F4=; b=p+9z0N10nwH1kYxaVnvuWFS2D2tKE6eiFgCCkxg8a+kBCFaSTdfo3cKU/iBJEutTLZ 7Qhp/wk2hUm9lBuW6aToVvA95ZxTwqeFWivkxWw2HNVGIQ3XLIDnWG/4Pd4lRSgGQvF+ 8edX1tnOpd8x2uFhcnS3+pwonLImcJX7UW+5sXOG7uHZ9xQbyopaN/zd66Dbx0FGzuZ7 ejIFSUtdhUKozJtqihlPDJDe+W+NAWoqvuJuL+HgjVIitaj2uKg3If00tkYVXYrDI9TI ygNQdTj9DrnVISpjdJQcIbmV03vBTRgNLcwZu3mZBTpjfBvwpxTU5N34E0uBRLq+x5J+ fLVg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id k25si1894183qtk.28.2017.12.13.05.03.51; Wed, 13 Dec 2017 05:03:51 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 0797C6074A; Wed, 13 Dec 2017 13:03:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id C00C9607C5; Wed, 13 Dec 2017 13:02:10 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 14C5E60922; Wed, 13 Dec 2017 13:02:03 +0000 (UTC) Received: from forward102j.mail.yandex.net (forward102j.mail.yandex.net [5.45.198.243]) by lists.linaro.org (Postfix) with ESMTPS id 6C8186067F for ; Wed, 13 Dec 2017 13:00:51 +0000 (UTC) Received: from mxback5j.mail.yandex.net (mxback5j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10e]) by forward102j.mail.yandex.net (Yandex) with ESMTP id D900056065E0 for ; Wed, 13 Dec 2017 16:00:49 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback5j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id ReKrBiqtWT-0nT4WVVL; Wed, 13 Dec 2017 16:00:49 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id ZKo7wGnMCt-0hUmuQjH; Wed, 13 Dec 2017 16:00:43 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Wed, 13 Dec 2017 16:00:08 +0300 Message-Id: <1513170009-9281-6-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513170009-9281-1-git-send-email-odpbot@yandex.ru> References: <1513170009-9281-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 338 Subject: [lng-odp] [PATCH API-NEXT v1 5/6] example: use odp_proto_layer_t instead of odp_pktio_parser_layer_t X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 338 (lumag:pktio_parse_layer) ** https://github.com/Linaro/odp/pull/338 ** Patch: https://github.com/Linaro/odp/pull/338.patch ** Base sha: d96a8207591fbcaac25b79286d7d72a537354c1f ** Merge commit sha: 874b90ec6730e9189edd69774044ef32d7f0d95f **/ example/l2fwd_simple/odp_l2fwd_simple.c | 2 +- example/l3fwd/odp_l3fwd.c | 4 ++-- example/switch/odp_switch.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/example/l2fwd_simple/odp_l2fwd_simple.c b/example/l2fwd_simple/odp_l2fwd_simple.c index e63814555..2592c3744 100644 --- a/example/l2fwd_simple/odp_l2fwd_simple.c +++ b/example/l2fwd_simple/odp_l2fwd_simple.c @@ -52,7 +52,7 @@ static odp_pktio_t create_pktio(const char *name, odp_pool_t pool, } odp_pktio_config_init(&config); - config.parser.layer = ODP_PKTIO_PARSER_LAYER_L2; + config.parser.layer = ODP_PROTO_LAYER_L2; odp_pktio_config(pktio, &config); odp_pktin_queue_param_init(&in_queue_param); diff --git a/example/l3fwd/odp_l3fwd.c b/example/l3fwd/odp_l3fwd.c index d5a24aa63..3946546fb 100644 --- a/example/l3fwd/odp_l3fwd.c +++ b/example/l3fwd/odp_l3fwd.c @@ -123,8 +123,8 @@ static int create_pktio(const char *name, odp_pool_t pool, odp_pktio_config_init(&config); config.parser.layer = global.cmd_args.error_check ? - ODP_PKTIO_PARSER_LAYER_ALL : - ODP_PKTIO_PARSER_LAYER_L4; + ODP_PROTO_LAYER_ALL : + ODP_PROTO_LAYER_L4; odp_pktio_config(pktio, &config); fwd_pktio->nb_rxq = (int)capa.max_input_queues; diff --git a/example/switch/odp_switch.c b/example/switch/odp_switch.c index be4830998..3e52970be 100644 --- a/example/switch/odp_switch.c +++ b/example/switch/odp_switch.c @@ -240,7 +240,7 @@ static int create_pktio(const char *dev, int idx, int num_rx, int num_tx, } odp_pktio_config_init(&config); - config.parser.layer = ODP_PKTIO_PARSER_LAYER_L2; + config.parser.layer = ODP_PROTO_LAYER_L2; odp_pktio_config(pktio, &config); odp_pktin_queue_param_init(&pktin_param); From patchwork Wed Dec 13 13:00:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 121771 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp5446057qgn; Wed, 13 Dec 2017 05:05:09 -0800 (PST) X-Google-Smtp-Source: ACJfBotPBYgefscVTSbyXwreYejvVodso/RxPDakx/fDJsGjkgYwkZ5xb1+vtx8rw3JE+pV7u3qo X-Received: by 10.55.157.66 with SMTP id g63mr10268089qke.59.1513170309396; Wed, 13 Dec 2017 05:05:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513170309; cv=none; d=google.com; s=arc-20160816; b=bxm8wfx3U1y3zobidRASnNuDLhCXn+SQMDLPBM9qQahbKnywFz6Uaugh4slOJh6zx1 gupm3LECZnKxfMkvgOFMJ96yvOOrqGUxQgM3RGtDv8ceIOE7Y8fcRu1f6Qx/EFpXrFm4 LZJuHY/xuiPdgU88mu5zAol817nxV1Vrd9zW6Kq5F1VVIWMZHfOmEnNxBd7A/dRPyuco 31+w+Yf2v/EbsYxGEDINUzqzKfqAfNFNq5mz6F1+2IAbj9Ew533ah5OvDmZ1/6voVyXq 9AFSqRrP5NyVkAuRW/eLw89f4RLaHDzMHbo9gFCK3xrGaSMxTnboo6B3uJVkY5k/ab+Y 6XQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=tdnFvoOs5JrjMvINYuLL1JGzNNL6a+XPEAhG6KhXrpA=; b=W0RpsBdd5eMf/Gdh3KKJpR9lg8z6RtELw4cUQX+2LKzE9jD7a107UukRDtclsV/GQn VtIonmQz5MgFe3eB4gFzjZW2zw2vs68fLS3oHaG9kp4D8thKuM/86UZW99ble7PNfS37 kShxrdiYOnNiEh8FoD4ZaA8V3/+uciWm9v2/OOs4ywZp20tJDuAbOL6Pf0pa3a7Ud6fl 0ZnSKJilQX9Aq2fl1W4sAbTMXPw5yzQUd1XwmbAxwGkG7SW1WlBrEmS/07WkJG6khUdS g/vmuTg11q/VBoiOFfwGoSrbtzZTIZ6NySA17mdqF4lydJKK8G+sZghqNzUOqEjoonwj 8YSA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id x3si391992qtf.197.2017.12.13.05.05.09; Wed, 13 Dec 2017 05:05:09 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id E42DF608EE; Wed, 13 Dec 2017 13:05:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 8D6A66093D; Wed, 13 Dec 2017 13:02:26 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 1A30A607C5; Wed, 13 Dec 2017 13:02:07 +0000 (UTC) Received: from forward101j.mail.yandex.net (forward101j.mail.yandex.net [5.45.198.241]) by lists.linaro.org (Postfix) with ESMTPS id DBCF5608EE for ; Wed, 13 Dec 2017 13:00:57 +0000 (UTC) Received: from mxback11j.mail.yandex.net (mxback11j.mail.yandex.net [IPv6:2a02:6b8:0:1619::84]) by forward101j.mail.yandex.net (Yandex) with ESMTP id 607851240A50 for ; Wed, 13 Dec 2017 16:00:56 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback11j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id xTbwEBnrgf-0uK8ZuZK; Wed, 13 Dec 2017 16:00:56 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id ZKo7wGnMCt-0nU0L3Gl; Wed, 13 Dec 2017 16:00:49 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Wed, 13 Dec 2017 16:00:09 +0300 Message-Id: <1513170009-9281-7-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513170009-9281-1-git-send-email-odpbot@yandex.ru> References: <1513170009-9281-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 338 Subject: [lng-odp] [PATCH API-NEXT v1 6/6] api: pktio: disable odp_pktio_parser_layer_t for non-deprecated builds X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov Finally put old odp_pktio_parser_layer_t and related values under ODP_DEPRECATED_API guard. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 338 (lumag:pktio_parse_layer) ** https://github.com/Linaro/odp/pull/338 ** Patch: https://github.com/Linaro/odp/pull/338.patch ** Base sha: d96a8207591fbcaac25b79286d7d72a537354c1f ** Merge commit sha: 874b90ec6730e9189edd69774044ef32d7f0d95f **/ include/odp/api/spec/packet_io.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/odp/api/spec/packet_io.h b/include/odp/api/spec/packet_io.h index bf30877f5..43b0e352b 100644 --- a/include/odp/api/spec/packet_io.h +++ b/include/odp/api/spec/packet_io.h @@ -408,8 +408,9 @@ typedef union odp_pktout_config_opt_t { * * @deprecated Use odp_proto_layer_t instead */ -typedef odp_proto_layer_t odp_pktio_parser_layer_t; +typedef odp_proto_layer_t ODP_DEPRECATE(odp_pktio_parser_layer_t); +#if ODP_DEPRECATED_API /** No layers * @deprecated Use ODP_PROTO_LAYER_NONE, instead */ #define ODP_PKTIO_PARSER_LAYER_NONE ODP_PROTO_LAYER_NONE @@ -429,6 +430,7 @@ typedef odp_proto_layer_t odp_pktio_parser_layer_t; /** All layers * @deprecated Use ODP_PROTO_LAYER_ALL instead */ #define ODP_PKTIO_PARSER_LAYER_ALL ODP_PROTO_LAYER_ALL +#endif /** * Parser configuration