Skip to content

Commit

Permalink
crypto: iaa - Account for cpu-less numa nodes
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Tom Zanussi <[email protected]>
Signed-off-by: Herbert Xu <[email protected]>
  • Loading branch information
tzanussi authored and herbertx committed Dec 29, 2023
1 parent 744e188 commit b891063
Showing 1 changed file with 13 additions and 2 deletions.
15 changes: 13 additions & 2 deletions drivers/crypto/intel/iaa/iaa_crypto_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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++;

Expand Down Expand Up @@ -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))
Expand Down

0 comments on commit b891063

Please sign in to comment.