From patchwork Wed Dec 21 20:03:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bill Fischofer X-Patchwork-Id: 88775 Delivered-To: patch@linaro.org Received: by 10.182.112.6 with SMTP id im6csp2896495obb; Wed, 21 Dec 2016 12:03:38 -0800 (PST) X-Received: by 10.55.118.3 with SMTP id r3mr6334536qkc.84.1482350618630; Wed, 21 Dec 2016 12:03:38 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id e19si15779128qtg.152.2016.12.21.12.03.36; Wed, 21 Dec 2016 12:03:38 -0800 (PST) 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=pass (p=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 43C7A63589; Wed, 21 Dec 2016 20:03:36 +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=-1.9 required=5.0 tests=BAYES_00, 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 C0C4960DB8; Wed, 21 Dec 2016 20:03: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 5CFDB60DBC; Wed, 21 Dec 2016 20:03:29 +0000 (UTC) Received: from mail-oi0-f52.google.com (mail-oi0-f52.google.com [209.85.218.52]) by lists.linaro.org (Postfix) with ESMTPS id 349C160DA8 for ; Wed, 21 Dec 2016 20:03:28 +0000 (UTC) Received: by mail-oi0-f52.google.com with SMTP id b126so221293991oia.2 for ; Wed, 21 Dec 2016 12:03:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=H4glkrEr6UOpw+nZRPI83pTJ14Qyujj8GZI+zKGSLQA=; b=DdNGrBPRL29UIiSyYQff/iyYuMWS4hguXesA7ErNeLfh3OVxL8QjBprgJ2qCTNPgU2 DzFUHZTUrvHRzG3gBqmrxdxLBQ0UgrHglBQqc0RjKhDCjaYEtyRUbjCyeQWD7B8Vc0X8 IH/g6EXGg7xhGCP0MtnHqzisEkF52iLnU1Kq7oaOoEjgQuQ82c7T66HvJ6+CE0ibEBAd HkOmvz2BwVPssJ98NlSettYAFPRjIGUff9ZXkXwhP/DFl4hcCcOxzedVlhf6P0zUM083 grqhzHSrE1m2j4oesNGmIJxfuKFGFp3O8KDfBQqmh6HxIJeSljjarOgvVx2qrtljrlp5 rXsA== X-Gm-Message-State: AIkVDXIcvCQuwR0bS6GAba73BUZCERdEPG/rzT8tk2v1CoieUFni22bt9Hwfi8wMErbl5HU2D+I= X-Received: by 10.202.75.86 with SMTP id y83mr2151197oia.16.1482350607635; Wed, 21 Dec 2016 12:03:27 -0800 (PST) Received: from localhost.localdomain (cpe-70-121-83-241.austin.res.rr.com. [70.121.83.241]) by smtp.gmail.com with ESMTPSA id w129sm12395528oie.1.2016.12.21.12.03.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 21 Dec 2016 12:03:27 -0800 (PST) From: Bill Fischofer To: lng-odp@lists.linaro.org Date: Wed, 21 Dec 2016 14:03:24 -0600 Message-Id: <1482350604-24090-1-git-send-email-bill.fischofer@linaro.org> X-Mailer: git-send-email 2.7.4 Subject: [lng-odp] [API-NEXT PATCH] linux-generic: packet: set correct tailroom on trim of multi-seg pkts 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" Fix Bug https://bugs.linaro.org/show_bug.cgi?id=2789 by calculating tailroom correctly when trimming multi-segment packets. Also handle head/tail push/pull operations that result in a zero-length packet correctly. Signed-off-by: Bill Fischofer --- platform/linux-generic/odp_packet.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) -- 2.7.4 diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 0d3fd05..ab352f2 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -413,8 +413,8 @@ static inline odp_packet_hdr_t *free_segments(odp_packet_hdr_t *pkt_hdr, * of the metadata. */ pkt_hdr->buf_hdr.segcount = n; pkt_hdr->frame_len -= free_len; - pkt_hdr->tailroom = pkt_hdr->buf_hdr.buf_end - - (uint8_t *)packet_tail(pkt_hdr); + pkt_hdr->tailroom = + pkt_hdr->buf_hdr.size - packet_last_seg_len(pkt_hdr); pull_tail(pkt_hdr, pull_len); } @@ -719,9 +719,12 @@ int odp_packet_trunc_head(odp_packet_t *pkt, uint32_t len, if (len > pkt_hdr->frame_len) return -1; - if (len < seg_len) { + /* Only the first segment may be zero length */ + if (CONFIG_PACKET_MAX_SEGS == 1 || + len < seg_len || + pkt_hdr->buf_hdr.segcount == 1) { pull_head(pkt_hdr, len); - } else if (CONFIG_PACKET_MAX_SEGS != 1) { + } else { int num = 0; uint32_t pull_len = 0; @@ -811,9 +814,12 @@ int odp_packet_trunc_tail(odp_packet_t *pkt, uint32_t len, last = packet_last_seg(pkt_hdr); seg_len = packet_seg_len(pkt_hdr, last); - if (len < seg_len) { + /* Only the first segment may be zero length */ + if (CONFIG_PACKET_MAX_SEGS == 1 || + len < seg_len || + pkt_hdr->buf_hdr.segcount == 1) { pull_tail(pkt_hdr, len); - } else if (CONFIG_PACKET_MAX_SEGS != 1) { + } else { int num = 0; uint32_t pull_len = 0;