Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 12:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

crypto: pcrypt - Update pcrypt cpumask according to the padata cpumask notifier

Browse Source 
The padata cpumask change notifier passes a padata_cpumask to the
notifier chain. So we use this cpumask instead of asking padata for
the cpumask.

Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Steffen Klassert 2010-07-27 07:18:46 +02:00 committed by Herbert Xu
parent c57e842eff
commit d3f64e46aa
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
crypto/pcrypt.c
View File

@ -26,6 +26,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/notifier.h> #include <linux/notifier.h>
#include <linux/kobject.h> #include <linux/kobject.h>
#include <linux/cpu.h>
#include <crypto/pcrypt.h> #include <crypto/pcrypt.h>
struct padata_pcrypt { struct padata_pcrypt {
@ -409,6 +410,7 @@ static int pcrypt_cpumask_change_notify(struct notifier_block *self,
{ {
struct padata_pcrypt *pcrypt; struct padata_pcrypt *pcrypt;
struct pcrypt_cpumask *new_mask, *old_mask; struct pcrypt_cpumask *new_mask, *old_mask;
struct padata_cpumask *cpumask = (struct padata_cpumask *)data;
if (!(val & PADATA_CPU_SERIAL)) if (!(val & PADATA_CPU_SERIAL))
return 0; return 0;
@ -424,7 +426,7 @@ static int pcrypt_cpumask_change_notify(struct notifier_block *self,
old_mask = pcrypt->cb_cpumask; old_mask = pcrypt->cb_cpumask;
padata_get_cpumask(pcrypt->pinst, PADATA_CPU_SERIAL, new_mask->mask); cpumask_copy(new_mask->mask, cpumask->cbcpu);
rcu_assign_pointer(pcrypt->cb_cpumask, new_mask); rcu_assign_pointer(pcrypt->cb_cpumask, new_mask);
synchronize_rcu_bh(); synchronize_rcu_bh();
@ -451,6 +453,8 @@ static int pcrypt_init_padata(struct padata_pcrypt *pcrypt,
int ret = -ENOMEM; int ret = -ENOMEM;
struct pcrypt_cpumask *mask; struct pcrypt_cpumask *mask;
get_online_cpus();
pcrypt->wq = create_workqueue(name); pcrypt->wq = create_workqueue(name);
if (!pcrypt->wq) if (!pcrypt->wq)
goto err; goto err;
@ -467,7 +471,7 @@ static int pcrypt_init_padata(struct padata_pcrypt *pcrypt,
goto err_free_padata; goto err_free_padata;
} }
padata_get_cpumask(pcrypt->pinst, PADATA_CPU_SERIAL, mask->mask); cpumask_and(mask->mask, cpu_possible_mask, cpu_active_mask);
rcu_assign_pointer(pcrypt->cb_cpumask, mask); rcu_assign_pointer(pcrypt->cb_cpumask, mask);
pcrypt->nblock.notifier_call = pcrypt_cpumask_change_notify; pcrypt->nblock.notifier_call = pcrypt_cpumask_change_notify;
@ -479,7 +483,10 @@ static int pcrypt_init_padata(struct padata_pcrypt *pcrypt,
if (ret) if (ret)
goto err_unregister_notifier; goto err_unregister_notifier;
put_online_cpus();
return ret; return ret;
err_unregister_notifier: err_unregister_notifier:
padata_unregister_cpumask_notifier(pcrypt->pinst, &pcrypt->nblock); padata_unregister_cpumask_notifier(pcrypt->pinst, &pcrypt->nblock);
err_free_cpumask: err_free_cpumask:
@ -490,6 +497,8 @@ err_free_padata:
err_destroy_workqueue: err_destroy_workqueue:
destroy_workqueue(pcrypt->wq); destroy_workqueue(pcrypt->wq);
err: err:
put_online_cpus();
return ret; return ret;
} }