mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 10:57:46 +00:00
padata: validate cpumask without removed CPU during offline
commit894c9ef978
upstream. Configuring an instance's parallel mask without any online CPUs... echo 2 > /sys/kernel/pcrypt/pencrypt/parallel_cpumask echo 0 > /sys/devices/system/cpu/cpu1/online ...makes tcrypt mode=215 crash like this: divide error: 0000 [#1] SMP PTI CPU: 4 PID: 283 Comm: modprobe Not tainted 5.4.0-rc8-padata-doc-v2+ #2 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS ?-20191013_105130-anatol 04/01/2014 RIP: 0010:padata_do_parallel+0x114/0x300 Call Trace: pcrypt_aead_encrypt+0xc0/0xd0 [pcrypt] crypto_aead_encrypt+0x1f/0x30 do_mult_aead_op+0x4e/0xdf [tcrypt] test_mb_aead_speed.constprop.0.cold+0x226/0x564 [tcrypt] do_test+0x28c2/0x4d49 [tcrypt] tcrypt_mod_init+0x55/0x1000 [tcrypt] ... cpumask_weight() in padata_cpu_hash() returns 0 because the mask has no CPUs. The problem is __padata_remove_cpu() checks for valid masks too early and so doesn't mark the instance PADATA_INVALID as expected, which would have made padata_do_parallel() return error before doing the division. Fix by introducing a second padata CPU hotplug state before CPUHP_BRINGUP_CPU so that __padata_remove_cpu() sees the online mask without @cpu. No need for the second argument to padata_replace() since @cpu is now already missing from the online mask. Fixes:33e5445068
("padata: Handle empty padata cpumasks") Signed-off-by: Daniel Jordan <daniel.m.jordan@oracle.com> Cc: Eric Biggers <ebiggers@kernel.org> Cc: Herbert Xu <herbert@gondor.apana.org.au> Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Cc: Steffen Klassert <steffen.klassert@secunet.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-crypto@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
7cbcb642a6
commit
2b1207801c
2 changed files with 15 additions and 4 deletions
|
@ -59,6 +59,7 @@ enum cpuhp_state {
|
||||||
CPUHP_IOMMU_INTEL_DEAD,
|
CPUHP_IOMMU_INTEL_DEAD,
|
||||||
CPUHP_LUSTRE_CFS_DEAD,
|
CPUHP_LUSTRE_CFS_DEAD,
|
||||||
CPUHP_AP_ARM_CACHE_B15_RAC_DEAD,
|
CPUHP_AP_ARM_CACHE_B15_RAC_DEAD,
|
||||||
|
CPUHP_PADATA_DEAD,
|
||||||
CPUHP_WORKQUEUE_PREP,
|
CPUHP_WORKQUEUE_PREP,
|
||||||
CPUHP_POWER_NUMA_PREPARE,
|
CPUHP_POWER_NUMA_PREPARE,
|
||||||
CPUHP_HRTIMERS_PREPARE,
|
CPUHP_HRTIMERS_PREPARE,
|
||||||
|
|
|
@ -682,7 +682,7 @@ static int __padata_remove_cpu(struct padata_instance *pinst, int cpu)
|
||||||
{
|
{
|
||||||
struct parallel_data *pd = NULL;
|
struct parallel_data *pd = NULL;
|
||||||
|
|
||||||
if (cpumask_test_cpu(cpu, cpu_online_mask)) {
|
if (!cpumask_test_cpu(cpu, cpu_online_mask)) {
|
||||||
|
|
||||||
if (!padata_validate_cpumask(pinst, pinst->cpumask.pcpu) ||
|
if (!padata_validate_cpumask(pinst, pinst->cpumask.pcpu) ||
|
||||||
!padata_validate_cpumask(pinst, pinst->cpumask.cbcpu))
|
!padata_validate_cpumask(pinst, pinst->cpumask.cbcpu))
|
||||||
|
@ -758,7 +758,7 @@ static int padata_cpu_online(unsigned int cpu, struct hlist_node *node)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int padata_cpu_prep_down(unsigned int cpu, struct hlist_node *node)
|
static int padata_cpu_dead(unsigned int cpu, struct hlist_node *node)
|
||||||
{
|
{
|
||||||
struct padata_instance *pinst;
|
struct padata_instance *pinst;
|
||||||
int ret;
|
int ret;
|
||||||
|
@ -779,6 +779,7 @@ static enum cpuhp_state hp_online;
|
||||||
static void __padata_free(struct padata_instance *pinst)
|
static void __padata_free(struct padata_instance *pinst)
|
||||||
{
|
{
|
||||||
#ifdef CONFIG_HOTPLUG_CPU
|
#ifdef CONFIG_HOTPLUG_CPU
|
||||||
|
cpuhp_state_remove_instance_nocalls(CPUHP_PADATA_DEAD, &pinst->node);
|
||||||
cpuhp_state_remove_instance_nocalls(hp_online, &pinst->node);
|
cpuhp_state_remove_instance_nocalls(hp_online, &pinst->node);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -964,6 +965,8 @@ static struct padata_instance *padata_alloc(struct workqueue_struct *wq,
|
||||||
|
|
||||||
#ifdef CONFIG_HOTPLUG_CPU
|
#ifdef CONFIG_HOTPLUG_CPU
|
||||||
cpuhp_state_add_instance_nocalls_cpuslocked(hp_online, &pinst->node);
|
cpuhp_state_add_instance_nocalls_cpuslocked(hp_online, &pinst->node);
|
||||||
|
cpuhp_state_add_instance_nocalls_cpuslocked(CPUHP_PADATA_DEAD,
|
||||||
|
&pinst->node);
|
||||||
#endif
|
#endif
|
||||||
return pinst;
|
return pinst;
|
||||||
|
|
||||||
|
@ -1010,17 +1013,24 @@ static __init int padata_driver_init(void)
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = cpuhp_setup_state_multi(CPUHP_AP_ONLINE_DYN, "padata:online",
|
ret = cpuhp_setup_state_multi(CPUHP_AP_ONLINE_DYN, "padata:online",
|
||||||
padata_cpu_online,
|
padata_cpu_online, NULL);
|
||||||
padata_cpu_prep_down);
|
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
hp_online = ret;
|
hp_online = ret;
|
||||||
|
|
||||||
|
ret = cpuhp_setup_state_multi(CPUHP_PADATA_DEAD, "padata:dead",
|
||||||
|
NULL, padata_cpu_dead);
|
||||||
|
if (ret < 0) {
|
||||||
|
cpuhp_remove_multi_state(hp_online);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
module_init(padata_driver_init);
|
module_init(padata_driver_init);
|
||||||
|
|
||||||
static __exit void padata_driver_exit(void)
|
static __exit void padata_driver_exit(void)
|
||||||
{
|
{
|
||||||
|
cpuhp_remove_multi_state(CPUHP_PADATA_DEAD);
|
||||||
cpuhp_remove_multi_state(hp_online);
|
cpuhp_remove_multi_state(hp_online);
|
||||||
}
|
}
|
||||||
module_exit(padata_driver_exit);
|
module_exit(padata_driver_exit);
|
||||||
|
|
Loading…
Reference in a new issue