From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 16 Sep 2024 04:28:28 +0000 (+0200)
Subject: Merge tag 'v6.12-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Url: https://repo.jachan.dev/J-linux.git/commitdiff_plain/85ffc6e4ed3712f8b3fedb3fbe42afae644a699c?hp=--cc

Merge tag 'v6.12-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto update from Herbert Xu"
 "API:
   - Make self-test asynchronous

  Algorithms:
   - Remove MPI functions added for SM3
   - Add allocation error checks to remaining MPI functions (introduced
     for SM3)
   - Set default Jitter RNG OSR to 3

  Drivers:
   - Add hwrng driver for Rockchip RK3568 SoC
   - Allow disabling SR-IOV VFs through sysfs in qat
   - Fix device reset bugs in hisilicon
   - Fix authenc key parsing by using generic helper in octeontx*

  Others:
   - Fix xor benchmarking on parisc"

* tag 'v6.12-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (96 commits)
  crypto: n2 - Set err to EINVAL if snprintf fails for hmac
  crypto: camm/qi - Use ERR_CAST() to return error-valued pointer
  crypto: mips/crc32 - Clean up useless assignment operations
  crypto: qcom-rng - rename *_of_data to *_match_data
  crypto: qcom-rng - fix support for ACPI-based systems
  dt-bindings: crypto: qcom,prng: document support for SA8255p
  crypto: aegis128 - Fix indentation issue in crypto_aegis128_process_crypt()
  crypto: octeontx* - Select CRYPTO_AUTHENC
  crypto: testmgr - Hide ENOENT errors
  crypto: qat - Remove trailing space after \n newline
  crypto: hisilicon/sec - Remove trailing space after \n newline
  crypto: algboss - Pass instance creation error up
  crypto: api - Fix generic algorithm self-test races
  crypto: hisilicon/qm - inject error before stopping queue
  crypto: hisilicon/hpre - mask cluster timeout error
  crypto: hisilicon/qm - reset device before enabling it
  crypto: hisilicon/trng - modifying the order of header files
  crypto: hisilicon - add a lock for the qp send operation
  crypto: hisilicon - fix missed error branch
  crypto: ccp - do not request interrupt on cmd completion when irqs disabled
  ...
---

85ffc6e4ed3712f8b3fedb3fbe42afae644a699c
diff --cc kernel/padata.c
index 0fa6c2895460,d51bbc76b227..d899f34558af
--- a/kernel/padata.c
+++ b/kernel/padata.c
@@@ -515,15 -518,9 +518,16 @@@ void __init padata_do_multithreaded(str
  	 */
  	ps.chunk_size = job->size / (ps.nworks * load_balance_factor);
  	ps.chunk_size = max(ps.chunk_size, job->min_chunk);
+ 	ps.chunk_size = max(ps.chunk_size, 1ul);
  	ps.chunk_size = roundup(ps.chunk_size, job->align);
  
 +	/*
 +	 * chunk_size can be 0 if the caller sets min_chunk to 0. So force it
 +	 * to at least 1 to prevent divide-by-0 panic in padata_mt_helper().`
 +	 */
 +	if (!ps.chunk_size)
 +		ps.chunk_size = 1U;
 +
  	list_for_each_entry(pw, &works, pw_list)
  		if (job->numa_aware) {
  			int old_node = atomic_read(&last_used_nid);