Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbf0ca1b authored by Steffen Klassert's avatar Steffen Klassert Committed by Herbert Xu
Browse files

crypto: pcrypt - Use the online cpumask as the default 



We use the active cpumask to determine the superset of cpus
to use for parallelization. However, the active cpumask is
for internal usage of the scheduler and therefore not the
appropriate cpumask for these purposes. So use the online
cpumask instead.

Reported-by: default avatarPeter Zijlstra <peterz@infradead.org>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 96120905

crypto/pcrypt.c

+4 −4
Original line number Diff line number Diff line
@@ -280,11 +280,11 @@ static int pcrypt_aead_init_tfm(struct crypto_tfm *tfm) 


	ictx->tfm_count++;



	cpu_index = ictx->tfm_count % cpumask_weight(cpu_active_mask);

	cpu_index = ictx->tfm_count % cpumask_weight(cpu_online_mask);



	ctx->cb_cpu = cpumask_first(cpu_active_mask);

	ctx->cb_cpu = cpumask_first(cpu_online_mask);

	for (cpu = 0; cpu < cpu_index; cpu++)

		ctx->cb_cpu = cpumask_next(ctx->cb_cpu, cpu_active_mask);

		ctx->cb_cpu = cpumask_next(ctx->cb_cpu, cpu_online_mask);



	cipher = crypto_spawn_aead(crypto_instance_ctx(inst));
@@ -472,7 +472,7 @@ static int pcrypt_init_padata(struct padata_pcrypt *pcrypt, 
		goto err_free_padata;

	}



	cpumask_and(mask->mask, cpu_possible_mask, cpu_active_mask);

	cpumask_and(mask->mask, cpu_possible_mask, cpu_online_mask);

	rcu_assign_pointer(pcrypt->cb_cpumask, mask);



	pcrypt->nblock.notifier_call = pcrypt_cpumask_change_notify;