From patchwork Mon Oct 9 16:00:17 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: 115264 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp2712961qgn; Mon, 9 Oct 2017 09:01:49 -0700 (PDT) X-Google-Smtp-Source: AOwi7QB9E72C3MapCq3mZJp4w4dki5rTT4FS5jXMOkiySASKHdcjldZj/6QFq84tAp2GGOVZIZyi X-Received: by 10.36.107.146 with SMTP id v140mr15132388itc.95.1507564909441; Mon, 09 Oct 2017 09:01:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507564909; cv=none; d=google.com; s=arc-20160816; b=M3PAMft4OECcQQOd7nhpl85CJgMw7Y0jqsMGVcCk627BWjBfuGeXfeQ7ihXN6sEIJv 4ckjocOU81zwtVff59YNBu3mSdU97wSwLsHiOSE5Melhb6bJvvMcPkufk0G5bD+iRB+D HmUHijaRKV7D6x9cJVrKVOMp72t/Sa/EjpHznFpjvis/4m7bRQ49a7OayzUfpLzCoSYM m8I64+LaCAeeYmchU35ePdYgiX4eDo9yNgG83lGp32GX+AgyGPzDqTNX1i0pgob4eATr jciXYwqZ8iyzoU3ApDK6Sa+KwI7AgGqcxcPXRgF3uOudReIUUZ70T5yOzPMtDSYRldOi 21Og== 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=99jwC2c85iLIvb+oFombkEUw0ao7XyjBjM6x5VFkBxI=; b=PcgGtX71NSQKpxztwwCnmfC+22p+qozlla0L1mOINeSAYHMGUieujjeEhlZtQ3l1yd Bp9z1ywyw/l3g6gx6eJH/p6Doe4Y7HyHLkXzfv5mHmL2UuHdRLrEhb0wwwF+63L8SGZE O169UycQkzMHhKlX3KH/aNd0pUYeuiKCqijs79h64vsn93CMjihsb8y73OOs7qVb7b6N bC08Ay3STpD2T4AkcrNnIZ9aQCwcKFmEMgdfRNcg9yqCRci9XYcShHSNF/OPnDMmZdsQ zpgQ2WrgKZS86N6vf2PvfMdr21/I2BFtvloioq33SE22j6OjrSoczj68fw63UdwFK/kM VXmQ== 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 x187si7241612itd.194.2017.10.09.09.01.49; Mon, 09 Oct 2017 09:01:49 -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 0B50C60692; Mon, 9 Oct 2017 16:01:49 +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,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, 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 D200760AC8; Mon, 9 Oct 2017 16:00:58 +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 8D16660A4D; Mon, 9 Oct 2017 16:00:50 +0000 (UTC) Received: from forward104j.mail.yandex.net (forward104j.mail.yandex.net [5.45.198.247]) by lists.linaro.org (Postfix) with ESMTPS id B9432609C3 for ; Mon, 9 Oct 2017 16:00:44 +0000 (UTC) Received: from mxback9g.mail.yandex.net (mxback9g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:170]) by forward104j.mail.yandex.net (Yandex) with ESMTP id 48B3A43508 for ; Mon, 9 Oct 2017 19:00:43 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback9g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id PsCsWtky2O-0hD8mTRN; Mon, 09 Oct 2017 19:00:43 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Oe94Leu3rZ-0gQmH6DX; Mon, 09 Oct 2017 19:00:42 +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: Mon, 9 Oct 2017 19:00:17 +0300 Message-Id: <1507564818-31998-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507564818-31998-1-git-send-email-odpbot@yandex.ru> References: <1507564818-31998-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 180 Subject: [lng-odp] [PATCH v4 1/2] linux-generic: packet: correct syntax issue 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: Bill Fischofer Not sure how this got by checkpatch originally, but clean up syntax associated with this code. Signed-off-by: Bill Fischofer --- /** Email created from pull request 180 (Bill-Fischofer-Linaro:pkt-debug) ** https://github.com/Linaro/odp/pull/180 ** Patch: https://github.com/Linaro/odp/pull/180.patch ** Base sha: c16af6486eea240609f334b1bdc81a11404275de ** Merge commit sha: 02c568dd05ef6e800819dd30516c1dc8016d268c **/ platform/linux-generic/odp_packet.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index f4a0e0ec9..a3fd0559f 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -389,10 +389,8 @@ static inline void init_segments(odp_packet_hdr_t *pkt_hdr[], int num) hdr->buf_hdr.next_seg = NULL; hdr->buf_hdr.last_seg = &hdr->buf_hdr; - if (odp_unlikely(num > 1)) { + if (odp_unlikely(num > 1)) link_segments(pkt_hdr, num); - - } } } From patchwork Mon Oct 9 16:00:18 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: 115263 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp2711914qgn; Mon, 9 Oct 2017 09:01:03 -0700 (PDT) X-Google-Smtp-Source: AOwi7QAsZvVTHhO4a9+AhyBJBFsdyXlWN9v03ea34xK7kcS6p0Xzf8XraPgjuLxUqwrP/pZft59D X-Received: by 10.36.150.4 with SMTP id z4mr15393587itd.48.1507564863766; Mon, 09 Oct 2017 09:01:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507564863; cv=none; d=google.com; s=arc-20160816; b=eCeT13aobtcvwQhS4dpHPLzi9vs/YrIRqEnzGgt+3j3KaZCMdEsQW1bymcaBLiRja+ WAr0b/UYvbgR6ArAH/GOeMloZb8DXIrdAld+gxm9uMIvdchYQdeZOOVwJKanolpy5X2u z2mZvPAX5UQOIVcwpv49xIg/t0YUcytaoew9zZVxl2cwuPewVYhwSpRS8pA6G3owK3OM f5pfFWBnUu8gHr0T3eb0m3I1fDJTwuHKFYTa6ALPPphGVpuidj30dietnxu0ix15+Nka SQoszpwPozhdN1F9YXC778gHmjyV6OnT+gu0Ow0yRcp/vTS45EVcmjFnPKWBxA3lIgmM HdTQ== 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=jnFB8OrfP3UZ/IpZdDoPYoJxN9WT6JwPc9fA3qX1M8c=; b=gL3ze/MtNSgPMKuS1eZEAc0t8Sku1YZYhGYuXYSkR9dznV3/eeX4Cltwjgr5Dw/U8g 5U4OzKtcC6lIK+LK42cDxoddZwJkgVIc0GP/STPj2OE4hEiorsGWYv9YcvQFT9mr6sXl Jn6ky/uVnSjTUfg5iN8Sutm96rXGIEyYJf/4J9zeNSH2GjhQbn9z2FZMn+ZeibmJ7kOd USJPB7etWA2wFUZSOjTNu9rVkXTkWpNhOKzHz3CadkRaY01s9essFDbeRZbspRjWGH7/ Uc6hsqIYF3UMYH1wOs9zZkTXN2hjeviNBMslqpw63HJC/YT3oJPSn7qQCUEm7kDYU+qd Q6Nw== 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 v6si6447952iof.272.2017.10.09.09.01.03; Mon, 09 Oct 2017 09:01:03 -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 C0B1C60BE0; Mon, 9 Oct 2017 16:01:02 +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 712E1609EA; Mon, 9 Oct 2017 16:00:53 +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 365A460A54; Mon, 9 Oct 2017 16:00:50 +0000 (UTC) Received: from forward103p.mail.yandex.net (forward103p.mail.yandex.net [77.88.28.106]) by lists.linaro.org (Postfix) with ESMTPS id 51433609EA for ; Mon, 9 Oct 2017 16:00:45 +0000 (UTC) Received: from mxback7g.mail.yandex.net (mxback7g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:168]) by forward103p.mail.yandex.net (Yandex) with ESMTP id 0D8CE21834CD for ; Mon, 9 Oct 2017 19:00:44 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback7g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id HsP5cPWyc6-0hkuevv4; Mon, 09 Oct 2017 19:00:44 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Oe94Leu3rZ-0hQmvZrT; Mon, 09 Oct 2017 19:00:43 +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: Mon, 9 Oct 2017 19:00:18 +0300 Message-Id: <1507564818-31998-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507564818-31998-1-git-send-email-odpbot@yandex.ru> References: <1507564818-31998-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 180 Subject: [lng-odp] [PATCH v4 2/2] linux-generic: packet: add debugging asserts in packet code 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: Bill Fischofer Restore the ODP_ASSERTS() that assist application debugging that were lost in the recent packet reference rework. When using --enable-debug insert guards to detect duplicate packet frees as well as attempts to modify known shared data sections of packet references. Signed-off-by: Bill Fischofer --- /** Email created from pull request 180 (Bill-Fischofer-Linaro:pkt-debug) ** https://github.com/Linaro/odp/pull/180 ** Patch: https://github.com/Linaro/odp/pull/180.patch ** Base sha: c16af6486eea240609f334b1bdc81a11404275de ** Merge commit sha: 02c568dd05ef6e800819dd30516c1dc8016d268c **/ platform/linux-generic/odp_packet.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index 012c9318e..5db4a4764 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -354,6 +354,11 @@ static inline void link_segments(odp_packet_hdr_t *pkt_hdr[], int num) hdr->buf_hdr.seg[i].hdr = buf_hdr; hdr->buf_hdr.seg[i].data = buf_hdr->base_data; hdr->buf_hdr.seg[i].len = BASE_LEN; + + ODP_ASSERT(cur == 0 || /* init_segments() does this */ + odp_atomic_fetch_inc_u32( + &pkt_hdr[cur]->buf_hdr.ref_cnt) + == 0); cur++; if (cur == num) { @@ -389,6 +394,9 @@ static inline void init_segments(odp_packet_hdr_t *pkt_hdr[], int num) hdr->buf_hdr.next_seg = NULL; hdr->buf_hdr.last_seg = &hdr->buf_hdr; + ODP_ASSERT( + odp_atomic_fetch_inc_u32(&hdr->buf_hdr.ref_cnt) == 0); + if (odp_unlikely(num > 1)) link_segments(pkt_hdr, num); } @@ -848,6 +856,8 @@ void odp_packet_free(odp_packet_t pkt) odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); int num_seg = pkt_hdr->buf_hdr.segcount; + ODP_ASSERT(buffer_ref(&pkt_hdr->buf_hdr) > 0); + if (odp_likely(CONFIG_PACKET_MAX_SEGS == 1 || num_seg == 1)) { odp_buffer_hdr_t *buf_hdr[2]; int num = 1; @@ -877,6 +887,8 @@ void odp_packet_free_multi(const odp_packet_t pkt[], int num) odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt[i]); int num_seg = pkt_hdr->buf_hdr.segcount; + ODP_ASSERT(buffer_ref(&pkt_hdr->buf_hdr) > 0); + if (odp_unlikely(num_seg > 1)) { free_all_segments(pkt_hdr, num_seg); num_freed++; @@ -1057,6 +1069,8 @@ void *odp_packet_push_tail(odp_packet_t pkt, uint32_t len) if (len > pkt_hdr->tailroom) return NULL; + ODP_ASSERT(odp_packet_has_ref(pkt) == 0); + old_tail = packet_tail(pkt_hdr); push_tail(pkt_hdr, len); @@ -1072,6 +1086,8 @@ int odp_packet_extend_tail(odp_packet_t *pkt, uint32_t len, uint32_t tail_off = frame_len; int ret = 0; + ODP_ASSERT(odp_packet_has_ref(*pkt) == 0); + if (len > tailroom) { pool_t *pool = pkt_hdr->buf_hdr.pool_ptr; int num; @@ -1104,6 +1120,8 @@ void *odp_packet_pull_tail(odp_packet_t pkt, uint32_t len) odp_packet_hdr_t *pkt_hdr = packet_hdr(pkt); seg_entry_t *last_seg = seg_entry_last(pkt_hdr); + ODP_ASSERT(odp_packet_has_ref(pkt) == 0); + if (len > last_seg->len) return NULL; @@ -1123,6 +1141,8 @@ int odp_packet_trunc_tail(odp_packet_t *pkt, uint32_t len, if (len > pkt_hdr->frame_len) return -1; + ODP_ASSERT(odp_packet_has_ref(*pkt) == 0); + last = packet_last_seg(pkt_hdr); last_seg = seg_entry_last(pkt_hdr); seg_len = last_seg->len; @@ -1386,6 +1406,8 @@ int odp_packet_align(odp_packet_t *pkt, uint32_t offset, uint32_t len, if (align > ODP_CACHE_LINE_SIZE) return -1; + ODP_ASSERT(odp_packet_has_ref(*pkt) == 0); + if (seglen >= len) { misalign = align <= 1 ? 0 : ROUNDUP_ALIGN(uaddr, align) - uaddr; @@ -1423,6 +1445,8 @@ int odp_packet_concat(odp_packet_t *dst, odp_packet_t src) uint32_t dst_len = dst_hdr->frame_len; uint32_t src_len = src_hdr->frame_len; + ODP_ASSERT(odp_packet_has_ref(*dst) == 0); + /* Do a copy if packets are from different pools. */ if (odp_unlikely(dst_pool != src_pool)) { if (odp_packet_extend_tail(dst, src_len, NULL, NULL) >= 0) { @@ -1453,6 +1477,8 @@ int odp_packet_split(odp_packet_t *pkt, uint32_t len, odp_packet_t *tail) if (len >= pktlen || tail == NULL) return -1; + ODP_ASSERT(odp_packet_has_ref(*pkt) == 0); + *tail = odp_packet_copy_part(*pkt, len, pktlen - len, odp_packet_pool(*pkt));