From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 276E1A0527 for ; Wed, 25 Nov 2020 10:03:57 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1EE3DC93E; Wed, 25 Nov 2020 10:03:56 +0100 (CET) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by dpdk.org (Postfix) with ESMTP id 3353EC950 for ; Wed, 25 Nov 2020 10:03:54 +0100 (CET) Received: by mail-wm1-f46.google.com with SMTP id w24so1408067wmi.0 for ; Wed, 25 Nov 2020 01:03:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=s3D25UqD8FDGVT8YcxWW1pBuwwgPY2OSOaOO/7snOO4=; b=ItfJc42UEADaKAOL0a8m0GjHQr1EK8cUuQKAmilVtirSHvgQcmoLXMFKnnCyO90DMy hs9xbicnMk7+rjs4JZ9SWaACiahPCOSd03QKmFSB9UDwWZAtZNXFXFmwKXRVemD9n+bv Zmq+gI0WYTRBbBDaUyz2TQDCd6it8UH9nXgsbuoFwOrTFjQJm026lYbTOV6oHYDHAEpl UJZ2SOoo6ZZirGOJojqOQCHiIfgI4VZHmAJsAxWVQ7rdmHoXrrsa7xN1dNv0ZZQrSMxl i23WvPs5YlEnMaYrk5sS6Xr7ezOVRVzYqPJ+iDxWZ6rNmcHB++sJiXUcndbYggH2rq7f 9UaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=s3D25UqD8FDGVT8YcxWW1pBuwwgPY2OSOaOO/7snOO4=; b=UNMnIqmHNU6E7TIEsRhyoC2uS5D8oDrWXLdQ+kAafzKU22zuTm+JWXV6y61Sp1uHPS bxAtSE0bK0gw8kkwjrzaaITCyIlAQe2tJIdI9Y2LJqEXgFlK78SWqdy0EQuBvdbjYco3 g4yxJF6FuZZB0ttVRRlfp3mNYvieuPNVWpmVXTsWMAhJ9MuUR9IkHWJZfsAzuwkyT3uC k3d0RXwt1fSg7eGurFjcHK1Ds1+akI8roAUHI49hGFeQl0O7gDj3a/DNULM9HuVq30xK oh74ekK+5+de0wq+szYPVU5S5G/eG+f2DB/tc7NqSFFsdX5loObxaCkSS7B7OEeUGLJc Tyiw== X-Gm-Message-State: AOAM530ZIFb4xSpuhdE1NvV825Z+XfFff3L4lH1V5YOglzzLDsgL4AtG WyqWasS3NW//BsGXONXVWsU= X-Google-Smtp-Source: ABdhPJxFrhz5wFFclXWjyi9HjY8+SM8BTB9ur+ru2IpN5uA/faTmNfqi/z2vUmqW3kEffLbXa21MNg== X-Received: by 2002:a05:600c:2159:: with SMTP id v25mr2762559wml.155.1606295032884; Wed, 25 Nov 2020 01:03:52 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id f19sm3285366wml.21.2020.11.25.01.03.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Nov 2020 01:03:52 -0800 (PST) From: luca.boccassi@gmail.com To: Julien Massonneau Cc: dpdk stable Date: Wed, 25 Nov 2020 09:02:58 +0000 Message-Id: <20201125090258.21457-16-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201125090258.21457-1-luca.boccassi@gmail.com> References: <20201117111416.1961049-42-luca.boccassi@gmail.com> <20201125090258.21457-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'usertools: fix pmdinfo parsing' has been queued to stable release 19.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.6 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/26/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/2aebe817793e60aaa7fea8186ab827e98b8d3651 Thanks. Luca Boccassi --- >From 2aebe817793e60aaa7fea8186ab827e98b8d3651 Mon Sep 17 00:00:00 2001 From: Julien Massonneau 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= ", "pci_ids" : []}" Fixes: c67c9a5c646a ("tools: query binaries for HW and other support information") Signed-off-by: Julien Massonneau --- 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 @@ -352,7 +352,7 @@ class ReadElf(object): mystring = force_unicode(data[dataptr:endptr]) 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.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-24 16:50:37.223769666 +0000 +++ 0016-usertools-fix-pmdinfo-parsing.patch 2020-11-24 16:50:36.577496485 +0000 @@ -1 +1 @@ -From 3515fa1e5ecbe0099cb886b81ba77058d1a2d397 Mon Sep 17 00:00:00 2001 +From 2aebe817793e60aaa7fea8186ab827e98b8d3651 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 @@ -@@ -346,7 +346,7 @@ class ReadElf(object): +@@ -352,7 +352,7 @@ class ReadElf(object): @@ -40 +41 @@ - if rc != -1: + if (rc != -1):