Commit 3f8a668a authored Dec 27, 2023 by Tom Zanussi Committed by Xiaochen Shen Jun 18, 2024

crypto: iaa - Account for cpu-less numa nodes

mainline inclusion
from mainline-v6.8-rc1
commit b8910630c967ffee582289451ddb5f9f19c26872
category: bugfix
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I9TA1S
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=b8910630c967ffee582289451ddb5f9f19c26872



--------------------------------

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.

Intel-SIG: commit b8910630c967 crypto: iaa - Account for cpu-less numa nodes.
Backporting patches for Intel IAA crypto driver on Intel Xeon platform.

Reported-by: Zhang, Rex <rex.zhang@intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Xiaochen Shen <xiaochen.shen@intel.com>

parent 31be540d

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))