From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from omzsmtpe01.verizonbusiness.com ([199.249.25.210]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VeWMg-0001pi-70 for kexec@lists.infradead.org; Thu, 07 Nov 2013 20:39:43 +0000 From: Don Slutz Message-ID: <527BF9BC.6070901@terremark.com> Date: Thu, 7 Nov 2013 15:36:12 -0500 MIME-Version: 1.0 Subject: Re: [Xen-devel] [PATCH 2/4] kexec/xen: use libxc to get location of crash notes References: <1383749722-12091-1-git-send-email-david.vrabel@citrix.com> <1383749722-12091-3-git-send-email-david.vrabel@citrix.com> In-Reply-To: <1383749722-12091-3-git-send-email-david.vrabel@citrix.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "kexec" Errors-To: kexec-bounces+dwmw2=twosheds.infradead.org@lists.infradead.org To: David Vrabel , xen-devel@lists.xen.org Cc: Daniel Kiper , Simon Horman , kexec@lists.infradead.org For what it is worth. Reviewed-by: Don Slutz -Don Slutz On 11/06/13 09:55, David Vrabel wrote: > From: David Vrabel > > Use xc_kexec_get_range(KEXEC_RANGE_MA_CPU) instead of parsing > /proc/iomem (which is only populated by non-upstream ("classic") Xen > kernels). > > Signed-off-by: David Vrabel > Reviewed-by: Daniel Kiper > --- > kexec/crashdump-xen.c | 67 +++++++++++++++++++++++++++++------------------- > 1 files changed, 40 insertions(+), 27 deletions(-) > > diff --git a/kexec/crashdump-xen.c b/kexec/crashdump-xen.c > index ff4706c..8185423 100644 > --- a/kexec/crashdump-xen.c > +++ b/kexec/crashdump-xen.c > @@ -163,42 +163,55 @@ unsigned long xen_architecture(struct crash_elf_info *elf_info) > return machine; > } > > -static int xen_crash_note_callback(void *UNUSED(data), int nr, > - char *UNUSED(str), > - unsigned long base, > - unsigned long length) > -{ > - struct crash_note_info *note = xen_phys_notes + nr; > - > - note->base = base; > - note->length = length; > - > - return 0; > -} > - > +#ifdef HAVE_LIBXENCTRL > int xen_get_nr_phys_cpus(void) > { > - char *match = "Crash note\n"; > - int cpus, n; > + xc_interface *xc; > + int max_cpus; > + int cpu = -1; > > if (xen_phys_cpus) > return xen_phys_cpus; > > - if ((cpus = kexec_iomem_for_each_line(match, NULL, NULL))) { > - n = sizeof(struct crash_note_info) * cpus; > - xen_phys_notes = malloc(n); > - if (!xen_phys_notes) { > - fprintf(stderr, "failed to allocate xen_phys_notes.\n"); > - return -1; > - } > - memset(xen_phys_notes, 0, n); > - kexec_iomem_for_each_line(match, > - xen_crash_note_callback, NULL); > - xen_phys_cpus = cpus; > + xc = xc_interface_open(NULL, NULL, 0); > + if (!xc) { > + fprintf(stderr, "failed to open xen control interface.\n"); > + return -1; > } > > - return cpus; > + max_cpus = xc_get_max_cpus(xc); > + if (max_cpus <= 0) > + goto out; > + > + xen_phys_notes = calloc(max_cpus, sizeof(*xen_phys_notes)); > + if (xen_phys_notes == NULL) > + goto out; > + > + for (cpu = 0; cpu < max_cpus; cpu++) { > + uint64_t size, start; > + int ret; > + > + ret = xc_kexec_get_range(xc, KEXEC_RANGE_MA_CPU, cpu, &size, &start); > + if (ret < 0) > + break; > + > + xen_phys_notes[cpu].base = start; > + xen_phys_notes[cpu].length = size; > + } > + > + xen_phys_cpus = cpu; > + > +out: > + xc_interface_close(xc); > + return cpu; > } > +#else > +int xen_get_nr_phys_cpus(void) > +{ > + return -1; > +} > +#endif > + > > int xen_get_note(int cpu, uint64_t *addr, uint64_t *len) > { _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec