From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: linux-kernel@vger.kernel.org
Cc: xen-devel@lists.xensource.com,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Subject: [PATCH] xen/cpu: Make VCPU hotplug code online CPUs properly.
Date: Fri, 10 Feb 2012 09:43:53 -0500 [thread overview]
Message-ID: <1328885033-8450-2-git-send-email-konrad.wilk@oracle.com> (raw)
In-Reply-To: <1328885033-8450-1-git-send-email-konrad.wilk@oracle.com>
Offlining CPUs works. Onlining does not work anymore and it looks
like we were missing a cpu_up() call in the hotplug bring up path.
When the vCPUs are initialized, if they are onlined or never had
been in use (so maxcpus > vcpus) the vCPUs are in xen_play_dead
having called VCPUOP_down and are not running. When a vCPU is
onlined, the bootup (or any other currently running CPU) is suppose
to call VCPUOP_up on the vCPU that is not running and make the
vCPU unhinge itself out of the xen_play_dead and continue in
cpu_idle. We did not make the hypercall on onlining, nor did we
recreate the timer, spinlocks, ipi interrupts so the vCPU never
was onlined. This patch fixes it by calling cpu_on() and we
also make the code more readable.
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
drivers/xen/cpu_hotplug.c | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/drivers/xen/cpu_hotplug.c b/drivers/xen/cpu_hotplug.c
index 4dcfced..df80af8 100644
--- a/drivers/xen/cpu_hotplug.c
+++ b/drivers/xen/cpu_hotplug.c
@@ -8,18 +8,20 @@
static void enable_hotplug_cpu(int cpu)
{
- if (!cpu_present(cpu))
+ if (!cpu_present(cpu)) {
arch_register_cpu(cpu);
-
- set_cpu_present(cpu, true);
+ set_cpu_present(cpu, true);
+ (void)cpu_up(cpu);
+ }
}
static void disable_hotplug_cpu(int cpu)
{
- if (cpu_present(cpu))
+ if (cpu_present(cpu)) {
+ (void)cpu_down(cpu);
+ set_cpu_present(cpu, false);
arch_unregister_cpu(cpu);
-
- set_cpu_present(cpu, false);
+ }
}
static int vcpu_online(unsigned int cpu)
@@ -53,7 +55,6 @@ static void vcpu_hotplug(unsigned int cpu)
enable_hotplug_cpu(cpu);
break;
case 0:
- (void)cpu_down(cpu);
disable_hotplug_cpu(cpu);
break;
default:
--
1.7.7.5
next prev parent reply other threads:[~2012-02-10 14:43 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-10 14:43 [PATCH] vcpu hotplug fix for v3.3-rc3 (v1) Konrad Rzeszutek Wilk
2012-02-10 14:43 ` Konrad Rzeszutek Wilk [this message]
2012-02-10 15:03 ` [Xen-devel] [PATCH] xen/cpu: Make VCPU hotplug code online CPUs properly Ian Campbell
2012-02-10 15:42 ` Konrad Rzeszutek Wilk
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=1328885033-8450-2-git-send-email-konrad.wilk@oracle.com \
--to=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=xen-devel@lists.xensource.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).