Skip to contentSkip to conversation

crypto: pcrypt - Use the online cpumask as the default

PATCH Applied Steffen Klassert 2 participants 2 messages Mar 28, 2012 – Mar 30, 2012

Subsystems (2)
Crypto API Pcrypt parallel crypto engine
lore
Share & tools
lore

Steffen Klassert

author maintainer
#0 lore raw

PATCH 1/1 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 Peter Zijlstra <[email protected]>
Signed-off-by Steffen Klassert <[email protected]>
---
 crypto/pcrypt.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
crypto/pcrypt.c +4 -4
index 29a89da..b2c99dc 100644
@@ -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;
Signature · 1 line
1.7.0.4
maintainer Applied
#1 lore raw
Quoted 8 lines · Steffen Klassert

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 Peter Zijlstra <[email protected]>
Signed-off-by Steffen Klassert <[email protected]>

Applied to crypto.

Signature · 3 lines
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt