From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56109) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZNfuO-0007Ry-Um for qemu-devel@nongnu.org; Fri, 07 Aug 2015 07:33:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZNfuJ-0001FV-Tr for qemu-devel@nongnu.org; Fri, 07 Aug 2015 07:33:56 -0400 Received: from e28smtp09.in.ibm.com ([122.248.162.9]:57625) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZNfuJ-0001E1-9L for qemu-devel@nongnu.org; Fri, 07 Aug 2015 07:33:51 -0400 Received: from /spool/local by e28smtp09.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 7 Aug 2015 17:03:47 +0530 Date: Fri, 7 Aug 2015 17:03:11 +0530 From: Bharata B Rao Message-ID: <20150807113311.GB23976@in.ibm.com> References: <1438838837-28504-1-git-send-email-bharata@linux.vnet.ibm.com> <1438838837-28504-6-git-send-email-bharata@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1438838837-28504-6-git-send-email-bharata@linux.vnet.ibm.com> Subject: Re: [Qemu-devel] [RFC PATCH v4 05/11] xics_kvm: Add cpu_destroy method to XICS Reply-To: bharata@linux.vnet.ibm.com List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aik@ozlabs.ru, mdroth@linux.vnet.ibm.com, agraf@suse.de, qemu-ppc@nongnu.org, tyreld@linux.vnet.ibm.com, nfont@linux.vnet.ibm.com, imammedo@redhat.com, afaerber@suse.de, david@gibson.dropbear.id.au On Thu, Aug 06, 2015 at 10:57:11AM +0530, Bharata B Rao wrote: > XICS is setup for each CPU during initialization. Provide a routine > to undo the same when CPU is unplugged. > > This allows reboot of a VM that has undergone CPU hotplug and unplug > to work correctly. > > Signed-off-by: Bharata B Rao > Reviewed-by: David Gibson > --- > hw/intc/xics.c | 12 ++++++++++++ > hw/intc/xics_kvm.c | 9 +++++++++ > include/hw/ppc/xics.h | 2 ++ > 3 files changed, 23 insertions(+) > > diff --git a/hw/intc/xics.c b/hw/intc/xics.c > index 924b1ae..cb33438 100644 > --- a/hw/intc/xics.c > +++ b/hw/intc/xics.c > @@ -44,6 +44,18 @@ static int get_cpu_index_by_dt_id(int cpu_dt_id) > return -1; > } > > +void xics_cpu_destroy(XICSState *icp, PowerPCCPU *cpu) > +{ > + CPUState *cs = CPU(cpu); > + XICSStateClass *info = XICS_COMMON_GET_CLASS(icp); > + > + assert(cs->cpu_index < icp->nr_servers); > + > + if (info->cpu_destroy) { > + info->cpu_destroy(icp, cpu); > + } > +} > + > void xics_cpu_setup(XICSState *icp, PowerPCCPU *cpu) > { > CPUState *cs = CPU(cpu); > diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c > index d58729c..e134f65 100644 > --- a/hw/intc/xics_kvm.c > +++ b/hw/intc/xics_kvm.c > @@ -356,6 +356,14 @@ static void xics_kvm_cpu_setup(XICSState *icp, PowerPCCPU *cpu) > } > } > > +static void xics_kvm_cpu_destroy(XICSState *icp, PowerPCCPU *cpu) > +{ > + CPUState *cs = CPU(cpu); > + ICPState *ss = &icp->ss[cs->cpu_index]; > + > + ss->cs = NULL; After this we need to ensure that when the hot-removed CPU is brought up again, we populate ss->cs correctly in the setup routine. Else correct removal of such a CPU after migration from the target side will not work correctly. The below patch replaces the current one after taking care of the above aspect. -------------- xics_kvm: Add cpu_destroy method to XICS From: Bharata B Rao XICS is setup for each CPU during initialization. Provide a routine to undo the same when CPU is unplugged. This allows reboot of a VM that has undergone CPU hotplug and unplug to work correctly. Signed-off-by: Bharata B Rao Reviewed-by: David Gibson --- hw/intc/xics.c | 12 ++++++++++++ hw/intc/xics_kvm.c | 13 +++++++++++-- include/hw/ppc/xics.h | 2 ++ 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 924b1ae..cb33438 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -44,6 +44,18 @@ static int get_cpu_index_by_dt_id(int cpu_dt_id) return -1; } +void xics_cpu_destroy(XICSState *icp, PowerPCCPU *cpu) +{ + CPUState *cs = CPU(cpu); + XICSStateClass *info = XICS_COMMON_GET_CLASS(icp); + + assert(cs->cpu_index < icp->nr_servers); + + if (info->cpu_destroy) { + info->cpu_destroy(icp, cpu); + } +} + void xics_cpu_setup(XICSState *icp, PowerPCCPU *cpu) { CPUState *cs = CPU(cpu); diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c index d58729c..cb96f69 100644 --- a/hw/intc/xics_kvm.c +++ b/hw/intc/xics_kvm.c @@ -331,6 +331,8 @@ static void xics_kvm_cpu_setup(XICSState *icp, PowerPCCPU *cpu) abort(); } + ss->cs = cs; + /* * If we are reusing a parked vCPU fd corresponding to the CPU * which was hot-removed earlier we don't have to renable @@ -343,8 +345,6 @@ static void xics_kvm_cpu_setup(XICSState *icp, PowerPCCPU *cpu) if (icpkvm->kernel_xics_fd != -1) { int ret; - ss->cs = cs; - ret = kvm_vcpu_enable_cap(cs, KVM_CAP_IRQ_XICS, 0, icpkvm->kernel_xics_fd, kvm_arch_vcpu_id(cs)); if (ret < 0) { @@ -356,6 +356,14 @@ static void xics_kvm_cpu_setup(XICSState *icp, PowerPCCPU *cpu) } } +static void xics_kvm_cpu_destroy(XICSState *icp, PowerPCCPU *cpu) +{ + CPUState *cs = CPU(cpu); + ICPState *ss = &icp->ss[cs->cpu_index]; + + ss->cs = NULL; +} + static void xics_kvm_set_nr_irqs(XICSState *icp, uint32_t nr_irqs, Error **errp) { icp->nr_irqs = icp->ics->nr_irqs = nr_irqs; @@ -486,6 +494,7 @@ static void xics_kvm_class_init(ObjectClass *oc, void *data) dc->realize = xics_kvm_realize; xsc->cpu_setup = xics_kvm_cpu_setup; + xsc->cpu_destroy = xics_kvm_cpu_destroy; xsc->set_nr_irqs = xics_kvm_set_nr_irqs; xsc->set_nr_servers = xics_kvm_set_nr_servers; } diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index 355a966..2faad48 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -68,6 +68,7 @@ struct XICSStateClass { DeviceClass parent_class; void (*cpu_setup)(XICSState *icp, PowerPCCPU *cpu); + void (*cpu_destroy)(XICSState *icp, PowerPCCPU *cpu); void (*set_nr_irqs)(XICSState *icp, uint32_t nr_irqs, Error **errp); void (*set_nr_servers)(XICSState *icp, uint32_t nr_servers, Error **errp); }; @@ -166,5 +167,6 @@ int xics_alloc_block(XICSState *icp, int src, int num, bool lsi, bool align); void xics_free(XICSState *icp, int irq, int num); void xics_cpu_setup(XICSState *icp, PowerPCCPU *cpu); +void xics_cpu_destroy(XICSState *icp, PowerPCCPU *cpu); #endif /* __XICS_H__ */