Received-SPF: pass (google.com: domain of linux-crypto+bounces-1066-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Message-ID: <4bd63cf80a77a696b78d1f16f586ac6517320cd6.camel@linux.intel.com>
Subject: [PATCH v2] crypto: iaa - Account for cpu-less numa nodes
From: Tom Zanussi <tom.zanussi@linux.intel.com>
To: herbert@gondor.apana.org.au, davem@davemloft.net, fenghua.yu@intel.com
Cc: rex.zhang@intel.com, dave.jiang@intel.com, tony.luck@intel.com, 
	rdunlap@infradead.org, linux-kernel@vger.kernel.org, 
	linux-crypto@vger.kernel.org, dmaengine@vger.kernel.org
Date: Wed, 27 Dec 2023 14:28:32 -0600
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.44.4-0ubuntu2 
Precedence: bulk
MIME-Version: 1.0

In some configurations e.g. systems with CXL, a numa node can have 0
cpus and cpumask_nth() will return a cpu value that doesn't exist,
which will result in an attempt to add an entry to the wq table at a
bad index.

To fix this, when iterating the cpus for a node, skip any node that
doesn't have cpus.

Also, as a precaution, add a warning and bail if cpumask_nth() returns
a nonexistent cpu.

Reported-by: Zhang, Rex <rex.zhang@intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
---
 v2: In iaa_crypto_init_module(), if nr_nodes is 0, print an error message =
and return.

 drivers/crypto/intel/iaa/iaa_crypto_main.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/drivers/crypto/intel/iaa/iaa_crypto_main.c b/drivers/crypto/in=
tel/iaa/iaa_crypto_main.c
index 5093361b0107..4ebf1950568a 100644
--- a/drivers/crypto/intel/iaa/iaa_crypto_main.c
+++ b/drivers/crypto/intel/iaa/iaa_crypto_main.c
@@ -1017,12 +1017,17 @@ static void rebalance_wq_table(void)
 		return;
 	}
=20
-	for_each_online_node(node) {
+	for_each_node_with_cpus(node) {
 		node_cpus =3D cpumask_of_node(node);
=20
 		for (cpu =3D 0; cpu < nr_cpus_per_node; cpu++) {
 			int node_cpu =3D cpumask_nth(cpu, node_cpus);
=20
+			if (WARN_ON(node_cpu >=3D nr_cpu_ids)) {
+				pr_debug("node_cpu %d doesn't exist!\n", node_cpu);
+				return;
+			}
+
 			if ((cpu % cpus_per_iaa) =3D=3D 0)
 				iaa++;
=20
@@ -2095,9 +2100,15 @@ static struct idxd_device_driver iaa_crypto_driver =
=3D {
 static int __init iaa_crypto_init_module(void)
 {
 	int ret =3D 0;
+	int node;
=20
 	nr_cpus =3D num_online_cpus();
-	nr_nodes =3D num_online_nodes();
+	for_each_node_with_cpus(node)
+		nr_nodes++;
+	if (!nr_nodes) {
+		pr_err("IAA couldn't find any nodes with cpus\n");
+		return -ENODEV;
+	}
 	nr_cpus_per_node =3D nr_cpus / nr_nodes;
=20
 	if (crypto_has_comp("deflate-generic", 0, 0))
--=20
2.34.1