From patchwork Tue Sep 5 10:07:02 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: 111659 Delivered-To: patch@linaro.org Received: by 10.140.94.166 with SMTP id g35csp2655609qge; Tue, 5 Sep 2017 03:42:16 -0700 (PDT) X-Google-Smtp-Source: ADKCNb6mGTd0Nnp+HNs4K3FeIuAwdnMRHO1Rt8mugzrT3Syzx5hEU3OW/Sr/o2qIYp2BhMPLx04r X-Received: by 10.55.71.6 with SMTP id u6mr4295599qka.166.1504608136325; Tue, 05 Sep 2017 03:42:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504608136; cv=none; d=google.com; s=arc-20160816; b=X2/CjyGctX+N1e6ETWIoEz+LdQpp7NyvodBL+DDJ8jrAGXTtsk6wNv0cA4gWm921RU O+F7kiWAx7w3TFCBx/tGI2UZhQUxyueZBCIWcrpR5GeMBRLnqawcwN9xOYgDHUUZTM2I hoE1/AKJv2KsbAyQABSs7xJvq8jJXG1cDPsihpV/MpiCszVfAj3Fl1ze4gIj8mxVaQck HpXmwtJ58XeXYCEjie1HUIvGjbATa5wwvO/3RyL9SuhI+oiJbex3Wla36/PgAkbXU53r 95LdREQ43zcniq1jirYWD1NOi4Ui1D5DceRptgDiTf4aAKAqMoSx8tpKHJp4BlT+Iu7V unxg== 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=2J7WbU4vqpjmUS44rYNC5Kb+C5bvLBGcHcCfoCskNgY=; b=XNM3C0CgKEmc84PFqS4+sofUzGpFaN3Korj3PJfY/3p48y69vNym8L3ANYlcwED25J pFEuBj3m3M8lwn20goFumnRm7jVsqez+H7QE11QM2JDF1X1+TkVGJyREn7LksHvRxz8A 29s9ksOTcAZlCWPl74UnIICetXZed4z5+UBIkKTIksDdNqPGLeCPHW3MlDB4mExwcUOs WcDTpa3aliPqtxvE5ByomNeHJw3Dtc8G+GBoliP/bvwWvJynyTnZwkUcbWg2RHLE30Ft DkYJAZ7e1KfBgHDzr28rG7y6qEERVOzU1S+aglN7/1pVW5Pqp0z+1vHuNSY1X3LRwODD lGqw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 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 (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id o41si360254qtf.249.2017.09.05.03.42.15; Tue, 05 Sep 2017 03:42:16 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 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 D25EA60D9E; Tue, 5 Sep 2017 10:42:15 +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,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 CB97462DFB; Tue, 5 Sep 2017 10:12:31 +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 B924C62DA3; Tue, 5 Sep 2017 10:11:45 +0000 (UTC) Received: from forward101p.mail.yandex.net (forward101p.mail.yandex.net [77.88.28.101]) by lists.linaro.org (Postfix) with ESMTPS id A8DE760E63 for ; Tue, 5 Sep 2017 10:07:24 +0000 (UTC) Received: from mxback11j.mail.yandex.net (mxback11j.mail.yandex.net [IPv6:2a02:6b8:0:1619::84]) by forward101p.mail.yandex.net (Yandex) with ESMTP id 8A1BA6A82353 for ; Tue, 5 Sep 2017 13:07:23 +0300 (MSK) Received: from smtp2o.mail.yandex.net (smtp2o.mail.yandex.net [2a02:6b8:0:1a2d::26]) by mxback11j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id iQ55Jt49ez-7Me8OPAT; Tue, 05 Sep 2017 13:07:22 +0300 Received: by smtp2o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 7CWa9Tztus-7LeGH0aI; Tue, 05 Sep 2017 13:07:22 +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, 5 Sep 2017 13:07:02 +0300 Message-Id: <1504606026-28181-6-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1504606026-28181-1-git-send-email-odpbot@yandex.ru> References: <1504606026-28181-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 81 Subject: [lng-odp] [PATCH API-NEXT v15 5/9] linux-gen: packet: support parsing of just L3/L4 headers 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 IPsec packet postprocessing needs parsing of packets which guarantee only L3/L4 headers. Separate parsing function doing L3/L4 headers parsing. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 81 (lumag:ipsec-packet-impl-2) ** https://github.com/Linaro/odp/pull/81 ** Patch: https://github.com/Linaro/odp/pull/81.patch ** Base sha: 91c0b58fc87ba0431241818758cea94438cd5498 ** Merge commit sha: 3ec7da960bd3d497e998f18cb30a2480296e7b6d **/ .../linux-generic/include/odp_packet_internal.h | 6 ++ platform/linux-generic/odp_packet.c | 85 ++++++++++++++-------- 2 files changed, 62 insertions(+), 29 deletions(-) diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h index 91fba1ea..1f215d7d 100644 --- a/platform/linux-generic/include/odp_packet_internal.h +++ b/platform/linux-generic/include/odp_packet_internal.h @@ -356,6 +356,12 @@ int packet_alloc_multi(odp_pool_t pool_hdl, uint32_t len, int packet_parse_layer(odp_packet_hdr_t *pkt_hdr, odp_pktio_parser_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, + uint32_t l3_offset, + uint16_t ethtype); + /* Reset parser metadata for a new parse */ void packet_parse_reset(odp_packet_hdr_t *pkt_hdr); diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 2038f60d..1292d33e 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -262,7 +262,7 @@ void packet_parse_reset(odp_packet_hdr_t *pkt_hdr) pkt_hdr->p.error_flags.all = 0; pkt_hdr->p.input_flags.all = 0; pkt_hdr->p.output_flags.all = 0; - pkt_hdr->p.l2_offset = 0; + pkt_hdr->p.l2_offset = ODP_PACKET_OFFSET_INVALID; pkt_hdr->p.l3_offset = ODP_PACKET_OFFSET_INVALID; pkt_hdr->p.l4_offset = ODP_PACKET_OFFSET_INVALID; @@ -2332,37 +2332,15 @@ static inline void parse_udp(packet_parser_t *prs, *parseptr += sizeof(_odp_udphdr_t); } -/** - * Parse common packet headers up to given layer - * - * The function expects at least PACKET_PARSE_SEG_LEN bytes of data to be - * available from the ptr. - */ -int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, - uint32_t frame_len, uint32_t seg_len, - odp_pktio_parser_layer_t layer) +static inline +int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr, + uint32_t offset, + uint32_t frame_len, uint32_t seg_len, + odp_pktio_parser_layer_t layer, + uint16_t ethtype) { - uint32_t offset; - uint16_t ethtype; - const uint8_t *parseptr; uint8_t ip_proto; - parseptr = ptr; - offset = 0; - - if (layer == ODP_PKTIO_PARSER_LAYER_NONE) - return 0; - - /* We only support Ethernet for now */ - prs->input_flags.eth = 1; - /* Assume valid L2 header, no CRC/FCS check in SW */ - prs->input_flags.l2 = 1; - - ethtype = parse_eth(prs, &parseptr, &offset, frame_len); - - if (layer == ODP_PKTIO_PARSER_LAYER_L2) - return prs->error_flags.all != 0; - /* Set l3_offset+flag only for known ethtypes */ prs->l3_offset = offset; prs->input_flags.l3 = 1; @@ -2445,6 +2423,42 @@ int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, } /** + * Parse common packet headers up to given layer + * + * The function expects at least PACKET_PARSE_SEG_LEN bytes of data to be + * available from the ptr. + */ +int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr, + uint32_t frame_len, uint32_t seg_len, + odp_pktio_parser_layer_t layer) +{ + uint32_t offset; + uint16_t ethtype; + const uint8_t *parseptr; + + parseptr = ptr; + offset = 0; + + if (layer == ODP_PKTIO_PARSER_LAYER_NONE) + return 0; + + /* Assume valid L2 header, no CRC/FCS check in SW */ + prs->l2_offset = offset; + prs->input_flags.l2 = 1; + /* We only support Ethernet for now */ + prs->input_flags.eth = 1; + + ethtype = parse_eth(prs, &parseptr, &offset, frame_len); + + if (layer == ODP_PKTIO_PARSER_LAYER_L2) + return prs->error_flags.all != 0; + + + return packet_parse_common_l3_l4(prs, parseptr, offset, frame_len, + seg_len, layer, ethtype); +} + +/** * Simple packet parser */ int packet_parse_layer(odp_packet_hdr_t *pkt_hdr, @@ -2457,6 +2471,19 @@ int packet_parse_layer(odp_packet_hdr_t *pkt_hdr, seg_len, layer); } +int packet_parse_l3_l4(odp_packet_hdr_t *pkt_hdr, + odp_pktio_parser_layer_t layer, + uint32_t l3_offset, + uint16_t ethtype) +{ + uint32_t seg_len = 0; + void *base = packet_map(pkt_hdr, l3_offset, &seg_len, NULL); + + return packet_parse_common_l3_l4(&pkt_hdr->p, base, l3_offset, + pkt_hdr->frame_len, seg_len, + layer, ethtype); +} + uint64_t odp_packet_to_u64(odp_packet_t hdl) { return _odp_pri(hdl);