[dpdk-stable] patch 'usertools: fix pmdinfo parsing' has been queued to LTS release 18.11.11

[Kevin Traynor <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):