From patchwork Wed Nov 8 14:00:20 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: 118264 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp5334114qgn; Wed, 8 Nov 2017 06:07:44 -0800 (PST) X-Google-Smtp-Source: ABhQp+S3mRWuQiZip+AfEy9vxXuMBKUh33Iw3NbQics8tsXbLnKqVQQ/P62ZJFDQh3y8sL2KTWad X-Received: by 10.55.77.67 with SMTP id a64mr869159qkb.172.1510150064399; Wed, 08 Nov 2017 06:07:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510150064; cv=none; d=google.com; s=arc-20160816; b=tB9Js332oabBgIdKPMzGbZUe9NB4VkftYgq9TIDL1MrgthKd5gudO1DxGNCyguQSLZ q/E30eo+wonNbBMbsi2JtktE4Q8U/vei5w+S7e52giV1P9VQ4RSYaGms0qLB2k24ijGL Jz8wLiqb3GLIK/ovwajDX4sVczMXX/yCUHi+VHEF26DxNeCXxlvsPAGPQ02L8VcaJVON B+7GAkuF5s7C/bQxHS9B4uLAVwC6Tcklp5V9328orpESITxFr993R6S76lQoyBh3wKxL EF8Gk8llRgWLJ4g9tOp3Dq1zt4tYZZPhGC+cU4gfAeIYNPE++xZzDvm1nqTJie/dSnEH 6eRg== 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=pYuKvgVrnr1NHtVH88yitCAsAM5nvXggDy/qdtu8ZsY=; b=tVj06EX0KC13xCzZ3LeUo80XI4sy/Lp78+BHy3EtLeU5ZnflnikjyZRt9aJjDFDqRO j5sGOqmkwj5w3TRPBozZveFyBns7IGJ9JUt2fGD7c76o2vmB3DRWE5Yd9l/LTQKfaDdZ 8hDFLye6RK1T9miWXXFb3IDA33+cUNJq1OFSzZ94EWv22qku5+NodKkA/W0KrsFJ2TTV iSTltmgm+n2bptlCeSZc/ldVSGDMHfeqeNokh3Qcpkp4mdKSYAV/GfcR8x2A1jdmdw48 CmJpblZX2gWDuvREd0DJro+smV5jZsHy4wmXvacoMEFaF+/kKkj6o2ZaHuQ2hlFDXV5z 3W1g== 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 x40si3893767qtj.258.2017.11.08.06.07.44; Wed, 08 Nov 2017 06:07:44 -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 01DD360BE3; Wed, 8 Nov 2017 14:07:43 +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 8B5CB60C8B; Wed, 8 Nov 2017 14:01:40 +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 4233060AF8; Wed, 8 Nov 2017 14:01:32 +0000 (UTC) Received: from forward102o.mail.yandex.net (forward102o.mail.yandex.net [37.140.190.182]) by lists.linaro.org (Postfix) with ESMTPS id 2B66660B4C for ; Wed, 8 Nov 2017 14:00:33 +0000 (UTC) Received: from mxback18j.mail.yandex.net (mxback18j.mail.yandex.net [IPv6:2a02:6b8:0:1619::94]) by forward102o.mail.yandex.net (Yandex) with ESMTP id 964DB5A03637 for ; Wed, 8 Nov 2017 17:00:31 +0300 (MSK) Received: from smtp4j.mail.yandex.net (smtp4j.mail.yandex.net [2a02:6b8:0:1619::15:6]) by mxback18j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id y2oqNvWmus-0VimhM6c; Wed, 08 Nov 2017 17:00:31 +0300 Received: by smtp4j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id ABVIw2d5cZ-0V10PuDP; Wed, 08 Nov 2017 17:00:31 +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, 8 Nov 2017 17:00:20 +0300 Message-Id: <1510149622-31536-5-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1510149622-31536-1-git-send-email-odpbot@yandex.ru> References: <1510149622-31536-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 273 Subject: [lng-odp] [PATCH API-NEXT v2 4/6] linux-gen: packet: add parse API 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: Petri Savolainen Implemented new API functions for packet parsing. Signed-off-by: Petri Savolainen --- /** Email created from pull request 273 (psavol:next-packet-parse) ** https://github.com/Linaro/odp/pull/273 ** Patch: https://github.com/Linaro/odp/pull/273.patch ** Base sha: d22c949cc466bf28de559855a1cb525740578137 ** Merge commit sha: 80af43ecfb926cbcf7f13ae5f91653aaee11ebf3 **/ platform/linux-generic/odp_packet.c | 57 +++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 3b2fac212..c1986f77f 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -2252,6 +2252,63 @@ int packet_parse_l3_l4(odp_packet_hdr_t *pkt_hdr, layer, ethtype); } +int odp_packet_parse(odp_packet_t pkt, uint32_t offset, + const odp_packet_parse_param_t *param) +{ + odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); + void *data; + uint32_t seg_len; + uint32_t packet_len = pkt_hdr->frame_len; + odp_proto_t proto = param->proto; + odp_proto_layer_t layer = param->layer; + int ret; + uint16_t ethtype; + + if (proto == ODP_PROTO_NONE || layer == ODP_PROTO_LAYER_NONE) + return -1; + + data = packet_map(pkt_hdr, offset, &seg_len, NULL); + + if (data == NULL) + return -1; + + packet_parse_reset(pkt_hdr); + + if (proto == ODP_PROTO_ETH) { + ret = packet_parse_common(&pkt_hdr->p, data, packet_len, + seg_len, layer); + + if (ret) + return -1; + } else { + if (proto == ODP_PROTO_IPV4) + ethtype = _ODP_ETHTYPE_IPV4; + else + ethtype = _ODP_ETHTYPE_IPV6; + + ret = packet_parse_common_l3_l4(&pkt_hdr->p, data, offset, + packet_len, seg_len, + layer, ethtype); + + if (ret) + return -1; + } + + return 0; +} + +int odp_packet_parse_multi(const odp_packet_t pkt[], const uint32_t offset[], + int num, const odp_packet_parse_param_t *param) +{ + int i; + + for (i = 0; i < num; i++) + if (odp_packet_parse(pkt[i], offset[i], param)) + return -1; + + return 0; +} + uint64_t odp_packet_to_u64(odp_packet_t hdl) { return _odp_pri(hdl);