diff options
author | Steffen Klassert <steffen.klassert@secunet.com> | 2012-03-28 08:51:03 +0200 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2012-03-29 19:52:47 +0800 |
commit | fbf0ca1bf852fe224cec5400a69cd755ddc4ddcb (patch) | |
tree | c447609eeb8ce7847b76fde5375e04678511ba49 /crypto | |
parent | 9612090527526a15832480c48b1f4b39e93e8a35 (diff) | |
download | linux-3.10-fbf0ca1bf852fe224cec5400a69cd755ddc4ddcb.tar.gz linux-3.10-fbf0ca1bf852fe224cec5400a69cd755ddc4ddcb.tar.bz2 linux-3.10-fbf0ca1bf852fe224cec5400a69cd755ddc4ddcb.zip |
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 <peterz@infradead.org>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/pcrypt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c index 29a89dad68b..b2c99dc1c5e 100644 --- a/crypto/pcrypt.c +++ b/crypto/pcrypt.c @@ -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; |