From 4760b32b646b0ceb9b18b62a726e53e56e7ded7a Mon Sep 17 00:00:00 2001 From: David Marchand Date: Wed, 4 Nov 2020 16:57:21 +0100 Subject: [PATCH] usertools: fix pmdinfo parsing This script inspects an ELF file (binary or shared library) and its linked dependencies by following DT_NEEDED tags. So far a simple librte_pmd prefix was used as a filter to only parse DPDK drivers dependencies. While the reason is not clear from the commitlog of the patch that introduced this filter, it was probably added for performance reasons, since going through all dependencies can be quite long. Testing with a DPDK built before the driver name changes: - running the script takes ~0.3s with the filter, - running the script takes ~9s without the filter, Now that we changed the driver library names, it becomes more difficult to identify only DPDK drivers, but we can just filter on the librte_ prefix to identify DPDK libraries: the script later checks for the PMD_INFO_STRING string in .rodata and it is enough to differentiate the DPDK drivers from the other DPDK libraries. Running the script with this patch takes ~0.5s. A debug message was logged for each inspected file, it gives no useful information and is removed. Fixes: a20b2c01a7a1 ("build: standardize component names and defines") Signed-off-by: David Marchand Acked-by: Robin Jarry Acked-by: Bruce Richardson --- usertools/dpdk-pmdinfo.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/usertools/dpdk-pmdinfo.py b/usertools/dpdk-pmdinfo.py index 1661982791..95fb0111d8 100755 --- a/usertools/dpdk-pmdinfo.py +++ b/usertools/dpdk-pmdinfo.py @@ -434,7 +434,6 @@ class ReadElf(object): """ Look to see if there are any DT_NEEDED entries in the binary And process those if there are """ - global raw_output runpath = "" ldlibpath = os.environ.get('LD_LIBRARY_PATH') if ldlibpath is None: @@ -450,13 +449,11 @@ class ReadElf(object): for tag in dynsec.iter_tags(): # pyelftools may return byte-strings, force decode them if force_unicode(tag.entry.d_tag) == 'DT_NEEDED': - if 'librte_pmd' in force_unicode(tag.needed): + if 'librte_' in force_unicode(tag.needed): library = search_file(force_unicode(tag.needed), runpath + ":" + ldlibpath + ":/usr/lib64:/lib64:/usr/lib:/lib") if library is not None: - if raw_output is False: - print("Scanning %s for pmd information" % library) with io.open(library, 'rb') as file: try: libelf = ReadElf(file, sys.stdout) -- 2.20.1