From patchwork Fri Sep 15 18:00:05 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: 112742 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp895313qgf; Fri, 15 Sep 2017 11:00:31 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCqR8jnVH/jDveSq7M56zKvlqO/1kBdSBgkyNlyWgQHSTeI7G7eJ537v8dqYVAQp5hGOlCK X-Received: by 10.200.27.85 with SMTP id p21mr35685050qtk.3.1505498430648; Fri, 15 Sep 2017 11:00:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505498430; cv=none; d=google.com; s=arc-20160816; b=Zcc6LJNjvns0KVZC36O4W411kbnv0+yM2txCGLRwaaMM2XTzCg1zmj5tuhrdAb/v+Z +muzAlFH3zCDyxaeF/5hlV9vVOg/uK8teTUX9lbVOH4qf9Bf9zlEr3Ak7qfejt7V8nrV 9U9kzjDybPM+n9Er4M46q8gepKX00DNEtJJdKOm9/+nroSe/dPgrJnv4On2MHK816dg3 1D68RVRyw0KX9DI2Kk1adC5OficWcu7L04Z3pIxtxDdDRMIpztgf/dDkn3aR0rcosTge +w0xdbPCvTpswzIl5XIk7C3fM1t+hGsAkto+ach812dqMZ/g0SwIHR7wfWgH4J0DWWbM IfiQ== 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=4cVVCaVOOhCxblb63lD3XqogJ32LMX+9JDXbQaUxf2g=; b=nWgO2yw29RT/yB3FogpYlxqxmUNAq6JokoE89o969tZ1T/J/j+eWl3h/xCt9rMQEMV BQ6edluZx+SPN30tz4pO66L41mrL49nr0QuMVpu3nK/+M+IgRdySmlkF2FCzQNSOPE8w e20StPspPL8H2Wq3msLugk+3PT08eVotO96qWa4f0v3ngTP2LRdGnFNbXY5Hrd/v0SX1 MYJMXRzQTfb/PvnXw6xFOWh8dddvDjthatMZ4SF0u8q1wgs+cZj70Y9nOKt54u0Lid04 PtRHzFznv3Cw9M+YBJ91hp0cdTbfhzN+blpfAfqMS1UVOHVUsOKfMz5c0wzdFm1RYSnA KLIw== 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 f89si1455772qtd.360.2017.09.15.11.00.29; Fri, 15 Sep 2017 11:00:30 -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 80EB160C1E; Fri, 15 Sep 2017 18:00:29 +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,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 C4AF960A46; Fri, 15 Sep 2017 18:00:24 +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 B1CF860AED; Fri, 15 Sep 2017 18:00:21 +0000 (UTC) Received: from forward106j.mail.yandex.net (forward106j.mail.yandex.net [5.45.198.249]) by lists.linaro.org (Postfix) with ESMTPS id 7D7C6609E8 for ; Fri, 15 Sep 2017 18:00:20 +0000 (UTC) Received: from mxback10o.mail.yandex.net (mxback10o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::24]) by forward106j.mail.yandex.net (Yandex) with ESMTP id B4D30180236B for ; Fri, 15 Sep 2017 21:00:18 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback10o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id EqvFuXkzUC-0IBaK5oU; Fri, 15 Sep 2017 21:00:18 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 6vp4pi9ths-0IvaWWrF; Fri, 15 Sep 2017 21:00:18 +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, 15 Sep 2017 21:00:05 +0300 Message-Id: <1505498406-22163-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1505498406-22163-1-git-send-email-odpbot@yandex.ru> References: <1505498406-22163-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 180 Subject: [lng-odp] [PATCH v1 1/2] linux-generic: packet: correct checkpatch 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: e1c46f8e296a730ed27141a33189185bb7dfd1b1 ** Merge commit sha: 82319aa84d238313408f2ffb7731ac67047f7694 **/ 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 Fri Sep 15 18:00:06 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: 112743 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp896473qgf; Fri, 15 Sep 2017 11:01:29 -0700 (PDT) X-Google-Smtp-Source: AOwi7QD9muGl1IJkFqe1IQuqRBNTDsbClhzkpW3ykhNZQdm21j2FQI2c2sWsYuzyZX7JkDc/QX4l X-Received: by 10.55.68.77 with SMTP id r74mr8627062qka.125.1505498488970; Fri, 15 Sep 2017 11:01:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505498488; cv=none; d=google.com; s=arc-20160816; b=f3gLvKcr6PntX6BNigA7oChBC7ImuxdWRMvejQnhx6Ur2+OM2142ZuPALIDkFqwv81 ZJMxThyx/L5rDyVCvsRD+Y1DS6ubl1yiCH5yvQ5dLNi/sso8xwYkBaCGloqarcGHqJGZ 4Q/1eMdFPuay/M9+tsSdhJzLbSWH4CCaKsnBt2KB0Mo0Nf/TIzKlbvQftFaszpd+U1oO v+d/OtAd/XnvkJUCl1y2vOhmHu240amPtjB8cG/54X7YHT3qDlw9DbKm4PD0nhrQSp8w 7HTVrrxBu5Pz/BxkuZ70+K3T6GLufPLrpXOWI4Wqne4F4VFU1+ZTY/Z/WSD3FO1BD16y JyDQ== 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=UKZTfcDAF2dLgeVMMeMCxGFOZp/hW/2xYXHsJXt8ZSo=; b=sTSIHwLcrJnXzReMBS29Sk5Q7rfRpfXhdwQjMc0/+nLXjzROije5OrwVRPwj+mA08W 3kfyvs3ZPrFAp/jSY0EuFuDzpqAwEgYY+1Kq/HUXW5Qa4NE+WIRlveMsaYxSBp5/1Yeh iuMCdagAhfhTwrIde7eNq+jXzCM0TziW31INOVHRNfQcdJREqL3lYbxvymoe9Q9yT8r3 q5q3TbqIWyClc6FFDsBn98qXoT1xCVUQ92eN5i/Bn3ygMNm6GlmY0lzwaq7GE9II4iou qdAeEw1w9b24g62mzKxDz/uByMUDhrZYkDQeTBap0ZtiQSNYaojjx63uGgo1xVgMhuNA Y5Dg== 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 t3si1459946qtd.285.2017.09.15.11.01.28; Fri, 15 Sep 2017 11:01:28 -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 92B6D6088A; Fri, 15 Sep 2017 18:01:28 +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 7BF3E60B59; Fri, 15 Sep 2017 18:00:29 +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 3E554609E8; Fri, 15 Sep 2017 18:00:24 +0000 (UTC) Received: from forward100p.mail.yandex.net (forward100p.mail.yandex.net [77.88.28.100]) by lists.linaro.org (Postfix) with ESMTPS id D049360A46 for ; Fri, 15 Sep 2017 18:00:20 +0000 (UTC) Received: from mxback8o.mail.yandex.net (mxback8o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::22]) by forward100p.mail.yandex.net (Yandex) with ESMTP id 709C9510622F for ; Fri, 15 Sep 2017 21:00:19 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback8o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 2z8nwxKR0I-0JgC4i1q; Fri, 15 Sep 2017 21:00:19 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 6vp4pi9ths-0IvWLmaT; Fri, 15 Sep 2017 21:00:18 +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, 15 Sep 2017 21:00:06 +0300 Message-Id: <1505498406-22163-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1505498406-22163-1-git-send-email-odpbot@yandex.ru> References: <1505498406-22163-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 180 Subject: [lng-odp] [PATCH v1 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 the 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: e1c46f8e296a730ed27141a33189185bb7dfd1b1 ** Merge commit sha: 82319aa84d238313408f2ffb7731ac67047f7694 **/ platform/linux-generic/odp_packet.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c index a3fd0559f..4cd0a108c 100644 --- a/platform/linux-generic/odp_packet.c +++ b/platform/linux-generic/odp_packet.c @@ -354,6 +354,8 @@ 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((odp_atomic_store_u32(&hdr->buf_hdr.ref_cnt, + 1), 1)); cur++; if (cur == num) { @@ -388,6 +390,7 @@ static inline void init_segments(odp_packet_hdr_t *pkt_hdr[], int num) hdr->buf_hdr.num_seg = 1; hdr->buf_hdr.next_seg = NULL; hdr->buf_hdr.last_seg = &hdr->buf_hdr; + ODP_ASSERT((odp_atomic_store_u32(&hdr->buf_hdr.ref_cnt, 1), 1)); if (odp_unlikely(num > 1)) link_segments(pkt_hdr, num); @@ -848,6 +851,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) >= 1); + if (odp_likely(CONFIG_PACKET_MAX_SEGS == 1 || num_seg == 1)) { odp_buffer_hdr_t *buf_hdr[2]; int num = 1; @@ -877,6 +882,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) >= 1); + if (odp_unlikely(num_seg > 1)) { free_all_segments(pkt_hdr, num_seg); num_freed++; @@ -1010,6 +1017,8 @@ void *odp_packet_pull_head(odp_packet_t pkt, uint32_t len) if (len > pkt_hdr->frame_len) return NULL; + ODP_ASSERT(len <= odp_packet_unshared_len(pkt)); + pull_head(pkt_hdr, len); return packet_data(pkt_hdr); } @@ -1023,6 +1032,8 @@ int odp_packet_trunc_head(odp_packet_t *pkt, uint32_t len, if (len > pkt_hdr->frame_len) return -1; + ODP_ASSERT(len <= odp_packet_unshared_len(*pkt)); + if (len < seg_len) { pull_head(pkt_hdr, len); } else if (CONFIG_PACKET_MAX_SEGS != 1) { @@ -1057,6 +1068,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 +1085,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 +1119,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 +1140,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 +1405,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 +1444,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 +1476,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)); @@ -1538,6 +1563,8 @@ int odp_packet_copy_from_mem(odp_packet_t pkt, uint32_t offset, if (offset + len > pkt_hdr->frame_len) return -1; + ODP_ASSERT(offset + len <= odp_packet_unshared_len(pkt)); + while (len > 0) { mapaddr = packet_map(pkt_hdr, offset, &seglen, NULL); cpylen = len > seglen ? seglen : len; @@ -1567,6 +1594,8 @@ int odp_packet_copy_from_pkt(odp_packet_t dst, uint32_t dst_offset, src_offset + len > src_hdr->frame_len) return -1; + ODP_ASSERT(dst_offset + len <= odp_packet_unshared_len(dst)); + overlap = (dst_hdr == src_hdr && ((dst_offset <= src_offset && dst_offset + len >= src_offset) || @@ -1607,6 +1636,8 @@ int odp_packet_copy_from_pkt(odp_packet_t dst, uint32_t dst_offset, int odp_packet_copy_data(odp_packet_t pkt, uint32_t dst_offset, uint32_t src_offset, uint32_t len) { + ODP_ASSERT(dst_offset + len <= odp_packet_unshared_len(pkt)); + return odp_packet_copy_from_pkt(pkt, dst_offset, pkt, src_offset, len); } @@ -1614,6 +1645,8 @@ int odp_packet_copy_data(odp_packet_t pkt, uint32_t dst_offset, int odp_packet_move_data(odp_packet_t pkt, uint32_t dst_offset, uint32_t src_offset, uint32_t len) { + ODP_ASSERT(dst_offset + len <= odp_packet_unshared_len(pkt)); + return odp_packet_copy_from_pkt(pkt, dst_offset, pkt, src_offset, len); } @@ -1629,6 +1662,8 @@ int _odp_packet_set_data(odp_packet_t pkt, uint32_t offset, if (offset + len > pkt_hdr->frame_len) return -1; + ODP_ASSERT(offset + len <= odp_packet_unshared_len(pkt)); + while (len > 0) { mapaddr = packet_map(pkt_hdr, offset, &seglen, NULL); setlen = len > seglen ? seglen : len;