patch 'common/cnxk: fix inline device pointer check' has been queued to stable release 23.11.1

Xueming Li xuemingl at nvidia.com
Sat Apr 13 14:48:28 CEST 2024


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 <xuemingl at nvidia.com>

---
>From 8bc81d544729171ea2faed5d394b6f9fed0979a5 Mon Sep 17 00:00:00 2001
From: Rahul Bhansali <rbhansali at marvell.com>
Date: Thu, 22 Feb 2024 15:37:27 +0530
Subject: [PATCH] common/cnxk: fix inline device pointer check
Cc: Xueming Li <xuemingl at nvidia.com>

[ 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 <rbhansali at marvell.com>
---
 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 <xuemingl at nvidia.com>
+
+[ upstream commit c4e9c066ab8c03a27183b03d29d4fce7c4b462d5 ]
@@ -10 +12,0 @@
-Cc: stable at 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)


More information about the stable mailing list