From patchwork Tue Nov 28 14:00:14 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: 119874 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp1768805qgn; Tue, 28 Nov 2017 06:19:11 -0800 (PST) X-Google-Smtp-Source: AGs4zManP6NsJO7phL7eju+ZaQB5pn+PkDYhWF4+vZPAnc7CFBQ16qHikba6oAqKgIyP5ewp/Ciy X-Received: by 10.200.53.201 with SMTP id l9mr65420462qtb.155.1511878751704; Tue, 28 Nov 2017 06:19:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511878751; cv=none; d=google.com; s=arc-20160816; b=n4mAGO1jPsuUPLEri2D8PjOsD2KEE6cSnj9p/GTBQNU2aexrfEHbzIsjJbNuuRd71/ j/+XnLkYrfH9BRDWB9sSPxsPD/vQNvG5QUSSnCu1xfL7UHCNe4JzD9qAINicfpWkdGE3 YTN/gXw8oRChHdFG3boV8K0rg21pPHtWXTCsFaKSMUIo7slWHT5WU3eeY1ob6IXza0ub SV3n8ysWfmXzZJvMzqkZcl0dBrchCRz13SQW+p8hWvWX5jQtOv1X2BkEPRx2te3Rp09Y yNjXIfTKhXXsyfsZRVSW3AMN43U5AnxLaPgcq+2dC0H9ZZ0rGrU4/ekQcURQxGZ75pGm +ObA== 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=g/HzV/TF3uGEJjL3DZyftfMQhqUlpjdSAm7ipQgag2o=; b=OFEoAoLtF+A6fel4h6ca8Zskf3qLr9IER4g3PPj5/nmJA6GKQBmEEOhYG16AaMRF/Y UJQXEK+HMm/SWHk4GvLlAOBl/M3hQQenDbucF9ysQlXIHRS1xe/Cii99TcS1D5uN288T kmI/YolzUjY/uiYOx+eajmyEs4DDb62thnfEVjBsCtV9/uROlO7opU+3MN8wF1nJnjBr dttw8FtT+SKyadh5wam84h5stPGYf53gmAnQpVEOaLWX9OJNEOM31kxLQoFhlBolSbFw ZzTCWgfXKr8xWk7PxvbfhNT1GyQ4VNZb23qo3A8XGjgwLqAeAmQ6sHBjqxLJeJsMU5a3 gsAA== 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 c11si1078521qth.423.2017.11.28.06.19.11; Tue, 28 Nov 2017 06:19:11 -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 6024160967; Tue, 28 Nov 2017 14:19:11 +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 51D80608E9; Tue, 28 Nov 2017 14:02:39 +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 7C19F608D9; Tue, 28 Nov 2017 14:01:46 +0000 (UTC) Received: from forward102j.mail.yandex.net (forward102j.mail.yandex.net [5.45.198.243]) by lists.linaro.org (Postfix) with ESMTPS id 56DA0608E8 for ; Tue, 28 Nov 2017 14:00:32 +0000 (UTC) Received: from mxback8o.mail.yandex.net (mxback8o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::22]) by forward102j.mail.yandex.net (Yandex) with ESMTP id C8B4E5604266 for ; Tue, 28 Nov 2017 17:00:30 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback8o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id FmqzpNoOoE-0U6ivxFM; Tue, 28 Nov 2017 17:00:30 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id oX3D6J5qU6-0UVa09i0; Tue, 28 Nov 2017 17: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: Tue, 28 Nov 2017 17:00:14 +0300 Message-Id: <1511877619-376-11-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511877619-376-1-git-send-email-odpbot@yandex.ru> References: <1511877619-376-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 304 Subject: [lng-odp] [PATCH API-NEXT v6 10/15] 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: 4cb02e1caccb9179575e95448fd46979e17d0905 ** Merge commit sha: 58c25c5ed099e25c8738c9220274c3bcf3fb66d2 **/ platform/linux-generic/include/odp/api/plat/packet_types.h | 1 + platform/linux-generic/odp_ipsec.c | 2 +- platform/linux-generic/odp_packet.c | 11 +++++++++++ 3 files changed, 13 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 2f4c69924..8bf4ced4c 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..167f8cbc6 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -2141,6 +2141,17 @@ 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) { + uint32_t val; + + memcpy(&val, udp + 1, 4); + if (val != 0) { + prs->input_flags.ipsec = 1; + prs->input_flags.ipsec_udp = 1; + } + } + if (offset) *offset += sizeof(_odp_udphdr_t); *parseptr += sizeof(_odp_udphdr_t);