From: Daniel Jordan <daniel.m.jordan@oracle.com>
To: Herbert Xu <herbert@gondor.apana.org.au>,
Steffen Klassert <steffen.klassert@secunet.com>
Cc: Daniel Jordan <daniel.m.jordan@oracle.com>,
linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 3/2] padata: initialize usable masks to reflect offlined CPU
Date: Mon, 12 Aug 2019 17:02:00 -0400 [thread overview]
Message-ID: <20190812210200.13653-1-daniel.m.jordan@oracle.com> (raw)
In-Reply-To: <20190809210603.20900-1-daniel.m.jordan@oracle.com>
__padata_remove_cpu clears the offlined CPU from the usable masks after
padata_alloc_pd has initialized pd->cpu, which means pd->cpu could be
initialized to this CPU, causing padata to wait indefinitely for the
next job in padata_get_next.
Make the usable masks reflect the offline CPU when they're established
in padata_setup_cpumasks so pd->cpu is initialized properly.
Fixes: 6fc4dbcf0276 ("padata: Replace delayed timer with immediate workqueue in padata_reorder")
Signed-off-by: Daniel Jordan <daniel.m.jordan@oracle.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Cc: linux-crypto@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
---
Hi, one more edge case. All combinations of CPUs among
parallel_cpumask, serial_cpumask, and CPU hotplug have now been tested
in a 4-CPU VM, and an 8-CPU VM has run with random combinations of these
settings for over an hour.
kernel/padata.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/kernel/padata.c b/kernel/padata.c
index 01460ea1d160..c1002ac4720c 100644
--- a/kernel/padata.c
+++ b/kernel/padata.c
@@ -702,17 +702,27 @@ static int __padata_remove_cpu(struct padata_instance *pinst, int cpu)
struct parallel_data *pd = NULL;
if (cpumask_test_cpu(cpu, cpu_online_mask)) {
+ cpumask_var_t pcpu, cbcpu;
+
__padata_stop(pinst);
- pd = padata_alloc_pd(pinst, pinst->cpumask.pcpu,
- pinst->cpumask.cbcpu);
+ /*
+ * padata_alloc_pd uses cpu_online_mask to get the usable
+ * masks, but @cpu hasn't been removed from it yet, so use
+ * temporary masks that exclude @cpu so the usable masks show
+ * @cpu as offline for pd->cpu's initialization.
+ */
+ cpumask_copy(pcpu, pinst->cpumask.pcpu);
+ cpumask_copy(cbcpu, pinst->cpumask.cbcpu);
+ cpumask_clear_cpu(cpu, cbcpu);
+ cpumask_clear_cpu(cpu, pcpu);
+
+ pd = padata_alloc_pd(pinst, pcpu, cbcpu);
if (!pd)
return -ENOMEM;
padata_replace(pinst, pd);
- cpumask_clear_cpu(cpu, pd->cpumask.cbcpu);
- cpumask_clear_cpu(cpu, pd->cpumask.pcpu);
if (padata_validate_cpumask(pinst, pd->cpumask.pcpu) &&
padata_validate_cpumask(pinst, pd->cpumask.cbcpu))
__padata_start(pinst);
--
2.22.0
next prev parent reply other threads:[~2019-08-12 21:02 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-09 19:28 [PATCH 1/2] padata: always acquire cpu_hotplug_lock before pinst->lock Daniel Jordan
2019-08-09 19:28 ` [PATCH 2/2] padata: validate cpumask without removed CPU during offline Daniel Jordan
2019-08-09 21:06 ` [PATCH v2] " Daniel Jordan
2019-08-12 21:02 ` Daniel Jordan [this message]
2019-08-22 3:51 ` [PATCH 3/2] padata: initialize usable masks to reflect offlined CPU Herbert Xu
2019-08-22 22:11 ` Daniel Jordan
2019-08-22 3:50 ` [PATCH v2] padata: validate cpumask without removed CPU during offline Herbert Xu
2019-08-22 22:10 ` Daniel Jordan
2019-08-22 22:53 ` Daniel Jordan
2019-08-15 5:15 ` [PATCH 1/2] padata: always acquire cpu_hotplug_lock before pinst->lock Herbert Xu
2019-08-21 4:14 ` Daniel Jordan
2019-08-21 6:43 ` Herbert Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190812210200.13653-1-daniel.m.jordan@oracle.com \
--to=daniel.m.jordan@oracle.com \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=steffen.klassert@secunet.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).