Commit b8910630 authored by Tom Zanussi's avatar Tom Zanussi Committed by Herbert Xu
Browse files

crypto: iaa - Account for cpu-less numa nodes 



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: default avatarZhang, Rex <rex.zhang@intel.com>
Signed-off-by: default avatarTom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 744e1885

drivers/crypto/intel/iaa/iaa_crypto_main.c

+13 −2
Original line number Diff line number Diff line
@@ -1017,12 +1017,17 @@ static void rebalance_wq_table(void) 
		return;

	}



	for_each_online_node(node) {

	for_each_node_with_cpus(node) {

		node_cpus = cpumask_of_node(node);



		for (cpu = 0; cpu < nr_cpus_per_node; cpu++) {

			int node_cpu = cpumask_nth(cpu, node_cpus);



			if (WARN_ON(node_cpu >= nr_cpu_ids)) {

				pr_debug("node_cpu %d doesn't exist!\n", node_cpu);

				return;

			}



			if ((cpu % cpus_per_iaa) == 0)

				iaa++;
@@ -2095,9 +2100,15 @@ static struct idxd_device_driver iaa_crypto_driver = { 
static int __init iaa_crypto_init_module(void)

{

	int ret = 0;

	int node;



	nr_cpus = num_online_cpus();

	nr_nodes = 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 = nr_cpus / nr_nodes;



	if (crypto_has_comp("deflate-generic", 0, 0))