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 A22D1428F8 for ; Sun, 9 Apr 2023 17:36:23 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9ADC8410EF; Sun, 9 Apr 2023 17:36:23 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2055.outbound.protection.outlook.com [40.107.92.55]) by mails.dpdk.org (Postfix) with ESMTP id 99CEA40EDE for ; Sun, 9 Apr 2023 17:36:22 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QMqlJ23jt729uBSlq1GxXylfJYvhq009QHn+1M8xxn1V+WgtUQlPyY8Jw5UoKlshb84O7rYPPeZp7HmQW9pngljZAviF6hcKvWCMm4qUPxCOJnOQFDreChLMsbN5nDEU7VWiIw2EgXxqN9Vkraq1QOJgf21CeI6e7JuMVeGZxyidW0LpDUZ+Imt3C7JYahFFfeWEmQBlgP794ACB287M01fmiB18aGV2GPbjWGngucBg82Y/w/RA0Hp+ARkZelIZNfoD9NJcLbOrLSHru/IXTyWtKxa9fk7GBjGZAbjF5mJfxzsqEoSVJFyXHs/r7rZB9RFMlCSy01xuuGDwBxRl5Q== 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=jhSZl7PtY0em0nzWmq9aB5CHGqSkn8WLJgVKpJpKCTc=; b=NrPB62IhYkVXxZNkpCfFCQ9kVulNoLoQRonpWwB4Y6Z0lTVWlcA2zkpcLHDWMHYVRQAMr20Eef8B1QNXe+gDl/f5qbWcKQFjAjDnEr13eqqvQEWe8pu2YnzHqjN+EWMtaQa/xB7J16y2knMDVOec4Whi8+/cjmppQ0oWJjwkTgBXImpAS3Pxq8Egi18C93/uSQHmUB1uM12+sLJIa/wdazotYJI4YD1dRtM7hXEhqpt5t00V7nZ8s8WYaLNh4FKg8/g1VtOWxbLFoHSvFgbDqw2r7BekJriqcjvevYY7NL1IZG+HxaLvSueWgNzFpw8WIzNoNqKmrAhR+qojs/RK/A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.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 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=jhSZl7PtY0em0nzWmq9aB5CHGqSkn8WLJgVKpJpKCTc=; b=hCQc7vubufy6VGyU8jj6Q+d7+DR5n2QilhOUfXaXNo2qVigmx0fCjjMP0+8Vmmb1Vg885j/y8+yFXYrHFn4ca8hnL8Vw83prkwTL9IXQcqSPY3uzDjAQRD6WdQKtugG573ZTnwLB1x8NdTTNi2vDw3s16+t9MEX/6OFWn5q40E8/8WDNCVlEia6R9w+k56qrV51s933eFqaieGJ5njob34n7Fxytugc94cJ+CxtsPJVapw2x9KlLBiShmtojNqPNm8l5PAlBc9eqyD0LrJPxHgAKUcWUKyqxYTRlzEqriY4w4sGHAJdafGW63ZjqPy9o+z6O+445f1ZVF5ZJ76WwbA== Received: from BN9PR03CA0251.namprd03.prod.outlook.com (2603:10b6:408:ff::16) by SA0PR12MB4352.namprd12.prod.outlook.com (2603:10b6:806:9c::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.36; Sun, 9 Apr 2023 15:36:20 +0000 Received: from BN8NAM11FT089.eop-nam11.prod.protection.outlook.com (2603:10b6:408:ff:cafe::15) by BN9PR03CA0251.outlook.office365.com (2603:10b6:408:ff::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.39 via Frontend Transport; Sun, 9 Apr 2023 15:36:20 +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 BN8NAM11FT089.mail.protection.outlook.com (10.13.176.105) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.20 via Frontend Transport; Sun, 9 Apr 2023 15:36:19 +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.5; Sun, 9 Apr 2023 08:36:08 -0700 Received: from nvidia.com (10.126.230.37) 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.37; Sun, 9 Apr 2023 08:36:07 -0700 From: Xueming Li To: Wei Huang CC: Tianfei Zhang , Rosen Xu , dpdk stable Subject: patch 'bus/ifpga: fix devargs handling' has been queued to stable release 22.11.2 Date: Sun, 9 Apr 2023 23:25:12 +0800 Message-ID: <20230409152529.5308-125-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230409152529.5308-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230409152529.5308-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT089:EE_|SA0PR12MB4352:EE_ X-MS-Office365-Filtering-Correlation-Id: 72b2d3b3-3c44-421c-d39a-08db39102a7f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: a2rxHZiOw3kxXxdV8+/7Ug5xFVDFM769/hxvH8wmExZ1A9vg30eZCknl/lRh3DbLiI9TcHNnZS5RPf54CTdrQ35m43usmd2KJOl2+zIUHH/3x6wNcCqt/5V4kjsMmcXG72rYkSuyQma3Bo/HRtTMxa8akXh9Bv1PI+9IoAFaRv4+yIXKlRg3yl0YNyofwr7X/drjq1WuXfz7fAGOeYoo4g7i3HHs/ogS0fw13sfNLOh6h7M7kUngqXBpNswXG2s2JXf0iqr85+arKjFwoUQXQS9W660G6mrYKx8FkrzbaALm+Nt5GKVVNZv93MFrk8e1FvplUWJXwtZ+DlLDVidxYTTlV/2bgNR9UaKB92MjgEPUqKF4G1BAK29W43fzKf02dOzhbHsPAY2jWXx2vqQLwLJfb8lGWdSEZMcwjxdg5WH+dw8aBi/FDObS3dAYVQuppeQvtewAjEbJ47anvDMCN2bgP09TBlVQAi+d6+j99PUAU9tVzUFyf9G+LXlF8vHYONguliSIdNZaSIV82YN4POG1Gu9wkZx4v/98WuZwJBgFOD4GPJOd2waCtLPKAEzXi6f3/zcOSZ80uG8+M2VRVMA5NSRwymsIiobQNwn/P5DckiN+ia2lKFL8VkHsC6qT+FKYs1EA34AZZI/wgLUk2udAoOh+4bMiqz2own7o8YjYmdrCswHil8YmQcuXZ+JUZ9mHM217uH6Af+pp279A7vpC9ApqTm/+biLqe4u1S0xy73CzyHmVt2X0pKKmTlRYvh6gce8ocvBF6apf8irI83c6BHLMTHAMd8KM5ae+9llRsvhAmkgj4FSja0qdzj4r+34YTLef3HITBYFSM2kglQ== 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:(13230028)(4636009)(39860400002)(136003)(346002)(396003)(376002)(451199021)(36840700001)(40470700004)(46966006)(7696005)(478600001)(86362001)(55016003)(40480700001)(83380400001)(47076005)(36756003)(40460700003)(82740400003)(7636003)(356005)(2616005)(36860700001)(426003)(336012)(6666004)(966005)(2906002)(54906003)(316002)(16526019)(6286002)(186003)(1076003)(53546011)(26005)(8676002)(6916009)(41300700001)(8936002)(5660300002)(82310400005)(4326008)(70586007)(70206006); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2023 15:36:19.6306 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 72b2d3b3-3c44-421c-d39a-08db39102a7f 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: BN8NAM11FT089.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB4352 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.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 04/11/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/log/?h=22.11-staging/commit/3bdf07e68240735a4051e3f3cf8dac9943dcfa46 Thanks. Xueming Li --- >From 3bdf07e68240735a4051e3f3cf8dac9943dcfa46 Mon Sep 17 00:00:00 2001 From: Wei Huang Date: Thu, 16 Mar 2023 16:44:12 -0400 Subject: [PATCH] bus/ifpga: fix devargs handling Cc: Xueming Li [ upstream commit 8a0b28b4d9581497d7b347c7c8797317707cd58f ] In function ifpga_scan_one(), variable 'path' is NULL if device argument 'afu_bts' is not set, subsequent string copy with 'path' would lead to segmentation fault. Fixes: 6fa4aa2b3645 ("bus/ifpga: fix forcing optional devargs") Signed-off-by: Wei Huang Acked-by: Tianfei Zhang Acked-by: Rosen Xu --- drivers/bus/ifpga/ifpga_bus.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/bus/ifpga/ifpga_bus.c b/drivers/bus/ifpga/ifpga_bus.c index bb943b58b5..07e316b38e 100644 --- a/drivers/bus/ifpga/ifpga_bus.c +++ b/drivers/bus/ifpga/ifpga_bus.c @@ -135,6 +135,8 @@ ifpga_scan_one(struct rte_rawdev *rawdev, goto end; } afu_pr_conf.pr_enable = 1; + strlcpy(afu_pr_conf.bs_path, path, + sizeof(afu_pr_conf.bs_path)); } else { afu_pr_conf.pr_enable = 0; } @@ -174,7 +176,6 @@ ifpga_scan_one(struct rte_rawdev *rawdev, rawdev->dev_ops->dev_start(rawdev)) goto end; - strlcpy(afu_pr_conf.bs_path, path, sizeof(afu_pr_conf.bs_path)); if (rawdev->dev_ops && rawdev->dev_ops->firmware_load && rawdev->dev_ops->firmware_load(rawdev, -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-04-09 21:45:41.947147600 +0800 +++ 0124-bus-ifpga-fix-devargs-handling.patch 2023-04-09 21:45:38.799042200 +0800 @@ -1 +1 @@ -From 8a0b28b4d9581497d7b347c7c8797317707cd58f Mon Sep 17 00:00:00 2001 +From 3bdf07e68240735a4051e3f3cf8dac9943dcfa46 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 8a0b28b4d9581497d7b347c7c8797317707cd58f ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org