From patchwork Sat Nov 25 02:00:11 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: 119635 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp3002981qgn; Fri, 24 Nov 2017 18:18:30 -0800 (PST) X-Google-Smtp-Source: AGs4zMaXxiC+ukTJTpo1BM7Y2koNjLHu5apuapy/Lw60BnmJ8QczflbVMCp0rURTY10V1E/ovPJC X-Received: by 10.55.191.135 with SMTP id p129mr26921688qkf.211.1511576310018; Fri, 24 Nov 2017 18:18:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511576310; cv=none; d=google.com; s=arc-20160816; b=ROO6MyakigRLliG0Hwrp192gKT7YP0ZbUHBxugDTKsFprPxiQFi9TmeEpEWRF2nmYx 3joCcyfTcSWI0GsxqKZjlNEPGmR3lPoXujvBWZB5uc7ioVb7rcABwf4UGX5ZT3Wgo+l4 Y6jVsyUnlHKnF0HYJjkba9qRb35JAKxxu0SeTW5Hnh8MMmkCv/QqDCp11+FAUvoiNgwj ofs5k3YkQG62VlC+j0bWeNJejJ3wgdNMMLflhQWkm0NXQo+HxjrZ3cSALVTi0iMvks1E ysGJnEQCll/GIGdmUcV1mdnBPv32jCLsgL46Blrca5yVHK39fS6vS1N77kLhUU0DMEGY bfIA== 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=q7ejHJsJieiAhU3ZcAkCGPQFXHO6cJryF06XwoRqe0s=; b=PMeWYGcZmytonj+NdLHfkd/XvYy4h+sfvDMu11HIVPr1/Lm8CEEdXK8eswqo6c0zVH BPfJyRISfqssiUlKy4bsOQVKPejDYXRZSIFFclSFQVotXo8JIUgOhkPg+I8D1AXiI5hE C7fo2fmCdVQwK0sNvZZ7BDnwcPGJ/R2xmG0J6jfuRuuSF2KRTXZt3mdAyIfC+SZMGgoL bROnVPZbAf6BNtTmdz084kSj2+0CVXmfe380PbK7aWscu8Tat25JzTqaMYlHFnDA9r0H YeRzZDaTbIGNMBVCo7wlI0FV8gG6wMp4OxR7viKsKjOxt6r06V30aLr2N0R8vvGTsLr9 cGnA== 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 r75si305085qkl.195.2017.11.24.18.18.29; Fri, 24 Nov 2017 18:18:30 -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 9CC40608AC; Sat, 25 Nov 2017 02:18:29 +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 4A39C60923; Sat, 25 Nov 2017 02:02:15 +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 DC48060880; Sat, 25 Nov 2017 02:02:01 +0000 (UTC) Received: from forward106o.mail.yandex.net (forward106o.mail.yandex.net [37.140.190.187]) by lists.linaro.org (Postfix) with ESMTPS id 101056083F for ; Sat, 25 Nov 2017 02:00:29 +0000 (UTC) Received: from mxback2o.mail.yandex.net (mxback2o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1c]) by forward106o.mail.yandex.net (Yandex) with ESMTP id DB62A785283 for ; Sat, 25 Nov 2017 05:00:27 +0300 (MSK) Received: from smtp3p.mail.yandex.net (smtp3p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:8]) by mxback2o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id HIQAYio1Tx-0ReOY0qP; Sat, 25 Nov 2017 05:00:27 +0300 Received: by smtp3p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 6zFBT0UdcP-0RT8qtto; Sat, 25 Nov 2017 05:00:27 +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: Sat, 25 Nov 2017 05:00:11 +0300 Message-Id: <1511575212-10926-11-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511575212-10926-1-git-send-email-odpbot@yandex.ru> References: <1511575212-10926-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 304 Subject: [lng-odp] [PATCH API-NEXT v4 10/11] linux-gen: packet: add flag for UDP-encapsulated IPsec packets 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 304 (lumag:ipsec-ipv6-2) ** https://github.com/Linaro/odp/pull/304 ** Patch: https://github.com/Linaro/odp/pull/304.patch ** Base sha: b95e7d08043ba45d12635c5afaa3fbf3a07ecc90 ** Merge commit sha: 9985269a954a3e183d4f19860e20e4f9b497cfdf **/ platform/linux-generic/include/odp/api/plat/packet_types.h | 1 + platform/linux-generic/odp_ipsec.c | 2 +- platform/linux-generic/odp_packet.c | 7 +++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/platform/linux-generic/include/odp/api/plat/packet_types.h b/platform/linux-generic/include/odp/api/plat/packet_types.h index 82fc66e53..128e83148 100644 --- a/platform/linux-generic/include/odp/api/plat/packet_types.h +++ b/platform/linux-generic/include/odp/api/plat/packet_types.h @@ -151,6 +151,7 @@ typedef union { uint64_t l3_chksum_done:1; /**< L3 checksum validation done */ uint64_t l4_chksum_done:1; /**< L4 checksum validation done */ + uint64_t ipsec_udp:1; /**< UDP-encapsulated IPsec packet */ }; } _odp_packet_input_flags_t; diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c index 0dffd98cf..31b5e687e 100644 --- a/platform/linux-generic/odp_ipsec.c +++ b/platform/linux-generic/odp_ipsec.c @@ -472,7 +472,7 @@ static int ipsec_in_esp_post(odp_packet_t pkt, ipsec_padding, esptrl.pad_len) != 0) return -1; - if (udp_encap) { + if (_ODP_IPPROTO_UDP == state->ip_next_hdr) { state->ip_hdr_len -= _ODP_UDPHDR_LEN; state->in.hdr_len += _ODP_UDPHDR_LEN; } diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index bdcb482fa..6919c71aa 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -2141,6 +2141,13 @@ static inline void parse_udp(packet_parser_t *prs, if (odp_unlikely(udplen < sizeof(_odp_udphdr_t))) prs->error_flags.udp_err = 1; + if (odp_cpu_to_be_16(_ODP_UDP_IPSEC_PORT) == udp->dst_port && + udplen > 4 && + *(const uint32_t *)(udp + 1) != 0) { + prs->input_flags.ipsec = 1; + prs->input_flags.ipsec_udp = 1; + } + if (offset) *offset += sizeof(_odp_udphdr_t); *parseptr += sizeof(_odp_udphdr_t);