From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E751048AEF for ; Wed, 12 Nov 2025 17:53:17 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E1FB1402A0; Wed, 12 Nov 2025 17:53:17 +0100 (CET) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mails.dpdk.org (Postfix) with ESMTP id 0128040A87 for ; Wed, 12 Nov 2025 17:53:15 +0100 (CET) Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-47112edf9f7so5641855e9.0 for ; Wed, 12 Nov 2025 08:53:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762966395; x=1763571195; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WIrtt/18jD/YPR+A3e6a4bMgE3hRbW3aiO6AmSxyjuI=; b=gFxK19ulmeU2g4Cxm1T6BMfOV2eaZiuqQWAfWb7nBelGUv9ci5RHnSGDcGv9isbmHU NCNgXefNM05d2iUObYK3Dnv2K8qRMAZC7sE4jFKbTMJSGMBhKx2sDWX1+6TtrCoK4jjC PuAroMfil7Yjg9b26jRRmNPdZY2c8bbFLKDy2v1X+dViyWDGHzAroRqSUSmFbg4V8F6C F4r+BL3ypKzvV5HsMmPtYPKc9UajMnepMkqMBMmRvXk8DZfehtrkv/4sSYCYwg3P/Qfd XuEo2HRCNVafXKQEzY+nF/i6E5Y8jFPb5AN1sY+WWEhRc0o9etRPy0IsAsh7IVHLcT0G mjOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762966395; x=1763571195; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=WIrtt/18jD/YPR+A3e6a4bMgE3hRbW3aiO6AmSxyjuI=; b=Ud18priTtQ58oA+HyxB5Oti8vFOzqbBZ0iZvEfveEROsvht0SL4oXGsnvCE54F3D31 1QuZZ55fTfvKqZ5jGerVzYKHNa1HFeLFvd/3ffLB6zCcCEvu88gXtnLNR++F/JHOWbVR idoSLiuGbDjqUT3mYfkESR27CWEsGxJP1viwv0r1U1SmmloT4ZauvNJW7aawz5oAPjWk A27zSbx37xQwn7sJrO8WzNQhOt8YYDxKe8l8BFuD1/menLqqEtOF1lByBLf6m5fP/usG WxRubE6AsMSN6/DwqFHXVmb3sicy6dIA97i+IMAj8uWt8DrW21ihU+/yIWH28t6inqS3 rj6Q== X-Forwarded-Encrypted: i=1; AJvYcCXKZdD2LqhQSx6fzDRUeG02FMpMr4DtxQ6gJb0pqlzpMfEvz8Qv2Qss2qJVtt8h6fz3Chi5HT4=@dpdk.org X-Gm-Message-State: AOJu0YwonSVpoC+1armimKXNT8kurNFW3VMzSECzqN4csWCta95HGEnV Qzp+jDiu7c62rFKzKxTJaTImiR5+jNhf2j3uxCGio05oDd38LfGKffee X-Gm-Gg: ASbGnctZSRTSozh4e4ZFRlhgKsne0C6TssaEqsihAmwesbeJ/IH5jypLXZPkIKrCsuS lkazqyyRlM+y4J2qym9xBL0mNCiVRpCvEKyAkFUO+hYW92+7m9zv/CHy9CtwgYzFFgFOWZLddAZ p3Yy2GqprHIKZy48S7URhyG3e3PQDUrLNvvfdUKSSYLETqA7msPxp0AhQvBsFReOC98rmVYfqVC TSSsyVVW7IApSH9ly6+kEzM69/wihXO+oDuCUkmDIWuvEHlLbhLRviItdCV8uDxkmrEjQ6/BB3p FNRuP82e0RTqj/Oh8uIPWxkGgSQ18Le2gPedH0cBUFAsnAh9G6Bij8w/8MGNDbI0fBqhIe1P8V7 CdwbaB7DsTzLcJQP0QWe2RH9i5txT2NgepNCri1gXrsI3kv9gokqURBBIhaGunRacqgqNS7ZfRr EoPgxA4w== X-Google-Smtp-Source: AGHT+IHVl626HwaqeTqMgQ4WiNvFJuBat4nON3rAd/eM+ogUV1v21wGluLqC35vj6xcM/46Tbdj5Kg== X-Received: by 2002:a05:6000:2909:b0:429:d742:87ee with SMTP id ffacd0b85a97d-42b4bdb682cmr3259707f8f.50.1762966395414; Wed, 12 Nov 2025 08:53:15 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:a397:14bc:5982:5745]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-42ac677abeasm35736037f8f.33.2025.11.12.08.53.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Nov 2025 08:53:14 -0800 (PST) From: luca.boccassi@gmail.com To: Robin Jarry Cc: Dmitry Kozlyuk , dpdk stable Subject: patch 'buildtools/pmdinfogen: fix warning with python 3.14' has been queued to stable release 22.11.11 Date: Wed, 12 Nov 2025 16:52:17 +0000 Message-ID: <20251112165308.1618107-3-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251112165308.1618107-1-luca.boccassi@gmail.com> References: <20251027162001.3710450-79-luca.boccassi@gmail.com> <20251112165308.1618107-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 22.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/14/25. 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/669959909646c4a06823e0c87fbc246b96b8bec0 Thanks. Luca Boccassi --- >From 669959909646c4a06823e0c87fbc246b96b8bec0 Mon Sep 17 00:00:00 2001 From: Robin Jarry Date: Wed, 29 Oct 2025 17:46:17 +0100 Subject: [PATCH] buildtools/pmdinfogen: fix warning with python 3.14 [ upstream commit 74019b85e70e6152594768d6d07b8360e39ee70a ] Fix the following warning seen on Fedora 43 with Python 3.14: buildtools/pmdinfogen.py:118: DeprecationWarning: Due to '_pack_', the 'rte_pci_id' Structure will use memory layout compatible with MSVC (Windows). If this is intended, set _layout_ to 'ms'. The implicit default is dep recated and slated to become an error in Python 3.19. Use the struct module which is simpler and assumes everything is packed by default. There is no change in the output of dpdk-pmdinfo.py before and after this patch. Bugzilla ID: 1818 Link: https://docs.python.org/3/library/struct.html Signed-off-by: Robin Jarry Acked-by: Dmitry Kozlyuk --- buildtools/pmdinfogen.py | 42 +++++++++++----------------------------- 1 file changed, 11 insertions(+), 31 deletions(-) diff --git a/buildtools/pmdinfogen.py b/buildtools/pmdinfogen.py index dfb89500c0..09e34f1524 100755 --- a/buildtools/pmdinfogen.py +++ b/buildtools/pmdinfogen.py @@ -4,9 +4,9 @@ # Copyright (c) 2020 Dmitry Kozlyuk import argparse -import ctypes import json import re +import struct import sys import tempfile @@ -110,24 +110,6 @@ class COFFImage: return None -def define_rte_pci_id(is_big_endian): - base_type = ctypes.LittleEndianStructure - if is_big_endian: - base_type = ctypes.BigEndianStructure - - class rte_pci_id(base_type): - _pack_ = True - _fields_ = [ - ("class_id", ctypes.c_uint32), - ("vendor_id", ctypes.c_uint16), - ("device_id", ctypes.c_uint16), - ("subsystem_vendor_id", ctypes.c_uint16), - ("subsystem_device_id", ctypes.c_uint16), - ] - - return rte_pci_id - - class Driver: OPTIONS = [ ("params", "_param_string_export"), @@ -166,26 +148,24 @@ class Driver: if not table_symbol: raise Exception("PCI table declared but not defined: %d" % table_name) - rte_pci_id = define_rte_pci_id(image.is_big_endian) + if image.is_big_endian: + fmt = ">" + else: + fmt = "<" + fmt += "LHHHH" result = [] while True: - size = ctypes.sizeof(rte_pci_id) + size = struct.calcsize(fmt) offset = size * len(result) data = table_symbol.get_value(offset, size) if not data: break - pci_id = rte_pci_id.from_buffer_copy(data) - if not pci_id.device_id: + _, vendor, device, ss_vendor, ss_device = struct.unpack_from(fmt, data) + if not device: break - result.append( - [ - pci_id.vendor_id, - pci_id.device_id, - pci_id.subsystem_vendor_id, - pci_id.subsystem_device_id, - ] - ) + result.append((vendor, device, ss_vendor, ss_device)) + return result def dump(self, file): -- 2.47.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-11-12 16:20:41.118796795 +0000 +++ 0003-buildtools-pmdinfogen-fix-warning-with-python-3.14.patch 2025-11-12 16:20:40.875715664 +0000 @@ -1 +1 @@ -From 74019b85e70e6152594768d6d07b8360e39ee70a Mon Sep 17 00:00:00 2001 +From 669959909646c4a06823e0c87fbc246b96b8bec0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 74019b85e70e6152594768d6d07b8360e39ee70a ] + @@ -20 +21,0 @@ -Cc: stable@dpdk.org @@ -30 +31 @@ -index 63e0a8b364..4401106f0b 100755 +index dfb89500c0..09e34f1524 100755