patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
To: "Min Hu (Connor)" <humin29@huawei.com>
Cc: Erik Gabriel Carrillo <erik.g.carrillo@intel.com>,
	dpdk stable <stable@dpdk.org>
Subject: [dpdk-stable] patch 'test/timer: check memzone allocation' has been queued to stable release 19.11.9
Date: Thu, 10 Jun 2021 14:05:55 +0200	[thread overview]
Message-ID: <20210610120641.885862-7-christian.ehrhardt@canonical.com> (raw)
In-Reply-To: <20210610120641.885862-1-christian.ehrhardt@canonical.com>

Hi,

FYI, your patch has been queued to stable release 19.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/12/21. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/5f49a5b80a2a1d8f7e65af66d477979c711df8cd

Thanks.

Christian Ehrhardt <christian.ehrhardt@canonical.com>

---
From 5f49a5b80a2a1d8f7e65af66d477979c711df8cd Mon Sep 17 00:00:00 2001
From: "Min Hu (Connor)" <humin29@huawei.com>
Date: Tue, 4 May 2021 09:07:49 +0800
Subject: [PATCH] test/timer: check memzone allocation

[ upstream commit fb9b862e7c0ddee29df36feb8dd0cbcd2762db25 ]

Segmentation fault may occur without checking if memzone
reserves succeed or not.

Fixes: 50247fe03fe0 ("test/timer: exercise new APIs in secondary process")

Signed-off-by: Min Hu (Connor) <humin29@huawei.com>
Acked-by: Erik Gabriel Carrillo <erik.g.carrillo@intel.com>
---
 app/test/test_timer_secondary.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/test/test_timer_secondary.c b/app/test/test_timer_secondary.c
index 790f180521..a4033b6a5d 100644
--- a/app/test/test_timer_secondary.c
+++ b/app/test/test_timer_secondary.c
@@ -126,9 +126,9 @@ test_timer_secondary(void)
 
 		mz = rte_memzone_reserve(TEST_INFO_MZ_NAME, sizeof(*test_info),
 					 SOCKET_ID_ANY, 0);
-		test_info = mz->addr;
-		TEST_ASSERT_NOT_NULL(test_info, "Couldn't allocate memory for "
+		TEST_ASSERT_NOT_NULL(mz, "Couldn't allocate memory for "
 				     "test data");
+		test_info = mz->addr;
 
 		test_info->tim_mempool = rte_mempool_create("test_timer_mp",
 				NUM_TIMERS, sizeof(struct rte_timer), 0, 0,
@@ -172,9 +172,9 @@ test_timer_secondary(void)
 		int i;
 
 		mz = rte_memzone_lookup(TEST_INFO_MZ_NAME);
-		test_info = mz->addr;
-		TEST_ASSERT_NOT_NULL(test_info, "Couldn't lookup memzone for "
+		TEST_ASSERT_NOT_NULL(mz, "Couldn't lookup memzone for "
 				     "test info");
+		test_info = mz->addr;
 
 		for (i = 0; i < NUM_TIMERS; i++) {
 			rte_mempool_get(test_info->tim_mempool, (void **)&tim);
-- 
2.31.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-06-10 14:04:58.426015296 +0200
+++ 0007-test-timer-check-memzone-allocation.patch	2021-06-10 14:04:58.010024228 +0200
@@ -1 +1 @@
-From fb9b862e7c0ddee29df36feb8dd0cbcd2762db25 Mon Sep 17 00:00:00 2001
+From 5f49a5b80a2a1d8f7e65af66d477979c711df8cd Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit fb9b862e7c0ddee29df36feb8dd0cbcd2762db25 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 1e8f1d4549..16a9f1878b 100644
+index 790f180521..a4033b6a5d 100644
@@ -22 +23 @@
-@@ -125,9 +125,9 @@ test_timer_secondary(void)
+@@ -126,9 +126,9 @@ test_timer_secondary(void)
@@ -34 +35 @@
-@@ -171,9 +171,9 @@ test_timer_secondary(void)
+@@ -172,9 +172,9 @@ test_timer_secondary(void)

  parent reply	other threads:[~2021-06-10 12:07 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-10 12:05 [dpdk-stable] patch 'app/testpmd: fix NVGRE encap configuration' " Christian Ehrhardt
2021-06-10 12:05 ` [dpdk-stable] patch 'Revert "kni: fix compilation on SLES15-SP3"' " Christian Ehrhardt
2021-06-10 12:05 ` [dpdk-stable] patch 'bus/fslmc: remove unused debug macro' " Christian Ehrhardt
2021-06-10 12:05 ` [dpdk-stable] patch 'raw/skeleton: add missing check after setting attribute' " Christian Ehrhardt
2021-06-10 12:05 ` [dpdk-stable] patch 'ipc: use monotonic clock' " Christian Ehrhardt
2021-06-10 12:05 ` [dpdk-stable] patch 'examples/timer: fix time interval' " Christian Ehrhardt
2021-06-10 12:05 ` Christian Ehrhardt [this message]
2021-06-10 12:05 ` [dpdk-stable] patch 'power: fix sanity checks for guest channel read' " Christian Ehrhardt
2021-06-10 12:05 ` [dpdk-stable] patch 'event/dpaa2: remove unused macros' " Christian Ehrhardt
2021-06-10 12:05 ` [dpdk-stable] patch 'app/eventdev: fix lcore parsing skipping last core' " Christian Ehrhardt
2021-06-10 12:05 ` [dpdk-stable] patch 'net/ice/base: fix memory allocation wrapper' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/ena: switch memcpy to optimized version' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/ena/base: fix type conversions by explicit casting' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/ena: remove endian swap functions' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/nfp: fix reporting of RSS capabilities' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/hns3: return error on PCI config write failure' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/hns3: clear hash map on flow director clear' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/hns3: fix querying flow director counter for out param' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/hns3: fix secondary process request start/stop Rx/Tx' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/hns3: fix ordering in secondary process initialization' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/iavf: fix Tx context descriptor' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/ice: fix VSI array out of bounds access' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/i40e: fix VF RSS configuration' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/bnx2x: fix build with GCC 11' " Christian Ehrhardt
2021-06-10 12:06 ` Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/ice/base: " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/tap: " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/mlx4: fix secondary process initialization ordering' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/mlx5: " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'crypto/qat: fix null authentication request' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'app/crypto-perf: check memory allocation' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'examples/rxtx_callbacks: fix port ID format specifier' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'examples/flow_classify: fix NUMA check of port and core' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'examples/l2fwd-cat: " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'examples/skeleton: " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'test: check flow classifier creation' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'test/power: fix CPU frequency check' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'test/power: add turbo mode to " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'test/power: fix low frequency test when turbo enabled' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'test/power: fix turbo test' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'test/table: fix build with GCC 11' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'examples/l3fwd-power: fix empty poll thresholds' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'test: fix division by zero' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'test/crypto: fix build with GCC 11' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/mlx4: fix leak when configured repeatedly' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/mlx5: " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/hns3: fix requested FC mode rollback' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/hns3: remove meaningless packet buffer " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/hns3: fix DCB reconfiguration' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'common/sfc_efx/base: limit reported MCDI response length' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/memif: fix Tx bps statistics for zero-copy' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'test: fix build with GCC 11' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'test/cmdline: silence clang 12 warning' " Christian Ehrhardt

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=20210610120641.885862-7-christian.ehrhardt@canonical.com \
    --to=christian.ehrhardt@canonical.com \
    --cc=erik.g.carrillo@intel.com \
    --cc=humin29@huawei.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).