From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by dpdk.org (Postfix) with ESMTP id 1118A29CB for ; Fri, 14 Jul 2017 12:36:02 +0200 (CEST) Received: by mail-pf0-f196.google.com with SMTP id e199so10570106pfh.0 for ; Fri, 14 Jul 2017 03:36:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gY2FsqFArGJC/JoUXP+SIQ4/HxdA2FVgaEsB5+F3kBY=; b=uF/bEW4UQQ4+NSeGnwMwt+BYSt1QlvmK9llTsIvftCi07CMxPLh/k3Vhx2TIlGdTjp V8P27jie/p8p1zXfvP5CaOA3fDkRMgbFGsEVQobYGgAcJMS/OSviqPiTV+R8ItUxJwJd C9DlGGZVfXo9P2XoBJtgn+1TGF20aL40soMYc3Cdh2/+SJIiv/kesKOXufjQRG6wSCGq iMGWqcpFBOuS1gh5cHt+b/V5W9UgddK1p7bB23/0168IhdDscZ9394gUCFyzxbryOMVR in1X5tNcEDcOCK+8y8EakD5I1Jzha8McMX9K+q7VN8HdO09gw1VPFbm7Re4FKhr0REkn lebA== 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:in-reply-to :references; bh=gY2FsqFArGJC/JoUXP+SIQ4/HxdA2FVgaEsB5+F3kBY=; b=YUwMgXZ/V8CMUUoHGpp4/vh15Z81eWDWiSfxuPGK+AnTRWxYLDhrNpv+RpvM1rAYNj Wyu8aKfNt6dFoNOpYBChqUySj0Ss+gh4esEyqsSJlosgyu1ZlHZJ1dEPdgNC272qFtaO fJWCv/jYuZ+iFta0DcjcXr30NV5UrxMzG46lRpmOsi0aO1qQr5W5LEwlv1VPxfuRDTlt 5zh6uemmaTemUrBpolLCkN6gihPuUtAdY5K8IDnoMw9djYR5ZGvP+xnhNYeQDfhDrNey sxc4oqbW1/zdFyT9KiFcaVD8lkDmFQPefNWMsOrUJIv++RO6h4oyAUHbgSkKAD1ssTtj zZyA== X-Gm-Message-State: AIVw113fDoSbgo6UcLfg+hsI7zHwB71Nnf15u+aZtQHWyx06mnPf1ZCg zUtqPE+rPb1wckhtrAF66GC8 X-Received: by 10.84.176.195 with SMTP id v61mr15188074plb.51.1500028561424; Fri, 14 Jul 2017 03:36:01 -0700 (PDT) Received: from localhost.localdomain ([180.158.48.171]) by smtp.gmail.com with ESMTPSA id y205sm15273553pfb.124.2017.07.14.03.35.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 14 Jul 2017 03:36:00 -0700 (PDT) From: Yuanhan Liu To: Vasily Philipov Cc: Olivier Matz , dpdk stable Date: Fri, 14 Jul 2017 18:33:48 +0800 Message-Id: <1500028450-25989-24-git-send-email-yliu@fridaylinux.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1500028450-25989-1-git-send-email-yliu@fridaylinux.org> References: <1500028450-25989-1-git-send-email-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'mbuf: fix debug checks for headroom and tailroom' has been queued to LTS release 16.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Jul 2017 10:36:02 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/19/17. So please shout if anyone has objections. Thanks. --yliu --- >>From e496325ee597bf8c478aacaae02c464d6a113d8e Mon Sep 17 00:00:00 2001 From: Vasily Philipov Date: Wed, 28 Jun 2017 15:25:12 +0300 Subject: [PATCH] mbuf: fix debug checks for headroom and tailroom [ upstream commit 814baffdb6910c1a949bd7c5ce3c6807f703c799 ] rte_pktmbuf_headroom() and rte_pktmbuf_tailroom() should be usable with any segment, not only with headered ones, so is_header should be 0 when we call for sanity check inside them. Fixes: af75078fece3 ("first public release") Signed-off-by: Vasily Philipov Acked-by: Olivier Matz --- lib/librte_mbuf/rte_mbuf.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h index ead7c6e..00b8495 100644 --- a/lib/librte_mbuf/rte_mbuf.h +++ b/lib/librte_mbuf/rte_mbuf.h @@ -1331,7 +1331,7 @@ static inline void rte_pktmbuf_refcnt_update(struct rte_mbuf *m, int16_t v) */ static inline uint16_t rte_pktmbuf_headroom(const struct rte_mbuf *m) { - __rte_mbuf_sanity_check(m, 1); + __rte_mbuf_sanity_check(m, 0); return m->data_off; } @@ -1345,7 +1345,7 @@ static inline uint16_t rte_pktmbuf_headroom(const struct rte_mbuf *m) */ static inline uint16_t rte_pktmbuf_tailroom(const struct rte_mbuf *m) { - __rte_mbuf_sanity_check(m, 1); + __rte_mbuf_sanity_check(m, 0); return (uint16_t)(m->buf_len - rte_pktmbuf_headroom(m) - m->data_len); } -- 2.7.4