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 99B64433D8 for ; Mon, 11 Dec 2023 11:22:28 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9355A42DBE; Mon, 11 Dec 2023 11:22:28 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2059.outbound.protection.outlook.com [40.107.243.59]) by mails.dpdk.org (Postfix) with ESMTP id 2B0DC42DBE for ; Mon, 11 Dec 2023 11:22:27 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WK46IY9Dvt6KiCSvNCDdR0c5l+Lv9idxO6baLsv02LsteFIoSi+ktK3a1aPKufQ7I/jtOZISyO1thDiZQS/Y8WF/VuI57Z/ggGYUFPfSx+vYKMtrzJ2ccJsszlI0r5tNu64ydo56ZAKWEQHrnFA5ZBcbf2kT8owcGvaWO8VIPBD7tBacpRJMJ6tOs+Ae/rzxSBQuLV8IFwypkZ84Pot0YEQIR4/T/DPzFgkKEEuxROQJcEMiYnadgeix3psQqiYmeRs9ENIiB6ntsdDQhXYcJmTXQtXBncCi9D2L1GMxJEooGaB1hP80SInzFqwq8lt8UMNd8udqBVyw6oLzguay+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=gKH6ShNAosKlm9oC5c5xQVnDPjSOejXhk7CY8tBS1WM=; b=SYqlTS5SK9gSINtyGtfv1WQslRCK6IumYQhSUmhXLMu627iwqrytKsgMR0+0nkmlnkh1nFoZVPnR/LBa5i68eA8Y1z2khoqFxy/15vgwkoMfzfeDy8Hvm/prFE5YE7IRKybsLyjMDPg82wM1hXhIO7MFQvXIHSLQ5twaG1q7JUqMSgc84wCnc59Fu1xLINzA6EEIEtCWVVKN17fqJpcLRbx0hppgjqpZkNYYLStJy8Jq80TCDYoLVndhjCTL2LCVMz8jQ+IH+PbsOjnUp3HuhtgLy4rTq2aXOBhocQL7lPf8+wsUzkYT1DRuf0IeN22bSvMEJ0+2ASqlRh1+wa2wIw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=redhat.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gKH6ShNAosKlm9oC5c5xQVnDPjSOejXhk7CY8tBS1WM=; b=hRqehQjnZ4W+J3Rx0CgurIJEfS6ZeWRx37EilRrxz9tV0FbJaGyPkIsmBUxqSvxv+4Yv46ENDjuIzeKi5Opd1yh1146oMKqMC1oThAeFaNRhE1UAwA4pv4A0vIsg+DpHisDK0koezG0yJkLXvLE6S09lA6n/Osup4g6ocSdryhfHQCziGGpEU9Mlo6xxBs/eqTWgibiQAidnNgPRCIFi/bqrIk7eBY5/rdnRg2z5SfbGfjfTxPoDdXr5zfHe+IlFiDKGCSUf/T0GV5p3a5h/sVjs8j8FQYVdkx0wjf91ajnxFN7krulk47c5s40pC0UZUEEEzlh8FZ19IaZW6WaYfA== Received: from SA9PR13CA0077.namprd13.prod.outlook.com (2603:10b6:806:23::22) by BY5PR12MB4052.namprd12.prod.outlook.com (2603:10b6:a03:209::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32; Mon, 11 Dec 2023 10:22:24 +0000 Received: from SN1PEPF0002529E.namprd05.prod.outlook.com (2603:10b6:806:23:cafe::d) by SA9PR13CA0077.outlook.office365.com (2603:10b6:806:23::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.23 via Frontend Transport; Mon, 11 Dec 2023 10:22:24 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SN1PEPF0002529E.mail.protection.outlook.com (10.167.242.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.18 via Frontend Transport; Mon, 11 Dec 2023 10:22:24 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 11 Dec 2023 02:22:14 -0800 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 11 Dec 2023 02:22:12 -0800 From: Xueming Li To: Robin Jarry CC: David Marchand , dpdk stable Subject: patch 'usertools/pmdinfo: fix usage typos' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:12:14 +0800 Message-ID: <20231211101226.2122-110-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231211101226.2122-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> <20231211101226.2122-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF0002529E:EE_|BY5PR12MB4052:EE_ X-MS-Office365-Filtering-Correlation-Id: 8af9f94e-c320-4684-67e6-08dbfa331173 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hLo10duUPP85V/3QWr1yebEmfu1BMXBjeGoSva8el/IX1WBu5HAamjpkArmQdlBH+s8aTWrbEyUYAoHjQnfZsb7tS6BmoIWp4goqJA2MbLGyIrdaA8iHRryRXHZ3TUtM4I/G8SAKVkHCGli8LcZaJg/k9kiQZl5MqVQpcjCVjfC6N0O8gsalJGntiQbDBtekIbAT2fRs8G77s7f4UjyCtwdaH7XovwNz6J77xYhcKvUgFqfahL/+HiVlc1Bo1lEpP1cbayNQYiPnDAOyRl4TqQINkC0wmjcLqjJDSrlEoI8Gy2v1B/4Ke4tGV1D6HT/uvSmNzO6ucU+CixoUFIRaFfAN4YMNjzMZ3fUDHv0aj4G3J85Z40e2wzBLbBRi/cQHpAb9VZ0EoZIsybqqK+yUg5dlWYrWaDbAJNBCdSh2HuJUdkCBNDfK0s4q95LP1dOpkYe3vpM+KQDIGbRf+3+sfGNgVhyOW/neuAB3nL3ixz2X1A7Bf6N2o7iyAg91i2aPbORClewyWhsWCQkr0tZCNlpDYVAIekLJGcaoPd4no/mYH+UiPOF8CKZCzqpPhUSsgO0w3tM/mWiTqQ5EhVXTVz6FhCTk3zH5UwmVLDkkoyTQEFAkDDo25Xq4rbdLMqmrxZwwN9Qa/wp4Ho8W4tmx2rI5Xtl4XwUvPaO7jvTZkSQ7HPbfO8Yvpe8IWFkVwsx580MOZNIif4Pqiy0XilxIfztdvOPJ15v6bf9vriUx7tdQTgUfTJQgCa1rEQAodR6p5amhBG42eizRhFdK/9ZjtWAOa2PQCgfcfc/TYlaiPaM= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(136003)(396003)(376002)(39850400004)(346002)(230922051799003)(1800799012)(82310400011)(64100799003)(186009)(451199024)(40470700004)(36840700001)(46966006)(40480700001)(1076003)(426003)(336012)(6286002)(26005)(16526019)(2616005)(40460700003)(82740400003)(36756003)(55016003)(356005)(7636003)(86362001)(83380400001)(5660300002)(53546011)(7696005)(36860700001)(47076005)(8936002)(8676002)(70586007)(70206006)(966005)(54906003)(316002)(6916009)(2906002)(4001150100001)(41300700001)(478600001)(4326008); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:22:24.4859 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8af9f94e-c320-4684-67e6-08dbfa331173 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF0002529E.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4052 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/13/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=122f600818bb16afa6ebf609bd5c145fc9e2a438 Thanks. Xueming Li --- >From 122f600818bb16afa6ebf609bd5c145fc9e2a438 Mon Sep 17 00:00:00 2001 From: Robin Jarry Date: Tue, 19 Sep 2023 12:20:13 +0200 Subject: [PATCH] usertools/pmdinfo: fix usage typos Cc: Xueming Li [ upstream commit e0a87c5f9d9b4b98ed016722954b8870ce93f985 ] The docs and script usages are not consistent. There is no .devices, .vendor_id nor .device_id fields. Fix usage to the correct field names. Some drivers do not expose any pci_ids, show how to use the []? jq operator to avoid spurious errors. Fixes: 0ce3cf4afd04 ("usertools/pmdinfo: rewrite simpler script") Signed-off-by: Robin Jarry Reviewed-by: David Marchand --- doc/guides/tools/pmdinfo.rst | 2 +- usertools/dpdk-pmdinfo.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/guides/tools/pmdinfo.rst b/doc/guides/tools/pmdinfo.rst index a9217de4ee..fdb9030171 100644 --- a/doc/guides/tools/pmdinfo.rst +++ b/doc/guides/tools/pmdinfo.rst @@ -82,5 +82,5 @@ Get only the required kernel modules for a given device: .. code-block:: console $ dpdk-pmdinfo.py /usr/bin/dpdk-testpmd | \ - jq '.[] | select(.pci_ids[] | .vendor == "15b3" and .device == "1013").kmod' + jq '.[] | select(.pci_ids[]? | .vendor == "15b3" and .device == "1013").kmod' "* ib_uverbs & mlx5_core & mlx5_ib" diff --git a/usertools/dpdk-pmdinfo.py b/usertools/dpdk-pmdinfo.py index 67d023a047..2c728de7b8 100755 --- a/usertools/dpdk-pmdinfo.py +++ b/usertools/dpdk-pmdinfo.py @@ -23,7 +23,7 @@ Get only the required kernel modules for a given driver: Get only the required kernel modules for a given device: %(prog)s dpdk-testpmd | \ - jq '.[] | select(.devices[] | .vendor_id == "15b3" and .device_id == "1013").kmod' + jq '.[] | select(.pci_ids[]? | .vendor == "15b3" and .device == "1013").kmod' """ import argparse -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:26.613146800 +0800 +++ 0109-usertools-pmdinfo-fix-usage-typos.patch 2023-12-11 17:56:23.217652300 +0800 @@ -1 +1 @@ -From e0a87c5f9d9b4b98ed016722954b8870ce93f985 Mon Sep 17 00:00:00 2001 +From 122f600818bb16afa6ebf609bd5c145fc9e2a438 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit e0a87c5f9d9b4b98ed016722954b8870ce93f985 ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org