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 3B79543E57 for ; Sat, 13 Apr 2024 14:53:05 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 377B8406B8; Sat, 13 Apr 2024 14:53:05 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2073.outbound.protection.outlook.com [40.107.244.73]) by mails.dpdk.org (Postfix) with ESMTP id F2F25400D6 for ; Sat, 13 Apr 2024 14:53:03 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jxQVqK/hDi1QtaDxTQB4/SxU1gAjfHzpcjPDXHH4z1ZL9tmjHURxIkOaD+4lhuI3C+JAC1w/bQo0WlffA5S562Egr6sjW5/dejhUasMV8wLR0eV54Fi6MbS4pFKUIjWBaZKErkxHcaJI+yJFFblm5SpoazdCNGkeKfgDsP8KVGl5nZKTJ56tprF38SRRWJSeUlnB9AiWqyq3Xm3GnNAS5KXImPWjaF927Rd4Cg1wc+Fa/yqVwh3Q3YEpnndY3qf5zCF4bfL3EcCVeuI6BDKcfeZgn5CGnbSah+x8w7IBBSNJZcohLPBNtyrO3g2r1EFT+3UXbhSQMoxNQeTujBJvQg== 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=Z2VO3/laMpLrF2+yPXX1UdjdfcfvSC2w2sULTBlGna4=; b=O6KLkxq9u9Tknlv2wE6I2jrEPVdpGPqqPuSC7+YIZ50NahWDpknBVRLQW0Je9G0fg8TQM7agzJeJGTZD3hjM4YNvkdNm6kZJbZKfYKET4Bgik4aoedksD4gh40Z5scjG3qDibKlOK5hHs8wkKw3Lke5cr7ztG4NsdJ+GWlImnTd1jQqcCQCPcit5UFM09asu2ShKNGLclpQA/M/sLm+Ou8G/fSBme0aoHKymlcjxHI2LOjTpoCCdMgoV876mVQRE/3GgWW3mYSHXh3TQG4p8Yl+z9h8h7PTGXQR9XHgcDm45lCLa5BhDQcD020OgqyXCTLoGv2ipAYT4GFyd6krXeA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=marvell.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=Z2VO3/laMpLrF2+yPXX1UdjdfcfvSC2w2sULTBlGna4=; b=CK8gNRdA3qOmGyOiouros41tKbnJ5uwydQulLciyNSUNPa+O+BQZI89xDF9bjZsGKKb6Vb4Fjt6VbBx4idKcEH3wl8qZ0+JXGD5GJIn93IQG2bKcdbNW8vcfDi6VQlGyBXaF9iFnZkPfheEUN9IyqrX8rxphukWZDegqquM1MszSYz/X6KYSWYMHGBKsQHvVTqNvL1zBnWbqp+0LB4MULP9ubY+e3jL5w5EPg3+iFdB7aw9tJSWnLWnHAu70XW6S8IwzwZ0GE4rEszCW6Meqe45Hu2mVDTXN2y3VtuquAmgUhydj9eR0fxjxNR4L7rb5Sn1Hp6ZSlarsJAECUc7h/A== Received: from MN2PR05CA0003.namprd05.prod.outlook.com (2603:10b6:208:c0::16) by DS0PR12MB7777.namprd12.prod.outlook.com (2603:10b6:8:153::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Sat, 13 Apr 2024 12:53:00 +0000 Received: from BL02EPF00021F6A.namprd02.prod.outlook.com (2603:10b6:208:c0:cafe::e2) by MN2PR05CA0003.outlook.office365.com (2603:10b6:208:c0::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7495.16 via Frontend Transport; Sat, 13 Apr 2024 12:53:00 +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 BL02EPF00021F6A.mail.protection.outlook.com (10.167.249.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.22 via Frontend Transport; Sat, 13 Apr 2024 12:53:00 +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; Sat, 13 Apr 2024 05:52:43 -0700 Received: from nvidia.com (10.126.230.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.1258.12; Sat, 13 Apr 2024 05:52:41 -0700 From: Xueming Li To: Rahul Bhansali CC: dpdk stable Subject: patch 'common/cnxk: fix inline device pointer check' has been queued to stable release 23.11.1 Date: Sat, 13 Apr 2024 20:48:28 +0800 Message-ID: <20240413125005.725659-28-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240413125005.725659-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> <20240413125005.725659-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.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: BL02EPF00021F6A:EE_|DS0PR12MB7777:EE_ X-MS-Office365-Filtering-Correlation-Id: dc624cfa-8b07-4495-2cea-08dc5bb8a691 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lQtDlFodfwLTc/ZvD8QQyqNnUjsE62AuakUVxLjHr7BwlUa2CwUdJkccYr0CSkazlJjR4urrq+u8y8ISHy9Cq5U246cBjjE6iJif3UPXC2uGbyfQv7kZrqIDUYlA838FD+DB386rxNSOWGBmwexJq39Rl8Qa1KiusDGG2xPCxU6sWd+lh+sjwwEmotYtxCnGIls0R289UsUKjTn/jjV4teKQ7LpugEJaXMKyvokT+FxCpCyobwh3QB/Ybize9iHhZrj5BlBaeLw7oQFibRkwil925OGpuCc32rS78QArOzePOp8dCntBGJYGpmbv2yqt6kfEVm4thRc0hl3xBmUJPUe4SIIHpiDSL/dqwsGdLvh7GzyBI5m9lKfPtQMYZMB+Yvq1m2TkaV3OSUlsYO0NpsUVlUj9EE9rnUbjimwZBiOvCl8ZyR1qntVxqW6VdbusTa0g2uiMEZWxj/5UusPlWuokjkNqN0blGCv7phMTKWeaFFrVmq5WhQz+RxaGMBnUkBdU4nl58nthee6dt/jlHsOxIJEvPDzobY6J4hgvnt/XbjfI7bUuid2hpaNWDCCSwE5Z6VFdVZn85qs/dFi2M0XacLbhaIXezMOaWzUtHSGoSdvBuocF9mnmcFMfflPQuNGr66smnZOhjSo1e3RY2413y4deQZDqPBhB4zaWtcCscDsFp8S4ADEN9e1BHDHPWdMmSlSH/eMp/VTHIaHVttCq88h4IPu90JtHzTa4zTb3/oeuZqg1LJ3CWrXn2Z3v 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)(82310400014)(376005)(1800799015)(36860700004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2024 12:53:00.4378 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dc624cfa-8b07-4495-2cea-08dc5bb8a691 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: BL02EPF00021F6A.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB7777 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 23.11.1 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/15/24. 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=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=8bc81d544729171ea2faed5d394b6f9fed0979a5 Thanks. Xueming Li --- >From 8bc81d544729171ea2faed5d394b6f9fed0979a5 Mon Sep 17 00:00:00 2001 From: Rahul Bhansali Date: Thu, 22 Feb 2024 15:37:27 +0530 Subject: [PATCH] common/cnxk: fix inline device pointer check Cc: Xueming Li [ upstream commit c4e9c066ab8c03a27183b03d29d4fce7c4b462d5 ] Add missing check of Inline device pointer before accessing is_multi_channel variable. Fixes: 7ea187184a51 ("common/cnxk: support 1-N pool-aura per NIX LF") Signed-off-by: Rahul Bhansali --- drivers/common/cnxk/roc_nix_inl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/common/cnxk/roc_nix_inl.c b/drivers/common/cnxk/roc_nix_inl.c index 750fd08355..a7bae8a51c 100644 --- a/drivers/common/cnxk/roc_nix_inl.c +++ b/drivers/common/cnxk/roc_nix_inl.c @@ -876,7 +876,8 @@ roc_nix_inl_inb_init(struct roc_nix *roc_nix) inl_dev = idev->nix_inl_dev; roc_nix->custom_meta_aura_ena = (roc_nix->local_meta_aura_ena && - (inl_dev->is_multi_channel || roc_nix->custom_sa_action)); + ((inl_dev && inl_dev->is_multi_channel) || + roc_nix->custom_sa_action)); if (!roc_model_is_cn9k() && !roc_errata_nix_no_meta_aura()) { nix->need_meta_aura = true; if (!roc_nix->local_meta_aura_ena || roc_nix->custom_meta_aura_ena) -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-04-13 20:43:05.987137539 +0800 +++ 0028-common-cnxk-fix-inline-device-pointer-check.patch 2024-04-13 20:43:04.937754010 +0800 @@ -1 +1 @@ -From c4e9c066ab8c03a27183b03d29d4fce7c4b462d5 Mon Sep 17 00:00:00 2001 +From 8bc81d544729171ea2faed5d394b6f9fed0979a5 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit c4e9c066ab8c03a27183b03d29d4fce7c4b462d5 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -18 +20 @@ -index de8fd2a605..a205c658e9 100644 +index 750fd08355..a7bae8a51c 100644 @@ -21 +23 @@ -@@ -933,7 +933,8 @@ roc_nix_inl_inb_init(struct roc_nix *roc_nix) +@@ -876,7 +876,8 @@ roc_nix_inl_inb_init(struct roc_nix *roc_nix)