From patchwork Tue Feb 27 20:00:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 129849 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp212488lja; Tue, 27 Feb 2018 12:04:10 -0800 (PST) X-Google-Smtp-Source: AG47ELvUSIv5gg9aCV32/ewhF8vXj9GpdmJFHByLSUwcEE+f11AW9bQ07AoAMPSYixDhbXGg6PB8 X-Received: by 10.237.59.59 with SMTP id p56mr26313488qte.84.1519761850681; Tue, 27 Feb 2018 12:04:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519761850; cv=none; d=google.com; s=arc-20160816; b=Is+XyORBcNAZk77M42PYWVi43yCZvXsrXUKZcaSeFU+OQTNIsU4WTirOu+5Gm7b1p/ jRmwjH/0RWgmaQs0TAKqGTBM9zysnbn+sLT/BTsnDnaG2Qo5oxl6QvgHGoeuRXX0aAqo DeNHn2DkvwwRcehw+LQzYKDZfIiSjtvh5Utl2j1qiW9ERV9a5Q/weHC8uN5j90jkHMC3 cxT/ve/jCMYUXjfM1mrArMMsbaM+ZY6cbqBcJHoYFvysGVU0mHJJNiPXr6IBP9xlIU3H eL5Fba20bk6kGSvxKSGQw/Bwya8TWkBDCiQfH8X/3ITB01eazRjtFRBosfPwYnvm/FY5 Nw8A== 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=NIyV0eKCBirc+nK/g+vCthjEHShcv87SO89dqUlRsIA=; b=dsnZZbBMnTh15c3vR/Id90Ck8lr3CnJPOQPwTfnpbEm6YLrSiXkK51nfv68uuQNPLw 4kBoIsbE0fSlr+dOf0eyBT4WE1GPWJn4qHLo4J1BWtK3VLYxiIb3ux3Cn+HVWToTtU/8 EYIYzvnN5jDOyhlZyJUEBTQibahhBYSDiz3PFvESNYKBpujaS1H/cVZ5dtVQ567jM8oq NGIByiZuslkQAH98r5OroRzjIGKmc77+Aw4zzjjcdItLtWoqxNAfGw2sBLRFkHp36/DW kRADpVlq9zzDPBFSVbEvLsWnQVrxyl7wrLzEDT/+Ono8gHjphXl2h47nXRGmYheBaAb3 e9xw== 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 p30si3307427qtl.313.2018.02.27.12.04.10; Tue, 27 Feb 2018 12:04:10 -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 52A9360C76; Tue, 27 Feb 2018 20:04:10 +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 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 119A260834; Tue, 27 Feb 2018 20:00:41 +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 60EE26173E; Tue, 27 Feb 2018 20:00:21 +0000 (UTC) Received: from forward104p.mail.yandex.net (forward104p.mail.yandex.net [77.88.28.107]) by lists.linaro.org (Postfix) with ESMTPS id 51F896173E for ; Tue, 27 Feb 2018 20:00:17 +0000 (UTC) Received: from mxback8o.mail.yandex.net (mxback8o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::22]) by forward104p.mail.yandex.net (Yandex) with ESMTP id 4839B1841B7 for ; Tue, 27 Feb 2018 23:00:16 +0300 (MSK) Received: from smtp4j.mail.yandex.net (smtp4j.mail.yandex.net [2a02:6b8:0:1619::15:6]) by mxback8o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id fAqL6T6SYp-0GH0WkpH; Tue, 27 Feb 2018 23:00:16 +0300 Received: by smtp4j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Upcczghx1N-0FQOwCcn; Tue, 27 Feb 2018 23:00:15 +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: Tue, 27 Feb 2018 23:00:04 +0300 Message-Id: <1519761609-20848-7-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519761609-20848-1-git-send-email-odpbot@yandex.ru> References: <1519761609-20848-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 502 Subject: [lng-odp] [PATCH API-NEXT v3 6/11] linux-gen: packet: support L4 type No Next Header 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 502 (lumag:ipsec-imp-upd) ** https://github.com/Linaro/odp/pull/502 ** Patch: https://github.com/Linaro/odp/pull/502.patch ** Base sha: ce5c4f9e7ce9fe504451c29429b9ae9fb68083ae ** Merge commit sha: fcd6960c97fe9a0a399be4f3418ba3dd83134544 **/ platform/linux-generic/include/odp/api/plat/packet_inline_types.h | 1 + platform/linux-generic/include/protocols/ip.h | 1 + platform/linux-generic/odp_packet.c | 6 ++++++ 3 files changed, 8 insertions(+) diff --git a/platform/linux-generic/include/odp/api/plat/packet_inline_types.h b/platform/linux-generic/include/odp/api/plat/packet_inline_types.h index 2e8efecb6..4b88d3517 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_inline_types.h +++ b/platform/linux-generic/include/odp/api/plat/packet_inline_types.h @@ -90,6 +90,7 @@ typedef union { uint64_t tcp:1; /* TCP */ uint64_t sctp:1; /* SCTP */ uint64_t icmp:1; /* ICMP */ + uint64_t no_next_hdr:1; /* No Next Header */ uint64_t color:2; /* Packet color for traffic mgmt */ uint64_t nodrop:1; /* Drop eligibility status */ diff --git a/platform/linux-generic/include/protocols/ip.h b/platform/linux-generic/include/protocols/ip.h index f02980693..19aef3dcc 100644 --- a/platform/linux-generic/include/protocols/ip.h +++ b/platform/linux-generic/include/protocols/ip.h @@ -167,6 +167,7 @@ typedef struct ODP_PACKED { #define _ODP_IPPROTO_AH 0x33 /**< Authentication Header (51) */ #define _ODP_IPPROTO_ESP 0x32 /**< Encapsulating Security Payload (50) */ #define _ODP_IPPROTO_ICMPV6 0x3A /**< Internet Control Message Protocol (58) */ +#define _ODP_IPPROTO_NO_NEXT 0x3B /**< No Next Header (59) */ #define _ODP_IPPROTO_DEST 0x3C /**< IPv6 Destination header (60) */ #define _ODP_IPPROTO_SCTP 0x84 /**< Stream Control Transmission protocol (132) */ diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 2459a3aa8..b30cc63ad 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -2224,6 +2224,10 @@ int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr, prs->input_flags.sctp = 1; break; + case _ODP_IPPROTO_NO_NEXT: + prs->input_flags.no_next_hdr = 1; + break; + default: prs->input_flags.l4 = 0; break; @@ -2529,6 +2533,8 @@ odp_proto_l4_type_t odp_packet_l4_type(odp_packet_t pkt) else if (pkt_hdr->p.input_flags.icmp && pkt_hdr->p.input_flags.ipv6) return ODP_PROTO_L4_TYPE_ICMPV6; + else if (pkt_hdr->p.input_flags.no_next_hdr) + return ODP_PROTO_L4_TYPE_NO_NEXT; return ODP_PROTO_L4_TYPE_NONE; }