From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 60466A04E7;
Tue, 3 Nov 2020 01:16:30 +0100 (CET)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id F2FCA72F0;
Tue, 3 Nov 2020 01:14:39 +0100 (CET)
Received: from new3-smtp.messagingengine.com (new3-smtp.messagingengine.com
[66.111.4.229]) by dpdk.org (Postfix) with ESMTP id CF1766947;
Tue, 3 Nov 2020 01:14:35 +0100 (CET)
Received: from compute2.internal (compute2.nyi.internal [10.202.2.42])
by mailnew.nyi.internal (Postfix) with ESMTP id 3427158063F;
Mon, 2 Nov 2020 19:14:35 -0500 (EST)
Received: from mailfrontend2 ([10.202.2.163])
by compute2.internal (MEProxy); Mon, 02 Nov 2020 19:14:35 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h=
from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding; s=fm2; bh=/Y5/EqEdDQ0Db
PZpnSB+FUPG32EN2onxRQIoXMDga+A=; b=CuxE2Zgi1Bcs62SauE+8G8gJ76+BG
eLkMcG8xO3kEJJ9HdPHxtFF2SrGPTjvO/aiLgI20UmSEAFEGkz/DIUCZg43rsgzZ
bIg6gkPgNlko/jdfPBPp9fHTQywxg4EOgvp2CevrkFfphJp4U0srC8mxkkPlwJZm
NHfgrlfv0wCGOoVPyXsUCqyGSa5pBRHV0I4ODmog53qBkZjrxh48PtV7RV/Q0ZB8
JMC/EN+tLqLnmfqrJtTSik7vFgDEl0Z/sbIDYAb/Yok/L/lONL+Fdo1XtyhJ04P1
tgxQaggZypc7iEctCh5Mt3wPdkBR1QDpWwV1xxtghyA1KKYLVbmTxoSMg==
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
messagingengine.com; h=cc:content-transfer-encoding:date:from
:in-reply-to:message-id:mime-version:references:subject:to
:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=
fm1; bh=/Y5/EqEdDQ0DbPZpnSB+FUPG32EN2onxRQIoXMDga+A=; b=D6lYzkFH
FWL1ioTxWm+GxCGDF1UcUys6DntVynTaMEuMY30UeYWHhasXgOuZzueLOIOrbDRT
+sTUULELS8a/aoB0xTMFXZZDuES+klf0cfVljiLxEhAu7FwqSFabCzws4pWiWDLg
26X13C/7FqLfBJzrGiB1WdJ5S+EeaUIQHL8gitcRRIMT5ZFfCYjRfWTmeMgo//lb
0AFtg79kBDr+1vEPhsATeeXbrcCMnRS6cCz1tbwuKUO684Yax3zSmkiBc17GsliN
+KaSTH3WPY1Tq/suEfMDyOUvN0h5kbEKMFkYe+ZZlRZ19j/5cP3Nuu4w/q8xNBdL
IrFx+TJsEDZ70Q==
X-ME-Sender: <xms:66CgX7eS5vCc8vz781yz3hybgG0X0HaSDKbbfRFKLDgy9gFOAn8eeA>
<xme:66CgXxP-pvSOllHU1bZNXHDBUS9mOgFhrhv4y9xL433IsbEkuVj9EhPJPXV2b5fWx
5E6nzi2W20BBNQdQQ>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedruddtvddgudejucetufdoteggodetrfdotf
fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen
uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne
cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefvhhhomhgr
shcuofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlhhonhdrnhgvtheqnecugg
ftrfgrthhtvghrnhepvdehgfeivdejgedtveehfefhteelfefgieevgfffveefjeegtdfg
uedthedtgeevnecukfhppeejjedrudefgedrvddtfedrudekgeenucevlhhushhtvghruf
hiiigvpeehnecurfgrrhgrmhepmhgrihhlfhhrohhmpehthhhomhgrshesmhhonhhjrghl
ohhnrdhnvght
X-ME-Proxy: <xmx:66CgX0iYQ94Y8Wf8vT0-y-dDxup5ccHcgSsjdOF17veL6rcNri5O9g>
<xmx:66CgX8_y23S4oU_uJ3OBWA_FLG603LJjOw0mHGzbvqbkBj5G3I6yUQ>
<xmx:66CgX3sg5PI34WeMZh14kyVz2PnsOOABtq5N6Mg_TdrCr0au15sArQ>
<xmx:66CgX1JlnyaTpSX32qrdsJfiOSeL02ceZle4KfhVCWG_66tWlEWxwg>
Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184])
by mail.messagingengine.com (Postfix) with ESMTPA id BCA8A306467E;
Mon, 2 Nov 2020 19:14:33 -0500 (EST)
From: Thomas Monjalon <thomas@monjalon.net>
To: dev@dpdk.org
Cc: ferruh.yigit@intel.com, david.marchand@redhat.com,
bruce.richardson@intel.com, olivier.matz@6wind.com,
andrew.rybchenko@oktetlabs.ru, jerinj@marvell.com, viacheslavo@nvidia.com,
stable@dpdk.org, Matan Azrad <matan@nvidia.com>,
Shahaf Shuler <shahafs@nvidia.com>, Ori Kam <orika@mellanox.com>
Date: Tue, 3 Nov 2020 01:13:57 +0100
Message-Id: <20201103001407.2931963-7-thomas@monjalon.net>
X-Mailer: git-send-email 2.28.0
In-Reply-To: <20201103001407.2931963-1-thomas@monjalon.net>
References: <20201029092751.3837177-1-thomas@monjalon.net>
<20201103001407.2931963-1-thomas@monjalon.net>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-dev] [PATCH v3 06/16] net/mlx5: fix dynamic mbuf offset
lookup check
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
The functions rte_mbuf_dynfield_lookup() and rte_mbuf_dynflag_lookup()
can return an offset starting with 0 or a negative error code.
In reality the first offsets are probably reserved forever,
but for the sake of strict API compliance,
the checks which considered 0 as an error are fixed.
Fixes: efa79e68c8cd ("net/mlx5: support fine grain dynamic flag")
Fixes: 3172c471b86f ("net/mlx5: prepare Tx queue structures to support timestamp")
Fixes: 0febfcce3693 ("net/mlx5: prepare Tx to support scheduling")
Cc: stable@dpdk.org
Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
drivers/net/mlx5/mlx5_rxtx.c | 4 ++--
drivers/net/mlx5/mlx5_trigger.c | 2 +-
drivers/net/mlx5/mlx5_txq.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c
index b530ff421f..e86468b67a 100644
--- a/drivers/net/mlx5/mlx5_rxtx.c
+++ b/drivers/net/mlx5/mlx5_rxtx.c
@@ -5661,9 +5661,9 @@ mlx5_select_tx_function(struct rte_eth_dev *dev)
}
if (tx_offloads & DEV_TX_OFFLOAD_SEND_ON_TIMESTAMP &&
rte_mbuf_dynflag_lookup
- (RTE_MBUF_DYNFLAG_TX_TIMESTAMP_NAME, NULL) > 0 &&
+ (RTE_MBUF_DYNFLAG_TX_TIMESTAMP_NAME, NULL) >= 0 &&
rte_mbuf_dynfield_lookup
- (RTE_MBUF_DYNFIELD_TIMESTAMP_NAME, NULL) > 0) {
+ (RTE_MBUF_DYNFIELD_TIMESTAMP_NAME, NULL) >= 0) {
/* Offload configured, dynamic entities registered. */
olx |= MLX5_TXOFF_CONFIG_TXPP;
}
diff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c
index 7735f022a3..917b433c4a 100644
--- a/drivers/net/mlx5/mlx5_trigger.c
+++ b/drivers/net/mlx5/mlx5_trigger.c
@@ -302,7 +302,7 @@ mlx5_dev_start(struct rte_eth_dev *dev)
DRV_LOG(DEBUG, "port %u starting device", dev->data->port_id);
fine_inline = rte_mbuf_dynflag_lookup
(RTE_PMD_MLX5_FINE_GRANULARITY_INLINE, NULL);
- if (fine_inline > 0)
+ if (fine_inline >= 0)
rte_net_mlx5_dynf_inline_mask = 1UL << fine_inline;
else
rte_net_mlx5_dynf_inline_mask = 0;
diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c
index af84f5f72b..8ed2bcff7b 100644
--- a/drivers/net/mlx5/mlx5_txq.c
+++ b/drivers/net/mlx5/mlx5_txq.c
@@ -1305,7 +1305,7 @@ mlx5_txq_dynf_timestamp_set(struct rte_eth_dev *dev)
(RTE_MBUF_DYNFLAG_TX_TIMESTAMP_NAME, NULL);
off = rte_mbuf_dynfield_lookup
(RTE_MBUF_DYNFIELD_TIMESTAMP_NAME, NULL);
- if (nbit > 0 && off >= 0 && sh->txpp.refcnt)
+ if (nbit >= 0 && off >= 0 && sh->txpp.refcnt)
mask = 1ULL << nbit;
for (i = 0; i != priv->txqs_n; ++i) {
data = (*priv->txqs)[i];
--
2.28.0