From: Yongseok Koh <yskoh@mellanox.com>
To: Remy Horton <remy.horton@intel.com>
Cc: dpdk stable <stable@dpdk.org>
Subject: [dpdk-stable] patch 'metrics: do not fail silently when uninitialised' has been queued to LTS release 17.11.4
Date: Thu, 26 Jul 2018 19:31:57 -0700 [thread overview]
Message-ID: <20180727023205.38767-2-yskoh@mellanox.com> (raw)
In-Reply-To: <20180727023205.38767-1-yskoh@mellanox.com>
Hi,
FYI, your patch has been queued to LTS release 17.11.4
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/28/18. So please
shout if anyone has objections.
Thanks.
Yongseok
---
>From 2191a73c5584a610d097f34fb8b419c666255488 Mon Sep 17 00:00:00 2001
From: Remy Horton <remy.horton@intel.com>
Date: Mon, 2 Jul 2018 15:55:47 +0100
Subject: [PATCH] metrics: do not fail silently when uninitialised
[ upstream commit a84bdf6a101f2ab3c3859a40f366962d78c12868 ]
If rte_metrics_init() had not been called and hence the internal
metric storage is not allocated, rte_metrics_get_values() and
rte_metrics_get_name() would silently fail by returning zero
(i.e. no metrics registered). This patch changes the result of
this scenario to an explicit fail by returning -EIO.
Fixes: 349950ddb9c5 ("metrics: add information metrics library")
Signed-off-by: Remy Horton <remy.horton@intel.com>
---
lib/librte_metrics/rte_metrics.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/lib/librte_metrics/rte_metrics.c b/lib/librte_metrics/rte_metrics.c
index 26c65b173..3ddf9caa4 100644
--- a/lib/librte_metrics/rte_metrics.c
+++ b/lib/librte_metrics/rte_metrics.c
@@ -236,9 +236,8 @@ rte_metrics_get_names(struct rte_metric_name *names,
int return_value;
memzone = rte_memzone_lookup(RTE_METRICS_MEMZONE_NAME);
- /* If not allocated, fail silently */
if (memzone == NULL)
- return 0;
+ return -EIO;
stats = memzone->addr;
rte_spinlock_lock(&stats->lock);
@@ -274,9 +273,9 @@ rte_metrics_get_values(int port_id,
return -EINVAL;
memzone = rte_memzone_lookup(RTE_METRICS_MEMZONE_NAME);
- /* If not allocated, fail silently */
if (memzone == NULL)
- return 0;
+ return -EIO;
+
stats = memzone->addr;
rte_spinlock_lock(&stats->lock);
--
2.11.0
next prev parent reply other threads:[~2018-07-27 2:32 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-27 2:31 [dpdk-stable] patch 'metrics: add check for invalid key' " Yongseok Koh
2018-07-27 2:31 ` Yongseok Koh [this message]
2018-07-27 2:31 ` [dpdk-stable] patch 'metrics: disallow null as metric name' " Yongseok Koh
2018-07-27 2:31 ` [dpdk-stable] patch 'test: fix EAL flags autotest on FreeBSD' " Yongseok Koh
2018-07-27 2:32 ` [dpdk-stable] patch 'test/flow_classify: fix return types' " Yongseok Koh
2018-07-27 2:32 ` [dpdk-stable] patch 'test/hash: fix multiwriter with non consecutive cores' " Yongseok Koh
2018-07-27 2:32 ` [dpdk-stable] patch 'test/hash: fix potential memory leak' " Yongseok Koh
2018-07-27 2:32 ` [dpdk-stable] patch 'doc: fix bonding command in testpmd' " Yongseok Koh
2018-07-27 2:32 ` [dpdk-stable] patch 'net/mlx5: add missing sanity checks for Tx completion queue' " Yongseok Koh
2018-07-27 2:32 ` [dpdk-stable] patch 'net/mlx5: fix assert for Tx completion queue count' " Yongseok Koh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180727023205.38767-2-yskoh@mellanox.com \
--to=yskoh@mellanox.com \
--cc=remy.horton@intel.com \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).