Commit 8309da04 authored by Tom Zanussi's avatar Tom Zanussi Committed by Xiaochen Shen
Browse files

crypto: iaa - Fix nr_cpus < nr_iaa case 

mainline inclusion
from mainline-v6.9-rc2
commit 5a7e89d3315d1be86aff8a8bf849023cda6547f7
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=5a7e89d3315d1be86aff8a8bf849023cda6547f7



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

If nr_cpus < nr_iaa, the calculated cpus_per_iaa will be 0, which
causes a divide-by-0 in rebalance_wq_table().

Make sure cpus_per_iaa is 1 in that case, and also in the nr_iaa == 0
case, even though cpus_per_iaa is never used if nr_iaa == 0, for
paranoia.

Intel-SIG: commit 5a7e89d3315d crypto: iaa - Fix nr_cpus < nr_iaa case.
Backporting patches for Intel IAA crypto driver on Intel Xeon platform.

Cc: <stable@vger.kernel.org> # v6.8+
Reported-by: default avatarJerry Snitselaar <jsnitsel@redhat.com>
Signed-off-by: default avatarTom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarXiaochen Shen <xiaochen.shen@intel.com>
parent f823ca0e

drivers/crypto/intel/iaa/iaa_crypto_main.c

+7 −3
Original line number Diff line number Diff line
@@ -806,6 +806,8 @@ static int save_iaa_wq(struct idxd_wq *wq) 
		return -EINVAL;



	cpus_per_iaa = (nr_nodes * nr_cpus_per_node) / nr_iaa;

	if (!cpus_per_iaa)

		cpus_per_iaa = 1;

out:

	return 0;

}
@@ -821,10 +823,12 @@ static void remove_iaa_wq(struct idxd_wq *wq) 
		}

	}



	if (nr_iaa)

	if (nr_iaa) {

		cpus_per_iaa = (nr_nodes * nr_cpus_per_node) / nr_iaa;

	else

		cpus_per_iaa = 0;

		if (!cpus_per_iaa)

			cpus_per_iaa = 1;

	} else

		cpus_per_iaa = 1;

}



static int wq_table_add_wqs(int iaa, int cpu)