From patchwork Thu Nov 9 11: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: 118427 Delivered-To: patch@linaro.org Received: by 10.80.225.132 with SMTP id k4csp777256edl; Thu, 9 Nov 2017 03:03:11 -0800 (PST) X-Google-Smtp-Source: AGs4zMZQ9C9RTs3T2njCPIlgRTpJ4gc3r2sr8D7WpCgcp9rXyxPd9AmpFB00WHRZkJavVXYBR7Nw X-Received: by 10.55.161.78 with SMTP id k75mr118911qke.158.1510225391635; Thu, 09 Nov 2017 03:03:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510225391; cv=none; d=google.com; s=arc-20160816; b=RXM70ZX1kAvQuwo9bbDDYovVZzEYiOn1j0M+psqjjXc5sSviyXt3UPFl9gooCDf4ko kehz6Mu6GDRucTdrCVqpVFcIPrnCkFclzoHgedX7qRTdbDMXUYGkfJwiG8PSTRqZIu1v xgUlg0McmcwHfugmo2CyTn52tFdXnEyz72RdFrWYE1z67Fzc0T0JoSiuDo3fJjnnykkd tJXoxtOcz4oq4k45nHxGCJb4/WQ3Lwo4vB9U49s4ZAMYqhrq3ZadXhMqgEoJNYK3TACX nMea3I45lmZYnba7jp0Ha9wxeXm5xO5eEwmanmOg4kTilgJ9BXZiSdI0eUCb5lXJBeTO eRFQ== 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=r5KqgbufXYMu80AqfhnegQC4eA91SDe7cDUJm0Kn7jY=; b=lXKLTrOHdZfWRFvYwY0uaUrnE2rdoOOJMxcyG8aPXr4VVDymlm9SCP+KEOgg36uczL /Ct8zEdFnuyPsL6nuk2bUKlhczA8qW3PivhY7poB3mpzEUTF2oGLODOQho+hAiL8z740 Oy/bPCZlx8aAZ5Cygq+ysmFK6cz8E6ZflSOpJN+dNxNjnyn0JtTaIPRvihXCPwLgsKHZ ixPjc89jlCqj88YOcNRqDTMRBMrwaBXRyAtTSLGabg7VJofaPwRV+IggR29tWmiwFrYe ar50M2TqPpaJzkvykcF+ssXA+Bjhv9kiG+rsR9bsiQx80vUf1GQvWl/zVzuzq3ejACNf +jWA== 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 p96si6464856qkp.201.2017.11.09.03.03.11; Thu, 09 Nov 2017 03:03: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 45E6260CB2; Thu, 9 Nov 2017 11:03: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=-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 EA69E60CDF; Thu, 9 Nov 2017 11:00:47 +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 702E360C71; Thu, 9 Nov 2017 11:00:30 +0000 (UTC) Received: from forward105o.mail.yandex.net (forward105o.mail.yandex.net [37.140.190.183]) by lists.linaro.org (Postfix) with ESMTPS id 15ABF6050D for ; Thu, 9 Nov 2017 11:00:18 +0000 (UTC) Received: from mxback13g.mail.yandex.net (mxback13g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:92]) by forward105o.mail.yandex.net (Yandex) with ESMTP id C5DC14444D10 for ; Thu, 9 Nov 2017 14:00:16 +0300 (MSK) Received: from smtp3p.mail.yandex.net (smtp3p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:8]) by mxback13g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id fIjKk6SIyr-0GEmIAjx; Thu, 09 Nov 2017 14:00:16 +0300 Received: by smtp3p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id OkOZyJOXa3-0GY4eg0h; Thu, 09 Nov 2017 14:00:16 +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: Thu, 9 Nov 2017 14:00:11 +0300 Message-Id: <1510225213-20407-5-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1510225213-20407-1-git-send-email-odpbot@yandex.ru> References: <1510225213-20407-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 273 Subject: [lng-odp] [PATCH API-NEXT v4 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: 0724c6474bb6db484fdbdbb1b14035a33ba9525d **/ 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..a60a8d087 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 i; + + return num; +} + uint64_t odp_packet_to_u64(odp_packet_t hdl) { return _odp_pri(hdl);