patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Kevin Traynor <ktraynor@redhat.com>
To: Chengwen Feng <fengchengwen@huawei.com>
Cc: David Marchand <david.marchand@redhat.com>,
	Jerin Jacob <jerinj@marvell.com>, dpdk stable <stable@dpdk.org>
Subject: patch 'trace: fix init with long file prefix' has been queued to stable release 21.11.2
Date: Fri, 24 Jun 2022 16:01:09 +0100	[thread overview]
Message-ID: <20220624150148.1855580-1-ktraynor@redhat.com> (raw)

Hi,

FYI, your patch has been queued to stable release 21.11.2

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/27/22. 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/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/b55b2820d215b4a24cb402aeb4bdf2f4ab6f0870

Thanks.

Kevin

---
From b55b2820d215b4a24cb402aeb4bdf2f4ab6f0870 Mon Sep 17 00:00:00 2001
From: Chengwen Feng <fengchengwen@huawei.com>
Date: Fri, 17 Jun 2022 10:29:11 +0800
Subject: [PATCH] trace: fix init with long file prefix

[ upstream commit d59a940667989461e2916207e7fbb8148504c44f ]

Bug scenario:
1. start testpmd:
  $ dpdk-testpmd -l 4-6 -a 0000:7d:00.0 --trace=.* \
    --file-prefix=trace_autotest -- -i
2. then observed:
  EAL: eal_trace_init():93 failed to initialize trace [File exists]
  EAL: FATAL: Cannot init trace
  EAL: Cannot init trace
  EAL: Error - exiting with code: 1

The root cause it that the offset set wrong with long file-prefix and
then lead the strftime return failed.

At the same time, trace_session_name_generate() uses errno as the return
value, but the errno was not set if strftime returned zero.
A previously set errno (EEXIST or ENOENT from call to mkdir for creating
the runtime configuration directory) was returned in this case.
This is fragile and may lead to incorrect logic if errno was set
to 0 previously.
This also resulted in inaccurate prompting.
Set errno to ENOSPC if strftime return zero.

Fixes: 321dd5f8fa62 ("trace: add internal init and fini interface")

Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
Reviewed-by: David Marchand <david.marchand@redhat.com>
Acked-by: Jerin Jacob <jerinj@marvell.com>
---
 lib/eal/common/eal_common_trace_utils.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/eal/common/eal_common_trace_utils.c b/lib/eal/common/eal_common_trace_utils.c
index 64f58fb66a..2b55dbec65 100644
--- a/lib/eal/common/eal_common_trace_utils.c
+++ b/lib/eal/common/eal_common_trace_utils.c
@@ -105,11 +105,13 @@ trace_session_name_generate(char *trace_dir)
 			TRACE_PREFIX_LEN);
 	if (rc == -E2BIG)
-		rc = TRACE_PREFIX_LEN;
+		rc = TRACE_PREFIX_LEN - 1;
 	trace_dir[rc++] = '-';
 
 	rc = strftime(trace_dir + rc, TRACE_DIR_STR_LEN - rc,
 			"%Y-%m-%d-%p-%I-%M-%S", tm_result);
-	if (rc == 0)
+	if (rc == 0) {
+		errno = ENOSPC;
 		goto fail;
+	}
 
 	return rc;
-- 
2.34.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-06-24 15:51:08.953407065 +0100
+++ 0001-trace-fix-init-with-long-file-prefix.patch	2022-06-24 15:51:08.764983794 +0100
@@ -1 +1 @@
-From d59a940667989461e2916207e7fbb8148504c44f Mon Sep 17 00:00:00 2001
+From b55b2820d215b4a24cb402aeb4bdf2f4ab6f0870 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit d59a940667989461e2916207e7fbb8148504c44f ]
+
@@ -29 +30,0 @@
-Cc: stable@dpdk.org


             reply	other threads:[~2022-06-24 15:02 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-24 15:01 Kevin Traynor [this message]
2022-06-24 15:01 ` patch 'test: drop reference to removed tests' " Kevin Traynor
2022-06-24 15:01 ` patch 'sched: remove unnecessary floating point' " Kevin Traynor
2022-06-24 15:01 ` patch 'eal/x86: drop export of internal alignment macro' " Kevin Traynor
2022-06-24 16:42   ` Kevin Traynor
2022-06-24 15:01 ` patch 'baseband/acc100: update companion PF configure function' " Kevin Traynor
2022-06-24 15:01 ` patch 'baseband/acc100: add protection for some negative scenario' " Kevin Traynor
2022-06-24 15:01 ` patch 'ipsec: fix NAT-T ports and length' " Kevin Traynor
2022-06-24 15:01 ` patch 'examples/ipsec-secgw: fix NAT-T header fields' " Kevin Traynor
2022-06-24 15:01 ` patch 'net/iavf: fix NAT-T payload length' " Kevin Traynor
2022-06-24 15:01 ` patch 'examples/ipsec-secgw: fix ESN setting' " Kevin Traynor
2022-06-24 15:01 ` patch 'common/cpt: fix build with GCC 12' " Kevin Traynor
2022-06-24 15:01 ` patch 'crypto/cnxk: " Kevin Traynor
2022-06-24 15:01 ` patch 'test/ipsec: " Kevin Traynor
2022-06-24 15:01 ` patch 'crypto/scheduler: fix queue pair in scheduler failover' " Kevin Traynor
2022-06-24 15:01 ` patch 'test/crypto: fix cipher offset for ZUC' " Kevin Traynor
2022-06-24 15:01 ` patch 'test/ipsec: fix performance test' " Kevin Traynor
2022-06-24 15:01 ` patch 'event/octeontx: fix SSO fast path' " Kevin Traynor
2022-06-24 15:01 ` patch 'event/dlb2: rework queue drain handling' " Kevin Traynor
2022-06-24 15:01 ` patch 'event/dlb2: fix check of QID in-flight' " Kevin Traynor
2022-06-24 15:01 ` patch 'event/cnxk: fix QoS parameter handling' " Kevin Traynor
2022-06-24 15:01 ` patch 'event/cnxk: fix Tx adapter enqueue return for CN10K' " Kevin Traynor
2022-06-24 15:01 ` patch 'event/dlb2: fix advertized capabilities' " Kevin Traynor
2022-06-24 15:01 ` patch 'eventdev/eth_tx: fix adapter creation' " Kevin Traynor
2022-06-24 15:01 ` patch 'net/bonding: fix RSS inconsistency between ports' " Kevin Traynor
2022-06-24 15:01 ` patch 'test/bonding: fix RSS test when disable RSS' " Kevin Traynor
2022-06-24 15:01 ` patch 'net/hns3: fix an unreasonable memset' " Kevin Traynor
2022-06-24 15:01 ` patch 'net/hns3: remove duplicate definition' " Kevin Traynor
2022-06-24 15:01 ` patch 'net/hns3: fix code check warning' " Kevin Traynor
2022-06-24 15:01 ` patch 'net/hns3: fix return value for unsupported tuple' " Kevin Traynor
2022-06-24 15:01 ` patch 'net/hns3: fix crash from secondary process' " Kevin Traynor
2022-06-24 15:01 ` patch 'net/hns3: fix TM capability' " Kevin Traynor
2022-06-24 15:01 ` patch 'app/testpmd: add help messages for multi-process' " Kevin Traynor
2022-06-24 15:01 ` patch 'app/testpmd: fix bonding slave devices not released' " Kevin Traynor
2022-06-24 15:01 ` patch 'net/txgbe: fix register polling' " Kevin Traynor
2022-06-24 15:01 ` patch 'net/ngbe: add more packet statistics' " Kevin Traynor
2022-06-24 15:01 ` patch 'app/testpmd: revert MAC update in checksum forwarding' " Kevin Traynor
2022-06-24 15:01 ` patch 'vhost: fix missing enqueue pseudo-header calculation' " Kevin Traynor
2022-06-24 15:01 ` patch 'vhost/crypto: fix build with GCC 12' " Kevin Traynor
2022-06-24 15:01 ` patch 'vhost/crypto: fix descriptor processing' " Kevin Traynor
2022-06-24 15:01 ` patch 'net/virtio: unmap PCI device in secondary process' " Kevin Traynor

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=20220624150148.1855580-1-ktraynor@redhat.com \
    --to=ktraynor@redhat.com \
    --cc=david.marchand@redhat.com \
    --cc=fengchengwen@huawei.com \
    --cc=jerinj@marvell.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).