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 154B7A0C3F for ; Sat, 12 Jun 2021 01:10:23 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 09449406A2; Sat, 12 Jun 2021 01:10:23 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2058.outbound.protection.outlook.com [40.107.236.58]) by mails.dpdk.org (Postfix) with ESMTP id 47606406A2 for ; Sat, 12 Jun 2021 01:10:22 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MjBmS+NyxyW//x9dqptLPYQQe0LfuTo2rEKPyKIS3U9MNGj92HqwP0KDg6//mxDMcCQqWejmqiHu7ml+gfEpujdeYvEaE7ZF+y3UL9FutMORH+6tdCOKfQeGseQJuAoJzttPPMHZ5RB5nkDgnwwYvP+hBn9HvG3FOj2VChrHYOmyuo1IWen+Iikv7DYa8LBtZ+GdVCy4txYthg1m3GTrNjtHLeSKmbT97oKeIcyxFz07avcV1VlpNA2V7nbQ0NSoDxsBmq6pUhckMPKhn7BI23eXkJBWLwbotsOEGNBRcjnD6R6tubsqbJqaeUHIiuaIEk2iHXH08Es4sPtAJUMV6w== 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-SenderADCheck; bh=COQLTivLdXeEpvul4fjhXpCDtin5NosoOgnIMo09SQE=; b=SJSJAhj38zbiYduvpwll3D1b7/8yV+OBceO8LQheqjECD1lnvvWuI7gOkPrDiBxOCtFtLNwZpPIkt66N4i/KTSvkJWMAhXlph7cGD/xGFSfC28UxK4GnCUa4KvzFJdjxzGVt9FOUqAijBVsQcTOhT08IkzQIc6kj1xLbgBZZYWISnfd4CPuv3Ow3EIlrgol1Yj+VuX/CnIABjJQmnVF4x/gv0NTTJzrBhjGIzv1AQT1zim6pQPYugE5nM/mXTs9lMofEti9ONyfmyhAEbtVUQrQsx5osZX/vlvVWhMwv7xYG5GcjbbFFaq5i4f/RjT+sF2uPSdePBqWA8QFUETtVjQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none 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=COQLTivLdXeEpvul4fjhXpCDtin5NosoOgnIMo09SQE=; b=JnidfbXIYWphIymZjY7b1eZSOTFiFySuwpV8CyBoDoJtMmpChRT5RUvHtPgTsxjgrqCNhVGJCOdcj5tuaZLNVk1TaAy1TlFfyXIT3Vkg1aPjmZ4DvotZM1LfhEH3YXxXoY5Hxi7taySzs3ycNVLu3N5pr9DinJUObp3jf5ERS6p15EgIx9SBQXm+UwvMkDFNmKeFFWeBxPGOQkinPV0dotFsd2IGjV6R224ag5oQzj+pFTHPiwVBC4SIG8iJdlu0CRid5hcv0QXYvpBZGNH9PCQKe59hvoAwKtBJsc5p9oEji7JL2YcKWNVnLC+Wv2jv1QmJ11mXoVit0Vh1aQqG8w== Received: from BN6PR1701CA0014.namprd17.prod.outlook.com (2603:10b6:405:15::24) by DM6PR12MB3497.namprd12.prod.outlook.com (2603:10b6:5:3c::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21; Fri, 11 Jun 2021 23:10:20 +0000 Received: from BN8NAM11FT054.eop-nam11.prod.protection.outlook.com (2603:10b6:405:15:cafe::e7) by BN6PR1701CA0014.outlook.office365.com (2603:10b6:405:15::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.26 via Frontend Transport; Fri, 11 Jun 2021 23:10:19 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by BN8NAM11FT054.mail.protection.outlook.com (10.13.177.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:10:19 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 11 Jun 2021 23:10:17 +0000 From: Xueming Li To: Wei Huang CC: Luca Boccassi , Tianfei Zhang , Rosen Xu , dpdk stable Date: Sat, 12 Jun 2021 07:02:32 +0800 Message-ID: <20210611230433.8208-58-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210611230433.8208-1-xuemingl@nvidia.com> References: <20210510160258.30982-229-xuemingl@nvidia.com> <20210611230433.8208-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d43741bf-3834-45ba-e4c7-08d92d2e153c X-MS-TrafficTypeDiagnostic: DM6PR12MB3497: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wl1tqhQaGYrmykkYb/LE/RtsOuogRx0z1FiErviw38QlRQ6qWEeWMD0g17OMC7wvh+hoEjtea1DKiH6nq7RY+A5MswXyi47vyjSrcVH4g3lllzCwyaR140myHQqqJyhoe1TON/a/gxAZebKZUw3uZzhThldokcd1Y2FcRakS0FS44mADhfjCirQrwY2wkRMXm4glxev6pWGimXE+Sb5ejLedWNMq9I1x9qFGba5xKf7pTcrARJTUblEH4RQexLF/2QpIOcC12OHMrn3QggyxBPvIE7Jm46g3+5ipNhRmbAbhPukhXdeASyxwJ6BVjbfFZlPuOkHtQyEsxy8C8hEL798evh0TPYzspDuEJEja7yO9bPX2pqH4B9CDsU++PbNC6Y3G3ZSxS2GdPRXN5MRgGx6T/R28l8uCLOgOa1rmOy0iulhUJaSXZCyPBTWtctpTa9n2Uh3v6w/uAF3RmKRFAyLTuGIGzvsR2rE6GpXJYTQCcNBBcG+92O3xHY0ocpZ+z6OTFE45vDuzZ17U/sDp94rlo1NMKlURlrIEZkcUg3s0SkxiI5Cp0UvN9VKXgCXqR3/OCQHBA1MQFcxsoiGSA/+mSPJ8TzGgQfAbiw8oUpV8FDXqisdR8yk2Kjne5kMVE3rxHQzsXiPtOB13pIeTKvhSGr8EmKrNOVPPC3Npmy92aGqjBMHvKpN0Sb0aynhwZ0yLXDWNnqxBOTmzV9DaMUML3skkEqInlECiN6ydWSC1VO/aqCCBwoZ1SHoDv2E4d3eSw3XavrCww7yoaVOSGPjKizsOiFuA5zN9Za9LGVV6fcSzfOnOjvPrbhxDNJLq X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(346002)(396003)(136003)(39860400002)(376002)(36840700001)(46966006)(356005)(47076005)(70586007)(16526019)(426003)(2616005)(6286002)(82740400003)(36756003)(54906003)(2906002)(1076003)(8936002)(7696005)(316002)(186003)(5660300002)(53546011)(6666004)(26005)(83380400001)(478600001)(82310400003)(6916009)(8676002)(4326008)(86362001)(36860700001)(336012)(70206006)(966005)(7636003)(36906005)(55016002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:10:19.5934 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d43741bf-3834-45ba-e4c7-08d92d2e153c X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT054.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3497 Subject: [dpdk-stable] patch 'raw/ifpga: fix device name format' has been queued to stable release 20.11.2 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/14/21. 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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/5c4358f054270a6b051391a23a2c9bec7085c693 Thanks. Xueming Li --- >From 5c4358f054270a6b051391a23a2c9bec7085c693 Mon Sep 17 00:00:00 2001 From: Wei Huang Date: Wed, 28 Apr 2021 22:33:40 -0400 Subject: [PATCH] raw/ifpga: fix device name format Cc: Luca Boccassi [ upstream commit 978bb0b33f4d17f4bba38f271a8fd32cbb28d34c ] The device name format used in ifpga_rawdev_create() was changed to "IFPGA:%02x:%02x.%x", but the format used in ifpga_rawdev_destroy() was left as "IFPGA:%x:%02x.%x", it should be changed synchronously. To prevent further similar errors, macro "IFPGA_RAWDEV_NAME_FMT" is defined to replace this format string. Fixes: 9c006c45d0c5 ("raw/ifpga: scan PCIe BDF device tree") Signed-off-by: Wei Huang Acked-by: Tianfei Zhang Acked-by: Rosen Xu --- drivers/raw/ifpga/ifpga_rawdev.c | 4 ++-- drivers/raw/ifpga/ifpga_rawdev.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/raw/ifpga/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c index 27129b133e..4747090af1 100644 --- a/drivers/raw/ifpga/ifpga_rawdev.c +++ b/drivers/raw/ifpga/ifpga_rawdev.c @@ -1448,7 +1448,7 @@ ifpga_rawdev_create(struct rte_pci_device *pci_dev, } memset(name, 0, sizeof(name)); - snprintf(name, RTE_RAWDEV_NAME_MAX_LEN, "IFPGA:%02x:%02x.%x", + snprintf(name, RTE_RAWDEV_NAME_MAX_LEN, IFPGA_RAWDEV_NAME_FMT, pci_dev->addr.bus, pci_dev->addr.devid, pci_dev->addr.function); IFPGA_RAWDEV_PMD_INFO("Init %s on NUMA node %d", name, rte_socket_id()); @@ -1551,7 +1551,7 @@ ifpga_rawdev_destroy(struct rte_pci_device *pci_dev) } memset(name, 0, sizeof(name)); - snprintf(name, RTE_RAWDEV_NAME_MAX_LEN, "IFPGA:%x:%02x.%x", + snprintf(name, RTE_RAWDEV_NAME_MAX_LEN, IFPGA_RAWDEV_NAME_FMT, pci_dev->addr.bus, pci_dev->addr.devid, pci_dev->addr.function); IFPGA_RAWDEV_PMD_INFO("Closing %s on NUMA node %d", diff --git a/drivers/raw/ifpga/ifpga_rawdev.h b/drivers/raw/ifpga/ifpga_rawdev.h index 7754beb02b..5c3ecd35d6 100644 --- a/drivers/raw/ifpga/ifpga_rawdev.h +++ b/drivers/raw/ifpga/ifpga_rawdev.h @@ -7,6 +7,8 @@ extern int ifpga_rawdev_logtype; +#define IFPGA_RAWDEV_NAME_FMT "IFPGA:%02x:%02x.%x" + #define IFPGA_RAWDEV_PMD_LOG(level, fmt, args...) \ rte_log(RTE_LOG_ ## level, ifpga_rawdev_logtype, "%s(): " fmt "\n", \ __func__, ##args) -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:58.149019000 +0800 +++ 0058-raw-ifpga-fix-device-name-format.patch 2021-06-12 06:53:56.290000000 +0800 @@ -1 +1 @@ -From 978bb0b33f4d17f4bba38f271a8fd32cbb28d34c Mon Sep 17 00:00:00 2001 +From 5c4358f054270a6b051391a23a2c9bec7085c693 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 978bb0b33f4d17f4bba38f271a8fd32cbb28d34c ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -20,4 +22,3 @@ - drivers/raw/ifpga/ifpga_rawdev.c | 4 ++-- - drivers/raw/ifpga/ifpga_rawdev.h | 2 ++ - drivers/raw/ifpga/rte_pmd_ifpga.c | 2 +- - 3 files changed, 5 insertions(+), 3 deletions(-) + drivers/raw/ifpga/ifpga_rawdev.c | 4 ++-- + drivers/raw/ifpga/ifpga_rawdev.h | 2 ++ + 2 files changed, 4 insertions(+), 2 deletions(-) @@ -26 +27 @@ -index f2551be821..7ccebfa3fa 100644 +index 27129b133e..4747090af1 100644 @@ -48 +49 @@ -index 9bbe9a4278..61c8366707 100644 +index 7754beb02b..5c3ecd35d6 100644 @@ -60,13 +60,0 @@ -diff --git a/drivers/raw/ifpga/rte_pmd_ifpga.c b/drivers/raw/ifpga/rte_pmd_ifpga.c -index 6e23a2581a..23146432c2 100644 ---- a/drivers/raw/ifpga/rte_pmd_ifpga.c -+++ b/drivers/raw/ifpga/rte_pmd_ifpga.c -@@ -34,7 +34,7 @@ rte_pmd_ifpga_get_dev_id(const char *pci_addr, uint16_t *dev_id) - return -EINVAL; - } - -- snprintf(rdev_name, RTE_RAWDEV_NAME_MAX_LEN, "IFPGA:%02x:%02x.%x", -+ snprintf(rdev_name, RTE_RAWDEV_NAME_MAX_LEN, IFPGA_RAWDEV_NAME_FMT, - addr.bus, addr.devid, addr.function); - rdev = rte_rawdev_pmd_get_named_dev(rdev_name); - if (!rdev) {