From patchwork Fri Dec 8 14:00:07 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: 121164 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp697882qgn; Fri, 8 Dec 2017 06:03:55 -0800 (PST) X-Google-Smtp-Source: AGs4zMa0UsZxMEgLk9QNF+NYVFl6Na7K3BUkOEqpOCQFNXXC4wFTQE1inCzArLXU1Ew0RmNvyEli X-Received: by 10.55.157.66 with SMTP id g63mr12746991qke.59.1512741835749; Fri, 08 Dec 2017 06:03:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512741835; cv=none; d=google.com; s=arc-20160816; b=qA8zB5eGU8bj37zglJ3v2GhfN9zXI5Y+ed/UaWt91Cv9a+7VqHMafn/r5WlZM4+naq 7x/I9pJfxeAVZBMvnH18Pbl6FfAQzRQfBZ+28K7IuQyGiaYmJGkUOEzxztTn7hhiUPai 3XkGbcjBfyFBIFD3p6H5y2wLb+fpliWxtsJtHarsadgG51cjkZ5MNPHtOFdnv4kxwKTD VGZN33R5onZ7sXfr3XpeFJcWNQpnpmpvrFTIfqd9q1F9LOfe/EDq80Yn/PRS+PTnQkMm QyM5RxmgZjBGpsWEij8c8DWe+r3G4fGQJd3fDMcKMg9oc1KzKLqdM+WgZ54AfktJyma+ OP8w== 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=lQ36G62o0kx0AB+CYcCe6F7M2JKTAPUIBHzgfnH1nqU=; b=ChPf9gY8fPDQaxK/V/vc1HRofRfgYUMMnqIZeVN3BWa2WGHEXjsOF3DB6d9q6VKFUb o2ojEyw46VoSKbFzTQ74EqDyjzq86Igdn3GS+6jS9N0fLSBl20r4/aEHEQdOepnyl06v oy/kTb5CVr4K7JAHCE/iQae3ppEOaOSSsCJaebmdKupc/icmal5Rs4CDFCfKzc7RjmVt N5wE/5ejmLETgGarTjJ5Q0q81QyouBZgoyvpeQIX3ybW9Lh1esYQW0eR9WwnUK0ARnFB PgSWtT9pkSUokvgoj69GuXyTygrvYSVeNyAXbKoDa3ujucOa4PbPyEFfsMcto1qFtrwV U/iw== 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 u78si5958948qkl.203.2017.12.08.06.03.55; Fri, 08 Dec 2017 06:03:55 -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 5EE73609C9; Fri, 8 Dec 2017 14:03:55 +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 8F5E1609DA; Fri, 8 Dec 2017 14: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 088E760973; Fri, 8 Dec 2017 14:00:20 +0000 (UTC) Received: from forward105j.mail.yandex.net (forward105j.mail.yandex.net [5.45.198.248]) by lists.linaro.org (Postfix) with ESMTPS id DCD376097C for ; Fri, 8 Dec 2017 14:00:13 +0000 (UTC) Received: from mxback1j.mail.yandex.net (mxback1j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10a]) by forward105j.mail.yandex.net (Yandex) with ESMTP id 7709C182B16 for ; Fri, 8 Dec 2017 17:00:12 +0300 (MSK) Received: from smtp1p.mail.yandex.net (smtp1p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:6]) by mxback1j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id KnqavtXaxk-0C7mtHAS; Fri, 08 Dec 2017 17:00:12 +0300 Received: by smtp1p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id bhVzcDRW4Y-0CdSdIjI; Fri, 08 Dec 2017 17:00:12 +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: Fri, 8 Dec 2017 17:00:07 +0300 Message-Id: <1512741607-12425-6-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1512741607-12425-1-git-send-email-odpbot@yandex.ru> References: <1512741607-12425-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 332 Subject: [lng-odp] [PATCH API-NEXT v1 5/5] linux-gen: packet: set next layer offsets allways 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 Update implementation to follow API change of layer offsets. Set L3 offset always after successful L2 parse. Set L4 offset always after successful L3 parse. Signed-off-by: Petri Savolainen --- /** Email created from pull request 332 (psavol:next-l4-offset) ** https://github.com/Linaro/odp/pull/332 ** Patch: https://github.com/Linaro/odp/pull/332.patch ** Base sha: 0980001e33b4190133d478a0aa2e718fd1e3c164 ** Merge commit sha: cd9b8173d9b3bfc056941b52dd6bb50af9c698b9 **/ platform/linux-generic/odp_packet.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 55f59178b..14d0ab63e 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -2154,11 +2154,12 @@ int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr, { uint8_t ip_proto; + prs->l3_offset = offset; + 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; + /* Set l3 flag only for known ethtypes */ prs->input_flags.l3 = 1; /* Parse Layer 3 headers */ @@ -2166,12 +2167,14 @@ int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr, case _ODP_ETHTYPE_IPV4: prs->input_flags.ipv4 = 1; ip_proto = parse_ipv4(prs, &parseptr, &offset, frame_len); + prs->l4_offset = offset; break; case _ODP_ETHTYPE_IPV6: prs->input_flags.ipv6 = 1; ip_proto = parse_ipv6(prs, &parseptr, &offset, frame_len, seg_len); + prs->l4_offset = offset; break; case _ODP_ETHTYPE_ARP: @@ -2181,15 +2184,13 @@ int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr, default: prs->input_flags.l3 = 0; - prs->l3_offset = ODP_PACKET_OFFSET_INVALID; ip_proto = 255; /* Reserved invalid by IANA */ } if (layer == ODP_PKTIO_PARSER_LAYER_L3) return prs->error_flags.all != 0; - /* Set l4_offset+flag only for known ip_proto */ - prs->l4_offset = offset; + /* Set l4 flag only for known ip_proto */ prs->input_flags.l4 = 1; /* Parse Layer 4 headers */ @@ -2235,7 +2236,6 @@ int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr, default: prs->input_flags.l4 = 0; - prs->l4_offset = ODP_PACKET_OFFSET_INVALID; break; }