From: Kevin Traynor <ktraynor@redhat.com> To: Julien Massonneau <julien.massonneau@6wind.com> Cc: dpdk stable <stable@dpdk.org> Subject: [dpdk-stable] patch 'usertools: fix pmdinfo parsing' has been queued to LTS release 18.11.11 Date: Mon, 23 Nov 2020 17:12:22 +0000 Message-ID: <20201123171222.79398-30-ktraynor@redhat.com> (raw) In-Reply-To: <20201123171222.79398-1-ktraynor@redhat.com> Hi, FYI, your patch has been queued to LTS release 18.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/27/20. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/3627aa71db4b46ac17b448fd35c409e2362ab181 Thanks. Kevin. --- From 3627aa71db4b46ac17b448fd35c409e2362ab181 Mon Sep 17 00:00:00 2001 From: Julien Massonneau <julien.massonneau@6wind.com> Date: Thu, 19 Nov 2020 10:44:01 +0100 Subject: [PATCH] usertools: fix pmdinfo parsing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 3515fa1e5ecbe0099cb886b81ba77058d1a2d397 ] In the display_pmd_info_strings function, the script parses the section until to find a byte between 32 and 127, and get all data until a byte equals to 0. After, it searches "PMD_INFO_STRING" in the data and passes the whole string in the parse_pmd_info_string function, which split the string with "=" and convert it in python dict with json.loads(). But the string may contain a "=" before "PMD_INFO_STRING", so it is not correctly split and will lead to an error (json.decoder.JSONDecodeError). Example of a string encountered that leads to an error: "Ag%=C£°ÐÊ+Ë®{0´wË-£0òjB·;¾¬úPMD_INFO_STRING= {"name" : "net_octeontx", "params" : "nr_port=<int> ", "pci_ids" : []}" Fixes: c67c9a5c646a ("tools: query binaries for HW and other support information") Signed-off-by: Julien Massonneau <julien.massonneau@6wind.com> --- usertools/dpdk-pmdinfo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usertools/dpdk-pmdinfo.py b/usertools/dpdk-pmdinfo.py index 12f20735e0..27e1cad328 100755 --- a/usertools/dpdk-pmdinfo.py +++ b/usertools/dpdk-pmdinfo.py @@ -353,5 +353,5 @@ class ReadElf(object): rc = mystring.find("PMD_INFO_STRING") if (rc != -1): - self.parse_pmd_info_string(mystring) + self.parse_pmd_info_string(mystring[rc:]) dataptr = endptr -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-23 17:10:14.700509820 +0000 +++ 0030-usertools-fix-pmdinfo-parsing.patch 2020-11-23 17:10:14.018061613 +0000 @@ -1 +1 @@ -From 3515fa1e5ecbe0099cb886b81ba77058d1a2d397 Mon Sep 17 00:00:00 2001 +From 3627aa71db4b46ac17b448fd35c409e2362ab181 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 3515fa1e5ecbe0099cb886b81ba77058d1a2d397 ] + @@ -26 +27,0 @@ -Cc: stable@dpdk.org @@ -34 +35 @@ -index b4e8a48cde..3381aa616c 100755 +index 12f20735e0..27e1cad328 100755 @@ -37 +38 @@ -@@ -347,5 +347,5 @@ class ReadElf(object): +@@ -353,5 +353,5 @@ class ReadElf(object): @@ -39 +40 @@ - if rc != -1: + if (rc != -1):
prev parent reply other threads:[~2020-11-23 17:13 UTC|newest] Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-23 17:11 [dpdk-stable] patch 'examples/l2fwd-keepalive: skip meson build if no librt' " Kevin Traynor 2020-11-23 17:11 ` [dpdk-stable] patch 'devtools: fix directory filter in forbidden token check' " Kevin Traynor 2020-11-23 17:11 ` [dpdk-stable] patch 'examples/qos_sched: fix usage string' " Kevin Traynor 2020-11-23 17:11 ` [dpdk-stable] patch 'usertools: fix CPU layout script to be PEP8 compliant' " Kevin Traynor 2020-11-23 17:11 ` [dpdk-stable] patch 'config: enable packet prefetching with Meson' " Kevin Traynor 2020-11-23 17:11 ` [dpdk-stable] patch 'net/ring: fix typo in log message' " Kevin Traynor 2020-11-23 17:11 ` [dpdk-stable] patch 'examples/vhost_crypto: add new line character in usage' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'vhost: fix virtqueue initialization' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'net/i40e: add C++ include guard' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'net/avf: fix releasing mbufs' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'net/avf: fix performance drop after port reset' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'net/i40e: fix build for log format specifier' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'net/ixgbe: remove redundant MAC flag check' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'vhost: fix error path when setting memory tables' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'vhost: fix fd leak in dirty logging setup' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'vhost: fix fd leak in kick " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'app/testpmd: fix MTU after device configure' " Kevin Traynor 2020-11-23 18:35 ` David Marchand 2020-11-24 9:38 ` Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'app/eventdev: check timer adadpters number' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'examples/kni: fix build with pkg-config' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'examples/l2fwd-crypto: " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'examples/performance-thread: " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'doc: fix rule file parameters in l3fwd-acl guide' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'net/mlx5: fix Rx queue count calculation' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'net/mlx5: fix Rx descriptor status' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'app/testpmd: revert setting MTU explicitly after configure' " Kevin Traynor 2020-11-23 18:36 ` David Marchand 2020-11-23 17:12 ` [dpdk-stable] patch 'compress/isal: check allocation in queue setup' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'examples/l3fwd-power: check packet types after start' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'net/mlx5: fix representor interrupts handler' " Kevin Traynor 2020-11-23 17:12 ` [dpdk-stable] patch 'malloc: fix style in free list index computation' " Kevin Traynor 2020-11-23 17:12 ` Kevin Traynor [this message]
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=20201123171222.79398-30-ktraynor@redhat.com \ --to=ktraynor@redhat.com \ --cc=julien.massonneau@6wind.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
patches for DPDK stable branches This inbox may be cloned and mirrored by anyone: git clone --mirror https://inbox.dpdk.org/stable/0 stable/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 stable stable/ https://inbox.dpdk.org/stable \ stable@dpdk.org public-inbox-index stable Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.stable AGPL code for this site: git clone https://public-inbox.org/public-inbox.git