From xen-changelog-bounces@lists.xen.org Mon Aug 03 11:55:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 03 Aug 2015 11:55:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZMEKf-0001pA-Ra; Mon, 03 Aug 2015 11:55:05 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZMEKf-0001oz-26 for xen-changelog@lists.xensource.com; Mon, 03 Aug 2015 11:55:05 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 92/4B-19220-8965FB55; Mon, 03 Aug 2015 11:55:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1438602903!25379241!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18001 invoked from network); 3 Aug 2015 11:55:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 3 Aug 2015 11:55:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZMEKc-0000Zi-PI for xen-changelog@lists.xensource.com; Mon, 03 Aug 2015 11:55:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZMEKc-0001GZ-Nc for xen-changelog@lists.xensource.com; Mon, 03 Aug 2015 11:55:02 +0000 Date: Mon, 03 Aug 2015 11:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl/libxl: disable PV vNUMA X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 27524b5e1556067545ee19b3f482ec755aa82de3 Author: Wei Liu AuthorDate: Thu Jul 30 17:11:29 2015 +0100 Commit: Ian Campbell CommitDate: Fri Jul 31 10:15:17 2015 +0100 xl/libxl: disable PV vNUMA Update xl manual and disable PV vNUMA in libxl. Signed-off-by: Wei Liu Reviewed-by: Dario Faggioli Acked-by: Ian Campbell --- docs/man/xl.cfg.pod.5 | 3 +++ tools/libxl/libxl_create.c | 9 +++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index c78c3ba..80e51bb 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -261,6 +261,9 @@ Specify virtual NUMA configuration with positional arguments. The nth B in the list specifies the configuration of nth virtual node. +Note that virtual NUMA for PV guest is not yet supported, because +there is an issue with cpuid handling that affects PV virtual NUMA. + Each B is a list, which has a form of "[VNODE_CONFIG_OPTION,VNODE_CONFIG_OPTION, ... ]" (without quotes). diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 4f2f50b..2348ffc 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -860,6 +860,15 @@ static void initiate_domain_create(libxl__egc *egc, goto error_out; } + /* PV vNUMA is not yet supported because there is an issue with + * cpuid handling. + */ + if (d_config->c_info.type == LIBXL_DOMAIN_TYPE_PV && + d_config->b_info.num_vnuma_nodes) { + LOG(ERROR, "PV vNUMA is not yet supported"); + goto error_out; + } + ret = libxl__domain_create_info_setdefault(gc, &d_config->c_info); if (ret) { LOG(ERROR, "Unable to set domain create info defaults"); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 03 11:55:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 03 Aug 2015 11:55:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZMEKf-0001pA-Ra; Mon, 03 Aug 2015 11:55:05 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZMEKf-0001oz-26 for xen-changelog@lists.xensource.com; Mon, 03 Aug 2015 11:55:05 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 92/4B-19220-8965FB55; Mon, 03 Aug 2015 11:55:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1438602903!25379241!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18001 invoked from network); 3 Aug 2015 11:55:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 3 Aug 2015 11:55:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZMEKc-0000Zi-PI for xen-changelog@lists.xensource.com; Mon, 03 Aug 2015 11:55:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZMEKc-0001GZ-Nc for xen-changelog@lists.xensource.com; Mon, 03 Aug 2015 11:55:02 +0000 Date: Mon, 03 Aug 2015 11:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl/libxl: disable PV vNUMA X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 27524b5e1556067545ee19b3f482ec755aa82de3 Author: Wei Liu AuthorDate: Thu Jul 30 17:11:29 2015 +0100 Commit: Ian Campbell CommitDate: Fri Jul 31 10:15:17 2015 +0100 xl/libxl: disable PV vNUMA Update xl manual and disable PV vNUMA in libxl. Signed-off-by: Wei Liu Reviewed-by: Dario Faggioli Acked-by: Ian Campbell --- docs/man/xl.cfg.pod.5 | 3 +++ tools/libxl/libxl_create.c | 9 +++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index c78c3ba..80e51bb 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -261,6 +261,9 @@ Specify virtual NUMA configuration with positional arguments. The nth B in the list specifies the configuration of nth virtual node. +Note that virtual NUMA for PV guest is not yet supported, because +there is an issue with cpuid handling that affects PV virtual NUMA. + Each B is a list, which has a form of "[VNODE_CONFIG_OPTION,VNODE_CONFIG_OPTION, ... ]" (without quotes). diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 4f2f50b..2348ffc 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -860,6 +860,15 @@ static void initiate_domain_create(libxl__egc *egc, goto error_out; } + /* PV vNUMA is not yet supported because there is an issue with + * cpuid handling. + */ + if (d_config->c_info.type == LIBXL_DOMAIN_TYPE_PV && + d_config->b_info.num_vnuma_nodes) { + LOG(ERROR, "PV vNUMA is not yet supported"); + goto error_out; + } + ret = libxl__domain_create_info_setdefault(gc, &d_config->c_info); if (ret) { LOG(ERROR, "Unable to set domain create info defaults"); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 03 14:44:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 03 Aug 2015 14:44:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZMGyH-0006N7-NB; Mon, 03 Aug 2015 14:44:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZMGyF-0006N2-Mc for xen-changelog@lists.xensource.com; Mon, 03 Aug 2015 14:44:07 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id 85/59-15765-73E7FB55; Mon, 03 Aug 2015 14:44:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1438613045!31453216!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4999 invoked from network); 3 Aug 2015 14:44:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 3 Aug 2015 14:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZMGyA-0002VL-6l for xen-changelog@lists.xensource.com; Mon, 03 Aug 2015 14:44:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZMGyA-0002eI-3l for xen-changelog@lists.xensource.com; Mon, 03 Aug 2015 14:44:02 +0000 Date: Mon, 03 Aug 2015 14:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [mini-os master] arm: interrupt controller X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 256035e01a1aa5739e34f245f3b1e9e8ee204210 Author: Thomas Leonard AuthorDate: Thu Jul 23 11:08:38 2015 +0100 Commit: Ian Campbell CommitDate: Mon Aug 3 14:59:25 2015 +0100 arm: interrupt controller Based on an initial patch by Karim Raslan. Signed-off-by: Karim Allah Ahmed Signed-off-by: Thomas Leonard --- README | 7 ++ arch/arm/gic.c | 238 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 245 insertions(+), 0 deletions(-) diff --git a/README b/README index 7960314..7e9c07a 100644 --- a/README +++ b/README @@ -44,3 +44,10 @@ show a mouse with which you can draw color squares. If you have compiled it with TCP/IP support, it will run a daytime server on TCP port 13. + + + ARM notes + ========= + +- The IRQ numbers are currently hard-coded in gic.c and may need to be updated if + future versions of Xen change them. diff --git a/arch/arm/gic.c b/arch/arm/gic.c new file mode 100644 index 0000000..1855293 --- /dev/null +++ b/arch/arm/gic.c @@ -0,0 +1,238 @@ +// ARM GIC implementation + +#include +#include +#include +#include + +//#define VGIC_DEBUG +#ifdef VGIC_DEBUG +#define DEBUG(_f, _a...) \ + printk("MINI_OS(file=vgic.c, line=%d) " _f , __LINE__, ## _a) +#else +#define DEBUG(_f, _a...) ((void)0) +#endif + +extern void (*IRQ_handler)(void); + +struct gic { + volatile char *gicd_base; + volatile char *gicc_base; +}; + +static struct gic gic; + +// Distributor Interface +#define GICD_CTLR 0x0 +#define GICD_ISENABLER 0x100 +#define GICD_IPRIORITYR 0x400 +#define GICD_ITARGETSR 0x800 +#define GICD_ICFGR 0xC00 + +// CPU Interface +#define GICC_CTLR 0x0 +#define GICC_PMR 0x4 +#define GICC_IAR 0xc +#define GICC_EOIR 0x10 +#define GICC_HPPIR 0x18 + +#define gicd(gic, offset) ((gic)->gicd_base + (offset)) +#define gicc(gic, offset) ((gic)->gicc_base + (offset)) + +#define REG(addr) ((uint32_t *)(addr)) + +static inline uint32_t REG_READ32(volatile uint32_t *addr) +{ + uint32_t value; + __asm__ __volatile__("ldr %0, [%1]":"=&r"(value):"r"(addr)); + rmb(); + return value; +} + +static inline void REG_WRITE32(volatile uint32_t *addr, unsigned int value) +{ + __asm__ __volatile__("str %0, [%1]"::"r"(value), "r"(addr)); + wmb(); +} + +static void gic_set_priority(struct gic *gic, int irq_number, unsigned char priority) +{ + uint32_t value; + uint32_t *addr = REG(gicd(gic, GICD_IPRIORITYR)) + (irq_number >> 2); + value = REG_READ32(addr); + value &= ~(0xff << (8 * (irq_number & 0x3))); // clear old priority + value |= priority << (8 * (irq_number & 0x3)); // set new priority + REG_WRITE32(addr, value); +} + +static void gic_route_interrupt(struct gic *gic, int irq_number, unsigned char cpu_set) +{ + uint32_t value; + uint32_t *addr = REG(gicd(gic, GICD_ITARGETSR)) + (irq_number >> 2); + value = REG_READ32(addr); + value &= ~(0xff << (8 * (irq_number & 0x3))); // clear old target + value |= cpu_set << (8 * (irq_number & 0x3)); // set new target + REG_WRITE32(addr, value); +} + +/* When accessing the GIC registers, we can't use LDREX/STREX because it's not regular memory. */ +static __inline__ void clear_bit_non_atomic(int nr, volatile void *base) +{ + volatile uint32_t *tmp = base; + tmp[nr >> 5] &= (unsigned long)~(1 << (nr & 0x1f)); +} + +static __inline__ void set_bit_non_atomic(int nr, volatile void *base) +{ + volatile uint32_t *tmp = base; + tmp[nr >> 5] |= (1 << (nr & 0x1f)); +} + +/* Note: not thread safe (but we only support one CPU for now anyway) */ +static void gic_enable_interrupt(struct gic *gic, int irq_number, + unsigned char cpu_set, unsigned char level_sensitive) +{ + int *set_enable_reg; + void *cfg_reg; + + // set priority + gic_set_priority(gic, irq_number, 0x0); + + // set target cpus for this interrupt + gic_route_interrupt(gic, irq_number, cpu_set); + + // set level/edge triggered + cfg_reg = (void *)gicd(gic, GICD_ICFGR); + if (level_sensitive) { + clear_bit_non_atomic((irq_number * 2) + 1, cfg_reg); + } else { + set_bit_non_atomic((irq_number * 2) + 1, cfg_reg); + } + + wmb(); + + // enable forwarding interrupt from distributor to cpu interface + set_enable_reg = (int *)gicd(gic, GICD_ISENABLER); + set_enable_reg[irq_number >> 5] = 1 << (irq_number & 0x1f); + wmb(); +} + +static void gic_enable_interrupts(struct gic *gic) +{ + // Global enable forwarding interrupts from distributor to cpu interface + REG_WRITE32(REG(gicd(gic, GICD_CTLR)), 0x00000001); + + // Global enable signalling of interrupt from the cpu interface + REG_WRITE32(REG(gicc(gic, GICC_CTLR)), 0x00000001); +} + +static void gic_disable_interrupts(struct gic *gic) +{ + // Global disable signalling of interrupt from the cpu interface + REG_WRITE32(REG(gicc(gic, GICC_CTLR)), 0x00000000); + + // Global disable forwarding interrupts from distributor to cpu interface + REG_WRITE32(REG(gicd(gic, GICD_CTLR)), 0x00000000); +} + +static void gic_cpu_set_priority(struct gic *gic, char priority) +{ + REG_WRITE32(REG(gicc(gic, GICC_PMR)), priority & 0x000000FF); +} + +static unsigned long gic_readiar(struct gic *gic) { + return REG_READ32(REG(gicc(gic, GICC_IAR))) & 0x000003FF; // Interrupt ID +} + +static void gic_eoir(struct gic *gic, uint32_t irq) { + REG_WRITE32(REG(gicc(gic, GICC_EOIR)), irq & 0x000003FF); +} + +//FIXME Get event_irq from dt +#define EVENTS_IRQ 31 +#define VIRTUALTIMER_IRQ 27 + +static void gic_handler(void) { + unsigned int irq = gic_readiar(&gic); + + DEBUG("IRQ received : %i\n", irq); + switch(irq) { + case EVENTS_IRQ: + do_hypervisor_callback(NULL); + break; + case VIRTUALTIMER_IRQ: + /* We need to get this event to wake us up from block_domain, + * but we don't need to do anything special with it. */ + break; + case 1022: + case 1023: + return; /* Spurious interrupt */ + default: + DEBUG("Unhandled irq\n"); + break; + } + + DEBUG("EIRQ\n"); + + gic_eoir(&gic, irq); +} + +void gic_init(void) { + gic.gicd_base = NULL; + int node = 0; + int depth = 0; + for (;;) + { + node = fdt_next_node(device_tree, node, &depth); + if (node <= 0 || depth < 0) + break; + + if (fdt_getprop(device_tree, node, "interrupt-controller", NULL)) { + int len = 0; + + if (fdt_node_check_compatible(device_tree, node, "arm,cortex-a15-gic") && + fdt_node_check_compatible(device_tree, node, "arm,cortex-a7-gic")) { + printk("Skipping incompatible interrupt-controller node\n"); + continue; + } + + const uint64_t *reg = fdt_getprop(device_tree, node, "reg", &len); + + /* We have two registers (GICC and GICD), each of which contains + * two parts (an address and a size), each of which is a 64-bit + * value (8 bytes), so we expect a length of 2 * 2 * 8 = 32. + * If any extra values are passed in future, we ignore them. */ + if (reg == NULL || len < 32) { + printk("Bad 'reg' property: %p %d\n", reg, len); + continue; + } + + gic.gicd_base = to_virt((long) fdt64_to_cpu(reg[0])); + gic.gicc_base = to_virt((long) fdt64_to_cpu(reg[2])); + printk("Found GIC: gicd_base = %p, gicc_base = %p\n", gic.gicd_base, gic.gicc_base); + break; + } + } + if (!gic.gicd_base) { + printk("GIC not found!\n"); + BUG(); + } + wmb(); + + /* Note: we could mark this as "device" memory here, but Xen will have already + * set it that way in the second stage translation table, so it's not necessary. + * See "Overlaying the memory type attribute" in the Architecture Reference Manual. + */ + + IRQ_handler = gic_handler; + + gic_disable_interrupts(&gic); + gic_cpu_set_priority(&gic, 0xff); + + /* Must call gic_enable_interrupts before enabling individual interrupts, otherwise our IRQ handler + * gets called endlessly with spurious interrupts. */ + gic_enable_interrupts(&gic); + + gic_enable_interrupt(&gic, EVENTS_IRQ /* interrupt number */, 0x1 /*cpu_set*/, 1 /*level_sensitive*/); + gic_enable_interrupt(&gic, VIRTUALTIMER_IRQ /* interrupt number */, 0x1 /*cpu_set*/, 1 /*level_sensitive*/); +} -- generated by git-patchbot for /home/xen/git/mini-os.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 03 14:44:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 03 Aug 2015 14:44:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZMGyH-0006N7-NB; Mon, 03 Aug 2015 14:44:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZMGyF-0006N2-Mc for xen-changelog@lists.xensource.com; Mon, 03 Aug 2015 14:44:07 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id 85/59-15765-73E7FB55; Mon, 03 Aug 2015 14:44:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1438613045!31453216!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4999 invoked from network); 3 Aug 2015 14:44:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 3 Aug 2015 14:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZMGyA-0002VL-6l for xen-changelog@lists.xensource.com; Mon, 03 Aug 2015 14:44:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZMGyA-0002eI-3l for xen-changelog@lists.xensource.com; Mon, 03 Aug 2015 14:44:02 +0000 Date: Mon, 03 Aug 2015 14:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [mini-os master] arm: interrupt controller X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 256035e01a1aa5739e34f245f3b1e9e8ee204210 Author: Thomas Leonard AuthorDate: Thu Jul 23 11:08:38 2015 +0100 Commit: Ian Campbell CommitDate: Mon Aug 3 14:59:25 2015 +0100 arm: interrupt controller Based on an initial patch by Karim Raslan. Signed-off-by: Karim Allah Ahmed Signed-off-by: Thomas Leonard --- README | 7 ++ arch/arm/gic.c | 238 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 245 insertions(+), 0 deletions(-) diff --git a/README b/README index 7960314..7e9c07a 100644 --- a/README +++ b/README @@ -44,3 +44,10 @@ show a mouse with which you can draw color squares. If you have compiled it with TCP/IP support, it will run a daytime server on TCP port 13. + + + ARM notes + ========= + +- The IRQ numbers are currently hard-coded in gic.c and may need to be updated if + future versions of Xen change them. diff --git a/arch/arm/gic.c b/arch/arm/gic.c new file mode 100644 index 0000000..1855293 --- /dev/null +++ b/arch/arm/gic.c @@ -0,0 +1,238 @@ +// ARM GIC implementation + +#include +#include +#include +#include + +//#define VGIC_DEBUG +#ifdef VGIC_DEBUG +#define DEBUG(_f, _a...) \ + printk("MINI_OS(file=vgic.c, line=%d) " _f , __LINE__, ## _a) +#else +#define DEBUG(_f, _a...) ((void)0) +#endif + +extern void (*IRQ_handler)(void); + +struct gic { + volatile char *gicd_base; + volatile char *gicc_base; +}; + +static struct gic gic; + +// Distributor Interface +#define GICD_CTLR 0x0 +#define GICD_ISENABLER 0x100 +#define GICD_IPRIORITYR 0x400 +#define GICD_ITARGETSR 0x800 +#define GICD_ICFGR 0xC00 + +// CPU Interface +#define GICC_CTLR 0x0 +#define GICC_PMR 0x4 +#define GICC_IAR 0xc +#define GICC_EOIR 0x10 +#define GICC_HPPIR 0x18 + +#define gicd(gic, offset) ((gic)->gicd_base + (offset)) +#define gicc(gic, offset) ((gic)->gicc_base + (offset)) + +#define REG(addr) ((uint32_t *)(addr)) + +static inline uint32_t REG_READ32(volatile uint32_t *addr) +{ + uint32_t value; + __asm__ __volatile__("ldr %0, [%1]":"=&r"(value):"r"(addr)); + rmb(); + return value; +} + +static inline void REG_WRITE32(volatile uint32_t *addr, unsigned int value) +{ + __asm__ __volatile__("str %0, [%1]"::"r"(value), "r"(addr)); + wmb(); +} + +static void gic_set_priority(struct gic *gic, int irq_number, unsigned char priority) +{ + uint32_t value; + uint32_t *addr = REG(gicd(gic, GICD_IPRIORITYR)) + (irq_number >> 2); + value = REG_READ32(addr); + value &= ~(0xff << (8 * (irq_number & 0x3))); // clear old priority + value |= priority << (8 * (irq_number & 0x3)); // set new priority + REG_WRITE32(addr, value); +} + +static void gic_route_interrupt(struct gic *gic, int irq_number, unsigned char cpu_set) +{ + uint32_t value; + uint32_t *addr = REG(gicd(gic, GICD_ITARGETSR)) + (irq_number >> 2); + value = REG_READ32(addr); + value &= ~(0xff << (8 * (irq_number & 0x3))); // clear old target + value |= cpu_set << (8 * (irq_number & 0x3)); // set new target + REG_WRITE32(addr, value); +} + +/* When accessing the GIC registers, we can't use LDREX/STREX because it's not regular memory. */ +static __inline__ void clear_bit_non_atomic(int nr, volatile void *base) +{ + volatile uint32_t *tmp = base; + tmp[nr >> 5] &= (unsigned long)~(1 << (nr & 0x1f)); +} + +static __inline__ void set_bit_non_atomic(int nr, volatile void *base) +{ + volatile uint32_t *tmp = base; + tmp[nr >> 5] |= (1 << (nr & 0x1f)); +} + +/* Note: not thread safe (but we only support one CPU for now anyway) */ +static void gic_enable_interrupt(struct gic *gic, int irq_number, + unsigned char cpu_set, unsigned char level_sensitive) +{ + int *set_enable_reg; + void *cfg_reg; + + // set priority + gic_set_priority(gic, irq_number, 0x0); + + // set target cpus for this interrupt + gic_route_interrupt(gic, irq_number, cpu_set); + + // set level/edge triggered + cfg_reg = (void *)gicd(gic, GICD_ICFGR); + if (level_sensitive) { + clear_bit_non_atomic((irq_number * 2) + 1, cfg_reg); + } else { + set_bit_non_atomic((irq_number * 2) + 1, cfg_reg); + } + + wmb(); + + // enable forwarding interrupt from distributor to cpu interface + set_enable_reg = (int *)gicd(gic, GICD_ISENABLER); + set_enable_reg[irq_number >> 5] = 1 << (irq_number & 0x1f); + wmb(); +} + +static void gic_enable_interrupts(struct gic *gic) +{ + // Global enable forwarding interrupts from distributor to cpu interface + REG_WRITE32(REG(gicd(gic, GICD_CTLR)), 0x00000001); + + // Global enable signalling of interrupt from the cpu interface + REG_WRITE32(REG(gicc(gic, GICC_CTLR)), 0x00000001); +} + +static void gic_disable_interrupts(struct gic *gic) +{ + // Global disable signalling of interrupt from the cpu interface + REG_WRITE32(REG(gicc(gic, GICC_CTLR)), 0x00000000); + + // Global disable forwarding interrupts from distributor to cpu interface + REG_WRITE32(REG(gicd(gic, GICD_CTLR)), 0x00000000); +} + +static void gic_cpu_set_priority(struct gic *gic, char priority) +{ + REG_WRITE32(REG(gicc(gic, GICC_PMR)), priority & 0x000000FF); +} + +static unsigned long gic_readiar(struct gic *gic) { + return REG_READ32(REG(gicc(gic, GICC_IAR))) & 0x000003FF; // Interrupt ID +} + +static void gic_eoir(struct gic *gic, uint32_t irq) { + REG_WRITE32(REG(gicc(gic, GICC_EOIR)), irq & 0x000003FF); +} + +//FIXME Get event_irq from dt +#define EVENTS_IRQ 31 +#define VIRTUALTIMER_IRQ 27 + +static void gic_handler(void) { + unsigned int irq = gic_readiar(&gic); + + DEBUG("IRQ received : %i\n", irq); + switch(irq) { + case EVENTS_IRQ: + do_hypervisor_callback(NULL); + break; + case VIRTUALTIMER_IRQ: + /* We need to get this event to wake us up from block_domain, + * but we don't need to do anything special with it. */ + break; + case 1022: + case 1023: + return; /* Spurious interrupt */ + default: + DEBUG("Unhandled irq\n"); + break; + } + + DEBUG("EIRQ\n"); + + gic_eoir(&gic, irq); +} + +void gic_init(void) { + gic.gicd_base = NULL; + int node = 0; + int depth = 0; + for (;;) + { + node = fdt_next_node(device_tree, node, &depth); + if (node <= 0 || depth < 0) + break; + + if (fdt_getprop(device_tree, node, "interrupt-controller", NULL)) { + int len = 0; + + if (fdt_node_check_compatible(device_tree, node, "arm,cortex-a15-gic") && + fdt_node_check_compatible(device_tree, node, "arm,cortex-a7-gic")) { + printk("Skipping incompatible interrupt-controller node\n"); + continue; + } + + const uint64_t *reg = fdt_getprop(device_tree, node, "reg", &len); + + /* We have two registers (GICC and GICD), each of which contains + * two parts (an address and a size), each of which is a 64-bit + * value (8 bytes), so we expect a length of 2 * 2 * 8 = 32. + * If any extra values are passed in future, we ignore them. */ + if (reg == NULL || len < 32) { + printk("Bad 'reg' property: %p %d\n", reg, len); + continue; + } + + gic.gicd_base = to_virt((long) fdt64_to_cpu(reg[0])); + gic.gicc_base = to_virt((long) fdt64_to_cpu(reg[2])); + printk("Found GIC: gicd_base = %p, gicc_base = %p\n", gic.gicd_base, gic.gicc_base); + break; + } + } + if (!gic.gicd_base) { + printk("GIC not found!\n"); + BUG(); + } + wmb(); + + /* Note: we could mark this as "device" memory here, but Xen will have already + * set it that way in the second stage translation table, so it's not necessary. + * See "Overlaying the memory type attribute" in the Architecture Reference Manual. + */ + + IRQ_handler = gic_handler; + + gic_disable_interrupts(&gic); + gic_cpu_set_priority(&gic, 0xff); + + /* Must call gic_enable_interrupts before enabling individual interrupts, otherwise our IRQ handler + * gets called endlessly with spurious interrupts. */ + gic_enable_interrupts(&gic); + + gic_enable_interrupt(&gic, EVENTS_IRQ /* interrupt number */, 0x1 /*cpu_set*/, 1 /*level_sensitive*/); + gic_enable_interrupt(&gic, VIRTUALTIMER_IRQ /* interrupt number */, 0x1 /*cpu_set*/, 1 /*level_sensitive*/); +} -- generated by git-patchbot for /home/xen/git/mini-os.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 04 16:11:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 04 Aug 2015 16:11:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZMeo5-0001xk-5O; Tue, 04 Aug 2015 16:11:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZMeo3-0001xa-Hv for xen-changelog@lists.xensource.com; Tue, 04 Aug 2015 16:11:11 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 17/58-06179-E14E0C55; Tue, 04 Aug 2015 16:11:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1438704665!21662447!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12189 invoked from network); 4 Aug 2015 16:11:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 4 Aug 2015 16:11:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZMenx-0001tq-D2 for xen-changelog@lists.xensource.com; Tue, 04 Aug 2015 16:11:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZMenv-0005cb-KS for xen-changelog@lists.xensource.com; Tue, 04 Aug 2015 16:11:03 +0000 Date: Tue, 04 Aug 2015 16:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2b08c5cd8103817f25f76f585a881295fd56c2cd Author: Ian Jackson AuthorDate: Wed Jul 29 16:34:09 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jul 29 16:34:09 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 96f7a62..5f4f162 100644 --- a/Config.mk +++ b/Config.mk @@ -246,9 +246,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.4.3-rc1 -# Sun May 24 10:53:44 2015 +0200 -# pcnet: force the buffer access to be in bounds during tx +QEMU_TAG ?= 30c002bffcd6287a7d5bb4e2c691b101c0937013 +# Wed Jun 3 14:41:27 2015 +0200 +# ide: Clear DRQ after handling all expected accesses # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 04 16:11:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 04 Aug 2015 16:11:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZMeo5-0001xk-5O; Tue, 04 Aug 2015 16:11:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZMeo3-0001xa-Hv for xen-changelog@lists.xensource.com; Tue, 04 Aug 2015 16:11:11 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 17/58-06179-E14E0C55; Tue, 04 Aug 2015 16:11:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1438704665!21662447!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12189 invoked from network); 4 Aug 2015 16:11:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 4 Aug 2015 16:11:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZMenx-0001tq-D2 for xen-changelog@lists.xensource.com; Tue, 04 Aug 2015 16:11:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZMenv-0005cb-KS for xen-changelog@lists.xensource.com; Tue, 04 Aug 2015 16:11:03 +0000 Date: Tue, 04 Aug 2015 16:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2b08c5cd8103817f25f76f585a881295fd56c2cd Author: Ian Jackson AuthorDate: Wed Jul 29 16:34:09 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jul 29 16:34:09 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 96f7a62..5f4f162 100644 --- a/Config.mk +++ b/Config.mk @@ -246,9 +246,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.4.3-rc1 -# Sun May 24 10:53:44 2015 +0200 -# pcnet: force the buffer access to be in bounds during tx +QEMU_TAG ?= 30c002bffcd6287a7d5bb4e2c691b101c0937013 +# Wed Jun 3 14:41:27 2015 +0200 +# ide: Clear DRQ after handling all expected accesses # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 04 16:11:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 04 Aug 2015 16:11:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZMeoC-0001yh-7h; Tue, 04 Aug 2015 16:11:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZMeoA-0001yR-Qs for xen-changelog@lists.xensource.com; Tue, 04 Aug 2015 16:11:19 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 2E/87-00536-624E0C55; Tue, 04 Aug 2015 16:11:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1438704676!32239614!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18542 invoked from network); 4 Aug 2015 16:11:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 4 Aug 2015 16:11:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZMeo8-0001tu-0w for xen-changelog@lists.xensource.com; Tue, 04 Aug 2015 16:11:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZMeo7-0005dg-I0 for xen-changelog@lists.xensource.com; Tue, 04 Aug 2015 16:11:15 +0000 Date: Tue, 04 Aug 2015 16:11:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] xl: Sane handling of extra config file arguments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 214fd40a20fa5988b4ea021c2d06e8aca8dda184 Author: Ian Jackson AuthorDate: Mon Jun 15 14:50:42 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jul 29 16:40:05 2015 +0100 xl: Sane handling of extra config file arguments Various xl sub-commands take additional parameters containing = as additional config fragments. The handling of these config fragments has a number of bugs: 1. Use of a static 1024-byte buffer. (If truncation would occur, with semi-trusted input, a security risk arises due to quotes being lost.) 2. Mishandling of the return value from snprintf, so that if truncation occurs, the to-write pointer is updated with the wanted-to-write length, resulting in stack corruption. (This is XSA-137.) 3. Clone-and-hack of the code for constructing the appended config file. These are fixed here, by introducing a new function `string_realloc_append' and using it everywhere. The `extra_info' buffers are replaced by pointers, which start off NULL and are explicitly freed on all return paths. The separate variable which will become dom_info.extra_config is abolished (which involves moving the clearing of dom_info). Additional bugs I observe, not fixed here: 4. The functions which now call string_realloc_append use ad-hoc error returns, with multiple calls to `return'. This currently necessitates multiple new calls to `free'. 5. Many of the paths in xl call exit(-rc) where rc is a libxl status code. This is a ridiculous exit status `convention'. 6. The loops for handling extra config data are clone-and-hacks. 7. Once the extra config buffer is accumulated, it must be combined with the appropriate main config file. The code to do this combining is clone-and-hacked too. Signed-off-by: Ian Jackson Tested-by: Ian Jackson Acked-by: Ian Campbell (cherry picked from commit dd84604f35bd3855c57146eb8fe53924c10d3963) (cherry picked from commit 6040b3aeb32b4bce2d9958ecbcbd020c46c35d61) --- tools/libxl/xl_cmdimpl.c | 64 ++++++++++++++++++++++++++++----------------- 1 files changed, 40 insertions(+), 24 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index d1c45e4..f5c8656 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -151,7 +151,7 @@ struct domain_create { int console_autoconnect; int checkpointed_stream; const char *config_file; - const char *extra_config; /* extra config string */ + char *extra_config; /* extra config string */ const char *restore_file; int migrate_fd; /* -1 means none */ char **migration_domname_r; /* from malloc */ @@ -4319,11 +4319,25 @@ int main_vm_list(int argc, char **argv) return 0; } +static void string_realloc_append(char **accumulate, const char *more) +{ + /* Appends more to accumulate. Accumulate is either NULL, or + * points (always) to a malloc'd nul-terminated string. */ + + size_t oldlen = *accumulate ? strlen(*accumulate) : 0; + size_t morelen = strlen(more) + 1/*nul*/; + if (oldlen > SSIZE_MAX || morelen > SSIZE_MAX - oldlen) { + fprintf(stderr,"Additional config data far too large\n"); + exit(-ERROR_FAIL); + } + + *accumulate = xrealloc(*accumulate, oldlen + morelen); + memcpy(*accumulate + oldlen, more, morelen); +} + int main_create(int argc, char **argv) { const char *filename = NULL; - char *p; - char extra_config[1024]; struct domain_create dom_info; int paused = 0, debug = 0, daemonize = 1, console_autoconnect = 0, quiet = 0, monitor = 1, vnc = 0, vncautopass = 0; @@ -4338,6 +4352,8 @@ int main_create(int argc, char **argv) {0, 0, 0, 0} }; + dom_info.extra_config = NULL; + if (argv[1] && argv[1][0] != '-' && !strchr(argv[1], '=')) { filename = argv[1]; argc--; argv++; @@ -4377,20 +4393,21 @@ int main_create(int argc, char **argv) break; } - extra_config[0] = '\0'; - for (p = extra_config; optind < argc; optind++) { + memset(&dom_info, 0, sizeof(dom_info)); + + for (; optind < argc; optind++) { if (strchr(argv[optind], '=') != NULL) { - p += snprintf(p, sizeof(extra_config) - (p - extra_config), - "%s\n", argv[optind]); + string_realloc_append(&dom_info.extra_config, argv[optind]); + string_realloc_append(&dom_info.extra_config, "\n"); } else if (!filename) { filename = argv[optind]; } else { help("create"); + free(dom_info.extra_config); return 2; } } - memset(&dom_info, 0, sizeof(dom_info)); dom_info.debug = debug; dom_info.daemonize = daemonize; dom_info.monitor = monitor; @@ -4398,16 +4415,18 @@ int main_create(int argc, char **argv) dom_info.dryrun = dryrun_only; dom_info.quiet = quiet; dom_info.config_file = filename; - dom_info.extra_config = extra_config; dom_info.migrate_fd = -1; dom_info.vnc = vnc; dom_info.vncautopass = vncautopass; dom_info.console_autoconnect = console_autoconnect; rc = create_domain(&dom_info); - if (rc < 0) + if (rc < 0) { + free(dom_info.extra_config); return -rc; + } + free(dom_info.extra_config); return 0; } @@ -4415,8 +4434,7 @@ int main_config_update(int argc, char **argv) { uint32_t domid; const char *filename = NULL; - char *p; - char extra_config[1024]; + char *extra_config = NULL; void *config_data = 0; int config_len = 0; libxl_domain_config d_config; @@ -4451,15 +4469,15 @@ int main_config_update(int argc, char **argv) break; } - extra_config[0] = '\0'; - for (p = extra_config; optind < argc; optind++) { + for (; optind < argc; optind++) { if (strchr(argv[optind], '=') != NULL) { - p += snprintf(p, sizeof(extra_config) - (p - extra_config), - "%s\n", argv[optind]); + string_realloc_append(&extra_config, argv[optind]); + string_realloc_append(&extra_config, "\n"); } else if (!filename) { filename = argv[optind]; } else { help("create"); + free(extra_config); return 2; } } @@ -4468,7 +4486,8 @@ int main_config_update(int argc, char **argv) rc = libxl_read_file_contents(ctx, filename, &config_data, &config_len); if (rc) { fprintf(stderr, "Failed to read config file: %s: %s\n", - filename, strerror(errno)); return ERROR_FAIL; } + filename, strerror(errno)); + free(extra_config); return ERROR_FAIL; } if (strlen(extra_config)) { if (config_len > INT_MAX - (strlen(extra_config) + 2 + 1)) { fprintf(stderr, "Failed to attach extra configration\n"); @@ -4509,7 +4528,7 @@ int main_config_update(int argc, char **argv) libxl_domain_config_dispose(&d_config); free(config_data); - + free(extra_config); return 0; } @@ -6558,7 +6577,7 @@ int main_cpupoolcreate(int argc, char **argv) { const char *filename = NULL, *config_src=NULL; const char *p; - char extra_config[1024]; + char *extra_config = NULL; int opt; static struct option opts[] = { {"defconfig", 1, 0, 'f'}, @@ -6592,13 +6611,10 @@ int main_cpupoolcreate(int argc, char **argv) break; } - memset(extra_config, 0, sizeof(extra_config)); while (optind < argc) { if ((p = strchr(argv[optind], '='))) { - if (strlen(extra_config) + 1 + strlen(argv[optind]) < sizeof(extra_config)) { - strcat(extra_config, "\n"); - strcat(extra_config, argv[optind]); - } + string_realloc_append(&extra_config, "\n"); + string_realloc_append(&extra_config, argv[optind]); } else if (!filename) { filename = argv[optind]; } else { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 04 16:11:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 04 Aug 2015 16:11:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZMeoC-0001yh-7h; Tue, 04 Aug 2015 16:11:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZMeoA-0001yR-Qs for xen-changelog@lists.xensource.com; Tue, 04 Aug 2015 16:11:19 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 2E/87-00536-624E0C55; Tue, 04 Aug 2015 16:11:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1438704676!32239614!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18542 invoked from network); 4 Aug 2015 16:11:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 4 Aug 2015 16:11:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZMeo8-0001tu-0w for xen-changelog@lists.xensource.com; Tue, 04 Aug 2015 16:11:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZMeo7-0005dg-I0 for xen-changelog@lists.xensource.com; Tue, 04 Aug 2015 16:11:15 +0000 Date: Tue, 04 Aug 2015 16:11:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] xl: Sane handling of extra config file arguments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 214fd40a20fa5988b4ea021c2d06e8aca8dda184 Author: Ian Jackson AuthorDate: Mon Jun 15 14:50:42 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jul 29 16:40:05 2015 +0100 xl: Sane handling of extra config file arguments Various xl sub-commands take additional parameters containing = as additional config fragments. The handling of these config fragments has a number of bugs: 1. Use of a static 1024-byte buffer. (If truncation would occur, with semi-trusted input, a security risk arises due to quotes being lost.) 2. Mishandling of the return value from snprintf, so that if truncation occurs, the to-write pointer is updated with the wanted-to-write length, resulting in stack corruption. (This is XSA-137.) 3. Clone-and-hack of the code for constructing the appended config file. These are fixed here, by introducing a new function `string_realloc_append' and using it everywhere. The `extra_info' buffers are replaced by pointers, which start off NULL and are explicitly freed on all return paths. The separate variable which will become dom_info.extra_config is abolished (which involves moving the clearing of dom_info). Additional bugs I observe, not fixed here: 4. The functions which now call string_realloc_append use ad-hoc error returns, with multiple calls to `return'. This currently necessitates multiple new calls to `free'. 5. Many of the paths in xl call exit(-rc) where rc is a libxl status code. This is a ridiculous exit status `convention'. 6. The loops for handling extra config data are clone-and-hacks. 7. Once the extra config buffer is accumulated, it must be combined with the appropriate main config file. The code to do this combining is clone-and-hacked too. Signed-off-by: Ian Jackson Tested-by: Ian Jackson Acked-by: Ian Campbell (cherry picked from commit dd84604f35bd3855c57146eb8fe53924c10d3963) (cherry picked from commit 6040b3aeb32b4bce2d9958ecbcbd020c46c35d61) --- tools/libxl/xl_cmdimpl.c | 64 ++++++++++++++++++++++++++++----------------- 1 files changed, 40 insertions(+), 24 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index d1c45e4..f5c8656 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -151,7 +151,7 @@ struct domain_create { int console_autoconnect; int checkpointed_stream; const char *config_file; - const char *extra_config; /* extra config string */ + char *extra_config; /* extra config string */ const char *restore_file; int migrate_fd; /* -1 means none */ char **migration_domname_r; /* from malloc */ @@ -4319,11 +4319,25 @@ int main_vm_list(int argc, char **argv) return 0; } +static void string_realloc_append(char **accumulate, const char *more) +{ + /* Appends more to accumulate. Accumulate is either NULL, or + * points (always) to a malloc'd nul-terminated string. */ + + size_t oldlen = *accumulate ? strlen(*accumulate) : 0; + size_t morelen = strlen(more) + 1/*nul*/; + if (oldlen > SSIZE_MAX || morelen > SSIZE_MAX - oldlen) { + fprintf(stderr,"Additional config data far too large\n"); + exit(-ERROR_FAIL); + } + + *accumulate = xrealloc(*accumulate, oldlen + morelen); + memcpy(*accumulate + oldlen, more, morelen); +} + int main_create(int argc, char **argv) { const char *filename = NULL; - char *p; - char extra_config[1024]; struct domain_create dom_info; int paused = 0, debug = 0, daemonize = 1, console_autoconnect = 0, quiet = 0, monitor = 1, vnc = 0, vncautopass = 0; @@ -4338,6 +4352,8 @@ int main_create(int argc, char **argv) {0, 0, 0, 0} }; + dom_info.extra_config = NULL; + if (argv[1] && argv[1][0] != '-' && !strchr(argv[1], '=')) { filename = argv[1]; argc--; argv++; @@ -4377,20 +4393,21 @@ int main_create(int argc, char **argv) break; } - extra_config[0] = '\0'; - for (p = extra_config; optind < argc; optind++) { + memset(&dom_info, 0, sizeof(dom_info)); + + for (; optind < argc; optind++) { if (strchr(argv[optind], '=') != NULL) { - p += snprintf(p, sizeof(extra_config) - (p - extra_config), - "%s\n", argv[optind]); + string_realloc_append(&dom_info.extra_config, argv[optind]); + string_realloc_append(&dom_info.extra_config, "\n"); } else if (!filename) { filename = argv[optind]; } else { help("create"); + free(dom_info.extra_config); return 2; } } - memset(&dom_info, 0, sizeof(dom_info)); dom_info.debug = debug; dom_info.daemonize = daemonize; dom_info.monitor = monitor; @@ -4398,16 +4415,18 @@ int main_create(int argc, char **argv) dom_info.dryrun = dryrun_only; dom_info.quiet = quiet; dom_info.config_file = filename; - dom_info.extra_config = extra_config; dom_info.migrate_fd = -1; dom_info.vnc = vnc; dom_info.vncautopass = vncautopass; dom_info.console_autoconnect = console_autoconnect; rc = create_domain(&dom_info); - if (rc < 0) + if (rc < 0) { + free(dom_info.extra_config); return -rc; + } + free(dom_info.extra_config); return 0; } @@ -4415,8 +4434,7 @@ int main_config_update(int argc, char **argv) { uint32_t domid; const char *filename = NULL; - char *p; - char extra_config[1024]; + char *extra_config = NULL; void *config_data = 0; int config_len = 0; libxl_domain_config d_config; @@ -4451,15 +4469,15 @@ int main_config_update(int argc, char **argv) break; } - extra_config[0] = '\0'; - for (p = extra_config; optind < argc; optind++) { + for (; optind < argc; optind++) { if (strchr(argv[optind], '=') != NULL) { - p += snprintf(p, sizeof(extra_config) - (p - extra_config), - "%s\n", argv[optind]); + string_realloc_append(&extra_config, argv[optind]); + string_realloc_append(&extra_config, "\n"); } else if (!filename) { filename = argv[optind]; } else { help("create"); + free(extra_config); return 2; } } @@ -4468,7 +4486,8 @@ int main_config_update(int argc, char **argv) rc = libxl_read_file_contents(ctx, filename, &config_data, &config_len); if (rc) { fprintf(stderr, "Failed to read config file: %s: %s\n", - filename, strerror(errno)); return ERROR_FAIL; } + filename, strerror(errno)); + free(extra_config); return ERROR_FAIL; } if (strlen(extra_config)) { if (config_len > INT_MAX - (strlen(extra_config) + 2 + 1)) { fprintf(stderr, "Failed to attach extra configration\n"); @@ -4509,7 +4528,7 @@ int main_config_update(int argc, char **argv) libxl_domain_config_dispose(&d_config); free(config_data); - + free(extra_config); return 0; } @@ -6558,7 +6577,7 @@ int main_cpupoolcreate(int argc, char **argv) { const char *filename = NULL, *config_src=NULL; const char *p; - char extra_config[1024]; + char *extra_config = NULL; int opt; static struct option opts[] = { {"defconfig", 1, 0, 'f'}, @@ -6592,13 +6611,10 @@ int main_cpupoolcreate(int argc, char **argv) break; } - memset(extra_config, 0, sizeof(extra_config)); while (optind < argc) { if ((p = strchr(argv[optind], '='))) { - if (strlen(extra_config) + 1 + strlen(argv[optind]) < sizeof(extra_config)) { - strcat(extra_config, "\n"); - strcat(extra_config, argv[optind]); - } + string_realloc_append(&extra_config, "\n"); + string_realloc_append(&extra_config, argv[optind]); } else if (!filename) { filename = argv[optind]; } else { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 05 10:55:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Aug 2015 10:55:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZMwLn-0006G2-66; Wed, 05 Aug 2015 10:55:11 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZMwLh-0006Fk-0b for xen-changelog@lists.xensource.com; Wed, 05 Aug 2015 10:55:09 +0000 Content-Length: 6513 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id B7/7B-12371-88BE1C55; Wed, 05 Aug 2015 10:55:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1438772102!38084865!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14537 invoked from network); 5 Aug 2015 10:55:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 5 Aug 2015 10:55:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZMwLe-0004fR-5e for xen-changelog@lists.xensource.com; Wed, 05 Aug 2015 10:55:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZMwLe-0007ln-48 for xen-changelog@lists.xensource.com; Wed, 05 Aug 2015 10:55:02 +0000 Date: Wed, 05 Aug 2015 10:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: don't rely on shared ioreq state for completion handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5902929283543746524==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5902929283543746524== Content-Length: 6217 Content-Transfer-Encoding: quoted-printable commit 480b83162a12520466d3933b0bea18aa43344d11 Author: Paul Durrant AuthorDate: Fri Jul 31 16:34:22 2015 +0100 Commit: Ian Campbell CommitDate: Mon Aug 3 10:17:32 2015 +0100 x86/hvm: don't rely on shared ioreq state for completion handling Both hvm_io_pending() and hvm_wait_for_io() use the shared (with emulator) ioreq structure to determined whether there is a pending I/O. The latter will misbehave if the shared state is driven to STATE_IOREQ_NONE by the emulator, or when the shared ioreq page is cleared for re-insertion into the guest P2M when the ioreq server is disabled (STATE_IOREQ_NONE =3D=3D 0) because it will terminate its wait without calling hvm_io_assist() to adjust Xen's internal I/O emulation state. This may then lead to an io completion handler finding incorrect internal emulation state and calling domain_crash(). This patch fixes the problem by adding a pending flag to the ioreq server's per-vcpu structure which cannot be directly manipulated by the emulator and thus can be used to determine whether an I/O is actually pending for that vcpu on that ioreq server. If an I/O is pending and the shared state is seen to go to STATE_IOREQ_NONE then it can be treated as an abnormal completion of emulation (hence the data placed in the shared structure is not used) and the internal state is adjusted as for a normal completion. Thus, when a completion handler subsequently runs, the internal state is as expected and domain_crash() will not be called. Signed-off-by: Paul Durrant Reported-by: Sander Eikelenboom Tested-by: Roger Pau Monn=C3=A9 Cc: Keir Fraser Cc: Jan Beulich Cc: Andrew Cooper Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/hvm.c | 46 +++++++++++++++++++++++++------------ xen/include/asm-x86/hvm/domain.h | 1 + 2 files changed, 32 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 0ca45e6..c957610 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -411,44 +411,57 @@ bool_t hvm_io_pending(struct vcpu *v) &d->arch.hvm_domain.ioreq_server.list, list_entry ) { - ioreq_t *p =3D get_ioreq(s, v); + struct hvm_ioreq_vcpu *sv; - if ( p->state !=3D STATE_IOREQ_NONE ) - return 1; + list_for_each_entry ( sv, + &s->ioreq_vcpu_list, + list_entry ) + { + if ( sv->vcpu =3D=3D v && sv->pending ) + return 1; + } } return 0; } -static void hvm_io_assist(ioreq_t *p) +static void hvm_io_assist(struct hvm_ioreq_vcpu *sv, uint64_t data) { - struct vcpu *curr =3D current; - struct hvm_vcpu_io *vio =3D &curr->arch.hvm_vcpu.hvm_io; - - p->state =3D STATE_IOREQ_NONE; + struct vcpu *v =3D sv->vcpu; + struct hvm_vcpu_io *vio =3D &v->arch.hvm_vcpu.hvm_io; if ( hvm_vcpu_io_need_completion(vio) ) { vio->io_req.state =3D STATE_IORESP_READY; - vio->io_req.data =3D p->data; + vio->io_req.data =3D data; } else vio->io_req.state =3D STATE_IOREQ_NONE; - msix_write_completion(curr); - vcpu_end_shutdown_deferral(curr); + msix_write_completion(v); + vcpu_end_shutdown_deferral(v); + + sv->pending =3D 0; } static bool_t hvm_wait_for_io(struct hvm_ioreq_vcpu *sv, ioreq_t *p) { - /* NB. Optimised for common case (p->state =3D=3D STATE_IOREQ_NONE). */ - while ( p->state !=3D STATE_IOREQ_NONE ) + while ( sv->pending ) { switch ( p->state ) { + case STATE_IOREQ_NONE: + /* + * The only reason we should see this case is when an + * emulator is dying and it races with an I/O being + * requested. + */ + hvm_io_assist(sv, ~0ul); + break; case STATE_IORESP_READY: /* IORESP_READY -> NONE */ rmb(); /* see IORESP_READY /then/ read contents of ioreq */ - hvm_io_assist(p); + p->state =3D STATE_IOREQ_NONE; + hvm_io_assist(sv, p->data); break; case STATE_IOREQ_READY: /* IOREQ_{READY,INPROCESS} -> IORESP_READY */ case STATE_IOREQ_INPROCESS: @@ -458,6 +471,7 @@ static bool_t hvm_wait_for_io(struct hvm_ioreq_vcpu *sv, ioreq_t *p) break; default: gdprintk(XENLOG_ERR, "Weird HVM iorequest state %d.\n", p->state); + sv->pending =3D 0; domain_crash(sv->vcpu->domain); return 0; /* bail */ } @@ -488,7 +502,7 @@ void hvm_do_resume(struct vcpu *v) &s->ioreq_vcpu_list, list_entry ) { - if ( sv->vcpu =3D=3D v ) + if ( sv->vcpu =3D=3D v && sv->pending ) { if ( !hvm_wait_for_io(sv, get_ioreq(s, v)) ) return; @@ -2744,6 +2758,8 @@ int hvm_send_ioreq(struct hvm_ioreq_server *s, ioreq_t *proto_p, */ p->state =3D STATE_IOREQ_READY; notify_via_xen_event_channel(d, port); + + sv->pending =3D 1; return X86EMUL_RETRY; } } diff --git a/xen/include/asm-x86/hvm/domain.h b/xen/include/asm-x86/hvm/domain.h index 4c1c061..992d5d1 100644 --- a/xen/include/asm-x86/hvm/domain.h +++ b/xen/include/asm-x86/hvm/domain.h @@ -45,6 +45,7 @@ struct hvm_ioreq_vcpu { struct list_head list_entry; struct vcpu *vcpu; evtchn_port_t ioreq_evtchn; + bool_t pending; }; #define NR_IO_RANGE_TYPES (HVMOP_IO_RANGE_PCI + 1) -- generated by git-patchbot for /home/xen/git/xen.git#master --===============5902929283543746524== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============5902929283543746524==-- From xen-changelog-bounces@lists.xen.org Wed Aug 05 10:55:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Aug 2015 10:55:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZMwLn-0006G2-66; Wed, 05 Aug 2015 10:55:11 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZMwLh-0006Fk-0b for xen-changelog@lists.xensource.com; Wed, 05 Aug 2015 10:55:09 +0000 Content-Length: 6513 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id B7/7B-12371-88BE1C55; Wed, 05 Aug 2015 10:55:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1438772102!38084865!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14537 invoked from network); 5 Aug 2015 10:55:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 5 Aug 2015 10:55:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZMwLe-0004fR-5e for xen-changelog@lists.xensource.com; Wed, 05 Aug 2015 10:55:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZMwLe-0007ln-48 for xen-changelog@lists.xensource.com; Wed, 05 Aug 2015 10:55:02 +0000 Date: Wed, 05 Aug 2015 10:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: don't rely on shared ioreq state for completion handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5902929283543746524==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5902929283543746524== Content-Length: 6217 Content-Transfer-Encoding: quoted-printable commit 480b83162a12520466d3933b0bea18aa43344d11 Author: Paul Durrant AuthorDate: Fri Jul 31 16:34:22 2015 +0100 Commit: Ian Campbell CommitDate: Mon Aug 3 10:17:32 2015 +0100 x86/hvm: don't rely on shared ioreq state for completion handling Both hvm_io_pending() and hvm_wait_for_io() use the shared (with emulator) ioreq structure to determined whether there is a pending I/O. The latter will misbehave if the shared state is driven to STATE_IOREQ_NONE by the emulator, or when the shared ioreq page is cleared for re-insertion into the guest P2M when the ioreq server is disabled (STATE_IOREQ_NONE =3D=3D 0) because it will terminate its wait without calling hvm_io_assist() to adjust Xen's internal I/O emulation state. This may then lead to an io completion handler finding incorrect internal emulation state and calling domain_crash(). This patch fixes the problem by adding a pending flag to the ioreq server's per-vcpu structure which cannot be directly manipulated by the emulator and thus can be used to determine whether an I/O is actually pending for that vcpu on that ioreq server. If an I/O is pending and the shared state is seen to go to STATE_IOREQ_NONE then it can be treated as an abnormal completion of emulation (hence the data placed in the shared structure is not used) and the internal state is adjusted as for a normal completion. Thus, when a completion handler subsequently runs, the internal state is as expected and domain_crash() will not be called. Signed-off-by: Paul Durrant Reported-by: Sander Eikelenboom Tested-by: Roger Pau Monn=C3=A9 Cc: Keir Fraser Cc: Jan Beulich Cc: Andrew Cooper Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/hvm.c | 46 +++++++++++++++++++++++++------------ xen/include/asm-x86/hvm/domain.h | 1 + 2 files changed, 32 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 0ca45e6..c957610 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -411,44 +411,57 @@ bool_t hvm_io_pending(struct vcpu *v) &d->arch.hvm_domain.ioreq_server.list, list_entry ) { - ioreq_t *p =3D get_ioreq(s, v); + struct hvm_ioreq_vcpu *sv; - if ( p->state !=3D STATE_IOREQ_NONE ) - return 1; + list_for_each_entry ( sv, + &s->ioreq_vcpu_list, + list_entry ) + { + if ( sv->vcpu =3D=3D v && sv->pending ) + return 1; + } } return 0; } -static void hvm_io_assist(ioreq_t *p) +static void hvm_io_assist(struct hvm_ioreq_vcpu *sv, uint64_t data) { - struct vcpu *curr =3D current; - struct hvm_vcpu_io *vio =3D &curr->arch.hvm_vcpu.hvm_io; - - p->state =3D STATE_IOREQ_NONE; + struct vcpu *v =3D sv->vcpu; + struct hvm_vcpu_io *vio =3D &v->arch.hvm_vcpu.hvm_io; if ( hvm_vcpu_io_need_completion(vio) ) { vio->io_req.state =3D STATE_IORESP_READY; - vio->io_req.data =3D p->data; + vio->io_req.data =3D data; } else vio->io_req.state =3D STATE_IOREQ_NONE; - msix_write_completion(curr); - vcpu_end_shutdown_deferral(curr); + msix_write_completion(v); + vcpu_end_shutdown_deferral(v); + + sv->pending =3D 0; } static bool_t hvm_wait_for_io(struct hvm_ioreq_vcpu *sv, ioreq_t *p) { - /* NB. Optimised for common case (p->state =3D=3D STATE_IOREQ_NONE). */ - while ( p->state !=3D STATE_IOREQ_NONE ) + while ( sv->pending ) { switch ( p->state ) { + case STATE_IOREQ_NONE: + /* + * The only reason we should see this case is when an + * emulator is dying and it races with an I/O being + * requested. + */ + hvm_io_assist(sv, ~0ul); + break; case STATE_IORESP_READY: /* IORESP_READY -> NONE */ rmb(); /* see IORESP_READY /then/ read contents of ioreq */ - hvm_io_assist(p); + p->state =3D STATE_IOREQ_NONE; + hvm_io_assist(sv, p->data); break; case STATE_IOREQ_READY: /* IOREQ_{READY,INPROCESS} -> IORESP_READY */ case STATE_IOREQ_INPROCESS: @@ -458,6 +471,7 @@ static bool_t hvm_wait_for_io(struct hvm_ioreq_vcpu *sv, ioreq_t *p) break; default: gdprintk(XENLOG_ERR, "Weird HVM iorequest state %d.\n", p->state); + sv->pending =3D 0; domain_crash(sv->vcpu->domain); return 0; /* bail */ } @@ -488,7 +502,7 @@ void hvm_do_resume(struct vcpu *v) &s->ioreq_vcpu_list, list_entry ) { - if ( sv->vcpu =3D=3D v ) + if ( sv->vcpu =3D=3D v && sv->pending ) { if ( !hvm_wait_for_io(sv, get_ioreq(s, v)) ) return; @@ -2744,6 +2758,8 @@ int hvm_send_ioreq(struct hvm_ioreq_server *s, ioreq_t *proto_p, */ p->state =3D STATE_IOREQ_READY; notify_via_xen_event_channel(d, port); + + sv->pending =3D 1; return X86EMUL_RETRY; } } diff --git a/xen/include/asm-x86/hvm/domain.h b/xen/include/asm-x86/hvm/domain.h index 4c1c061..992d5d1 100644 --- a/xen/include/asm-x86/hvm/domain.h +++ b/xen/include/asm-x86/hvm/domain.h @@ -45,6 +45,7 @@ struct hvm_ioreq_vcpu { struct list_head list_entry; struct vcpu *vcpu; evtchn_port_t ioreq_evtchn; + bool_t pending; }; #define NR_IO_RANGE_TYPES (HVMOP_IO_RANGE_PCI + 1) -- generated by git-patchbot for /home/xen/git/xen.git#master --===============5902929283543746524== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============5902929283543746524==-- From xen-changelog-bounces@lists.xen.org Fri Aug 07 12:22:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 12:22:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgf1-0004NO-5v; Fri, 07 Aug 2015 12:22:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgf0-0004NH-9t for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:22:06 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id 30/27-18886-DE2A4C55; Fri, 07 Aug 2015 12:22:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1438950124!27400451!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10358 invoked from network); 7 Aug 2015 12:22:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 12:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgex-00029w-Qv for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNgex-0004Hi-OP for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:22:03 +0000 Date: Fri, 07 Aug 2015 12:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: remove stray declaration of libxl__hotplug_settings X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6ae35286aca73b93a3f10018795b63c17ec2b2ea Author: Wei Liu AuthorDate: Tue Aug 4 11:16:32 2015 +0100 Commit: Ian Campbell CommitDate: Wed Aug 5 10:31:40 2015 +0100 libxl: remove stray declaration of libxl__hotplug_settings That function was removed in 2ba368d1 ("libxl: Remove linux udev rules") Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl_internal.h | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 911de2d..2771c71 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1921,9 +1921,6 @@ _hidden char *libxl__device_model_xs_path(libxl__gc *gc, uint32_t dm_domid, uint32_t domid, const char *format, ...) PRINTF_ATTRIBUTE(4, 5); -/* Check how executes hotplug script currently */ -int libxl__hotplug_settings(libxl__gc *gc, xs_transaction_t t); - /* * Calling context and GC for event-generating functions: * -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 07 12:22:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 12:22:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgf1-0004NO-5v; Fri, 07 Aug 2015 12:22:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgf0-0004NH-9t for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:22:06 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id 30/27-18886-DE2A4C55; Fri, 07 Aug 2015 12:22:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1438950124!27400451!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10358 invoked from network); 7 Aug 2015 12:22:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 12:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgex-00029w-Qv for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNgex-0004Hi-OP for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:22:03 +0000 Date: Fri, 07 Aug 2015 12:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: remove stray declaration of libxl__hotplug_settings X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6ae35286aca73b93a3f10018795b63c17ec2b2ea Author: Wei Liu AuthorDate: Tue Aug 4 11:16:32 2015 +0100 Commit: Ian Campbell CommitDate: Wed Aug 5 10:31:40 2015 +0100 libxl: remove stray declaration of libxl__hotplug_settings That function was removed in 2ba368d1 ("libxl: Remove linux udev rules") Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl_internal.h | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 911de2d..2771c71 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1921,9 +1921,6 @@ _hidden char *libxl__device_model_xs_path(libxl__gc *gc, uint32_t dm_domid, uint32_t domid, const char *format, ...) PRINTF_ATTRIBUTE(4, 5); -/* Check how executes hotplug script currently */ -int libxl__hotplug_settings(libxl__gc *gc, xs_transaction_t t); - /* * Calling context and GC for event-generating functions: * -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 07 12:22:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 12:22:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgfD-0004OJ-8Q; Fri, 07 Aug 2015 12:22:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgfB-0004OC-SV for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:22:17 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 59/37-01753-9F2A4C55; Fri, 07 Aug 2015 12:22:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1438950135!33308816!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25598 invoked from network); 7 Aug 2015 12:22:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 12:22:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgf8-0002A4-VH for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNgf7-0004IG-Vc for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:22:14 +0000 Date: Fri, 07 Aug 2015 12:22:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/gdt: Drop write-only, xalloc()'d array from set_gdt() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a7bd9b1661304500cd18b7d216d616ecf053ebdb Author: Andrew Cooper AuthorDate: Mon Aug 3 18:05:43 2015 +0100 Commit: Ian Campbell CommitDate: Wed Aug 5 10:32:45 2015 +0100 x86/gdt: Drop write-only, xalloc()'d array from set_gdt() It is not used, and can cause a spurious failure of the set_gdt() hypercall in low memory situations. Signed-off-by: Andrew Cooper Reviewed-by: Wei Liu Reviewed-by: Ian Campbell Reviewed-by: George Dunlap --- xen/arch/x86/mm.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 63aa666..4b76587 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -4439,20 +4439,15 @@ long set_gdt(struct vcpu *v, l1_pgentry_t *pl1e; /* NB. There are 512 8-byte entries per GDT page. */ int i, nr_pages = (entries + 511) / 512; - unsigned long *pfns; if ( entries > FIRST_RESERVED_GDT_ENTRY ) return -EINVAL; - pfns = xmalloc_array(unsigned long, nr_pages); - if ( !pfns ) - return -ENOMEM; - /* Check the pages in the new GDT. */ for ( i = 0; i < nr_pages; i++ ) { struct page_info *page; - pfns[i] = frames[i]; + page = get_page_from_gfn(d, frames[i], NULL, P2M_ALLOC); if ( !page ) goto fail; @@ -4476,7 +4471,6 @@ long set_gdt(struct vcpu *v, l1e_write(&pl1e[i], l1e_from_pfn(frames[i], __PAGE_HYPERVISOR_RW)); } - xfree(pfns); return 0; fail: @@ -4484,7 +4478,6 @@ long set_gdt(struct vcpu *v, { put_page_and_type(mfn_to_page(frames[i])); } - xfree(pfns); return -EINVAL; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 07 12:22:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 12:22:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgfD-0004OJ-8Q; Fri, 07 Aug 2015 12:22:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgfB-0004OC-SV for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:22:17 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 59/37-01753-9F2A4C55; Fri, 07 Aug 2015 12:22:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1438950135!33308816!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25598 invoked from network); 7 Aug 2015 12:22:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 12:22:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgf8-0002A4-VH for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNgf7-0004IG-Vc for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:22:14 +0000 Date: Fri, 07 Aug 2015 12:22:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/gdt: Drop write-only, xalloc()'d array from set_gdt() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a7bd9b1661304500cd18b7d216d616ecf053ebdb Author: Andrew Cooper AuthorDate: Mon Aug 3 18:05:43 2015 +0100 Commit: Ian Campbell CommitDate: Wed Aug 5 10:32:45 2015 +0100 x86/gdt: Drop write-only, xalloc()'d array from set_gdt() It is not used, and can cause a spurious failure of the set_gdt() hypercall in low memory situations. Signed-off-by: Andrew Cooper Reviewed-by: Wei Liu Reviewed-by: Ian Campbell Reviewed-by: George Dunlap --- xen/arch/x86/mm.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 63aa666..4b76587 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -4439,20 +4439,15 @@ long set_gdt(struct vcpu *v, l1_pgentry_t *pl1e; /* NB. There are 512 8-byte entries per GDT page. */ int i, nr_pages = (entries + 511) / 512; - unsigned long *pfns; if ( entries > FIRST_RESERVED_GDT_ENTRY ) return -EINVAL; - pfns = xmalloc_array(unsigned long, nr_pages); - if ( !pfns ) - return -ENOMEM; - /* Check the pages in the new GDT. */ for ( i = 0; i < nr_pages; i++ ) { struct page_info *page; - pfns[i] = frames[i]; + page = get_page_from_gfn(d, frames[i], NULL, P2M_ALLOC); if ( !page ) goto fail; @@ -4476,7 +4471,6 @@ long set_gdt(struct vcpu *v, l1e_write(&pl1e[i], l1e_from_pfn(frames[i], __PAGE_HYPERVISOR_RW)); } - xfree(pfns); return 0; fail: @@ -4484,7 +4478,6 @@ long set_gdt(struct vcpu *v, { put_page_and_type(mfn_to_page(frames[i])); } - xfree(pfns); return -EINVAL; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 07 12:22:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 12:22:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgfM-0004PV-Au; Fri, 07 Aug 2015 12:22:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgfL-0004PO-Dj for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:22:27 +0000 Content-Length: 1906 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id AC/08-13905-203A4C55; Fri, 07 Aug 2015 12:22:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1438950145!26462926!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9073 invoked from network); 7 Aug 2015 12:22:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 12:22:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgfJ-0002AC-4V for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:22:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNgfJ-0004Ik-35 for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:22:25 +0000 Date: Fri, 07 Aug 2015 12:22:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: increase hotplug timeout to 40s X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5510686677972919294==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5510686677972919294== Content-Length: 1491 Content-Transfer-Encoding: quoted-printable commit 8928100064f6c8a5ba0c2e798172f123024631ba Author: Roger Pau Monne AuthorDate: Tue Aug 4 12:02:55 2015 +0200 Commit: Ian Campbell CommitDate: Wed Aug 5 10:39:40 2015 +0100 libxl: increase hotplug timeout to 40s The default libxl timeout for hotplug scripts execution is too low, when launching 40 HVM guests in parallel, all using the same file as disk, execution times of ~20s are expected. Increase the timeout to 40s in order to be sure hotplug scripts have enough time to execute. This is a short term solution. Reported-by: Konrad Rzeszutek Wilk Signed-off-by: Roger Pau Monn=C3=A9 Acked-by: Wei Liu --- tools/libxl/libxl_internal.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 2771c71..29e0429 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -86,7 +86,7 @@ #define LIBXL_INIT_TIMEOUT 10 #define LIBXL_DESTROY_TIMEOUT 10 -#define LIBXL_HOTPLUG_TIMEOUT 10 +#define LIBXL_HOTPLUG_TIMEOUT 40 /* QEMU may be slow to load and start due to a bug in Linux where the I/O * subsystem sometime produce high latency under load. */ #define LIBXL_DEVICE_MODEL_START_TIMEOUT 60 -- generated by git-patchbot for /home/xen/git/xen.git#master --===============5510686677972919294== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============5510686677972919294==-- From xen-changelog-bounces@lists.xen.org Fri Aug 07 12:22:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 12:22:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgfM-0004PV-Au; Fri, 07 Aug 2015 12:22:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgfL-0004PO-Dj for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:22:27 +0000 Content-Length: 1906 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id AC/08-13905-203A4C55; Fri, 07 Aug 2015 12:22:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1438950145!26462926!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9073 invoked from network); 7 Aug 2015 12:22:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 12:22:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgfJ-0002AC-4V for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:22:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNgfJ-0004Ik-35 for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:22:25 +0000 Date: Fri, 07 Aug 2015 12:22:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: increase hotplug timeout to 40s X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5510686677972919294==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5510686677972919294== Content-Length: 1491 Content-Transfer-Encoding: quoted-printable commit 8928100064f6c8a5ba0c2e798172f123024631ba Author: Roger Pau Monne AuthorDate: Tue Aug 4 12:02:55 2015 +0200 Commit: Ian Campbell CommitDate: Wed Aug 5 10:39:40 2015 +0100 libxl: increase hotplug timeout to 40s The default libxl timeout for hotplug scripts execution is too low, when launching 40 HVM guests in parallel, all using the same file as disk, execution times of ~20s are expected. Increase the timeout to 40s in order to be sure hotplug scripts have enough time to execute. This is a short term solution. Reported-by: Konrad Rzeszutek Wilk Signed-off-by: Roger Pau Monn=C3=A9 Acked-by: Wei Liu --- tools/libxl/libxl_internal.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 2771c71..29e0429 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -86,7 +86,7 @@ #define LIBXL_INIT_TIMEOUT 10 #define LIBXL_DESTROY_TIMEOUT 10 -#define LIBXL_HOTPLUG_TIMEOUT 10 +#define LIBXL_HOTPLUG_TIMEOUT 40 /* QEMU may be slow to load and start due to a bug in Linux where the I/O * subsystem sometime produce high latency under load. */ #define LIBXL_DEVICE_MODEL_START_TIMEOUT 60 -- generated by git-patchbot for /home/xen/git/xen.git#master --===============5510686677972919294== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============5510686677972919294==-- From xen-changelog-bounces@lists.xen.org Fri Aug 07 12:22:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 12:22:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgfX-0004Qp-Db; Fri, 07 Aug 2015 12:22:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgfV-0004Qc-Qy for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:22:37 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id B7/9A-03763-D03A4C55; Fri, 07 Aug 2015 12:22:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1438950155!33393325!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28212 invoked from network); 7 Aug 2015 12:22:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 12:22:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgfT-0002AK-9j for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:22:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNgfT-0004K0-8V for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:22:35 +0000 Date: Fri, 07 Aug 2015 12:22:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: Make libxl__conversion_helper_abort() safe to use X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2b8ba04cd150250d23ff0a396851b7ec9a500f07 Author: Andrew Cooper AuthorDate: Tue Aug 4 18:16:31 2015 +0100 Commit: Ian Campbell CommitDate: Wed Aug 5 10:40:35 2015 +0100 tools/libxl: Make libxl__conversion_helper_abort() safe to use Previously, in the case of an error causing a call to libxl__conversion_helper_abort() on a stream without legacy conversion, libxl would fall over a NULL pointer because chs->ao was not set up. Arrange for all ->ao's to be set up at _init() time, by having each _init() function assert that their caller has done the right thing. While doing so, introduce a previously-missing save_helper_init() in stream_read_init(). Signed-off-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxl/libxl_convert_callout.c | 2 ++ tools/libxl/libxl_internal.h | 4 ++-- tools/libxl/libxl_stream_read.c | 11 ++++++++--- tools/libxl/libxl_stream_write.c | 5 +++++ 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl_convert_callout.c b/tools/libxl/libxl_convert_callout.c index 65b4df9..5e5678b 100644 --- a/tools/libxl/libxl_convert_callout.c +++ b/tools/libxl/libxl_convert_callout.c @@ -34,6 +34,8 @@ static void helper_done(libxl__egc *egc, void libxl__conversion_helper_init(libxl__conversion_helper_state *chs) { + assert(chs->ao); + chs->v2_carefd = NULL; chs->rc = 0; libxl__ao_abortable_init(&chs->abrt); diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 29e0429..0253b49 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2945,9 +2945,9 @@ _hidden int libxl__netbuffer_enabled(libxl__gc *gc); typedef struct libxl__conversion_helper_state libxl__conversion_helper_state; struct libxl__conversion_helper_state { - /* public */ + /* Public - Must be filled by caller unless noted. */ libxl__ao *ao; - int legacy_fd; + int legacy_fd; /* fd to read the legacy stream from. */ bool hvm; /* pv or hvm domain? */ libxl__carefd *v2_carefd; /* Filled by successful call to * libxl__convert_legacy_stream(). Caller diff --git a/tools/libxl/libxl_stream_read.c b/tools/libxl/libxl_stream_read.c index fd3675c..c555542 100644 --- a/tools/libxl/libxl_stream_read.c +++ b/tools/libxl/libxl_stream_read.c @@ -173,12 +173,18 @@ static void free_record(libxl__sr_record_buf *rec) void libxl__stream_read_init(libxl__stream_read_state *stream) { + assert(stream->ao); + + stream->shs.ao = stream->ao; + libxl__save_helper_init(&stream->shs); + + stream->chs.ao = stream->ao; + libxl__conversion_helper_init(&stream->chs); + stream->rc = 0; stream->running = false; stream->in_checkpoint = false; stream->sync_teardown = false; - libxl__save_helper_init(&stream->shs); - libxl__conversion_helper_init(&stream->chs); FILLZERO(stream->dc); FILLZERO(stream->hdr); LIBXL_STAILQ_INIT(&stream->record_queue); @@ -205,7 +211,6 @@ void libxl__stream_read_start(libxl__egc *egc, /* Convert the legacy stream. */ libxl__conversion_helper_state *chs = &stream->chs; - chs->ao = stream->ao; chs->legacy_fd = stream->fd; chs->hvm = (stream->dcs->guest_config->b_info.type == LIBXL_DOMAIN_TYPE_HVM); diff --git a/tools/libxl/libxl_stream_write.c b/tools/libxl/libxl_stream_write.c index 9e9c998..be8f548 100644 --- a/tools/libxl/libxl_stream_write.c +++ b/tools/libxl/libxl_stream_write.c @@ -155,6 +155,11 @@ static void write_done(libxl__egc *egc, void libxl__stream_write_init(libxl__stream_write_state *stream) { + assert(stream->ao); + + stream->shs.ao = stream->ao; + libxl__save_helper_init(&stream->shs); + stream->rc = 0; stream->running = false; stream->in_checkpoint = false; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 07 12:22:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 12:22:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgfX-0004Qp-Db; Fri, 07 Aug 2015 12:22:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgfV-0004Qc-Qy for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:22:37 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id B7/9A-03763-D03A4C55; Fri, 07 Aug 2015 12:22:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1438950155!33393325!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28212 invoked from network); 7 Aug 2015 12:22:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 12:22:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgfT-0002AK-9j for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:22:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNgfT-0004K0-8V for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:22:35 +0000 Date: Fri, 07 Aug 2015 12:22:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: Make libxl__conversion_helper_abort() safe to use X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2b8ba04cd150250d23ff0a396851b7ec9a500f07 Author: Andrew Cooper AuthorDate: Tue Aug 4 18:16:31 2015 +0100 Commit: Ian Campbell CommitDate: Wed Aug 5 10:40:35 2015 +0100 tools/libxl: Make libxl__conversion_helper_abort() safe to use Previously, in the case of an error causing a call to libxl__conversion_helper_abort() on a stream without legacy conversion, libxl would fall over a NULL pointer because chs->ao was not set up. Arrange for all ->ao's to be set up at _init() time, by having each _init() function assert that their caller has done the right thing. While doing so, introduce a previously-missing save_helper_init() in stream_read_init(). Signed-off-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxl/libxl_convert_callout.c | 2 ++ tools/libxl/libxl_internal.h | 4 ++-- tools/libxl/libxl_stream_read.c | 11 ++++++++--- tools/libxl/libxl_stream_write.c | 5 +++++ 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl_convert_callout.c b/tools/libxl/libxl_convert_callout.c index 65b4df9..5e5678b 100644 --- a/tools/libxl/libxl_convert_callout.c +++ b/tools/libxl/libxl_convert_callout.c @@ -34,6 +34,8 @@ static void helper_done(libxl__egc *egc, void libxl__conversion_helper_init(libxl__conversion_helper_state *chs) { + assert(chs->ao); + chs->v2_carefd = NULL; chs->rc = 0; libxl__ao_abortable_init(&chs->abrt); diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 29e0429..0253b49 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2945,9 +2945,9 @@ _hidden int libxl__netbuffer_enabled(libxl__gc *gc); typedef struct libxl__conversion_helper_state libxl__conversion_helper_state; struct libxl__conversion_helper_state { - /* public */ + /* Public - Must be filled by caller unless noted. */ libxl__ao *ao; - int legacy_fd; + int legacy_fd; /* fd to read the legacy stream from. */ bool hvm; /* pv or hvm domain? */ libxl__carefd *v2_carefd; /* Filled by successful call to * libxl__convert_legacy_stream(). Caller diff --git a/tools/libxl/libxl_stream_read.c b/tools/libxl/libxl_stream_read.c index fd3675c..c555542 100644 --- a/tools/libxl/libxl_stream_read.c +++ b/tools/libxl/libxl_stream_read.c @@ -173,12 +173,18 @@ static void free_record(libxl__sr_record_buf *rec) void libxl__stream_read_init(libxl__stream_read_state *stream) { + assert(stream->ao); + + stream->shs.ao = stream->ao; + libxl__save_helper_init(&stream->shs); + + stream->chs.ao = stream->ao; + libxl__conversion_helper_init(&stream->chs); + stream->rc = 0; stream->running = false; stream->in_checkpoint = false; stream->sync_teardown = false; - libxl__save_helper_init(&stream->shs); - libxl__conversion_helper_init(&stream->chs); FILLZERO(stream->dc); FILLZERO(stream->hdr); LIBXL_STAILQ_INIT(&stream->record_queue); @@ -205,7 +211,6 @@ void libxl__stream_read_start(libxl__egc *egc, /* Convert the legacy stream. */ libxl__conversion_helper_state *chs = &stream->chs; - chs->ao = stream->ao; chs->legacy_fd = stream->fd; chs->hvm = (stream->dcs->guest_config->b_info.type == LIBXL_DOMAIN_TYPE_HVM); diff --git a/tools/libxl/libxl_stream_write.c b/tools/libxl/libxl_stream_write.c index 9e9c998..be8f548 100644 --- a/tools/libxl/libxl_stream_write.c +++ b/tools/libxl/libxl_stream_write.c @@ -155,6 +155,11 @@ static void write_done(libxl__egc *egc, void libxl__stream_write_init(libxl__stream_write_state *stream) { + assert(stream->ao); + + stream->shs.ao = stream->ao; + libxl__save_helper_init(&stream->shs); + stream->rc = 0; stream->running = false; stream->in_checkpoint = false; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 07 12:22:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 12:22:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgfh-0004Si-Sm; Fri, 07 Aug 2015 12:22:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgfg-0004SH-Ii for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:22:48 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id 7D/6D-28791-713A4C55; Fri, 07 Aug 2015 12:22:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1438950165!38807708!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4783 invoked from network); 7 Aug 2015 12:22:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 12:22:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgfd-0002AX-Ea for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:22:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNgfd-0004KN-DR for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:22:45 +0000 Date: Fri, 07 Aug 2015 12:22:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs/libxl: Re-specify XENSTORE_DATA as EMULATOR_XENSTORE_DATA X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 47801b04514ba1da91b57801d36be6c61033a312 Author: Andrew Cooper AuthorDate: Tue Aug 4 18:16:32 2015 +0100 Commit: Ian Campbell CommitDate: Wed Aug 5 10:46:30 2015 +0100 docs/libxl: Re-specify XENSTORE_DATA as EMULATOR_XENSTORE_DATA The legacy "toolstack" record as implemented in libxl turns out not to be 32/64bit safe. As migration v2 has not shipped yet, take this opportunity to adjust the specification and fix the incompatibility. Libxl shall loose all knowledge of the old "toolstack" blob and use this EMULATOR_XENSTORE_DATA record instead. Compatibility shall be handled by the legacy conversion script. Signed-off-by: Andrew Cooper Acked-by: Ian Campbell Acked-by: Wei Liu --- docs/specs/libxl-migration-stream.pandoc | 82 ++++++++++++++++++++-------- tools/libxl/libxl_sr_stream_format.h | 11 ++-- tools/python/Makefile | 1 + tools/python/scripts/convert-legacy-stream | 2 +- tools/python/xen/migration/legacy.py | 40 +++++++++++++- tools/python/xen/migration/libxl.py | 71 +++++++++++++++++------- tools/python/xen/migration/tests.py | 2 +- 7 files changed, 155 insertions(+), 54 deletions(-) diff --git a/docs/specs/libxl-migration-stream.pandoc b/docs/specs/libxl-migration-stream.pandoc index cdec168..2c97d86 100644 --- a/docs/specs/libxl-migration-stream.pandoc +++ b/docs/specs/libxl-migration-stream.pandoc @@ -90,8 +90,8 @@ i386, x86_64, or arm host. \clearpage -Records -======= +Record Overview +=============== A record has a record header, type specific data and a trailing footer. If `length` is not a multiple of 8, the body is padded with zeroes to align the @@ -113,7 +113,7 @@ type 0x00000000: END 0x00000001: LIBXC_CONTEXT - 0x00000002: XENSTORE_DATA + 0x00000002: EMULATOR_XENSTORE_DATA 0x00000003: EMULATOR_CONTEXT @@ -135,6 +135,38 @@ padding 0 to 7 octets of zeros to pad the whole record to a multiple \clearpage +Emulator Records +---------------- + +Several records are specifically for emulators, and have a common sub header. + + 0 1 2 3 4 5 6 7 octet + +------------------------+------------------------+ + | emulator_id | index | + +------------------------+------------------------+ + | record specific data | + ... + +-------------------------------------------------+ + +-------------------------------------------------------------------- +Field Description +------------ --------------------------------------------------- +emulator_id 0x00000000: Unknown (In the case of a legacy stream) + + 0x00000001: Qemu Traditional + + 0x00000002: Qemu Upstream + + 0x00000003 - 0xFFFFFFFF: Reserved for future emulators. + +index Index of this emulator for the domain. +-------------------------------------------------------------------- + +\clearpage + +Records +======= + END ---- @@ -163,17 +195,33 @@ The libxc context record contains no fields; its body_length is 0[^1]. might write into the stream, especially for live migration where the quantity of data is partially proportional to the elapsed time. -XENSTORE\_DATA -------------- +EMULATOR\_XENSTORE\_DATA +------------------------ -A record containing xenstore key/value pairs of data. +A set of xenstore key/value pairs for a specific emulator associated with the +domain. 0 1 2 3 4 5 6 7 octet - +-------------------------------------------------+ - | xenstore key/value pairs | + +------------------------+------------------------+ + | emulator_id | index | + +------------------------+------------------------+ + | xenstore key/value data | ... +-------------------------------------------------+ +Xenstore key/value data are encoded as a packed sequence of (key, value) +tuples. Each (key, value) tuple is a packed pair of NUL terminated octets, +conforming to xenstore protocol character encoding (keys strictly as +alphanumeric ASCII and `-/_@`, values expected to be human-readable ASCII). + +Keys shall be relative to to the device models xenstore tree for the new +domain. At the time of writing, keys are relative to the path + +> `/local/domain/$dm_domid/device-model/$domid/` + +although this path is free to change moving forward, thus should not be +assumed. + EMULATOR\_CONTEXT ---------------- @@ -187,22 +235,8 @@ A context blob for a specific emulator associated with the domain. ... +-------------------------------------------------+ --------------------------------------------------------------------- -Field Description ------------- --------------------------------------------------- -emulator_id 0x00000000: Unknown (In the case of a legacy stream) - - 0x00000001: Qemu Traditional - - 0x00000002: Qemu Upstream - - 0x00000003 - 0xFFFFFFFF: Reserved for future emulators. - -index Index of this emulator for the domain, if multiple - emulators are in use. - -emulator_ctx Emulator context blob. --------------------------------------------------------------------- +The *emulator_ctx* is a binary blob interpreted by the emulator identified by +*emulator_id*. Its format is unspecified. CHECKPOINT\_END --------------- diff --git a/tools/libxl/libxl_sr_stream_format.h b/tools/libxl/libxl_sr_stream_format.h index 3f3c497..4c23367 100644 --- a/tools/libxl/libxl_sr_stream_format.h +++ b/tools/libxl/libxl_sr_stream_format.h @@ -31,11 +31,12 @@ typedef struct libxl__sr_rec_hdr /* All records must be aligned up to an 8 octet boundary */ #define REC_ALIGN_ORDER 3U -#define REC_TYPE_END 0x00000000U -#define REC_TYPE_LIBXC_CONTEXT 0x00000001U -#define REC_TYPE_XENSTORE_DATA 0x00000002U -#define REC_TYPE_EMULATOR_CONTEXT 0x00000003U -#define REC_TYPE_CHECKPOINT_END 0x00000004U +#define REC_TYPE_END 0x00000000U +#define REC_TYPE_LIBXC_CONTEXT 0x00000001U +#define REC_TYPE_XENSTORE_DATA 0x00000002U /* TOOLSTACK COMPAT */ +#define REC_TYPE_EMULATOR_XENSTORE_DATA 0x00000002U +#define REC_TYPE_EMULATOR_CONTEXT 0x00000003U +#define REC_TYPE_CHECKPOINT_END 0x00000004U typedef struct libxl__sr_emulator_hdr { diff --git a/tools/python/Makefile b/tools/python/Makefile index 8d2c7dd..0395e50 100644 --- a/tools/python/Makefile +++ b/tools/python/Makefile @@ -23,6 +23,7 @@ install: $(PYTHON_PREFIX_ARG) --root="$(DESTDIR)" --force $(INSTALL_PROG) scripts/convert-legacy-stream $(DESTDIR)$(LIBEXEC_BIN) + $(INSTALL_PROG) scripts/verify-stream-v2 $(DESTDIR)$(LIBEXEC_BIN) .PHONY: test test: diff --git a/tools/python/scripts/convert-legacy-stream b/tools/python/scripts/convert-legacy-stream index d54fa22..16331a4 100755 --- a/tools/python/scripts/convert-legacy-stream +++ b/tools/python/scripts/convert-legacy-stream @@ -174,7 +174,7 @@ def write_libxl_xenstore_data(data): def write_libxl_emulator_context(blob): write_record(libxl.REC_TYPE_emulator_context, - pack(libxl.EMULATOR_CONTEXT_FORMAT, + pack(libxl.EMULATOR_HEADER_FORMAT, libxl.EMULATOR_ID_unknown, 0) + blob) def rdexact(nr_bytes): diff --git a/tools/python/xen/migration/legacy.py b/tools/python/xen/migration/legacy.py index 2f2240a..6456d61 100644 --- a/tools/python/xen/migration/legacy.py +++ b/tools/python/xen/migration/legacy.py @@ -2,12 +2,15 @@ # -*- coding: utf-8 -*- """ -Libxc legacy migration streams +Legacy migration stream information. -Documentation and record structures for legacy migration +Documentation and record structures for legacy migration, for both libxc +and libxl. """ """ +Libxc: + SAVE/RESTORE/MIGRATE PROTOCOL ============================= @@ -277,3 +280,36 @@ MAX_BATCH = 1024 # Maximum #VCPUs currently supported for save/restore MAX_VCPU_ID = 4095 + + +""" +Libxl: + +Legacy "toolstack" record layout: + +Version 1: + uint32_t version + QEMU physmap data: + uint32_t count + libxl__physmap_info * count + +The problem is that libxl__physmap_info was declared as: + +struct libxl__physmap_info { + uint64_t phys_offset; + uint64_t start_addr; + uint64_t size; + uint32_t namelen; + char name[]; +}; + +Which has 4 bytes of padding at the end in a 64bit build, thus not the +same between 32 and 64bit builds. + +Because of the pointer arithmatic used to construct the record, the 'name' was +shifted up to start at the padding, leaving the erronious 4 bytes at the end +of the name string, after the NUL terminator. + +Instead, the information described here has been changed to fit in a new +EMULATOR_XENSTORE_DATA record made of NUL terminated strings. +""" diff --git a/tools/python/xen/migration/libxl.py b/tools/python/xen/migration/libxl.py index 415502e..1a9ca87 100644 --- a/tools/python/xen/migration/libxl.py +++ b/tools/python/xen/migration/libxl.py @@ -10,7 +10,7 @@ verification routines. import sys -from struct import calcsize, unpack +from struct import calcsize, unpack, unpack_from from xen.migration.verify import StreamError, RecordError, VerifyBase from xen.migration.libxc import VerifyLibxc @@ -32,22 +32,23 @@ HDR_OPT_RESZ_MASK = 0xfffc # Records RH_FORMAT = "II" -REC_TYPE_end = 0x00000000 -REC_TYPE_libxc_context = 0x00000001 -REC_TYPE_xenstore_data = 0x00000002 -REC_TYPE_emulator_context = 0x00000003 -REC_TYPE_checkpoint_end = 0x00000004 +REC_TYPE_end = 0x00000000 +REC_TYPE_libxc_context = 0x00000001 +REC_TYPE_xenstore_data = 0x00000002 # TOOLSTACK COMPAT +REC_TYPE_emulator_xenstore_data = 0x00000002 +REC_TYPE_emulator_context = 0x00000003 +REC_TYPE_checkpoint_end = 0x00000004 rec_type_to_str = { - REC_TYPE_end : "End", - REC_TYPE_libxc_context : "Libxc context", - REC_TYPE_xenstore_data : "Xenstore data", - REC_TYPE_emulator_context : "Emulator context", - REC_TYPE_checkpoint_end : "Checkpoint end", + REC_TYPE_end : "End", + REC_TYPE_libxc_context : "Libxc context", + REC_TYPE_emulator_xenstore_data : "Emulator xenstore data", + REC_TYPE_emulator_context : "Emulator context", + REC_TYPE_checkpoint_end : "Checkpoint end", } -# emulator_context -EMULATOR_CONTEXT_FORMAT = "II" +# emulator_* header +EMULATOR_HEADER_FORMAT = "II" EMULATOR_ID_unknown = 0x00000000 EMULATOR_ID_qemu_trad = 0x00000001 @@ -155,22 +156,50 @@ class VerifyLibxl(VerifyBase): VerifyLibxc(self.info, self.read).verify() - def verify_record_xenstore_data(self, content): - """ Xenstore Data record """ + def verify_record_emulator_xenstore_data(self, content): + """ Emulator Xenstore Data record """ + minsz = calcsize(EMULATOR_HEADER_FORMAT) - if len(content) == 0: - raise RecordError("Xenstore data record with zero length") + if len(content) < minsz: + raise RecordError("Length must be at least %d bytes, got %d" + % (minsz, len(content))) + + emu_id, emu_idx = unpack(EMULATOR_HEADER_FORMAT, content[:minsz]) + + if emu_id not in emulator_id_to_str: + raise RecordError("Unrecognised emulator id 0x%x" % (emu_id, )) + + self.info("Emulator Xenstore Data (%s, idx %d)" + % (emulator_id_to_str[emu_id], emu_idx)) + + # Chop off the emulator header + content = content[minsz:] + + if len(content): + + if content[-1] != '\x00': + raise RecordError("Data not NUL terminated") + + # Split without the final NUL, to get an even number of parts + parts = content[:-1].split("\x00") + + if (len(parts) % 2) != 0: + raise RecordError("Expected an even number of strings, got %d" + % (len(parts), )) + + for key, val in zip(parts[0::2], parts[1::2]): + self.info(" '%s' = '%s'" % (key, val)) def verify_record_emulator_context(self, content): """ Emulator Context record """ - minsz = calcsize(EMULATOR_CONTEXT_FORMAT) + minsz = calcsize(EMULATOR_HEADER_FORMAT) if len(content) < minsz: raise RecordError("Length must be at least %d bytes, got %d" % (minsz, len(content))) - emu_id, emu_idx = unpack(EMULATOR_CONTEXT_FORMAT, content[:minsz]) + emu_id, emu_idx = unpack(EMULATOR_HEADER_FORMAT, content[:minsz]) if emu_id not in emulator_id_to_str: raise RecordError("Unrecognised emulator id 0x%x" % (emu_id, )) @@ -190,8 +219,8 @@ record_verifiers = { VerifyLibxl.verify_record_end, REC_TYPE_libxc_context: VerifyLibxl.verify_record_libxc_context, - REC_TYPE_xenstore_data: - VerifyLibxl.verify_record_xenstore_data, + REC_TYPE_emulator_xenstore_data: + VerifyLibxl.verify_record_emulator_xenstore_data, REC_TYPE_emulator_context: VerifyLibxl.verify_record_emulator_context, REC_TYPE_checkpoint_end: diff --git a/tools/python/xen/migration/tests.py b/tools/python/xen/migration/tests.py index 91044cd..026cf38 100644 --- a/tools/python/xen/migration/tests.py +++ b/tools/python/xen/migration/tests.py @@ -37,7 +37,7 @@ class TestLibxl(unittest.TestCase): for fmt, sz in ( (libxl.HDR_FORMAT, 16), (libxl.RH_FORMAT, 8), - (libxl.EMULATOR_CONTEXT_FORMAT, 8), + (libxl.EMULATOR_HEADER_FORMAT, 8), ): self.assertEqual(calcsize(fmt), sz) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 07 12:22:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 12:22:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgfh-0004Si-Sm; Fri, 07 Aug 2015 12:22:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgfg-0004SH-Ii for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:22:48 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id 7D/6D-28791-713A4C55; Fri, 07 Aug 2015 12:22:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1438950165!38807708!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4783 invoked from network); 7 Aug 2015 12:22:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 12:22:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgfd-0002AX-Ea for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:22:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNgfd-0004KN-DR for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:22:45 +0000 Date: Fri, 07 Aug 2015 12:22:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs/libxl: Re-specify XENSTORE_DATA as EMULATOR_XENSTORE_DATA X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 47801b04514ba1da91b57801d36be6c61033a312 Author: Andrew Cooper AuthorDate: Tue Aug 4 18:16:32 2015 +0100 Commit: Ian Campbell CommitDate: Wed Aug 5 10:46:30 2015 +0100 docs/libxl: Re-specify XENSTORE_DATA as EMULATOR_XENSTORE_DATA The legacy "toolstack" record as implemented in libxl turns out not to be 32/64bit safe. As migration v2 has not shipped yet, take this opportunity to adjust the specification and fix the incompatibility. Libxl shall loose all knowledge of the old "toolstack" blob and use this EMULATOR_XENSTORE_DATA record instead. Compatibility shall be handled by the legacy conversion script. Signed-off-by: Andrew Cooper Acked-by: Ian Campbell Acked-by: Wei Liu --- docs/specs/libxl-migration-stream.pandoc | 82 ++++++++++++++++++++-------- tools/libxl/libxl_sr_stream_format.h | 11 ++-- tools/python/Makefile | 1 + tools/python/scripts/convert-legacy-stream | 2 +- tools/python/xen/migration/legacy.py | 40 +++++++++++++- tools/python/xen/migration/libxl.py | 71 +++++++++++++++++------- tools/python/xen/migration/tests.py | 2 +- 7 files changed, 155 insertions(+), 54 deletions(-) diff --git a/docs/specs/libxl-migration-stream.pandoc b/docs/specs/libxl-migration-stream.pandoc index cdec168..2c97d86 100644 --- a/docs/specs/libxl-migration-stream.pandoc +++ b/docs/specs/libxl-migration-stream.pandoc @@ -90,8 +90,8 @@ i386, x86_64, or arm host. \clearpage -Records -======= +Record Overview +=============== A record has a record header, type specific data and a trailing footer. If `length` is not a multiple of 8, the body is padded with zeroes to align the @@ -113,7 +113,7 @@ type 0x00000000: END 0x00000001: LIBXC_CONTEXT - 0x00000002: XENSTORE_DATA + 0x00000002: EMULATOR_XENSTORE_DATA 0x00000003: EMULATOR_CONTEXT @@ -135,6 +135,38 @@ padding 0 to 7 octets of zeros to pad the whole record to a multiple \clearpage +Emulator Records +---------------- + +Several records are specifically for emulators, and have a common sub header. + + 0 1 2 3 4 5 6 7 octet + +------------------------+------------------------+ + | emulator_id | index | + +------------------------+------------------------+ + | record specific data | + ... + +-------------------------------------------------+ + +-------------------------------------------------------------------- +Field Description +------------ --------------------------------------------------- +emulator_id 0x00000000: Unknown (In the case of a legacy stream) + + 0x00000001: Qemu Traditional + + 0x00000002: Qemu Upstream + + 0x00000003 - 0xFFFFFFFF: Reserved for future emulators. + +index Index of this emulator for the domain. +-------------------------------------------------------------------- + +\clearpage + +Records +======= + END ---- @@ -163,17 +195,33 @@ The libxc context record contains no fields; its body_length is 0[^1]. might write into the stream, especially for live migration where the quantity of data is partially proportional to the elapsed time. -XENSTORE\_DATA -------------- +EMULATOR\_XENSTORE\_DATA +------------------------ -A record containing xenstore key/value pairs of data. +A set of xenstore key/value pairs for a specific emulator associated with the +domain. 0 1 2 3 4 5 6 7 octet - +-------------------------------------------------+ - | xenstore key/value pairs | + +------------------------+------------------------+ + | emulator_id | index | + +------------------------+------------------------+ + | xenstore key/value data | ... +-------------------------------------------------+ +Xenstore key/value data are encoded as a packed sequence of (key, value) +tuples. Each (key, value) tuple is a packed pair of NUL terminated octets, +conforming to xenstore protocol character encoding (keys strictly as +alphanumeric ASCII and `-/_@`, values expected to be human-readable ASCII). + +Keys shall be relative to to the device models xenstore tree for the new +domain. At the time of writing, keys are relative to the path + +> `/local/domain/$dm_domid/device-model/$domid/` + +although this path is free to change moving forward, thus should not be +assumed. + EMULATOR\_CONTEXT ---------------- @@ -187,22 +235,8 @@ A context blob for a specific emulator associated with the domain. ... +-------------------------------------------------+ --------------------------------------------------------------------- -Field Description ------------- --------------------------------------------------- -emulator_id 0x00000000: Unknown (In the case of a legacy stream) - - 0x00000001: Qemu Traditional - - 0x00000002: Qemu Upstream - - 0x00000003 - 0xFFFFFFFF: Reserved for future emulators. - -index Index of this emulator for the domain, if multiple - emulators are in use. - -emulator_ctx Emulator context blob. --------------------------------------------------------------------- +The *emulator_ctx* is a binary blob interpreted by the emulator identified by +*emulator_id*. Its format is unspecified. CHECKPOINT\_END --------------- diff --git a/tools/libxl/libxl_sr_stream_format.h b/tools/libxl/libxl_sr_stream_format.h index 3f3c497..4c23367 100644 --- a/tools/libxl/libxl_sr_stream_format.h +++ b/tools/libxl/libxl_sr_stream_format.h @@ -31,11 +31,12 @@ typedef struct libxl__sr_rec_hdr /* All records must be aligned up to an 8 octet boundary */ #define REC_ALIGN_ORDER 3U -#define REC_TYPE_END 0x00000000U -#define REC_TYPE_LIBXC_CONTEXT 0x00000001U -#define REC_TYPE_XENSTORE_DATA 0x00000002U -#define REC_TYPE_EMULATOR_CONTEXT 0x00000003U -#define REC_TYPE_CHECKPOINT_END 0x00000004U +#define REC_TYPE_END 0x00000000U +#define REC_TYPE_LIBXC_CONTEXT 0x00000001U +#define REC_TYPE_XENSTORE_DATA 0x00000002U /* TOOLSTACK COMPAT */ +#define REC_TYPE_EMULATOR_XENSTORE_DATA 0x00000002U +#define REC_TYPE_EMULATOR_CONTEXT 0x00000003U +#define REC_TYPE_CHECKPOINT_END 0x00000004U typedef struct libxl__sr_emulator_hdr { diff --git a/tools/python/Makefile b/tools/python/Makefile index 8d2c7dd..0395e50 100644 --- a/tools/python/Makefile +++ b/tools/python/Makefile @@ -23,6 +23,7 @@ install: $(PYTHON_PREFIX_ARG) --root="$(DESTDIR)" --force $(INSTALL_PROG) scripts/convert-legacy-stream $(DESTDIR)$(LIBEXEC_BIN) + $(INSTALL_PROG) scripts/verify-stream-v2 $(DESTDIR)$(LIBEXEC_BIN) .PHONY: test test: diff --git a/tools/python/scripts/convert-legacy-stream b/tools/python/scripts/convert-legacy-stream index d54fa22..16331a4 100755 --- a/tools/python/scripts/convert-legacy-stream +++ b/tools/python/scripts/convert-legacy-stream @@ -174,7 +174,7 @@ def write_libxl_xenstore_data(data): def write_libxl_emulator_context(blob): write_record(libxl.REC_TYPE_emulator_context, - pack(libxl.EMULATOR_CONTEXT_FORMAT, + pack(libxl.EMULATOR_HEADER_FORMAT, libxl.EMULATOR_ID_unknown, 0) + blob) def rdexact(nr_bytes): diff --git a/tools/python/xen/migration/legacy.py b/tools/python/xen/migration/legacy.py index 2f2240a..6456d61 100644 --- a/tools/python/xen/migration/legacy.py +++ b/tools/python/xen/migration/legacy.py @@ -2,12 +2,15 @@ # -*- coding: utf-8 -*- """ -Libxc legacy migration streams +Legacy migration stream information. -Documentation and record structures for legacy migration +Documentation and record structures for legacy migration, for both libxc +and libxl. """ """ +Libxc: + SAVE/RESTORE/MIGRATE PROTOCOL ============================= @@ -277,3 +280,36 @@ MAX_BATCH = 1024 # Maximum #VCPUs currently supported for save/restore MAX_VCPU_ID = 4095 + + +""" +Libxl: + +Legacy "toolstack" record layout: + +Version 1: + uint32_t version + QEMU physmap data: + uint32_t count + libxl__physmap_info * count + +The problem is that libxl__physmap_info was declared as: + +struct libxl__physmap_info { + uint64_t phys_offset; + uint64_t start_addr; + uint64_t size; + uint32_t namelen; + char name[]; +}; + +Which has 4 bytes of padding at the end in a 64bit build, thus not the +same between 32 and 64bit builds. + +Because of the pointer arithmatic used to construct the record, the 'name' was +shifted up to start at the padding, leaving the erronious 4 bytes at the end +of the name string, after the NUL terminator. + +Instead, the information described here has been changed to fit in a new +EMULATOR_XENSTORE_DATA record made of NUL terminated strings. +""" diff --git a/tools/python/xen/migration/libxl.py b/tools/python/xen/migration/libxl.py index 415502e..1a9ca87 100644 --- a/tools/python/xen/migration/libxl.py +++ b/tools/python/xen/migration/libxl.py @@ -10,7 +10,7 @@ verification routines. import sys -from struct import calcsize, unpack +from struct import calcsize, unpack, unpack_from from xen.migration.verify import StreamError, RecordError, VerifyBase from xen.migration.libxc import VerifyLibxc @@ -32,22 +32,23 @@ HDR_OPT_RESZ_MASK = 0xfffc # Records RH_FORMAT = "II" -REC_TYPE_end = 0x00000000 -REC_TYPE_libxc_context = 0x00000001 -REC_TYPE_xenstore_data = 0x00000002 -REC_TYPE_emulator_context = 0x00000003 -REC_TYPE_checkpoint_end = 0x00000004 +REC_TYPE_end = 0x00000000 +REC_TYPE_libxc_context = 0x00000001 +REC_TYPE_xenstore_data = 0x00000002 # TOOLSTACK COMPAT +REC_TYPE_emulator_xenstore_data = 0x00000002 +REC_TYPE_emulator_context = 0x00000003 +REC_TYPE_checkpoint_end = 0x00000004 rec_type_to_str = { - REC_TYPE_end : "End", - REC_TYPE_libxc_context : "Libxc context", - REC_TYPE_xenstore_data : "Xenstore data", - REC_TYPE_emulator_context : "Emulator context", - REC_TYPE_checkpoint_end : "Checkpoint end", + REC_TYPE_end : "End", + REC_TYPE_libxc_context : "Libxc context", + REC_TYPE_emulator_xenstore_data : "Emulator xenstore data", + REC_TYPE_emulator_context : "Emulator context", + REC_TYPE_checkpoint_end : "Checkpoint end", } -# emulator_context -EMULATOR_CONTEXT_FORMAT = "II" +# emulator_* header +EMULATOR_HEADER_FORMAT = "II" EMULATOR_ID_unknown = 0x00000000 EMULATOR_ID_qemu_trad = 0x00000001 @@ -155,22 +156,50 @@ class VerifyLibxl(VerifyBase): VerifyLibxc(self.info, self.read).verify() - def verify_record_xenstore_data(self, content): - """ Xenstore Data record """ + def verify_record_emulator_xenstore_data(self, content): + """ Emulator Xenstore Data record """ + minsz = calcsize(EMULATOR_HEADER_FORMAT) - if len(content) == 0: - raise RecordError("Xenstore data record with zero length") + if len(content) < minsz: + raise RecordError("Length must be at least %d bytes, got %d" + % (minsz, len(content))) + + emu_id, emu_idx = unpack(EMULATOR_HEADER_FORMAT, content[:minsz]) + + if emu_id not in emulator_id_to_str: + raise RecordError("Unrecognised emulator id 0x%x" % (emu_id, )) + + self.info("Emulator Xenstore Data (%s, idx %d)" + % (emulator_id_to_str[emu_id], emu_idx)) + + # Chop off the emulator header + content = content[minsz:] + + if len(content): + + if content[-1] != '\x00': + raise RecordError("Data not NUL terminated") + + # Split without the final NUL, to get an even number of parts + parts = content[:-1].split("\x00") + + if (len(parts) % 2) != 0: + raise RecordError("Expected an even number of strings, got %d" + % (len(parts), )) + + for key, val in zip(parts[0::2], parts[1::2]): + self.info(" '%s' = '%s'" % (key, val)) def verify_record_emulator_context(self, content): """ Emulator Context record """ - minsz = calcsize(EMULATOR_CONTEXT_FORMAT) + minsz = calcsize(EMULATOR_HEADER_FORMAT) if len(content) < minsz: raise RecordError("Length must be at least %d bytes, got %d" % (minsz, len(content))) - emu_id, emu_idx = unpack(EMULATOR_CONTEXT_FORMAT, content[:minsz]) + emu_id, emu_idx = unpack(EMULATOR_HEADER_FORMAT, content[:minsz]) if emu_id not in emulator_id_to_str: raise RecordError("Unrecognised emulator id 0x%x" % (emu_id, )) @@ -190,8 +219,8 @@ record_verifiers = { VerifyLibxl.verify_record_end, REC_TYPE_libxc_context: VerifyLibxl.verify_record_libxc_context, - REC_TYPE_xenstore_data: - VerifyLibxl.verify_record_xenstore_data, + REC_TYPE_emulator_xenstore_data: + VerifyLibxl.verify_record_emulator_xenstore_data, REC_TYPE_emulator_context: VerifyLibxl.verify_record_emulator_context, REC_TYPE_checkpoint_end: diff --git a/tools/python/xen/migration/tests.py b/tools/python/xen/migration/tests.py index 91044cd..026cf38 100644 --- a/tools/python/xen/migration/tests.py +++ b/tools/python/xen/migration/tests.py @@ -37,7 +37,7 @@ class TestLibxl(unittest.TestCase): for fmt, sz in ( (libxl.HDR_FORMAT, 16), (libxl.RH_FORMAT, 8), - (libxl.EMULATOR_CONTEXT_FORMAT, 8), + (libxl.EMULATOR_HEADER_FORMAT, 8), ): self.assertEqual(calcsize(fmt), sz) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 07 12:23:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 12:23:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgfs-0004W2-1I; Fri, 07 Aug 2015 12:23:00 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgfq-0004VU-Dc for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:22:58 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 36/A8-01753-123A4C55; Fri, 07 Aug 2015 12:22:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1438950175!33374492!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18308 invoked from network); 7 Aug 2015 12:22:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 12:22:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgfn-0002Af-KQ for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:22:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNgfn-0004Ko-JC for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:22:55 +0000 Date: Fri, 07 Aug 2015 12:22:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: Save and restore EMULATOR_XENSTORE_DATA content X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 874820999dd51533ca408ec72e8bba2a35cd1207 Author: Andrew Cooper AuthorDate: Tue Aug 4 18:16:33 2015 +0100 Commit: Ian Campbell CommitDate: Wed Aug 5 10:46:38 2015 +0100 tools/libxl: Save and restore EMULATOR_XENSTORE_DATA content The new EMULATOR_XENSTORE_DATA content is a sequence of NUL terminated key/value strings, with the key relative to the device model's xenstore tree. A sample might look like (as decoded by verify-stream-v2): Emulator Xenstore Data (Qemu Upstream, idx 0) 'physmap/1f00000/start_addr' = 'f0000000' 'physmap/1f00000/size' = '800000' 'physmap/1f00000/name' = 'vga.vram' This patch introduces libxl helpers to save and restore this new format, which reimplement the existing libxl__toolstack_{save,restore}() logic. Signed-off-by: Andrew Cooper Acked-by: Ian Campbell Acked-by: Wei Liu --- tools/libxl/libxl_dom.c | 135 ++++++++++++++++++++++++++++++++++++++++++ tools/libxl/libxl_internal.h | 4 + 2 files changed, 139 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 5555fea..d54d892 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1151,6 +1151,76 @@ out: return ret; } +/* + * Inspect the buffer between start and end, and return a pointer to the + * character following the NUL terminator of start, or NULL if start is not + * terminated before end. + */ +static const char *next_string(const char *start, const char *end) +{ + if (start >= end) return NULL; + + size_t total_len = end - start; + size_t len = strnlen(start, total_len); + + if (len == total_len) + return NULL; + else + return start + len + 1; +} + +int libxl__restore_emulator_xenstore_data(libxl__domain_create_state *dcs, + const char *ptr, uint32_t size) +{ + STATE_AO_GC(dcs->ao); + const char *next = ptr, *end = ptr + size, *key, *val; + int rc; + + const uint32_t domid = dcs->guest_domid; + const uint32_t dm_domid = libxl_get_stubdom_id(CTX, domid); + const char *xs_root = libxl__device_model_xs_path(gc, dm_domid, domid, ""); + + while (next < end) { + key = next; + next = next_string(next, end); + + /* Sanitise 'key'. */ + if (!next) { + rc = ERROR_FAIL; + LOG(ERROR, "Key in xenstore data not NUL terminated"); + goto out; + } + if (key[0] == '\0') { + rc = ERROR_FAIL; + LOG(ERROR, "empty key found in xenstore data"); + goto out; + } + if (key[0] == '/') { + rc = ERROR_FAIL; + LOG(ERROR, "Key in xenstore data not relative"); + goto out; + } + + val = next; + next = next_string(next, end); + + /* Sanitise 'val'. */ + if (!next) { + rc = ERROR_FAIL; + LOG(ERROR, "Val in xenstore data not NUL terminated"); + goto out; + } + + libxl__xs_write(gc, XBT_NULL, + GCSPRINTF("%s/%s", xs_root, key), "%s", val); + } + + rc = 0; + + out: + return rc; +} + /*==================== Domain suspend (save) ====================*/ static void stream_done(libxl__egc *egc, @@ -1487,6 +1557,71 @@ out: return ret; } +/* + * Expand the buffer 'buf' of length 'len', to append 'str' including its NUL + * terminator. + */ +static void append_string(libxl__gc *gc, char **buf, uint32_t *len, + const char *str) +{ + size_t extralen = strlen(str) + 1; + char *new = libxl__realloc(gc, *buf, *len + extralen); + + *buf = new; + memcpy(new + *len, str, extralen); + *len += extralen; +} + +int libxl__save_emulator_xenstore_data(libxl__domain_suspend_state *dss, + char **callee_buf, + uint32_t *callee_len) +{ + STATE_AO_GC(dss->ao); + const char *xs_root; + char **entries, *buf = NULL; + unsigned int nr_entries, i, j, len = 0; + int rc; + + const uint32_t domid = dss->domid; + const uint32_t dm_domid = libxl_get_stubdom_id(CTX, domid); + + xs_root = libxl__device_model_xs_path(gc, dm_domid, domid, ""); + + entries = libxl__xs_directory(gc, 0, GCSPRINTF("%s/physmap", xs_root), + &nr_entries); + if (!entries || nr_entries == 0) { rc = 0; goto out; } + + for (i = 0; i < nr_entries; ++i) { + static const char *const physmap_subkeys[] = { + "start_addr", "size", "name" + }; + + for (j = 0; j < ARRAY_SIZE(physmap_subkeys); ++j) { + const char *key = GCSPRINTF("physmap/%s/%s", + entries[i], physmap_subkeys[j]); + + const char *val = + libxl__xs_read(gc, XBT_NULL, + GCSPRINTF("%s/%s", xs_root, key)); + + if (!val) { rc = ERROR_FAIL; goto out; } + + append_string(gc, &buf, &len, key); + append_string(gc, &buf, &len, val); + } + } + + rc = 0; + + out: + if (!rc) { + *callee_buf = buf; + *callee_len = len; + } + + return rc; +} + /*----- remus callbacks -----*/ static void remus_domain_suspend_callback_common_done(libxl__egc *egc, libxl__domain_suspend_state *dss, int ok); diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 0253b49..54c3a6d 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3436,6 +3436,10 @@ _hidden void libxl__domain_suspend_common_switch_qemu_logdirty (int domid, unsigned int enable, void *data); _hidden int libxl__toolstack_save(uint32_t domid, uint8_t **buf, uint32_t *len, void *data); +_hidden int libxl__save_emulator_xenstore_data(libxl__domain_suspend_state *dss, + char **buf, uint32_t *len); +_hidden int libxl__restore_emulator_xenstore_data + (libxl__domain_create_state *dcs, const char *ptr, uint32_t size); /* calls libxl__xc_domain_restore_done when done */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 07 12:23:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 12:23:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgfs-0004W2-1I; Fri, 07 Aug 2015 12:23:00 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgfq-0004VU-Dc for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:22:58 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 36/A8-01753-123A4C55; Fri, 07 Aug 2015 12:22:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1438950175!33374492!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18308 invoked from network); 7 Aug 2015 12:22:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 12:22:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgfn-0002Af-KQ for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:22:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNgfn-0004Ko-JC for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:22:55 +0000 Date: Fri, 07 Aug 2015 12:22:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: Save and restore EMULATOR_XENSTORE_DATA content X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 874820999dd51533ca408ec72e8bba2a35cd1207 Author: Andrew Cooper AuthorDate: Tue Aug 4 18:16:33 2015 +0100 Commit: Ian Campbell CommitDate: Wed Aug 5 10:46:38 2015 +0100 tools/libxl: Save and restore EMULATOR_XENSTORE_DATA content The new EMULATOR_XENSTORE_DATA content is a sequence of NUL terminated key/value strings, with the key relative to the device model's xenstore tree. A sample might look like (as decoded by verify-stream-v2): Emulator Xenstore Data (Qemu Upstream, idx 0) 'physmap/1f00000/start_addr' = 'f0000000' 'physmap/1f00000/size' = '800000' 'physmap/1f00000/name' = 'vga.vram' This patch introduces libxl helpers to save and restore this new format, which reimplement the existing libxl__toolstack_{save,restore}() logic. Signed-off-by: Andrew Cooper Acked-by: Ian Campbell Acked-by: Wei Liu --- tools/libxl/libxl_dom.c | 135 ++++++++++++++++++++++++++++++++++++++++++ tools/libxl/libxl_internal.h | 4 + 2 files changed, 139 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 5555fea..d54d892 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1151,6 +1151,76 @@ out: return ret; } +/* + * Inspect the buffer between start and end, and return a pointer to the + * character following the NUL terminator of start, or NULL if start is not + * terminated before end. + */ +static const char *next_string(const char *start, const char *end) +{ + if (start >= end) return NULL; + + size_t total_len = end - start; + size_t len = strnlen(start, total_len); + + if (len == total_len) + return NULL; + else + return start + len + 1; +} + +int libxl__restore_emulator_xenstore_data(libxl__domain_create_state *dcs, + const char *ptr, uint32_t size) +{ + STATE_AO_GC(dcs->ao); + const char *next = ptr, *end = ptr + size, *key, *val; + int rc; + + const uint32_t domid = dcs->guest_domid; + const uint32_t dm_domid = libxl_get_stubdom_id(CTX, domid); + const char *xs_root = libxl__device_model_xs_path(gc, dm_domid, domid, ""); + + while (next < end) { + key = next; + next = next_string(next, end); + + /* Sanitise 'key'. */ + if (!next) { + rc = ERROR_FAIL; + LOG(ERROR, "Key in xenstore data not NUL terminated"); + goto out; + } + if (key[0] == '\0') { + rc = ERROR_FAIL; + LOG(ERROR, "empty key found in xenstore data"); + goto out; + } + if (key[0] == '/') { + rc = ERROR_FAIL; + LOG(ERROR, "Key in xenstore data not relative"); + goto out; + } + + val = next; + next = next_string(next, end); + + /* Sanitise 'val'. */ + if (!next) { + rc = ERROR_FAIL; + LOG(ERROR, "Val in xenstore data not NUL terminated"); + goto out; + } + + libxl__xs_write(gc, XBT_NULL, + GCSPRINTF("%s/%s", xs_root, key), "%s", val); + } + + rc = 0; + + out: + return rc; +} + /*==================== Domain suspend (save) ====================*/ static void stream_done(libxl__egc *egc, @@ -1487,6 +1557,71 @@ out: return ret; } +/* + * Expand the buffer 'buf' of length 'len', to append 'str' including its NUL + * terminator. + */ +static void append_string(libxl__gc *gc, char **buf, uint32_t *len, + const char *str) +{ + size_t extralen = strlen(str) + 1; + char *new = libxl__realloc(gc, *buf, *len + extralen); + + *buf = new; + memcpy(new + *len, str, extralen); + *len += extralen; +} + +int libxl__save_emulator_xenstore_data(libxl__domain_suspend_state *dss, + char **callee_buf, + uint32_t *callee_len) +{ + STATE_AO_GC(dss->ao); + const char *xs_root; + char **entries, *buf = NULL; + unsigned int nr_entries, i, j, len = 0; + int rc; + + const uint32_t domid = dss->domid; + const uint32_t dm_domid = libxl_get_stubdom_id(CTX, domid); + + xs_root = libxl__device_model_xs_path(gc, dm_domid, domid, ""); + + entries = libxl__xs_directory(gc, 0, GCSPRINTF("%s/physmap", xs_root), + &nr_entries); + if (!entries || nr_entries == 0) { rc = 0; goto out; } + + for (i = 0; i < nr_entries; ++i) { + static const char *const physmap_subkeys[] = { + "start_addr", "size", "name" + }; + + for (j = 0; j < ARRAY_SIZE(physmap_subkeys); ++j) { + const char *key = GCSPRINTF("physmap/%s/%s", + entries[i], physmap_subkeys[j]); + + const char *val = + libxl__xs_read(gc, XBT_NULL, + GCSPRINTF("%s/%s", xs_root, key)); + + if (!val) { rc = ERROR_FAIL; goto out; } + + append_string(gc, &buf, &len, key); + append_string(gc, &buf, &len, val); + } + } + + rc = 0; + + out: + if (!rc) { + *callee_buf = buf; + *callee_len = len; + } + + return rc; +} + /*----- remus callbacks -----*/ static void remus_domain_suspend_callback_common_done(libxl__egc *egc, libxl__domain_suspend_state *dss, int ok); diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 0253b49..54c3a6d 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3436,6 +3436,10 @@ _hidden void libxl__domain_suspend_common_switch_qemu_logdirty (int domid, unsigned int enable, void *data); _hidden int libxl__toolstack_save(uint32_t domid, uint8_t **buf, uint32_t *len, void *data); +_hidden int libxl__save_emulator_xenstore_data(libxl__domain_suspend_state *dss, + char **buf, uint32_t *len); +_hidden int libxl__restore_emulator_xenstore_data + (libxl__domain_create_state *dcs, const char *ptr, uint32_t size); /* calls libxl__xc_domain_restore_done when done */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 07 12:23:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 12:23:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgg3-0004YH-47; Fri, 07 Aug 2015 12:23:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgg1-0004Xp-4f for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:23:09 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 82/27-01421-C23A4C55; Fri, 07 Aug 2015 12:23:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1438950186!33196060!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32100 invoked from network); 7 Aug 2015 12:23:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 12:23:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgfx-0002BI-Qb for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:23:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNgfx-0004LS-O8 for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:23:05 +0000 Date: Fri, 07 Aug 2015 12:23:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: Prepare to write multiple records with EMULATOR headers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 11106a244c165f154362625f13b844a8e37cada4 Author: Andrew Cooper AuthorDate: Tue Aug 4 18:16:34 2015 +0100 Commit: Ian Campbell CommitDate: Wed Aug 5 10:46:46 2015 +0100 tools/libxl: Prepare to write multiple records with EMULATOR headers With the newly specified EMULATOR_XENSTORE_DATA record, there are two libxl records with an emulator subheader. Refactor the existing code to make future additions easier, and rename some functions for consistency with the new scheme. * Calculate the subheader at stream start time, rather than on the fly. Its contents are not going to change. * Introduce a new setup_emulator_write() to insert a sub header in the appropriate place before a blob of data. * Rename *toolstack_* to *emulator_xenstore_* * Rename *emulator_* to *emulator_context_* No functional change. Signed-off-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxl/libxl_internal.h | 3 +- tools/libxl/libxl_stream_write.c | 182 +++++++++++++++++++++++--------------- 2 files changed, 113 insertions(+), 72 deletions(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 54c3a6d..49c7cb6 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3013,10 +3013,11 @@ struct libxl__stream_write_state { libxl__datacopier_state dc; sws_record_done_cb record_done_callback; - /* Only used when constructing an EMULATOR record. */ + /* Only used when constructing EMULATOR records. */ libxl__datacopier_state emu_dc; libxl__carefd *emu_carefd; libxl__sr_rec_hdr emu_rec_hdr; + libxl__sr_emulator_hdr emu_sub_hdr; void *emu_body; }; diff --git a/tools/libxl/libxl_stream_write.c b/tools/libxl/libxl_stream_write.c index be8f548..55439dd 100644 --- a/tools/libxl/libxl_stream_write.c +++ b/tools/libxl/libxl_stream_write.c @@ -38,14 +38,16 @@ * The main loop for a plain VM writes: * - Stream header * - Libxc record - * - Toolstack record - * - if (hvm), Qemu record + * - (optional) Emulator xenstore record + * - if (hvm) + * - Emulator context record * - End record * * For checkpointed stream, there is a second loop which is triggered by a * save-helper checkpoint callback. It writes: - * - Toolstack record - * - if (hvm), Qemu record + * - (optional) Emulator xenstore record + * - if (hvm) + * - Emulator context record * - Checkpoint end record */ @@ -69,17 +71,17 @@ static void stream_header_done(libxl__egc *egc, static void libxc_header_done(libxl__egc *egc, libxl__stream_write_state *stream); /* libxl__xc_domain_save_done() lives here, event-order wise. */ -static void write_toolstack_record(libxl__egc *egc, - libxl__stream_write_state *stream); -static void toolstack_record_done(libxl__egc *egc, - libxl__stream_write_state *stream); -static void write_emulator_record(libxl__egc *egc, - libxl__stream_write_state *stream); -static void emulator_read_done(libxl__egc *egc, - libxl__datacopier_state *dc, - int rc, int onwrite, int errnoval); -static void emulator_record_done(libxl__egc *egc, - libxl__stream_write_state *stream); +static void write_emulator_xenstore_record(libxl__egc *egc, + libxl__stream_write_state *stream); +static void emulator_xenstore_record_done(libxl__egc *egc, + libxl__stream_write_state *stream); +static void write_emulator_context_record(libxl__egc *egc, + libxl__stream_write_state *stream); +static void emulator_context_read_done(libxl__egc *egc, + libxl__datacopier_state *dc, + int rc, int onwrite, int errnoval); +static void emulator_context_record_done(libxl__egc *egc, + libxl__stream_write_state *stream); static void write_end_record(libxl__egc *egc, libxl__stream_write_state *stream); @@ -95,12 +97,14 @@ static void write_done(libxl__egc *egc, libxl__datacopier_state *dc, int rc, int onwrite, int errnoval); -/* Helper to set up reading some data from the stream. */ -static void setup_write(libxl__egc *egc, - libxl__stream_write_state *stream, - const char *what, - libxl__sr_rec_hdr *hdr, void *body, - sws_record_done_cb cb) +/* Generic helper to set up writing some data to the stream. */ +static void setup_generic_write(libxl__egc *egc, + libxl__stream_write_state *stream, + const char *what, + libxl__sr_rec_hdr *hdr, + libxl__sr_emulator_hdr *emu_hdr, + void *body, + sws_record_done_cb cb) { static const uint8_t zero_padding[1U << REC_ALIGN_ORDER] = { 0 }; @@ -120,13 +124,21 @@ static void setup_write(libxl__egc *egc, } size_t padsz = ROUNDUP(hdr->length, REC_ALIGN_ORDER) - hdr->length; + uint32_t length = hdr->length; /* Insert header */ libxl__datacopier_prefixdata(egc, dc, hdr, sizeof(*hdr)); + /* Optional emulator sub-header */ + if (emu_hdr) { + assert(length >= sizeof(*emu_hdr)); + libxl__datacopier_prefixdata(egc, dc, emu_hdr, sizeof(*emu_hdr)); + length -= sizeof(*emu_hdr); + } + /* Optional body */ if (body) - libxl__datacopier_prefixdata(egc, dc, body, hdr->length); + libxl__datacopier_prefixdata(egc, dc, body, length); /* Any required padding */ if (padsz > 0) @@ -135,6 +147,30 @@ static void setup_write(libxl__egc *egc, stream->record_done_callback = cb; } +/* Helper to set up writing a regular record to the stream. */ +static void setup_write(libxl__egc *egc, + libxl__stream_write_state *stream, + const char *what, + libxl__sr_rec_hdr *hdr, + void *body, + sws_record_done_cb cb) +{ + setup_generic_write(egc, stream, what, hdr, NULL, body, cb); +} + +/* Helper to set up writing a record with an emulator prefix to the stream. */ +static void setup_emulator_write(libxl__egc *egc, + libxl__stream_write_state *stream, + const char *what, + libxl__sr_rec_hdr *hdr, + libxl__sr_emulator_hdr *emu_hdr, + void *body, + sws_record_done_cb cb) +{ + setup_generic_write(egc, stream, what, hdr, emu_hdr, body, cb); +} + + static void write_done(libxl__egc *egc, libxl__datacopier_state *dc, int rc, int onwrite, int errnoval) @@ -169,6 +205,7 @@ void libxl__stream_write_init(libxl__stream_write_state *stream) FILLZERO(stream->emu_dc); stream->emu_carefd = NULL; FILLZERO(stream->emu_rec_hdr); + FILLZERO(stream->emu_sub_hdr); stream->emu_body = NULL; } @@ -176,6 +213,7 @@ void libxl__stream_write_start(libxl__egc *egc, libxl__stream_write_state *stream) { libxl__datacopier_state *dc = &stream->dc; + libxl__domain_suspend_state *dss = stream->dss; STATE_AO_GC(stream->ao); struct libxl__sr_hdr hdr; int rc = 0; @@ -184,6 +222,24 @@ void libxl__stream_write_start(libxl__egc *egc, stream->running = true; + if (dss->type == LIBXL_DOMAIN_TYPE_HVM) { + switch (libxl__device_model_version_running(gc, dss->domid)) { + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: + stream->emu_sub_hdr.id = EMULATOR_QEMU_TRADITIONAL; + break; + + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: + stream->emu_sub_hdr.id = EMULATOR_QEMU_UPSTREAM; + break; + + default: + rc = ERROR_FAIL; + LOG(ERROR, "Unknown emulator for HVM domain\n"); + goto err; + } + stream->emu_sub_hdr.index = 0; + } + dc->ao = ao; dc->readfd = -1; dc->writewhat = "stream header"; @@ -216,7 +272,7 @@ void libxl__stream_write_start_checkpoint(libxl__egc *egc, assert(!stream->in_checkpoint); stream->in_checkpoint = true; - write_toolstack_record(egc, stream); + write_emulator_xenstore_record(egc, stream); } void libxl__stream_write_abort(libxl__egc *egc, @@ -290,48 +346,47 @@ void libxl__xc_domain_save_done(libxl__egc *egc, void *dss_void, * If the stream is not still alive, we must not continue any work. */ if (libxl__stream_write_inuse(stream)) - write_toolstack_record(egc, stream); + write_emulator_xenstore_record(egc, stream); } -static void write_toolstack_record(libxl__egc *egc, - libxl__stream_write_state *stream) +static void write_emulator_xenstore_record(libxl__egc *egc, + libxl__stream_write_state *stream) { libxl__domain_suspend_state *dss = stream->dss; STATE_AO_GC(stream->ao); struct libxl__sr_rec_hdr rec; int rc; - uint8_t *toolstack_buf = NULL; /* We must free this. */ - uint32_t toolstack_len; + uint8_t *buf = NULL; /* We must free this. */ + uint32_t len; - rc = libxl__toolstack_save(dss->domid, &toolstack_buf, - &toolstack_len, dss); + rc = libxl__toolstack_save(dss->domid, &buf, &len, dss); if (rc) goto err; FILLZERO(rec); rec.type = REC_TYPE_XENSTORE_DATA; - rec.length = toolstack_len; + rec.length = len; - setup_write(egc, stream, "toolstack record", - &rec, toolstack_buf, - toolstack_record_done); + setup_write(egc, stream, "emulator xenstore record", + &rec, buf, + emulator_xenstore_record_done); - free(toolstack_buf); + free(buf); return; err: assert(rc); - free(toolstack_buf); + free(buf); stream_complete(egc, stream, rc); } -static void toolstack_record_done(libxl__egc *egc, - libxl__stream_write_state *stream) +static void emulator_xenstore_record_done(libxl__egc *egc, + libxl__stream_write_state *stream) { libxl__domain_suspend_state *dss = stream->dss; if (dss->type == LIBXL_DOMAIN_TYPE_HVM) - write_emulator_record(egc, stream); + write_emulator_context_record(egc, stream); else { if (stream->in_checkpoint) write_checkpoint_end_record(egc, stream); @@ -340,14 +395,13 @@ static void toolstack_record_done(libxl__egc *egc, } } -static void write_emulator_record(libxl__egc *egc, - libxl__stream_write_state *stream) +static void write_emulator_context_record(libxl__egc *egc, + libxl__stream_write_state *stream) { libxl__domain_suspend_state *dss = stream->dss; libxl__datacopier_state *dc = &stream->emu_dc; STATE_AO_GC(stream->ao); struct libxl__sr_rec_hdr *rec = &stream->emu_rec_hdr; - struct libxl__sr_emulator_hdr *ehdr = NULL; struct stat st; int rc; @@ -355,7 +409,6 @@ static void write_emulator_record(libxl__egc *egc, /* Convenience aliases */ const char *const filename = dss->dm_savefile; - const uint32_t domid = dss->domid; libxl__carefd_begin(); int readfd = open(filename, O_RDONLY); @@ -379,23 +432,8 @@ static void write_emulator_record(libxl__egc *egc, } rec->type = REC_TYPE_EMULATOR_CONTEXT; - rec->length = st.st_size + sizeof(*ehdr); - stream->emu_body = ehdr = libxl__malloc(NOGC, rec->length); - - switch(libxl__device_model_version_running(gc, domid)) { - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - ehdr->id = EMULATOR_QEMU_TRADITIONAL; - break; - - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: - ehdr->id = EMULATOR_QEMU_UPSTREAM; - break; - - default: - rc = ERROR_FAIL; - goto err; - } - ehdr->index = 0; + rec->length = st.st_size + sizeof(stream->emu_sub_hdr); + stream->emu_body = libxl__malloc(NOGC, st.st_size); FILLZERO(*dc); dc->ao = stream->ao; @@ -404,9 +442,9 @@ static void write_emulator_record(libxl__egc *egc, dc->readfd = readfd; dc->writefd = -1; dc->maxsz = -1; - dc->readbuf = stream->emu_body + sizeof(*ehdr); - dc->bytes_to_read = rec->length - sizeof(*ehdr); - dc->callback = emulator_read_done; + dc->readbuf = stream->emu_body; + dc->bytes_to_read = st.st_size; + dc->callback = emulator_context_read_done; rc = libxl__datacopier_start(dc); if (rc) @@ -419,9 +457,9 @@ static void write_emulator_record(libxl__egc *egc, stream_complete(egc, stream, rc); } -static void emulator_read_done(libxl__egc *egc, - libxl__datacopier_state *dc, - int rc, int onwrite, int errnoval) +static void emulator_context_read_done(libxl__egc *egc, + libxl__datacopier_state *dc, + int rc, int onwrite, int errnoval) { libxl__stream_write_state *stream = CONTAINER_OF(dc, *stream, emu_dc); STATE_AO_GC(stream->ao); @@ -434,13 +472,15 @@ static void emulator_read_done(libxl__egc *egc, libxl__carefd_close(stream->emu_carefd); stream->emu_carefd = NULL; - setup_write(egc, stream, "emulator record", - &stream->emu_rec_hdr, stream->emu_body, - emulator_record_done); + setup_emulator_write(egc, stream, "emulator record", + &stream->emu_rec_hdr, + &stream->emu_sub_hdr, + stream->emu_body, + emulator_context_record_done); } -static void emulator_record_done(libxl__egc *egc, - libxl__stream_write_state *stream) +static void emulator_context_record_done(libxl__egc *egc, + libxl__stream_write_state *stream) { free(stream->emu_body); stream->emu_body = NULL; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 07 12:23:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 12:23:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgg3-0004YH-47; Fri, 07 Aug 2015 12:23:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgg1-0004Xp-4f for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:23:09 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 82/27-01421-C23A4C55; Fri, 07 Aug 2015 12:23:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1438950186!33196060!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32100 invoked from network); 7 Aug 2015 12:23:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 12:23:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgfx-0002BI-Qb for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:23:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNgfx-0004LS-O8 for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:23:05 +0000 Date: Fri, 07 Aug 2015 12:23:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: Prepare to write multiple records with EMULATOR headers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 11106a244c165f154362625f13b844a8e37cada4 Author: Andrew Cooper AuthorDate: Tue Aug 4 18:16:34 2015 +0100 Commit: Ian Campbell CommitDate: Wed Aug 5 10:46:46 2015 +0100 tools/libxl: Prepare to write multiple records with EMULATOR headers With the newly specified EMULATOR_XENSTORE_DATA record, there are two libxl records with an emulator subheader. Refactor the existing code to make future additions easier, and rename some functions for consistency with the new scheme. * Calculate the subheader at stream start time, rather than on the fly. Its contents are not going to change. * Introduce a new setup_emulator_write() to insert a sub header in the appropriate place before a blob of data. * Rename *toolstack_* to *emulator_xenstore_* * Rename *emulator_* to *emulator_context_* No functional change. Signed-off-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxl/libxl_internal.h | 3 +- tools/libxl/libxl_stream_write.c | 182 +++++++++++++++++++++++--------------- 2 files changed, 113 insertions(+), 72 deletions(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 54c3a6d..49c7cb6 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3013,10 +3013,11 @@ struct libxl__stream_write_state { libxl__datacopier_state dc; sws_record_done_cb record_done_callback; - /* Only used when constructing an EMULATOR record. */ + /* Only used when constructing EMULATOR records. */ libxl__datacopier_state emu_dc; libxl__carefd *emu_carefd; libxl__sr_rec_hdr emu_rec_hdr; + libxl__sr_emulator_hdr emu_sub_hdr; void *emu_body; }; diff --git a/tools/libxl/libxl_stream_write.c b/tools/libxl/libxl_stream_write.c index be8f548..55439dd 100644 --- a/tools/libxl/libxl_stream_write.c +++ b/tools/libxl/libxl_stream_write.c @@ -38,14 +38,16 @@ * The main loop for a plain VM writes: * - Stream header * - Libxc record - * - Toolstack record - * - if (hvm), Qemu record + * - (optional) Emulator xenstore record + * - if (hvm) + * - Emulator context record * - End record * * For checkpointed stream, there is a second loop which is triggered by a * save-helper checkpoint callback. It writes: - * - Toolstack record - * - if (hvm), Qemu record + * - (optional) Emulator xenstore record + * - if (hvm) + * - Emulator context record * - Checkpoint end record */ @@ -69,17 +71,17 @@ static void stream_header_done(libxl__egc *egc, static void libxc_header_done(libxl__egc *egc, libxl__stream_write_state *stream); /* libxl__xc_domain_save_done() lives here, event-order wise. */ -static void write_toolstack_record(libxl__egc *egc, - libxl__stream_write_state *stream); -static void toolstack_record_done(libxl__egc *egc, - libxl__stream_write_state *stream); -static void write_emulator_record(libxl__egc *egc, - libxl__stream_write_state *stream); -static void emulator_read_done(libxl__egc *egc, - libxl__datacopier_state *dc, - int rc, int onwrite, int errnoval); -static void emulator_record_done(libxl__egc *egc, - libxl__stream_write_state *stream); +static void write_emulator_xenstore_record(libxl__egc *egc, + libxl__stream_write_state *stream); +static void emulator_xenstore_record_done(libxl__egc *egc, + libxl__stream_write_state *stream); +static void write_emulator_context_record(libxl__egc *egc, + libxl__stream_write_state *stream); +static void emulator_context_read_done(libxl__egc *egc, + libxl__datacopier_state *dc, + int rc, int onwrite, int errnoval); +static void emulator_context_record_done(libxl__egc *egc, + libxl__stream_write_state *stream); static void write_end_record(libxl__egc *egc, libxl__stream_write_state *stream); @@ -95,12 +97,14 @@ static void write_done(libxl__egc *egc, libxl__datacopier_state *dc, int rc, int onwrite, int errnoval); -/* Helper to set up reading some data from the stream. */ -static void setup_write(libxl__egc *egc, - libxl__stream_write_state *stream, - const char *what, - libxl__sr_rec_hdr *hdr, void *body, - sws_record_done_cb cb) +/* Generic helper to set up writing some data to the stream. */ +static void setup_generic_write(libxl__egc *egc, + libxl__stream_write_state *stream, + const char *what, + libxl__sr_rec_hdr *hdr, + libxl__sr_emulator_hdr *emu_hdr, + void *body, + sws_record_done_cb cb) { static const uint8_t zero_padding[1U << REC_ALIGN_ORDER] = { 0 }; @@ -120,13 +124,21 @@ static void setup_write(libxl__egc *egc, } size_t padsz = ROUNDUP(hdr->length, REC_ALIGN_ORDER) - hdr->length; + uint32_t length = hdr->length; /* Insert header */ libxl__datacopier_prefixdata(egc, dc, hdr, sizeof(*hdr)); + /* Optional emulator sub-header */ + if (emu_hdr) { + assert(length >= sizeof(*emu_hdr)); + libxl__datacopier_prefixdata(egc, dc, emu_hdr, sizeof(*emu_hdr)); + length -= sizeof(*emu_hdr); + } + /* Optional body */ if (body) - libxl__datacopier_prefixdata(egc, dc, body, hdr->length); + libxl__datacopier_prefixdata(egc, dc, body, length); /* Any required padding */ if (padsz > 0) @@ -135,6 +147,30 @@ static void setup_write(libxl__egc *egc, stream->record_done_callback = cb; } +/* Helper to set up writing a regular record to the stream. */ +static void setup_write(libxl__egc *egc, + libxl__stream_write_state *stream, + const char *what, + libxl__sr_rec_hdr *hdr, + void *body, + sws_record_done_cb cb) +{ + setup_generic_write(egc, stream, what, hdr, NULL, body, cb); +} + +/* Helper to set up writing a record with an emulator prefix to the stream. */ +static void setup_emulator_write(libxl__egc *egc, + libxl__stream_write_state *stream, + const char *what, + libxl__sr_rec_hdr *hdr, + libxl__sr_emulator_hdr *emu_hdr, + void *body, + sws_record_done_cb cb) +{ + setup_generic_write(egc, stream, what, hdr, emu_hdr, body, cb); +} + + static void write_done(libxl__egc *egc, libxl__datacopier_state *dc, int rc, int onwrite, int errnoval) @@ -169,6 +205,7 @@ void libxl__stream_write_init(libxl__stream_write_state *stream) FILLZERO(stream->emu_dc); stream->emu_carefd = NULL; FILLZERO(stream->emu_rec_hdr); + FILLZERO(stream->emu_sub_hdr); stream->emu_body = NULL; } @@ -176,6 +213,7 @@ void libxl__stream_write_start(libxl__egc *egc, libxl__stream_write_state *stream) { libxl__datacopier_state *dc = &stream->dc; + libxl__domain_suspend_state *dss = stream->dss; STATE_AO_GC(stream->ao); struct libxl__sr_hdr hdr; int rc = 0; @@ -184,6 +222,24 @@ void libxl__stream_write_start(libxl__egc *egc, stream->running = true; + if (dss->type == LIBXL_DOMAIN_TYPE_HVM) { + switch (libxl__device_model_version_running(gc, dss->domid)) { + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: + stream->emu_sub_hdr.id = EMULATOR_QEMU_TRADITIONAL; + break; + + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: + stream->emu_sub_hdr.id = EMULATOR_QEMU_UPSTREAM; + break; + + default: + rc = ERROR_FAIL; + LOG(ERROR, "Unknown emulator for HVM domain\n"); + goto err; + } + stream->emu_sub_hdr.index = 0; + } + dc->ao = ao; dc->readfd = -1; dc->writewhat = "stream header"; @@ -216,7 +272,7 @@ void libxl__stream_write_start_checkpoint(libxl__egc *egc, assert(!stream->in_checkpoint); stream->in_checkpoint = true; - write_toolstack_record(egc, stream); + write_emulator_xenstore_record(egc, stream); } void libxl__stream_write_abort(libxl__egc *egc, @@ -290,48 +346,47 @@ void libxl__xc_domain_save_done(libxl__egc *egc, void *dss_void, * If the stream is not still alive, we must not continue any work. */ if (libxl__stream_write_inuse(stream)) - write_toolstack_record(egc, stream); + write_emulator_xenstore_record(egc, stream); } -static void write_toolstack_record(libxl__egc *egc, - libxl__stream_write_state *stream) +static void write_emulator_xenstore_record(libxl__egc *egc, + libxl__stream_write_state *stream) { libxl__domain_suspend_state *dss = stream->dss; STATE_AO_GC(stream->ao); struct libxl__sr_rec_hdr rec; int rc; - uint8_t *toolstack_buf = NULL; /* We must free this. */ - uint32_t toolstack_len; + uint8_t *buf = NULL; /* We must free this. */ + uint32_t len; - rc = libxl__toolstack_save(dss->domid, &toolstack_buf, - &toolstack_len, dss); + rc = libxl__toolstack_save(dss->domid, &buf, &len, dss); if (rc) goto err; FILLZERO(rec); rec.type = REC_TYPE_XENSTORE_DATA; - rec.length = toolstack_len; + rec.length = len; - setup_write(egc, stream, "toolstack record", - &rec, toolstack_buf, - toolstack_record_done); + setup_write(egc, stream, "emulator xenstore record", + &rec, buf, + emulator_xenstore_record_done); - free(toolstack_buf); + free(buf); return; err: assert(rc); - free(toolstack_buf); + free(buf); stream_complete(egc, stream, rc); } -static void toolstack_record_done(libxl__egc *egc, - libxl__stream_write_state *stream) +static void emulator_xenstore_record_done(libxl__egc *egc, + libxl__stream_write_state *stream) { libxl__domain_suspend_state *dss = stream->dss; if (dss->type == LIBXL_DOMAIN_TYPE_HVM) - write_emulator_record(egc, stream); + write_emulator_context_record(egc, stream); else { if (stream->in_checkpoint) write_checkpoint_end_record(egc, stream); @@ -340,14 +395,13 @@ static void toolstack_record_done(libxl__egc *egc, } } -static void write_emulator_record(libxl__egc *egc, - libxl__stream_write_state *stream) +static void write_emulator_context_record(libxl__egc *egc, + libxl__stream_write_state *stream) { libxl__domain_suspend_state *dss = stream->dss; libxl__datacopier_state *dc = &stream->emu_dc; STATE_AO_GC(stream->ao); struct libxl__sr_rec_hdr *rec = &stream->emu_rec_hdr; - struct libxl__sr_emulator_hdr *ehdr = NULL; struct stat st; int rc; @@ -355,7 +409,6 @@ static void write_emulator_record(libxl__egc *egc, /* Convenience aliases */ const char *const filename = dss->dm_savefile; - const uint32_t domid = dss->domid; libxl__carefd_begin(); int readfd = open(filename, O_RDONLY); @@ -379,23 +432,8 @@ static void write_emulator_record(libxl__egc *egc, } rec->type = REC_TYPE_EMULATOR_CONTEXT; - rec->length = st.st_size + sizeof(*ehdr); - stream->emu_body = ehdr = libxl__malloc(NOGC, rec->length); - - switch(libxl__device_model_version_running(gc, domid)) { - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - ehdr->id = EMULATOR_QEMU_TRADITIONAL; - break; - - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: - ehdr->id = EMULATOR_QEMU_UPSTREAM; - break; - - default: - rc = ERROR_FAIL; - goto err; - } - ehdr->index = 0; + rec->length = st.st_size + sizeof(stream->emu_sub_hdr); + stream->emu_body = libxl__malloc(NOGC, st.st_size); FILLZERO(*dc); dc->ao = stream->ao; @@ -404,9 +442,9 @@ static void write_emulator_record(libxl__egc *egc, dc->readfd = readfd; dc->writefd = -1; dc->maxsz = -1; - dc->readbuf = stream->emu_body + sizeof(*ehdr); - dc->bytes_to_read = rec->length - sizeof(*ehdr); - dc->callback = emulator_read_done; + dc->readbuf = stream->emu_body; + dc->bytes_to_read = st.st_size; + dc->callback = emulator_context_read_done; rc = libxl__datacopier_start(dc); if (rc) @@ -419,9 +457,9 @@ static void write_emulator_record(libxl__egc *egc, stream_complete(egc, stream, rc); } -static void emulator_read_done(libxl__egc *egc, - libxl__datacopier_state *dc, - int rc, int onwrite, int errnoval) +static void emulator_context_read_done(libxl__egc *egc, + libxl__datacopier_state *dc, + int rc, int onwrite, int errnoval) { libxl__stream_write_state *stream = CONTAINER_OF(dc, *stream, emu_dc); STATE_AO_GC(stream->ao); @@ -434,13 +472,15 @@ static void emulator_read_done(libxl__egc *egc, libxl__carefd_close(stream->emu_carefd); stream->emu_carefd = NULL; - setup_write(egc, stream, "emulator record", - &stream->emu_rec_hdr, stream->emu_body, - emulator_record_done); + setup_emulator_write(egc, stream, "emulator record", + &stream->emu_rec_hdr, + &stream->emu_sub_hdr, + stream->emu_body, + emulator_context_record_done); } -static void emulator_record_done(libxl__egc *egc, - libxl__stream_write_state *stream) +static void emulator_context_record_done(libxl__egc *egc, + libxl__stream_write_state *stream) { free(stream->emu_body); stream->emu_body = NULL; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 07 12:23:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 12:23:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNggB-0004aJ-9a; Fri, 07 Aug 2015 12:23:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNggA-0004Zs-Gg for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:23:18 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 86/80-24856-533A4C55; Fri, 07 Aug 2015 12:23:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1438950196!26455192!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20578 invoked from network); 7 Aug 2015 12:23:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 12:23:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgg7-0002BQ-VH for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:23:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNgg7-0004Lu-Ta for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:23:15 +0000 Date: Fri, 07 Aug 2015 12:23:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl/save&restore&convert: Switch to new EMULATOR_XENSTORE_DATA records X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6b3da2ba3b37ec54363553892528b06efcd51719 Author: Andrew Cooper AuthorDate: Tue Aug 4 18:16:35 2015 +0100 Commit: Ian Campbell CommitDate: Wed Aug 5 10:46:46 2015 +0100 libxl/save&restore&convert: Switch to new EMULATOR_XENSTORE_DATA records Read and write "toolstack" information using the new EMULATOR_XENSTORE_DATA record, and have the conversion script take care of the old format. The entire libxc and libxl migration v2 streams are now bitness-neutral in their records. Signed-off-by: Andrew Cooper Acked-by: Wei Liu --- tools/libxl/libxl_stream_read.c | 16 +++++-- tools/libxl/libxl_stream_write.c | 25 ++++++----- tools/python/scripts/convert-legacy-stream | 66 +++++++++++++++++++++++++--- 3 files changed, 85 insertions(+), 22 deletions(-) diff --git a/tools/libxl/libxl_stream_read.c b/tools/libxl/libxl_stream_read.c index c555542..4ec29da 100644 --- a/tools/libxl/libxl_stream_read.c +++ b/tools/libxl/libxl_stream_read.c @@ -538,14 +538,22 @@ static bool process_record(libxl__egc *egc, libxl__xc_domain_restore(egc, dcs, &stream->shs, 0, 0, 0); break; - case REC_TYPE_XENSTORE_DATA: - rc = libxl__toolstack_restore(dcs->guest_domid, rec->body, - rec->hdr.length, &stream->shs); + case REC_TYPE_EMULATOR_XENSTORE_DATA: + if (rec->hdr.length < sizeof(libxl__sr_emulator_hdr)) { + rc = ERROR_FAIL; + LOG(ERROR, + "Emulator xenstore data record too short to contain header"); + goto err; + } + + rc = libxl__restore_emulator_xenstore_data(dcs, + rec->body + sizeof(libxl__sr_emulator_hdr), + rec->hdr.length - sizeof(libxl__sr_emulator_hdr)); if (rc) goto err; /* - * libxl__toolstack_restore() is a synchronous function. + * libxl__restore_emulator_xenstore_data() is a synchronous function. * Request that our caller queues another action for us. */ further_action_needed = true; diff --git a/tools/libxl/libxl_stream_write.c b/tools/libxl/libxl_stream_write.c index 55439dd..10a9e0f 100644 --- a/tools/libxl/libxl_stream_write.c +++ b/tools/libxl/libxl_stream_write.c @@ -356,27 +356,30 @@ static void write_emulator_xenstore_record(libxl__egc *egc, STATE_AO_GC(stream->ao); struct libxl__sr_rec_hdr rec; int rc; - uint8_t *buf = NULL; /* We must free this. */ - uint32_t len; + char *buf = NULL; + uint32_t len = 0; - rc = libxl__toolstack_save(dss->domid, &buf, &len, dss); + rc = libxl__save_emulator_xenstore_data(dss, &buf, &len); if (rc) goto err; - FILLZERO(rec); - rec.type = REC_TYPE_XENSTORE_DATA; - rec.length = len; + /* No record? - All done. */ + if (len == 0) { + emulator_xenstore_record_done(egc, stream); + return; + } - setup_write(egc, stream, "emulator xenstore record", - &rec, buf, - emulator_xenstore_record_done); + FILLZERO(rec); + rec.type = REC_TYPE_EMULATOR_XENSTORE_DATA; + rec.length = len + sizeof(stream->emu_sub_hdr); - free(buf); + setup_emulator_write(egc, stream, "emulator xenstore record", + &rec, &stream->emu_sub_hdr, buf, + emulator_xenstore_record_done); return; err: assert(rc); - free(buf); stream_complete(egc, stream, rc); } diff --git a/tools/python/scripts/convert-legacy-stream b/tools/python/scripts/convert-legacy-stream index 16331a4..41fee10 100755 --- a/tools/python/scripts/convert-legacy-stream +++ b/tools/python/scripts/convert-legacy-stream @@ -70,7 +70,7 @@ class VM(object): # libxl self.libxl = fmt == "libxl" - self.xenstore = [] # Deferred "toolstack" records + self.emu_xenstore = "" # NUL terminated key&val pairs from "toolstack" records def write_libxc_ihdr(): stream_write(pack(libxc.IHDR_FORMAT, @@ -169,8 +169,10 @@ def write_libxl_end(): def write_libxl_libxc_context(): write_record(libxl.REC_TYPE_libxc_context, "") -def write_libxl_xenstore_data(data): - write_record(libxl.REC_TYPE_xenstore_data, data) +def write_libxl_emulator_xenstore_data(data): + write_record(libxl.REC_TYPE_emulator_xenstore_data, + pack(libxl.EMULATOR_HEADER_FORMAT, + libxl.EMULATOR_ID_unknown, 0) + data) def write_libxl_emulator_context(blob): write_record(libxl.REC_TYPE_emulator_context, @@ -297,6 +299,57 @@ def read_pv_tail(vm): write_record(libxc.REC_TYPE_end, "") +def read_libxl_toolstack(vm, data): + + if len(data) < 8: + raise StreamError("Overly short libxl toolstack data") + + ver, count = unpack("=II", data[:8]) + data = data[8:] + + if ver != 1: + raise StreamError("Cannot decode libxl toolstack version %u" % (ver, )) + info(" Version %u, count %u" % (ver, count)) + + for x in range(count): + + if len(data) < 28: + raise StreamError("Remaining data too short for physmap header") + + phys, start, size, namelen = unpack("=QQQI", data[:28]) + data = data[28:] + + if namelen == 0: + raise StreamError("No physmap info name") + + # 64bit leaked 4 bytes of padding onto the end of name + if twidth == 64: + namelen += 4 + + if len(data) < namelen: + raise StreamError("Remaining data too short for physmap name") + + name = data[:namelen] + data = data[namelen:] + + # Strip padding off the end of name + if twidth == 64: + name = name[:-4] + + if name[-1] != '\x00': + raise StreamError("physmap name not NUL terminated") + + root = "physmap/%x" % (phys,) + kv = [root + "/start_addr", "%x" % (start, ), + root + "/size", "%x" % (size, ), + root + "/name", name[:-1]] + + for key, val in zip(kv[0::2], kv[1::2]): + info(" '%s' = '%s'" % (key, val)) + + vm.emu_xenstore += '\x00'.join(kv) + '\x00' + + def read_chunks(vm): hvm_params = [] @@ -441,7 +494,7 @@ def read_chunks(vm): info(" Toolstack Data: sz 0x%x" % (sz, )) if vm.libxl: - vm.xenstore.append(data) + read_libxl_toolstack(vm, data) else: info(" Discarding") @@ -544,9 +597,8 @@ def read_legacy_stream(vm): else: read_hvm_tail(vm) - if vm.libxl: - for rec in vm.xenstore: - write_libxl_xenstore_data(rec) + if vm.libxl and len(vm.emu_xenstore): + write_libxl_emulator_xenstore_data(vm.emu_xenstore) if not pv and (vm.libxl or qemu): read_qemu(vm) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 07 12:23:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 12:23:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNggB-0004aJ-9a; Fri, 07 Aug 2015 12:23:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNggA-0004Zs-Gg for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:23:18 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 86/80-24856-533A4C55; Fri, 07 Aug 2015 12:23:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1438950196!26455192!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20578 invoked from network); 7 Aug 2015 12:23:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 12:23:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNgg7-0002BQ-VH for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:23:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNgg7-0004Lu-Ta for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:23:15 +0000 Date: Fri, 07 Aug 2015 12:23:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl/save&restore&convert: Switch to new EMULATOR_XENSTORE_DATA records X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6b3da2ba3b37ec54363553892528b06efcd51719 Author: Andrew Cooper AuthorDate: Tue Aug 4 18:16:35 2015 +0100 Commit: Ian Campbell CommitDate: Wed Aug 5 10:46:46 2015 +0100 libxl/save&restore&convert: Switch to new EMULATOR_XENSTORE_DATA records Read and write "toolstack" information using the new EMULATOR_XENSTORE_DATA record, and have the conversion script take care of the old format. The entire libxc and libxl migration v2 streams are now bitness-neutral in their records. Signed-off-by: Andrew Cooper Acked-by: Wei Liu --- tools/libxl/libxl_stream_read.c | 16 +++++-- tools/libxl/libxl_stream_write.c | 25 ++++++----- tools/python/scripts/convert-legacy-stream | 66 +++++++++++++++++++++++++--- 3 files changed, 85 insertions(+), 22 deletions(-) diff --git a/tools/libxl/libxl_stream_read.c b/tools/libxl/libxl_stream_read.c index c555542..4ec29da 100644 --- a/tools/libxl/libxl_stream_read.c +++ b/tools/libxl/libxl_stream_read.c @@ -538,14 +538,22 @@ static bool process_record(libxl__egc *egc, libxl__xc_domain_restore(egc, dcs, &stream->shs, 0, 0, 0); break; - case REC_TYPE_XENSTORE_DATA: - rc = libxl__toolstack_restore(dcs->guest_domid, rec->body, - rec->hdr.length, &stream->shs); + case REC_TYPE_EMULATOR_XENSTORE_DATA: + if (rec->hdr.length < sizeof(libxl__sr_emulator_hdr)) { + rc = ERROR_FAIL; + LOG(ERROR, + "Emulator xenstore data record too short to contain header"); + goto err; + } + + rc = libxl__restore_emulator_xenstore_data(dcs, + rec->body + sizeof(libxl__sr_emulator_hdr), + rec->hdr.length - sizeof(libxl__sr_emulator_hdr)); if (rc) goto err; /* - * libxl__toolstack_restore() is a synchronous function. + * libxl__restore_emulator_xenstore_data() is a synchronous function. * Request that our caller queues another action for us. */ further_action_needed = true; diff --git a/tools/libxl/libxl_stream_write.c b/tools/libxl/libxl_stream_write.c index 55439dd..10a9e0f 100644 --- a/tools/libxl/libxl_stream_write.c +++ b/tools/libxl/libxl_stream_write.c @@ -356,27 +356,30 @@ static void write_emulator_xenstore_record(libxl__egc *egc, STATE_AO_GC(stream->ao); struct libxl__sr_rec_hdr rec; int rc; - uint8_t *buf = NULL; /* We must free this. */ - uint32_t len; + char *buf = NULL; + uint32_t len = 0; - rc = libxl__toolstack_save(dss->domid, &buf, &len, dss); + rc = libxl__save_emulator_xenstore_data(dss, &buf, &len); if (rc) goto err; - FILLZERO(rec); - rec.type = REC_TYPE_XENSTORE_DATA; - rec.length = len; + /* No record? - All done. */ + if (len == 0) { + emulator_xenstore_record_done(egc, stream); + return; + } - setup_write(egc, stream, "emulator xenstore record", - &rec, buf, - emulator_xenstore_record_done); + FILLZERO(rec); + rec.type = REC_TYPE_EMULATOR_XENSTORE_DATA; + rec.length = len + sizeof(stream->emu_sub_hdr); - free(buf); + setup_emulator_write(egc, stream, "emulator xenstore record", + &rec, &stream->emu_sub_hdr, buf, + emulator_xenstore_record_done); return; err: assert(rc); - free(buf); stream_complete(egc, stream, rc); } diff --git a/tools/python/scripts/convert-legacy-stream b/tools/python/scripts/convert-legacy-stream index 16331a4..41fee10 100755 --- a/tools/python/scripts/convert-legacy-stream +++ b/tools/python/scripts/convert-legacy-stream @@ -70,7 +70,7 @@ class VM(object): # libxl self.libxl = fmt == "libxl" - self.xenstore = [] # Deferred "toolstack" records + self.emu_xenstore = "" # NUL terminated key&val pairs from "toolstack" records def write_libxc_ihdr(): stream_write(pack(libxc.IHDR_FORMAT, @@ -169,8 +169,10 @@ def write_libxl_end(): def write_libxl_libxc_context(): write_record(libxl.REC_TYPE_libxc_context, "") -def write_libxl_xenstore_data(data): - write_record(libxl.REC_TYPE_xenstore_data, data) +def write_libxl_emulator_xenstore_data(data): + write_record(libxl.REC_TYPE_emulator_xenstore_data, + pack(libxl.EMULATOR_HEADER_FORMAT, + libxl.EMULATOR_ID_unknown, 0) + data) def write_libxl_emulator_context(blob): write_record(libxl.REC_TYPE_emulator_context, @@ -297,6 +299,57 @@ def read_pv_tail(vm): write_record(libxc.REC_TYPE_end, "") +def read_libxl_toolstack(vm, data): + + if len(data) < 8: + raise StreamError("Overly short libxl toolstack data") + + ver, count = unpack("=II", data[:8]) + data = data[8:] + + if ver != 1: + raise StreamError("Cannot decode libxl toolstack version %u" % (ver, )) + info(" Version %u, count %u" % (ver, count)) + + for x in range(count): + + if len(data) < 28: + raise StreamError("Remaining data too short for physmap header") + + phys, start, size, namelen = unpack("=QQQI", data[:28]) + data = data[28:] + + if namelen == 0: + raise StreamError("No physmap info name") + + # 64bit leaked 4 bytes of padding onto the end of name + if twidth == 64: + namelen += 4 + + if len(data) < namelen: + raise StreamError("Remaining data too short for physmap name") + + name = data[:namelen] + data = data[namelen:] + + # Strip padding off the end of name + if twidth == 64: + name = name[:-4] + + if name[-1] != '\x00': + raise StreamError("physmap name not NUL terminated") + + root = "physmap/%x" % (phys,) + kv = [root + "/start_addr", "%x" % (start, ), + root + "/size", "%x" % (size, ), + root + "/name", name[:-1]] + + for key, val in zip(kv[0::2], kv[1::2]): + info(" '%s' = '%s'" % (key, val)) + + vm.emu_xenstore += '\x00'.join(kv) + '\x00' + + def read_chunks(vm): hvm_params = [] @@ -441,7 +494,7 @@ def read_chunks(vm): info(" Toolstack Data: sz 0x%x" % (sz, )) if vm.libxl: - vm.xenstore.append(data) + read_libxl_toolstack(vm, data) else: info(" Discarding") @@ -544,9 +597,8 @@ def read_legacy_stream(vm): else: read_hvm_tail(vm) - if vm.libxl: - for rec in vm.xenstore: - write_libxl_xenstore_data(rec) + if vm.libxl and len(vm.emu_xenstore): + write_libxl_emulator_xenstore_data(vm.emu_xenstore) if not pv and (vm.libxl or qemu): read_qemu(vm) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 07 12:23:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 12:23:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNggM-0004dH-EA; Fri, 07 Aug 2015 12:23:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNggL-0004ck-44 for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:23:29 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id C8/A3-05269-043A4C55; Fri, 07 Aug 2015 12:23:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1438950206!33298529!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16823 invoked from network); 7 Aug 2015 12:23:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 12:23:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNggI-0002BY-4c for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:23:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNggI-0004MH-3J for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:23:26 +0000 Date: Fri, 07 Aug 2015 12:23:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: Drop all legacy "toolstack" record infrastructure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit db1770342f824764274b19472389da568f7d4fb9 Author: Andrew Cooper AuthorDate: Tue Aug 4 18:16:36 2015 +0100 Commit: Ian Campbell CommitDate: Wed Aug 5 10:46:46 2015 +0100 tools/libxl: Drop all legacy "toolstack" record infrastructure No functional change. It is not used any more. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson Acked-by: Wei Liu --- tools/libxl/libxl_dom.c | 223 ---------------------------------- tools/libxl/libxl_internal.h | 4 - tools/libxl/libxl_sr_stream_format.h | 1 - tools/python/xen/migration/libxl.py | 1 - 4 files changed, 0 insertions(+), 229 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index d54d892..e1f11a3 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1031,126 +1031,6 @@ int libxl__qemu_traditional_cmd(libxl__gc *gc, uint32_t domid, return libxl__xs_write(gc, XBT_NULL, path, "%s", cmd); } -struct libxl__physmap_info { - uint64_t phys_offset; - uint64_t start_addr; - uint64_t size; - uint32_t namelen; - char name[]; -}; - -/* Bump version every time when toolstack saved data changes. - * Different types of data are arranged in the specified order. - * - * Version 1: - * uint32_t version - * QEMU physmap data: - * uint32_t count - * libxl__physmap_info * count - */ -#define TOOLSTACK_SAVE_VERSION 1 - -static inline char *restore_helper(libxl__gc *gc, uint32_t dm_domid, - uint32_t domid, - uint64_t phys_offset, char *node) -{ - return libxl__device_model_xs_path(gc, dm_domid, domid, - "/physmap/%"PRIx64"/%s", - phys_offset, node); -} - -static int libxl__toolstack_restore_qemu(libxl__gc *gc, uint32_t domid, - const uint8_t *ptr, uint32_t size) -{ - int ret, i; - uint32_t count; - char *xs_path; - uint32_t dm_domid; - struct libxl__physmap_info *pi; - - if (size < sizeof(count)) { - LOG(ERROR, "wrong size"); - ret = -1; - goto out; - } - - memcpy(&count, ptr, sizeof(count)); - ptr += sizeof(count); - - if (size < sizeof(count) + count*(sizeof(struct libxl__physmap_info))) { - LOG(ERROR, "wrong size"); - ret = -1; - goto out; - } - - dm_domid = libxl_get_stubdom_id(CTX, domid); - for (i = 0; i < count; i++) { - pi = (struct libxl__physmap_info*) ptr; - ptr += sizeof(struct libxl__physmap_info) + pi->namelen; - - xs_path = restore_helper(gc, dm_domid, domid, - pi->phys_offset, "start_addr"); - ret = libxl__xs_write(gc, 0, xs_path, "%"PRIx64, pi->start_addr); - if (ret) goto out; - - xs_path = restore_helper(gc, dm_domid, domid, pi->phys_offset, "size"); - ret = libxl__xs_write(gc, 0, xs_path, "%"PRIx64, pi->size); - if (ret) goto out; - - if (pi->namelen > 0) { - xs_path = restore_helper(gc, dm_domid, domid, - pi->phys_offset, "name"); - ret = libxl__xs_write(gc, 0, xs_path, "%s", pi->name); - if (ret) goto out; - } - } - - ret = 0; -out: - return ret; - -} - -static int libxl__toolstack_restore_v1(libxl__gc *gc, uint32_t domid, - const uint8_t *ptr, uint32_t size) -{ - return libxl__toolstack_restore_qemu(gc, domid, ptr, size); -} - -int libxl__toolstack_restore(uint32_t domid, const uint8_t *ptr, - uint32_t size, void *user) -{ - libxl__save_helper_state *shs = user; - libxl__domain_create_state *dcs = shs->caller_state; - STATE_AO_GC(dcs->ao); - int ret; - uint32_t version = 0, bufsize; - - LOG(DEBUG,"domain=%"PRIu32" toolstack data size=%"PRIu32, domid, size); - - if (size < sizeof(version)) { - LOG(ERROR, "wrong size"); - ret = -1; - goto out; - } - - memcpy(&version, ptr, sizeof(version)); - ptr += sizeof(version); - bufsize = size - sizeof(version); - - switch (version) { - case 1: - ret = libxl__toolstack_restore_v1(gc, domid, ptr, bufsize); - break; - default: - LOG(ERROR, "wrong version"); - ret = -1; - } - -out: - return ret; -} - /* * Inspect the buffer between start and end, and return a pointer to the * character following the NUL terminator of start, or NULL if start is not @@ -1454,109 +1334,6 @@ static void switch_logdirty_done(libxl__egc *egc, /*----- callbacks, called by xc_domain_save -----*/ -static inline char *physmap_path(libxl__gc *gc, uint32_t dm_domid, - uint32_t domid, - char *phys_offset, char *node) -{ - return libxl__device_model_xs_path(gc, dm_domid, domid, - "/physmap/%s/%s", - phys_offset, node); -} - -int libxl__toolstack_save(uint32_t domid, uint8_t **buf, - uint32_t *len, void *dss_void) -{ - libxl__domain_suspend_state *dss = dss_void; - int ret; - STATE_AO_GC(dss->ao); - int i = 0; - uint32_t version = TOOLSTACK_SAVE_VERSION; - uint8_t *ptr = NULL; - - ret = -1; - - /* Version number */ - *len = sizeof(version); - *buf = calloc(1, *len); - if (*buf == NULL) goto out; - ptr = *buf; - memcpy(ptr, &version, sizeof(version)); - - /* QEMU physmap data */ - { - char **entries = NULL, *xs_path; - struct libxl__physmap_info *pi; - uint32_t dm_domid; - char *start_addr = NULL, *size = NULL, *phys_offset = NULL; - char *name = NULL; - unsigned int num = 0; - uint32_t count = 0, namelen = 0; - - dm_domid = libxl_get_stubdom_id(CTX, domid); - - xs_path = libxl__device_model_xs_path(gc, dm_domid, domid, - "/physmap"); - entries = libxl__xs_directory(gc, 0, xs_path, &num); - count = num; - - *len += sizeof(count); - *buf = realloc(*buf, *len); - if (*buf == NULL) goto out; - ptr = *buf + sizeof(version); - memcpy(ptr, &count, sizeof(count)); - ptr += sizeof(count); - - for (i = 0; i < count; i++) { - unsigned long offset; - phys_offset = entries[i]; - if (phys_offset == NULL) { - LOG(ERROR, "phys_offset %d is NULL", i); - goto out; - } - - xs_path = physmap_path(gc, dm_domid, domid, phys_offset, - "start_addr"); - start_addr = libxl__xs_read(gc, 0, xs_path); - if (start_addr == NULL) { - LOG(ERROR, "%s is NULL", xs_path); - goto out; - } - - xs_path = physmap_path(gc, dm_domid, domid, phys_offset, "size"); - size = libxl__xs_read(gc, 0, xs_path); - if (size == NULL) { - LOG(ERROR, "%s is NULL", xs_path); - goto out; - } - - xs_path = physmap_path(gc, dm_domid, domid, phys_offset, "name"); - name = libxl__xs_read(gc, 0, xs_path); - if (name == NULL) - namelen = 0; - else - namelen = strlen(name) + 1; - *len += namelen + sizeof(struct libxl__physmap_info); - offset = ptr - (*buf); - *buf = realloc(*buf, *len); - if (*buf == NULL) goto out; - ptr = (*buf) + offset; - pi = (struct libxl__physmap_info *) ptr; - pi->phys_offset = strtoll(phys_offset, NULL, 16); - pi->start_addr = strtoll(start_addr, NULL, 16); - pi->size = strtoll(size, NULL, 16); - pi->namelen = namelen; - memcpy(pi->name, name, namelen); - ptr += sizeof(struct libxl__physmap_info) + namelen; - } - } - - LOG(DEBUG,"domain=%"PRIu32" toolstack data size=%"PRIu32, domid, *len); - - ret = 0; -out: - return ret; -} - /* * Expand the buffer 'buf' of length 'len', to append 'str' including its NUL * terminator. diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 49c7cb6..6ea6c83 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1091,8 +1091,6 @@ _hidden int libxl__domain_rename(libxl__gc *gc, uint32_t domid, const char *old_name, const char *new_name, xs_transaction_t trans); -_hidden int libxl__toolstack_restore(uint32_t domid, const uint8_t *buf, - uint32_t size, void *data); _hidden int libxl__domain_resume_device_model(libxl__gc *gc, uint32_t domid); _hidden const char *libxl__userdata_path(libxl__gc *gc, uint32_t domid, @@ -3435,8 +3433,6 @@ void libxl__xc_domain_saverestore_async_callback_done(libxl__egc *egc, _hidden void libxl__domain_suspend_common_switch_qemu_logdirty (int domid, unsigned int enable, void *data); -_hidden int libxl__toolstack_save(uint32_t domid, uint8_t **buf, - uint32_t *len, void *data); _hidden int libxl__save_emulator_xenstore_data(libxl__domain_suspend_state *dss, char **buf, uint32_t *len); _hidden int libxl__restore_emulator_xenstore_data diff --git a/tools/libxl/libxl_sr_stream_format.h b/tools/libxl/libxl_sr_stream_format.h index 4c23367..54da360 100644 --- a/tools/libxl/libxl_sr_stream_format.h +++ b/tools/libxl/libxl_sr_stream_format.h @@ -33,7 +33,6 @@ typedef struct libxl__sr_rec_hdr #define REC_TYPE_END 0x00000000U #define REC_TYPE_LIBXC_CONTEXT 0x00000001U -#define REC_TYPE_XENSTORE_DATA 0x00000002U /* TOOLSTACK COMPAT */ #define REC_TYPE_EMULATOR_XENSTORE_DATA 0x00000002U #define REC_TYPE_EMULATOR_CONTEXT 0x00000003U #define REC_TYPE_CHECKPOINT_END 0x00000004U diff --git a/tools/python/xen/migration/libxl.py b/tools/python/xen/migration/libxl.py index 1a9ca87..fc0acf6 100644 --- a/tools/python/xen/migration/libxl.py +++ b/tools/python/xen/migration/libxl.py @@ -34,7 +34,6 @@ RH_FORMAT = "II" REC_TYPE_end = 0x00000000 REC_TYPE_libxc_context = 0x00000001 -REC_TYPE_xenstore_data = 0x00000002 # TOOLSTACK COMPAT REC_TYPE_emulator_xenstore_data = 0x00000002 REC_TYPE_emulator_context = 0x00000003 REC_TYPE_checkpoint_end = 0x00000004 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 07 12:23:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 12:23:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNggM-0004dH-EA; Fri, 07 Aug 2015 12:23:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNggL-0004ck-44 for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:23:29 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id C8/A3-05269-043A4C55; Fri, 07 Aug 2015 12:23:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1438950206!33298529!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16823 invoked from network); 7 Aug 2015 12:23:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 12:23:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNggI-0002BY-4c for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:23:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNggI-0004MH-3J for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 12:23:26 +0000 Date: Fri, 07 Aug 2015 12:23:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: Drop all legacy "toolstack" record infrastructure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit db1770342f824764274b19472389da568f7d4fb9 Author: Andrew Cooper AuthorDate: Tue Aug 4 18:16:36 2015 +0100 Commit: Ian Campbell CommitDate: Wed Aug 5 10:46:46 2015 +0100 tools/libxl: Drop all legacy "toolstack" record infrastructure No functional change. It is not used any more. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson Acked-by: Wei Liu --- tools/libxl/libxl_dom.c | 223 ---------------------------------- tools/libxl/libxl_internal.h | 4 - tools/libxl/libxl_sr_stream_format.h | 1 - tools/python/xen/migration/libxl.py | 1 - 4 files changed, 0 insertions(+), 229 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index d54d892..e1f11a3 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1031,126 +1031,6 @@ int libxl__qemu_traditional_cmd(libxl__gc *gc, uint32_t domid, return libxl__xs_write(gc, XBT_NULL, path, "%s", cmd); } -struct libxl__physmap_info { - uint64_t phys_offset; - uint64_t start_addr; - uint64_t size; - uint32_t namelen; - char name[]; -}; - -/* Bump version every time when toolstack saved data changes. - * Different types of data are arranged in the specified order. - * - * Version 1: - * uint32_t version - * QEMU physmap data: - * uint32_t count - * libxl__physmap_info * count - */ -#define TOOLSTACK_SAVE_VERSION 1 - -static inline char *restore_helper(libxl__gc *gc, uint32_t dm_domid, - uint32_t domid, - uint64_t phys_offset, char *node) -{ - return libxl__device_model_xs_path(gc, dm_domid, domid, - "/physmap/%"PRIx64"/%s", - phys_offset, node); -} - -static int libxl__toolstack_restore_qemu(libxl__gc *gc, uint32_t domid, - const uint8_t *ptr, uint32_t size) -{ - int ret, i; - uint32_t count; - char *xs_path; - uint32_t dm_domid; - struct libxl__physmap_info *pi; - - if (size < sizeof(count)) { - LOG(ERROR, "wrong size"); - ret = -1; - goto out; - } - - memcpy(&count, ptr, sizeof(count)); - ptr += sizeof(count); - - if (size < sizeof(count) + count*(sizeof(struct libxl__physmap_info))) { - LOG(ERROR, "wrong size"); - ret = -1; - goto out; - } - - dm_domid = libxl_get_stubdom_id(CTX, domid); - for (i = 0; i < count; i++) { - pi = (struct libxl__physmap_info*) ptr; - ptr += sizeof(struct libxl__physmap_info) + pi->namelen; - - xs_path = restore_helper(gc, dm_domid, domid, - pi->phys_offset, "start_addr"); - ret = libxl__xs_write(gc, 0, xs_path, "%"PRIx64, pi->start_addr); - if (ret) goto out; - - xs_path = restore_helper(gc, dm_domid, domid, pi->phys_offset, "size"); - ret = libxl__xs_write(gc, 0, xs_path, "%"PRIx64, pi->size); - if (ret) goto out; - - if (pi->namelen > 0) { - xs_path = restore_helper(gc, dm_domid, domid, - pi->phys_offset, "name"); - ret = libxl__xs_write(gc, 0, xs_path, "%s", pi->name); - if (ret) goto out; - } - } - - ret = 0; -out: - return ret; - -} - -static int libxl__toolstack_restore_v1(libxl__gc *gc, uint32_t domid, - const uint8_t *ptr, uint32_t size) -{ - return libxl__toolstack_restore_qemu(gc, domid, ptr, size); -} - -int libxl__toolstack_restore(uint32_t domid, const uint8_t *ptr, - uint32_t size, void *user) -{ - libxl__save_helper_state *shs = user; - libxl__domain_create_state *dcs = shs->caller_state; - STATE_AO_GC(dcs->ao); - int ret; - uint32_t version = 0, bufsize; - - LOG(DEBUG,"domain=%"PRIu32" toolstack data size=%"PRIu32, domid, size); - - if (size < sizeof(version)) { - LOG(ERROR, "wrong size"); - ret = -1; - goto out; - } - - memcpy(&version, ptr, sizeof(version)); - ptr += sizeof(version); - bufsize = size - sizeof(version); - - switch (version) { - case 1: - ret = libxl__toolstack_restore_v1(gc, domid, ptr, bufsize); - break; - default: - LOG(ERROR, "wrong version"); - ret = -1; - } - -out: - return ret; -} - /* * Inspect the buffer between start and end, and return a pointer to the * character following the NUL terminator of start, or NULL if start is not @@ -1454,109 +1334,6 @@ static void switch_logdirty_done(libxl__egc *egc, /*----- callbacks, called by xc_domain_save -----*/ -static inline char *physmap_path(libxl__gc *gc, uint32_t dm_domid, - uint32_t domid, - char *phys_offset, char *node) -{ - return libxl__device_model_xs_path(gc, dm_domid, domid, - "/physmap/%s/%s", - phys_offset, node); -} - -int libxl__toolstack_save(uint32_t domid, uint8_t **buf, - uint32_t *len, void *dss_void) -{ - libxl__domain_suspend_state *dss = dss_void; - int ret; - STATE_AO_GC(dss->ao); - int i = 0; - uint32_t version = TOOLSTACK_SAVE_VERSION; - uint8_t *ptr = NULL; - - ret = -1; - - /* Version number */ - *len = sizeof(version); - *buf = calloc(1, *len); - if (*buf == NULL) goto out; - ptr = *buf; - memcpy(ptr, &version, sizeof(version)); - - /* QEMU physmap data */ - { - char **entries = NULL, *xs_path; - struct libxl__physmap_info *pi; - uint32_t dm_domid; - char *start_addr = NULL, *size = NULL, *phys_offset = NULL; - char *name = NULL; - unsigned int num = 0; - uint32_t count = 0, namelen = 0; - - dm_domid = libxl_get_stubdom_id(CTX, domid); - - xs_path = libxl__device_model_xs_path(gc, dm_domid, domid, - "/physmap"); - entries = libxl__xs_directory(gc, 0, xs_path, &num); - count = num; - - *len += sizeof(count); - *buf = realloc(*buf, *len); - if (*buf == NULL) goto out; - ptr = *buf + sizeof(version); - memcpy(ptr, &count, sizeof(count)); - ptr += sizeof(count); - - for (i = 0; i < count; i++) { - unsigned long offset; - phys_offset = entries[i]; - if (phys_offset == NULL) { - LOG(ERROR, "phys_offset %d is NULL", i); - goto out; - } - - xs_path = physmap_path(gc, dm_domid, domid, phys_offset, - "start_addr"); - start_addr = libxl__xs_read(gc, 0, xs_path); - if (start_addr == NULL) { - LOG(ERROR, "%s is NULL", xs_path); - goto out; - } - - xs_path = physmap_path(gc, dm_domid, domid, phys_offset, "size"); - size = libxl__xs_read(gc, 0, xs_path); - if (size == NULL) { - LOG(ERROR, "%s is NULL", xs_path); - goto out; - } - - xs_path = physmap_path(gc, dm_domid, domid, phys_offset, "name"); - name = libxl__xs_read(gc, 0, xs_path); - if (name == NULL) - namelen = 0; - else - namelen = strlen(name) + 1; - *len += namelen + sizeof(struct libxl__physmap_info); - offset = ptr - (*buf); - *buf = realloc(*buf, *len); - if (*buf == NULL) goto out; - ptr = (*buf) + offset; - pi = (struct libxl__physmap_info *) ptr; - pi->phys_offset = strtoll(phys_offset, NULL, 16); - pi->start_addr = strtoll(start_addr, NULL, 16); - pi->size = strtoll(size, NULL, 16); - pi->namelen = namelen; - memcpy(pi->name, name, namelen); - ptr += sizeof(struct libxl__physmap_info) + namelen; - } - } - - LOG(DEBUG,"domain=%"PRIu32" toolstack data size=%"PRIu32, domid, *len); - - ret = 0; -out: - return ret; -} - /* * Expand the buffer 'buf' of length 'len', to append 'str' including its NUL * terminator. diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 49c7cb6..6ea6c83 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1091,8 +1091,6 @@ _hidden int libxl__domain_rename(libxl__gc *gc, uint32_t domid, const char *old_name, const char *new_name, xs_transaction_t trans); -_hidden int libxl__toolstack_restore(uint32_t domid, const uint8_t *buf, - uint32_t size, void *data); _hidden int libxl__domain_resume_device_model(libxl__gc *gc, uint32_t domid); _hidden const char *libxl__userdata_path(libxl__gc *gc, uint32_t domid, @@ -3435,8 +3433,6 @@ void libxl__xc_domain_saverestore_async_callback_done(libxl__egc *egc, _hidden void libxl__domain_suspend_common_switch_qemu_logdirty (int domid, unsigned int enable, void *data); -_hidden int libxl__toolstack_save(uint32_t domid, uint8_t **buf, - uint32_t *len, void *data); _hidden int libxl__save_emulator_xenstore_data(libxl__domain_suspend_state *dss, char **buf, uint32_t *len); _hidden int libxl__restore_emulator_xenstore_data diff --git a/tools/libxl/libxl_sr_stream_format.h b/tools/libxl/libxl_sr_stream_format.h index 4c23367..54da360 100644 --- a/tools/libxl/libxl_sr_stream_format.h +++ b/tools/libxl/libxl_sr_stream_format.h @@ -33,7 +33,6 @@ typedef struct libxl__sr_rec_hdr #define REC_TYPE_END 0x00000000U #define REC_TYPE_LIBXC_CONTEXT 0x00000001U -#define REC_TYPE_XENSTORE_DATA 0x00000002U /* TOOLSTACK COMPAT */ #define REC_TYPE_EMULATOR_XENSTORE_DATA 0x00000002U #define REC_TYPE_EMULATOR_CONTEXT 0x00000003U #define REC_TYPE_CHECKPOINT_END 0x00000004U diff --git a/tools/python/xen/migration/libxl.py b/tools/python/xen/migration/libxl.py index 1a9ca87..fc0acf6 100644 --- a/tools/python/xen/migration/libxl.py +++ b/tools/python/xen/migration/libxl.py @@ -34,7 +34,6 @@ RH_FORMAT = "II" REC_TYPE_end = 0x00000000 REC_TYPE_libxc_context = 0x00000001 -REC_TYPE_xenstore_data = 0x00000002 # TOOLSTACK COMPAT REC_TYPE_emulator_xenstore_data = 0x00000002 REC_TYPE_emulator_context = 0x00000003 REC_TYPE_checkpoint_end = 0x00000004 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 07 15:22:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 15:22:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjTD-0004FU-AZ; Fri, 07 Aug 2015 15:22:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjTC-0004FM-G0 for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:22:06 +0000 Content-Length: 1876 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id B1/66-04752-D1DC4C55; Fri, 07 Aug 2015 15:22:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1438960924!38886156!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9515 invoked from network); 7 Aug 2015 15:22:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 15:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjT9-0004Ha-TS for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNjT9-0002W8-QV for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:22:03 +0000 Date: Fri, 07 Aug 2015 15:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] spice: fix spice_chr_add_watch() pre-condition X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3560894358896115743==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============3560894358896115743== Content-Length: 1461 Content-Transfer-Encoding: quoted-printable commit c3eb5b77be3c731c2ecd6eddab403bb8dabc135a Author: Marc-Andr=C3=A9 Lureau AuthorDate: Thu May 28 15:04:58 2015 +0200 Commit: Stefano Stabellini CommitDate: Mon Jul 20 11:26:15 2015 +0000 spice: fix spice_chr_add_watch() pre-condition Since e02bc6de30c44fd668dc0d6e1cd1804f2eed3ed3, add_watch() is called with G_IO_HUP. Even if spice-qemu-char ignores this flag, the precondition must be changed. https://bugzilla.redhat.com/show_bug.cgi=3Fid=3D1128992 upstream-commit-id: f7a8beb5e6a13dc924895244777d9ef08b23b367 Signed-off-by: Gerd Hoffmann Signed-off-by: Stefano Stabellini --- spice-qemu-char.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/spice-qemu-char.c b/spice-qemu-char.c index 8106e06..b436532 100644 --- a/spice-qemu-char.c +++ b/spice-qemu-char.c @@ -170,7 +170,7 @@ static GSource *spice_chr_add_watch(CharDriverState *chr, GIOCondition cond) SpiceCharDriver *scd =3D chr->opaque; SpiceCharSource *src; - assert(cond =3D=3D G_IO_OUT); + assert(cond & G_IO_OUT); src =3D (SpiceCharSource *)g_source_new(&SpiceCharSourceFuncs, sizeof(SpiceCharSource)); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git --===============3560894358896115743== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============3560894358896115743==-- From xen-changelog-bounces@lists.xen.org Fri Aug 07 15:22:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 15:22:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjTD-0004FU-AZ; Fri, 07 Aug 2015 15:22:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjTC-0004FM-G0 for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:22:06 +0000 Content-Length: 1876 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id B1/66-04752-D1DC4C55; Fri, 07 Aug 2015 15:22:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1438960924!38886156!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9515 invoked from network); 7 Aug 2015 15:22:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 15:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjT9-0004Ha-TS for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNjT9-0002W8-QV for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:22:03 +0000 Date: Fri, 07 Aug 2015 15:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] spice: fix spice_chr_add_watch() pre-condition X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3560894358896115743==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============3560894358896115743== Content-Length: 1461 Content-Transfer-Encoding: quoted-printable commit c3eb5b77be3c731c2ecd6eddab403bb8dabc135a Author: Marc-Andr=C3=A9 Lureau AuthorDate: Thu May 28 15:04:58 2015 +0200 Commit: Stefano Stabellini CommitDate: Mon Jul 20 11:26:15 2015 +0000 spice: fix spice_chr_add_watch() pre-condition Since e02bc6de30c44fd668dc0d6e1cd1804f2eed3ed3, add_watch() is called with G_IO_HUP. Even if spice-qemu-char ignores this flag, the precondition must be changed. https://bugzilla.redhat.com/show_bug.cgi=3Fid=3D1128992 upstream-commit-id: f7a8beb5e6a13dc924895244777d9ef08b23b367 Signed-off-by: Gerd Hoffmann Signed-off-by: Stefano Stabellini --- spice-qemu-char.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/spice-qemu-char.c b/spice-qemu-char.c index 8106e06..b436532 100644 --- a/spice-qemu-char.c +++ b/spice-qemu-char.c @@ -170,7 +170,7 @@ static GSource *spice_chr_add_watch(CharDriverState *chr, GIOCondition cond) SpiceCharDriver *scd =3D chr->opaque; SpiceCharSource *src; - assert(cond =3D=3D G_IO_OUT); + assert(cond & G_IO_OUT); src =3D (SpiceCharSource *)g_source_new(&SpiceCharSourceFuncs, sizeof(SpiceCharSource)); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git --===============3560894358896115743== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============3560894358896115743==-- From xen-changelog-bounces@lists.xen.org Fri Aug 07 15:22:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 15:22:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjTP-0004H1-Dl; Fri, 07 Aug 2015 15:22:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjTN-0004Gj-OE for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:22:17 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 84/6F-01421-92DC4C55; Fri, 07 Aug 2015 15:22:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1438960935!33358764!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20738 invoked from network); 7 Aug 2015 15:22:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 15:22:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjTK-0004Hi-UW for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNjTK-0002WX-2E for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:22:14 +0000 Date: Fri, 07 Aug 2015 15:22:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen/HVM: atomically access pointers in bufioreq handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9ad5c2cf05a084ef2fab2b21c4175f0a34482664 Author: Jan Beulich AuthorDate: Fri Jul 24 03:38:28 2015 -0600 Commit: Stefano Stabellini CommitDate: Fri Jul 24 10:36:08 2015 +0000 xen/HVM: atomically access pointers in bufioreq handling The number of slots per page being 511 (i.e. not a power of two) means that the (32-bit) read and write indexes going beyond 2^32 will likely disturb operation. The hypervisor side gets I/O req server creation extended so we can indicate that we're using suitable atomic accesses where needed, allowing it to atomically canonicalize both pointers when both have gone through at least one cycle. The Xen side counterpart (which is not a functional prereq to this change, albeit a build one) went in already (commit b7007bc6f9). upstream-commit-id: 95728305c4781e69896e9f72d1023daa7be46dbe Signed-off-by: Jan Beulich Signed-off-by: Stefano Stabellini --- configure | 27 +++++++++++++++++++++++++++ include/hw/xen/xen_common.h | 12 +++++++++++- xen-hvm.c | 26 ++++++++++++++++++-------- 3 files changed, 56 insertions(+), 9 deletions(-) diff --git a/configure b/configure index b1f8c2a..779623a 100755 --- a/configure +++ b/configure @@ -1877,6 +1877,33 @@ int main(void) { xc_gnttab_open(NULL, 0); xc_domain_add_to_physmap(0, 0, XENMAPSPACE_gmfn, 0, 0); xc_hvm_inject_msi(xc, 0, 0xf0000000, 0x00000000); + xc_hvm_create_ioreq_server(xc, 0, HVM_IOREQSRV_BUFIOREQ_ATOMIC, NULL); + return 0; +} +EOF + compile_prog "" "$xen_libs" + then + xen_ctrl_version=460 + xen=yes + + # Xen 4.5 + elif + cat > $TMPC < +#include +#include +#include +#if !defined(HVM_MAX_VCPUS) +# error HVM_MAX_VCPUS not defined +#endif +int main(void) { + xc_interface *xc; + xs_daemon_open(); + xc = xc_interface_open(0, 0, 0); + xc_hvm_set_mem_type(0, 0, HVMMEM_ram_ro, 0, 0); + xc_gnttab_open(NULL, 0); + xc_domain_add_to_physmap(0, 0, XENMAPSPACE_gmfn, 0, 0); + xc_hvm_inject_msi(xc, 0, 0xf0000000, 0x00000000); xc_hvm_create_ioreq_server(xc, 0, 0, NULL); return 0; } diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h index 38f29fb..5923290 100644 --- a/include/hw/xen/xen_common.h +++ b/include/hw/xen/xen_common.h @@ -186,6 +186,15 @@ static inline int xen_get_vmport_regs_pfn(XenXC xc, domid_t dom, } #endif +/* Xen before 4.6 */ +#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 460 + +#ifndef HVM_IOREQSRV_BUFIOREQ_ATOMIC +#define HVM_IOREQSRV_BUFIOREQ_ATOMIC 2 +#endif + +#endif + /* Xen before 4.5 */ #if CONFIG_XEN_CTRL_INTERFACE_VERSION < 450 @@ -370,7 +379,8 @@ static inline void xen_unmap_pcidev(XenXC xc, domid_t dom, static inline int xen_create_ioreq_server(XenXC xc, domid_t dom, ioservid_t *ioservid) { - int rc = xc_hvm_create_ioreq_server(xc, dom, 1, ioservid); + int rc = xc_hvm_create_ioreq_server(xc, dom, HVM_IOREQSRV_BUFIOREQ_ATOMIC, + ioservid); if (rc == 0) { trace_xen_ioreq_server_create(*ioservid); diff --git a/xen-hvm.c b/xen-hvm.c index 31cb3ca..3a7fd58 100644 --- a/xen-hvm.c +++ b/xen-hvm.c @@ -957,19 +957,30 @@ static void handle_ioreq(XenIOState *state, ioreq_t *req) static int handle_buffered_iopage(XenIOState *state) { + buffered_iopage_t *buf_page = state->buffered_io_page; buf_ioreq_t *buf_req = NULL; ioreq_t req; int qw; - if (!state->buffered_io_page) { + if (!buf_page) { return 0; } memset(&req, 0x00, sizeof(req)); - while (state->buffered_io_page->read_pointer != state->buffered_io_page->write_pointer) { - buf_req = &state->buffered_io_page->buf_ioreq[ - state->buffered_io_page->read_pointer % IOREQ_BUFFER_SLOT_NUM]; + for (;;) { + uint32_t rdptr = buf_page->read_pointer, wrptr; + + xen_rmb(); + wrptr = buf_page->write_pointer; + xen_rmb(); + if (rdptr != buf_page->read_pointer) { + continue; + } + if (rdptr == wrptr) { + break; + } + buf_req = &buf_page->buf_ioreq[rdptr % IOREQ_BUFFER_SLOT_NUM]; req.size = 1UL << buf_req->size; req.count = 1; req.addr = buf_req->addr; @@ -981,15 +992,14 @@ static int handle_buffered_iopage(XenIOState *state) req.data_is_ptr = 0; qw = (req.size == 8); if (qw) { - buf_req = &state->buffered_io_page->buf_ioreq[ - (state->buffered_io_page->read_pointer + 1) % IOREQ_BUFFER_SLOT_NUM]; + buf_req = &buf_page->buf_ioreq[(rdptr + 1) % + IOREQ_BUFFER_SLOT_NUM]; req.data |= ((uint64_t)buf_req->data) << 32; } handle_ioreq(state, &req); - xen_mb(); - state->buffered_io_page->read_pointer += qw ? 2 : 1; + atomic_add(&buf_page->read_pointer, qw + 1); } return req.count; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 07 15:22:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 15:22:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjTP-0004H1-Dl; Fri, 07 Aug 2015 15:22:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjTN-0004Gj-OE for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:22:17 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 84/6F-01421-92DC4C55; Fri, 07 Aug 2015 15:22:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1438960935!33358764!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20738 invoked from network); 7 Aug 2015 15:22:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 15:22:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjTK-0004Hi-UW for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNjTK-0002WX-2E for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:22:14 +0000 Date: Fri, 07 Aug 2015 15:22:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen/HVM: atomically access pointers in bufioreq handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9ad5c2cf05a084ef2fab2b21c4175f0a34482664 Author: Jan Beulich AuthorDate: Fri Jul 24 03:38:28 2015 -0600 Commit: Stefano Stabellini CommitDate: Fri Jul 24 10:36:08 2015 +0000 xen/HVM: atomically access pointers in bufioreq handling The number of slots per page being 511 (i.e. not a power of two) means that the (32-bit) read and write indexes going beyond 2^32 will likely disturb operation. The hypervisor side gets I/O req server creation extended so we can indicate that we're using suitable atomic accesses where needed, allowing it to atomically canonicalize both pointers when both have gone through at least one cycle. The Xen side counterpart (which is not a functional prereq to this change, albeit a build one) went in already (commit b7007bc6f9). upstream-commit-id: 95728305c4781e69896e9f72d1023daa7be46dbe Signed-off-by: Jan Beulich Signed-off-by: Stefano Stabellini --- configure | 27 +++++++++++++++++++++++++++ include/hw/xen/xen_common.h | 12 +++++++++++- xen-hvm.c | 26 ++++++++++++++++++-------- 3 files changed, 56 insertions(+), 9 deletions(-) diff --git a/configure b/configure index b1f8c2a..779623a 100755 --- a/configure +++ b/configure @@ -1877,6 +1877,33 @@ int main(void) { xc_gnttab_open(NULL, 0); xc_domain_add_to_physmap(0, 0, XENMAPSPACE_gmfn, 0, 0); xc_hvm_inject_msi(xc, 0, 0xf0000000, 0x00000000); + xc_hvm_create_ioreq_server(xc, 0, HVM_IOREQSRV_BUFIOREQ_ATOMIC, NULL); + return 0; +} +EOF + compile_prog "" "$xen_libs" + then + xen_ctrl_version=460 + xen=yes + + # Xen 4.5 + elif + cat > $TMPC < +#include +#include +#include +#if !defined(HVM_MAX_VCPUS) +# error HVM_MAX_VCPUS not defined +#endif +int main(void) { + xc_interface *xc; + xs_daemon_open(); + xc = xc_interface_open(0, 0, 0); + xc_hvm_set_mem_type(0, 0, HVMMEM_ram_ro, 0, 0); + xc_gnttab_open(NULL, 0); + xc_domain_add_to_physmap(0, 0, XENMAPSPACE_gmfn, 0, 0); + xc_hvm_inject_msi(xc, 0, 0xf0000000, 0x00000000); xc_hvm_create_ioreq_server(xc, 0, 0, NULL); return 0; } diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h index 38f29fb..5923290 100644 --- a/include/hw/xen/xen_common.h +++ b/include/hw/xen/xen_common.h @@ -186,6 +186,15 @@ static inline int xen_get_vmport_regs_pfn(XenXC xc, domid_t dom, } #endif +/* Xen before 4.6 */ +#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 460 + +#ifndef HVM_IOREQSRV_BUFIOREQ_ATOMIC +#define HVM_IOREQSRV_BUFIOREQ_ATOMIC 2 +#endif + +#endif + /* Xen before 4.5 */ #if CONFIG_XEN_CTRL_INTERFACE_VERSION < 450 @@ -370,7 +379,8 @@ static inline void xen_unmap_pcidev(XenXC xc, domid_t dom, static inline int xen_create_ioreq_server(XenXC xc, domid_t dom, ioservid_t *ioservid) { - int rc = xc_hvm_create_ioreq_server(xc, dom, 1, ioservid); + int rc = xc_hvm_create_ioreq_server(xc, dom, HVM_IOREQSRV_BUFIOREQ_ATOMIC, + ioservid); if (rc == 0) { trace_xen_ioreq_server_create(*ioservid); diff --git a/xen-hvm.c b/xen-hvm.c index 31cb3ca..3a7fd58 100644 --- a/xen-hvm.c +++ b/xen-hvm.c @@ -957,19 +957,30 @@ static void handle_ioreq(XenIOState *state, ioreq_t *req) static int handle_buffered_iopage(XenIOState *state) { + buffered_iopage_t *buf_page = state->buffered_io_page; buf_ioreq_t *buf_req = NULL; ioreq_t req; int qw; - if (!state->buffered_io_page) { + if (!buf_page) { return 0; } memset(&req, 0x00, sizeof(req)); - while (state->buffered_io_page->read_pointer != state->buffered_io_page->write_pointer) { - buf_req = &state->buffered_io_page->buf_ioreq[ - state->buffered_io_page->read_pointer % IOREQ_BUFFER_SLOT_NUM]; + for (;;) { + uint32_t rdptr = buf_page->read_pointer, wrptr; + + xen_rmb(); + wrptr = buf_page->write_pointer; + xen_rmb(); + if (rdptr != buf_page->read_pointer) { + continue; + } + if (rdptr == wrptr) { + break; + } + buf_req = &buf_page->buf_ioreq[rdptr % IOREQ_BUFFER_SLOT_NUM]; req.size = 1UL << buf_req->size; req.count = 1; req.addr = buf_req->addr; @@ -981,15 +992,14 @@ static int handle_buffered_iopage(XenIOState *state) req.data_is_ptr = 0; qw = (req.size == 8); if (qw) { - buf_req = &state->buffered_io_page->buf_ioreq[ - (state->buffered_io_page->read_pointer + 1) % IOREQ_BUFFER_SLOT_NUM]; + buf_req = &buf_page->buf_ioreq[(rdptr + 1) % + IOREQ_BUFFER_SLOT_NUM]; req.data |= ((uint64_t)buf_req->data) << 32; } handle_ioreq(state, &req); - xen_mb(); - state->buffered_io_page->read_pointer += qw ? 2 : 1; + atomic_add(&buf_page->read_pointer, qw + 1); } return req.count; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 07 15:22:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 15:22:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjTY-0004Ia-GN; Fri, 07 Aug 2015 15:22:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjTX-0004IO-J8 for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:22:27 +0000 Content-Length: 2208 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 72/66-23203-23DC4C55; Fri, 07 Aug 2015 15:22:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1438960945!28975034!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11991 invoked from network); 7 Aug 2015 15:22:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 15:22:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjTV-0004Hw-5R for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:22:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNjTV-0002Ww-1b for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:22:25 +0000 Date: Fri, 07 Aug 2015 15:22:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] scsi: fix buffer overflow in scsi_req_parse_cdb (CVE-2015-5158) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4984773188353575675==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============4984773188353575675== Content-Length: 1806 Content-Transfer-Encoding: quoted-printable commit e40ae8730e83e25f160c7576dd32d882bf2a3846 Author: Paolo Bonzini AuthorDate: Tue Jul 21 08:59:39 2015 +0200 Commit: Stefano Stabellini CommitDate: Wed Jul 29 15:20:24 2015 +0000 scsi: fix buffer overflow in scsi_req_parse_cdb (CVE-2015-5158) This is a guest-triggerable buffer overflow present in QEMU 2.2.0 and newer. scsi_cdb_length returns -1 as an error value, but the caller does not check it. Luckily, the massive overflow means that QEMU will just SIGSEGV, making the impact much smaller. upstream-commit-id: c170aad8b057223b1139d72e5ce7acceafab4fa9 Reported-by: Zhu Donghai (=E6=9C=B1=E4=B8=9C=E6=B5=B7) Fixes: 1894df02811f6b79ea3ffbf1084599d96f316173 Reviewed-by: Fam Zheng Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini Signed-off-by: Stefano Stabellini --- hw/scsi/scsi-bus.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index 9b740a3..8e4a986 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -1234,10 +1234,15 @@ int scsi_cdb_length(uint8_t *buf) { int scsi_req_parse_cdb(SCSIDevice *dev, SCSICommand *cmd, uint8_t *buf) { int rc; + int len; cmd->lba =3D -1; - cmd->len =3D scsi_cdb_length(buf); + len =3D scsi_cdb_length(buf); + if (len < 0) { + return -1; + } + cmd->len =3D len; switch (dev->type) { case TYPE_TAPE: rc =3D scsi_req_stream_xfer(cmd, dev, buf); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git --===============4984773188353575675== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============4984773188353575675==-- From xen-changelog-bounces@lists.xen.org Fri Aug 07 15:22:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 15:22:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjTY-0004Ia-GN; Fri, 07 Aug 2015 15:22:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjTX-0004IO-J8 for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:22:27 +0000 Content-Length: 2208 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 72/66-23203-23DC4C55; Fri, 07 Aug 2015 15:22:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1438960945!28975034!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11991 invoked from network); 7 Aug 2015 15:22:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 15:22:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjTV-0004Hw-5R for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:22:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNjTV-0002Ww-1b for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:22:25 +0000 Date: Fri, 07 Aug 2015 15:22:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] scsi: fix buffer overflow in scsi_req_parse_cdb (CVE-2015-5158) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4984773188353575675==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============4984773188353575675== Content-Length: 1806 Content-Transfer-Encoding: quoted-printable commit e40ae8730e83e25f160c7576dd32d882bf2a3846 Author: Paolo Bonzini AuthorDate: Tue Jul 21 08:59:39 2015 +0200 Commit: Stefano Stabellini CommitDate: Wed Jul 29 15:20:24 2015 +0000 scsi: fix buffer overflow in scsi_req_parse_cdb (CVE-2015-5158) This is a guest-triggerable buffer overflow present in QEMU 2.2.0 and newer. scsi_cdb_length returns -1 as an error value, but the caller does not check it. Luckily, the massive overflow means that QEMU will just SIGSEGV, making the impact much smaller. upstream-commit-id: c170aad8b057223b1139d72e5ce7acceafab4fa9 Reported-by: Zhu Donghai (=E6=9C=B1=E4=B8=9C=E6=B5=B7) Fixes: 1894df02811f6b79ea3ffbf1084599d96f316173 Reviewed-by: Fam Zheng Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini Signed-off-by: Stefano Stabellini --- hw/scsi/scsi-bus.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index 9b740a3..8e4a986 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -1234,10 +1234,15 @@ int scsi_cdb_length(uint8_t *buf) { int scsi_req_parse_cdb(SCSIDevice *dev, SCSICommand *cmd, uint8_t *buf) { int rc; + int len; cmd->lba =3D -1; - cmd->len =3D scsi_cdb_length(buf); + len =3D scsi_cdb_length(buf); + if (len < 0) { + return -1; + } + cmd->len =3D len; switch (dev->type) { case TYPE_TAPE: rc =3D scsi_req_stream_xfer(cmd, dev, buf); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git --===============4984773188353575675== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============4984773188353575675==-- From xen-changelog-bounces@lists.xen.org Fri Aug 07 15:22:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 15:22:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjTi-0004Ju-JU; Fri, 07 Aug 2015 15:22:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjTh-0004Jk-K4 for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:22:37 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 0E/61-02324-C3DC4C55; Fri, 07 Aug 2015 15:22:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1438960955!10797751!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29532 invoked from network); 7 Aug 2015 15:22:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 15:22:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjTf-0004I9-Ad for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:22:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNjTf-0002XN-9c for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:22:35 +0000 Date: Fri, 07 Aug 2015 15:22:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] ide: Check array bounds before writing to io_buffer (CVE-2015-5154) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit aaaa1f4499a81204a96ed8273ee3d90d684102ed Author: Kevin Wolf AuthorDate: Sun Jul 26 23:42:53 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Jul 29 15:25:09 2015 +0000 ide: Check array bounds before writing to io_buffer (CVE-2015-5154) If the end_transfer_func of a command is called because enough data has been read or written for the current PIO transfer, and it fails to correctly call the command completion functions, the DRQ bit in the status register and s->end_transfer_func may remain set. This allows the guest to access further bytes in s->io_buffer beyond s->data_end, and eventually overflowing the io_buffer. One case where this currently happens is emulation of the ATAPI command START STOP UNIT. This patch fixes the problem by adding explicit array bounds checks before accessing the buffer instead of relying on end_transfer_func to function correctly. upstream-commit-id: d2ff85854512574e7209f295e87b0835d5b032c6 Cc: qemu-stable@nongnu.org Signed-off-by: Kevin Wolf Reviewed-by: John Snow Signed-off-by: Stefano Stabellini --- hw/ide/core.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index d4af5e2..a4467e9 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -2013,6 +2013,10 @@ void ide_data_writew(void *opaque, uint32_t addr, uint32_t val) } p = s->data_ptr; + if (p + 2 > s->data_end) { + return; + } + *(uint16_t *)p = le16_to_cpu(val); p += 2; s->data_ptr = p; @@ -2034,6 +2038,10 @@ uint32_t ide_data_readw(void *opaque, uint32_t addr) } p = s->data_ptr; + if (p + 2 > s->data_end) { + return 0; + } + ret = cpu_to_le16(*(uint16_t *)p); p += 2; s->data_ptr = p; @@ -2055,6 +2063,10 @@ void ide_data_writel(void *opaque, uint32_t addr, uint32_t val) } p = s->data_ptr; + if (p + 4 > s->data_end) { + return; + } + *(uint32_t *)p = le32_to_cpu(val); p += 4; s->data_ptr = p; @@ -2076,6 +2088,10 @@ uint32_t ide_data_readl(void *opaque, uint32_t addr) } p = s->data_ptr; + if (p + 4 > s->data_end) { + return 0; + } + ret = cpu_to_le32(*(uint32_t *)p); p += 4; s->data_ptr = p; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 07 15:22:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 15:22:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjTi-0004Ju-JU; Fri, 07 Aug 2015 15:22:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjTh-0004Jk-K4 for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:22:37 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 0E/61-02324-C3DC4C55; Fri, 07 Aug 2015 15:22:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1438960955!10797751!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29532 invoked from network); 7 Aug 2015 15:22:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 15:22:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjTf-0004I9-Ad for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:22:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNjTf-0002XN-9c for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:22:35 +0000 Date: Fri, 07 Aug 2015 15:22:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] ide: Check array bounds before writing to io_buffer (CVE-2015-5154) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit aaaa1f4499a81204a96ed8273ee3d90d684102ed Author: Kevin Wolf AuthorDate: Sun Jul 26 23:42:53 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Jul 29 15:25:09 2015 +0000 ide: Check array bounds before writing to io_buffer (CVE-2015-5154) If the end_transfer_func of a command is called because enough data has been read or written for the current PIO transfer, and it fails to correctly call the command completion functions, the DRQ bit in the status register and s->end_transfer_func may remain set. This allows the guest to access further bytes in s->io_buffer beyond s->data_end, and eventually overflowing the io_buffer. One case where this currently happens is emulation of the ATAPI command START STOP UNIT. This patch fixes the problem by adding explicit array bounds checks before accessing the buffer instead of relying on end_transfer_func to function correctly. upstream-commit-id: d2ff85854512574e7209f295e87b0835d5b032c6 Cc: qemu-stable@nongnu.org Signed-off-by: Kevin Wolf Reviewed-by: John Snow Signed-off-by: Stefano Stabellini --- hw/ide/core.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index d4af5e2..a4467e9 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -2013,6 +2013,10 @@ void ide_data_writew(void *opaque, uint32_t addr, uint32_t val) } p = s->data_ptr; + if (p + 2 > s->data_end) { + return; + } + *(uint16_t *)p = le16_to_cpu(val); p += 2; s->data_ptr = p; @@ -2034,6 +2038,10 @@ uint32_t ide_data_readw(void *opaque, uint32_t addr) } p = s->data_ptr; + if (p + 2 > s->data_end) { + return 0; + } + ret = cpu_to_le16(*(uint16_t *)p); p += 2; s->data_ptr = p; @@ -2055,6 +2063,10 @@ void ide_data_writel(void *opaque, uint32_t addr, uint32_t val) } p = s->data_ptr; + if (p + 4 > s->data_end) { + return; + } + *(uint32_t *)p = le32_to_cpu(val); p += 4; s->data_ptr = p; @@ -2076,6 +2088,10 @@ uint32_t ide_data_readl(void *opaque, uint32_t addr) } p = s->data_ptr; + if (p + 4 > s->data_end) { + return 0; + } + ret = cpu_to_le32(*(uint32_t *)p); p += 4; s->data_ptr = p; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 07 15:22:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 15:22:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjTt-0004MS-OF; Fri, 07 Aug 2015 15:22:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjTs-0004MA-58 for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:22:48 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 22/1B-31069-74DC4C55; Fri, 07 Aug 2015 15:22:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1438960965!33412377!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5641 invoked from network); 7 Aug 2015 15:22:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 15:22:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjTp-0004IH-Fu for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:22:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNjTp-0002YY-Dg for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:22:45 +0000 Date: Fri, 07 Aug 2015 15:22:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] ide/atapi: Fix START STOP UNIT command completion (CVE-2015-5154) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 325ec5e0b290b47b177c42e4a930b6644c538321 Author: Kevin Wolf AuthorDate: Sun Jul 26 23:42:53 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Jul 29 15:34:52 2015 +0000 ide/atapi: Fix START STOP UNIT command completion (CVE-2015-5154) The command must be completed on all code paths. START STOP UNIT with pwrcnd set should succeed without doing anything. upstream-commit-id: 03441c3a4a42beb25460dd11592539030337d0f8 Signed-off-by: Kevin Wolf Reviewed-by: John Snow Signed-off-by: Stefano Stabellini --- hw/ide/atapi.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c index c63b7e5..2887b0f 100644 --- a/hw/ide/atapi.c +++ b/hw/ide/atapi.c @@ -880,6 +880,7 @@ static void cmd_start_stop_unit(IDEState *s, uint8_t* buf) if (pwrcnd) { /* eject/load only happens for power condition == 0 */ + ide_atapi_cmd_ok(s); return; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 07 15:22:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 15:22:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjTt-0004MS-OF; Fri, 07 Aug 2015 15:22:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjTs-0004MA-58 for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:22:48 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 22/1B-31069-74DC4C55; Fri, 07 Aug 2015 15:22:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1438960965!33412377!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5641 invoked from network); 7 Aug 2015 15:22:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 15:22:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjTp-0004IH-Fu for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:22:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNjTp-0002YY-Dg for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:22:45 +0000 Date: Fri, 07 Aug 2015 15:22:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] ide/atapi: Fix START STOP UNIT command completion (CVE-2015-5154) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 325ec5e0b290b47b177c42e4a930b6644c538321 Author: Kevin Wolf AuthorDate: Sun Jul 26 23:42:53 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Jul 29 15:34:52 2015 +0000 ide/atapi: Fix START STOP UNIT command completion (CVE-2015-5154) The command must be completed on all code paths. START STOP UNIT with pwrcnd set should succeed without doing anything. upstream-commit-id: 03441c3a4a42beb25460dd11592539030337d0f8 Signed-off-by: Kevin Wolf Reviewed-by: John Snow Signed-off-by: Stefano Stabellini --- hw/ide/atapi.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c index c63b7e5..2887b0f 100644 --- a/hw/ide/atapi.c +++ b/hw/ide/atapi.c @@ -880,6 +880,7 @@ static void cmd_start_stop_unit(IDEState *s, uint8_t* buf) if (pwrcnd) { /* eject/load only happens for power condition == 0 */ + ide_atapi_cmd_ok(s); return; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 07 15:22:59 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 15:22:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjU3-0004OD-Qm; Fri, 07 Aug 2015 15:22:59 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjU1-0004Nt-T8 for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:22:57 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 3E/66-10422-15DC4C55; Fri, 07 Aug 2015 15:22:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1438960975!26504840!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11039 invoked from network); 7 Aug 2015 15:22:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 15:22:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjTz-0004IP-L6 for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:22:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNjTz-0002Yu-K4 for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:22:55 +0000 Date: Fri, 07 Aug 2015 15:22:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] ide: Clear DRQ after handling all expected accesses (CVE-2015-5154) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f748613efca3cd444db26d5aae9244ffa7d7d313 Author: Kevin Wolf AuthorDate: Sun Jul 26 23:42:53 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Jul 29 15:35:25 2015 +0000 ide: Clear DRQ after handling all expected accesses (CVE-2015-5154) This is additional hardening against an end_transfer_func that fails to clear the DRQ status bit. The bit must be unset as soon as the PIO transfer has completed, so it's better to do this in a central place instead of duplicating the code in all commands (and forgetting it in some). upstream-commit-id: cb72cba83021fa42719e73a5249c12096a4d1cfc Signed-off-by: Kevin Wolf Reviewed-by: John Snow Signed-off-by: Stefano Stabellini --- hw/ide/core.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index a4467e9..1d64bca 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -2020,8 +2020,10 @@ void ide_data_writew(void *opaque, uint32_t addr, uint32_t val) *(uint16_t *)p = le16_to_cpu(val); p += 2; s->data_ptr = p; - if (p >= s->data_end) + if (p >= s->data_end) { + s->status &= ~DRQ_STAT; s->end_transfer_func(s); + } } uint32_t ide_data_readw(void *opaque, uint32_t addr) @@ -2045,8 +2047,10 @@ uint32_t ide_data_readw(void *opaque, uint32_t addr) ret = cpu_to_le16(*(uint16_t *)p); p += 2; s->data_ptr = p; - if (p >= s->data_end) + if (p >= s->data_end) { + s->status &= ~DRQ_STAT; s->end_transfer_func(s); + } return ret; } @@ -2070,8 +2074,10 @@ void ide_data_writel(void *opaque, uint32_t addr, uint32_t val) *(uint32_t *)p = le32_to_cpu(val); p += 4; s->data_ptr = p; - if (p >= s->data_end) + if (p >= s->data_end) { + s->status &= ~DRQ_STAT; s->end_transfer_func(s); + } } uint32_t ide_data_readl(void *opaque, uint32_t addr) @@ -2095,8 +2101,10 @@ uint32_t ide_data_readl(void *opaque, uint32_t addr) ret = cpu_to_le32(*(uint32_t *)p); p += 4; s->data_ptr = p; - if (p >= s->data_end) + if (p >= s->data_end) { + s->status &= ~DRQ_STAT; s->end_transfer_func(s); + } return ret; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 07 15:22:59 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 15:22:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjU3-0004OD-Qm; Fri, 07 Aug 2015 15:22:59 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjU1-0004Nt-T8 for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:22:57 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 3E/66-10422-15DC4C55; Fri, 07 Aug 2015 15:22:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1438960975!26504840!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11039 invoked from network); 7 Aug 2015 15:22:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 15:22:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjTz-0004IP-L6 for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:22:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNjTz-0002Yu-K4 for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:22:55 +0000 Date: Fri, 07 Aug 2015 15:22:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] ide: Clear DRQ after handling all expected accesses (CVE-2015-5154) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f748613efca3cd444db26d5aae9244ffa7d7d313 Author: Kevin Wolf AuthorDate: Sun Jul 26 23:42:53 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Jul 29 15:35:25 2015 +0000 ide: Clear DRQ after handling all expected accesses (CVE-2015-5154) This is additional hardening against an end_transfer_func that fails to clear the DRQ status bit. The bit must be unset as soon as the PIO transfer has completed, so it's better to do this in a central place instead of duplicating the code in all commands (and forgetting it in some). upstream-commit-id: cb72cba83021fa42719e73a5249c12096a4d1cfc Signed-off-by: Kevin Wolf Reviewed-by: John Snow Signed-off-by: Stefano Stabellini --- hw/ide/core.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index a4467e9..1d64bca 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -2020,8 +2020,10 @@ void ide_data_writew(void *opaque, uint32_t addr, uint32_t val) *(uint16_t *)p = le16_to_cpu(val); p += 2; s->data_ptr = p; - if (p >= s->data_end) + if (p >= s->data_end) { + s->status &= ~DRQ_STAT; s->end_transfer_func(s); + } } uint32_t ide_data_readw(void *opaque, uint32_t addr) @@ -2045,8 +2047,10 @@ uint32_t ide_data_readw(void *opaque, uint32_t addr) ret = cpu_to_le16(*(uint16_t *)p); p += 2; s->data_ptr = p; - if (p >= s->data_end) + if (p >= s->data_end) { + s->status &= ~DRQ_STAT; s->end_transfer_func(s); + } return ret; } @@ -2070,8 +2074,10 @@ void ide_data_writel(void *opaque, uint32_t addr, uint32_t val) *(uint32_t *)p = le32_to_cpu(val); p += 4; s->data_ptr = p; - if (p >= s->data_end) + if (p >= s->data_end) { + s->status &= ~DRQ_STAT; s->end_transfer_func(s); + } } uint32_t ide_data_readl(void *opaque, uint32_t addr) @@ -2095,8 +2101,10 @@ uint32_t ide_data_readl(void *opaque, uint32_t addr) ret = cpu_to_le32(*(uint32_t *)p); p += 4; s->data_ptr = p; - if (p >= s->data_end) + if (p >= s->data_end) { + s->status &= ~DRQ_STAT; s->end_transfer_func(s); + } return ret; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 07 15:23:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 15:23:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjUD-0004QW-96; Fri, 07 Aug 2015 15:23:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjUC-0004Q4-7j for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:23:08 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 11/5B-12889-B5DC4C55; Fri, 07 Aug 2015 15:23:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1438960986!38830947!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28067 invoked from network); 7 Aug 2015 15:23:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 15:23:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjU9-0004J5-RL for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:23:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNjU9-0002ZT-Op for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:23:05 +0000 Date: Fri, 07 Aug 2015 15:23:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] rtl8139: avoid nested ifs in IP header parsing X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4b47e318c956c6cf7287870bf88cd306c1e4c068 Author: Stefan Hajnoczi AuthorDate: Wed Jul 15 18:16:58 2015 +0100 Commit: Stefano Stabellini CommitDate: Mon Aug 3 13:52:05 2015 +0000 rtl8139: avoid nested ifs in IP header parsing Transmit offload needs to parse packet headers. If header fields have unexpected values the offload processing is skipped. The code currently uses nested ifs because there is relatively little input validation. The next patches will add missing input validation and a goto label is more appropriate to avoid deep if statement nesting. Signed-off-by: Stefan Hajnoczi Signed-off-by: Stefano Stabellini --- hw/net/rtl8139.c | 41 ++++++++++++++++++++++------------------- 1 files changed, 22 insertions(+), 19 deletions(-) diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index 5f0197c..91ba33b 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -2174,28 +2174,30 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) size_t eth_payload_len = 0; int proto = be16_to_cpu(*(uint16_t *)(saved_buffer + 12)); - if (proto == ETH_P_IP) + if (proto != ETH_P_IP) { - DPRINTF("+++ C+ mode has IP packet\n"); - - /* not aligned */ - eth_payload_data = saved_buffer + ETH_HLEN; - eth_payload_len = saved_size - ETH_HLEN; - - ip = (ip_header*)eth_payload_data; - - if (IP_HEADER_VERSION(ip) != IP_HEADER_VERSION_4) { - DPRINTF("+++ C+ mode packet has bad IP version %d " - "expected %d\n", IP_HEADER_VERSION(ip), - IP_HEADER_VERSION_4); - ip = NULL; - } else { - hlen = IP_HEADER_LENGTH(ip); - ip_protocol = ip->ip_p; - ip_data_len = be16_to_cpu(ip->ip_len) - hlen; - } + goto skip_offload; } + DPRINTF("+++ C+ mode has IP packet\n"); + + /* not aligned */ + eth_payload_data = saved_buffer + ETH_HLEN; + eth_payload_len = saved_size - ETH_HLEN; + + ip = (ip_header*)eth_payload_data; + + if (IP_HEADER_VERSION(ip) != IP_HEADER_VERSION_4) { + DPRINTF("+++ C+ mode packet has bad IP version %d " + "expected %d\n", IP_HEADER_VERSION(ip), + IP_HEADER_VERSION_4); + goto skip_offload; + } + + hlen = IP_HEADER_LENGTH(ip); + ip_protocol = ip->ip_p; + ip_data_len = be16_to_cpu(ip->ip_len) - hlen; + if (ip) { if (txdw0 & CP_TX_IPCS) @@ -2391,6 +2393,7 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) } } +skip_offload: /* update tally counter */ ++s->tally_counters.TxOk; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 07 15:23:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 15:23:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjUD-0004QW-96; Fri, 07 Aug 2015 15:23:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjUC-0004Q4-7j for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:23:08 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 11/5B-12889-B5DC4C55; Fri, 07 Aug 2015 15:23:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1438960986!38830947!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28067 invoked from network); 7 Aug 2015 15:23:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 15:23:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjU9-0004J5-RL for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:23:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNjU9-0002ZT-Op for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:23:05 +0000 Date: Fri, 07 Aug 2015 15:23:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] rtl8139: avoid nested ifs in IP header parsing X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4b47e318c956c6cf7287870bf88cd306c1e4c068 Author: Stefan Hajnoczi AuthorDate: Wed Jul 15 18:16:58 2015 +0100 Commit: Stefano Stabellini CommitDate: Mon Aug 3 13:52:05 2015 +0000 rtl8139: avoid nested ifs in IP header parsing Transmit offload needs to parse packet headers. If header fields have unexpected values the offload processing is skipped. The code currently uses nested ifs because there is relatively little input validation. The next patches will add missing input validation and a goto label is more appropriate to avoid deep if statement nesting. Signed-off-by: Stefan Hajnoczi Signed-off-by: Stefano Stabellini --- hw/net/rtl8139.c | 41 ++++++++++++++++++++++------------------- 1 files changed, 22 insertions(+), 19 deletions(-) diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index 5f0197c..91ba33b 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -2174,28 +2174,30 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) size_t eth_payload_len = 0; int proto = be16_to_cpu(*(uint16_t *)(saved_buffer + 12)); - if (proto == ETH_P_IP) + if (proto != ETH_P_IP) { - DPRINTF("+++ C+ mode has IP packet\n"); - - /* not aligned */ - eth_payload_data = saved_buffer + ETH_HLEN; - eth_payload_len = saved_size - ETH_HLEN; - - ip = (ip_header*)eth_payload_data; - - if (IP_HEADER_VERSION(ip) != IP_HEADER_VERSION_4) { - DPRINTF("+++ C+ mode packet has bad IP version %d " - "expected %d\n", IP_HEADER_VERSION(ip), - IP_HEADER_VERSION_4); - ip = NULL; - } else { - hlen = IP_HEADER_LENGTH(ip); - ip_protocol = ip->ip_p; - ip_data_len = be16_to_cpu(ip->ip_len) - hlen; - } + goto skip_offload; } + DPRINTF("+++ C+ mode has IP packet\n"); + + /* not aligned */ + eth_payload_data = saved_buffer + ETH_HLEN; + eth_payload_len = saved_size - ETH_HLEN; + + ip = (ip_header*)eth_payload_data; + + if (IP_HEADER_VERSION(ip) != IP_HEADER_VERSION_4) { + DPRINTF("+++ C+ mode packet has bad IP version %d " + "expected %d\n", IP_HEADER_VERSION(ip), + IP_HEADER_VERSION_4); + goto skip_offload; + } + + hlen = IP_HEADER_LENGTH(ip); + ip_protocol = ip->ip_p; + ip_data_len = be16_to_cpu(ip->ip_len) - hlen; + if (ip) { if (txdw0 & CP_TX_IPCS) @@ -2391,6 +2393,7 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) } } +skip_offload: /* update tally counter */ ++s->tally_counters.TxOk; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 07 15:23:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 15:23:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjUR-0004Tk-Bn; Fri, 07 Aug 2015 15:23:23 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjUQ-0004TU-3K for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:23:22 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id D5/96-12371-96DC4C55; Fri, 07 Aug 2015 15:23:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1438960996!38909734!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28001 invoked from network); 7 Aug 2015 15:23:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 15:23:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjUJ-0004JD-Vf for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:23:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNjUJ-0002Zu-Ue for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:23:15 +0000 Date: Fri, 07 Aug 2015 15:23:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] rtl8139: drop tautologous if (ip) {...} statement X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1f559270d11f62b0d7ea20a741876fb3f2f376af Author: Stefan Hajnoczi AuthorDate: Wed Jul 15 18:16:59 2015 +0100 Commit: Stefano Stabellini CommitDate: Mon Aug 3 13:52:13 2015 +0000 rtl8139: drop tautologous if (ip) {...} statement The previous patch stopped using the ip pointer as an indicator that the IP header is present. When we reach the if (ip) {...} statement we know ip is always non-NULL. Remove the if statement to reduce nesting. Signed-off-by: Stefan Hajnoczi Signed-off-by: Stefano Stabellini --- hw/net/rtl8139.c | 305 +++++++++++++++++++++++++++--------------------------- 1 files changed, 151 insertions(+), 154 deletions(-) diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index 91ba33b..2f12d42 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -2198,198 +2198,195 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) ip_protocol = ip->ip_p; ip_data_len = be16_to_cpu(ip->ip_len) - hlen; - if (ip) + if (txdw0 & CP_TX_IPCS) { - if (txdw0 & CP_TX_IPCS) - { - DPRINTF("+++ C+ mode need IP checksum\n"); + DPRINTF("+++ C+ mode need IP checksum\n"); - if (hleneth_payload_len) {/* min header length */ - /* bad packet header len */ - /* or packet too short */ - } - else - { - ip->ip_sum = 0; - ip->ip_sum = ip_checksum(ip, hlen); - DPRINTF("+++ C+ mode IP header len=%d checksum=%04x\n", - hlen, ip->ip_sum); - } + if (hleneth_payload_len) {/* min header length */ + /* bad packet header len */ + /* or packet too short */ } - - if ((txdw0 & CP_TX_LGSEN) && ip_protocol == IP_PROTO_TCP) + else { - int large_send_mss = (txdw0 >> 16) & CP_TC_LGSEN_MSS_MASK; + ip->ip_sum = 0; + ip->ip_sum = ip_checksum(ip, hlen); + DPRINTF("+++ C+ mode IP header len=%d checksum=%04x\n", + hlen, ip->ip_sum); + } + } - DPRINTF("+++ C+ mode offloaded task TSO MTU=%d IP data %d " - "frame data %d specified MSS=%d\n", ETH_MTU, - ip_data_len, saved_size - ETH_HLEN, large_send_mss); + if ((txdw0 & CP_TX_LGSEN) && ip_protocol == IP_PROTO_TCP) + { + int large_send_mss = (txdw0 >> 16) & CP_TC_LGSEN_MSS_MASK; - int tcp_send_offset = 0; - int send_count = 0; + DPRINTF("+++ C+ mode offloaded task TSO MTU=%d IP data %d " + "frame data %d specified MSS=%d\n", ETH_MTU, + ip_data_len, saved_size - ETH_HLEN, large_send_mss); - /* maximum IP header length is 60 bytes */ - uint8_t saved_ip_header[60]; + int tcp_send_offset = 0; + int send_count = 0; - /* save IP header template; data area is used in tcp checksum calculation */ - memcpy(saved_ip_header, eth_payload_data, hlen); + /* maximum IP header length is 60 bytes */ + uint8_t saved_ip_header[60]; - /* a placeholder for checksum calculation routine in tcp case */ - uint8_t *data_to_checksum = eth_payload_data + hlen - 12; - // size_t data_to_checksum_len = eth_payload_len - hlen + 12; + /* save IP header template; data area is used in tcp checksum calculation */ + memcpy(saved_ip_header, eth_payload_data, hlen); - /* pointer to TCP header */ - tcp_header *p_tcp_hdr = (tcp_header*)(eth_payload_data + hlen); + /* a placeholder for checksum calculation routine in tcp case */ + uint8_t *data_to_checksum = eth_payload_data + hlen - 12; + // size_t data_to_checksum_len = eth_payload_len - hlen + 12; - int tcp_hlen = TCP_HEADER_DATA_OFFSET(p_tcp_hdr); + /* pointer to TCP header */ + tcp_header *p_tcp_hdr = (tcp_header*)(eth_payload_data + hlen); - /* ETH_MTU = ip header len + tcp header len + payload */ - int tcp_data_len = ip_data_len - tcp_hlen; - int tcp_chunk_size = ETH_MTU - hlen - tcp_hlen; + int tcp_hlen = TCP_HEADER_DATA_OFFSET(p_tcp_hdr); - DPRINTF("+++ C+ mode TSO IP data len %d TCP hlen %d TCP " - "data len %d TCP chunk size %d\n", ip_data_len, - tcp_hlen, tcp_data_len, tcp_chunk_size); + /* ETH_MTU = ip header len + tcp header len + payload */ + int tcp_data_len = ip_data_len - tcp_hlen; + int tcp_chunk_size = ETH_MTU - hlen - tcp_hlen; - /* note the cycle below overwrites IP header data, - but restores it from saved_ip_header before sending packet */ + DPRINTF("+++ C+ mode TSO IP data len %d TCP hlen %d TCP " + "data len %d TCP chunk size %d\n", ip_data_len, + tcp_hlen, tcp_data_len, tcp_chunk_size); - int is_last_frame = 0; + /* note the cycle below overwrites IP header data, + but restores it from saved_ip_header before sending packet */ - for (tcp_send_offset = 0; tcp_send_offset < tcp_data_len; tcp_send_offset += tcp_chunk_size) - { - uint16_t chunk_size = tcp_chunk_size; - - /* check if this is the last frame */ - if (tcp_send_offset + tcp_chunk_size >= tcp_data_len) - { - is_last_frame = 1; - chunk_size = tcp_data_len - tcp_send_offset; - } - - DPRINTF("+++ C+ mode TSO TCP seqno %08x\n", - be32_to_cpu(p_tcp_hdr->th_seq)); - - /* add 4 TCP pseudoheader fields */ - /* copy IP source and destination fields */ - memcpy(data_to_checksum, saved_ip_header + 12, 8); - - DPRINTF("+++ C+ mode TSO calculating TCP checksum for " - "packet with %d bytes data\n", tcp_hlen + - chunk_size); - - if (tcp_send_offset) - { - memcpy((uint8_t*)p_tcp_hdr + tcp_hlen, (uint8_t*)p_tcp_hdr + tcp_hlen + tcp_send_offset, chunk_size); - } - - /* keep PUSH and FIN flags only for the last frame */ - if (!is_last_frame) - { - TCP_HEADER_CLEAR_FLAGS(p_tcp_hdr, TCP_FLAG_PUSH|TCP_FLAG_FIN); - } - - /* recalculate TCP checksum */ - ip_pseudo_header *p_tcpip_hdr = (ip_pseudo_header *)data_to_checksum; - p_tcpip_hdr->zeros = 0; - p_tcpip_hdr->ip_proto = IP_PROTO_TCP; - p_tcpip_hdr->ip_payload = cpu_to_be16(tcp_hlen + chunk_size); - - p_tcp_hdr->th_sum = 0; - - int tcp_checksum = ip_checksum(data_to_checksum, tcp_hlen + chunk_size + 12); - DPRINTF("+++ C+ mode TSO TCP checksum %04x\n", - tcp_checksum); - - p_tcp_hdr->th_sum = tcp_checksum; - - /* restore IP header */ - memcpy(eth_payload_data, saved_ip_header, hlen); - - /* set IP data length and recalculate IP checksum */ - ip->ip_len = cpu_to_be16(hlen + tcp_hlen + chunk_size); - - /* increment IP id for subsequent frames */ - ip->ip_id = cpu_to_be16(tcp_send_offset/tcp_chunk_size + be16_to_cpu(ip->ip_id)); - - ip->ip_sum = 0; - ip->ip_sum = ip_checksum(eth_payload_data, hlen); - DPRINTF("+++ C+ mode TSO IP header len=%d " - "checksum=%04x\n", hlen, ip->ip_sum); - - int tso_send_size = ETH_HLEN + hlen + tcp_hlen + chunk_size; - DPRINTF("+++ C+ mode TSO transferring packet size " - "%d\n", tso_send_size); - rtl8139_transfer_frame(s, saved_buffer, tso_send_size, - 0, (uint8_t *) dot1q_buffer); - - /* add transferred count to TCP sequence number */ - p_tcp_hdr->th_seq = cpu_to_be32(chunk_size + be32_to_cpu(p_tcp_hdr->th_seq)); - ++send_count; - } + int is_last_frame = 0; - /* Stop sending this frame */ - saved_size = 0; - } - else if (txdw0 & (CP_TX_TCPCS|CP_TX_UDPCS)) + for (tcp_send_offset = 0; tcp_send_offset < tcp_data_len; tcp_send_offset += tcp_chunk_size) { - DPRINTF("+++ C+ mode need TCP or UDP checksum\n"); + uint16_t chunk_size = tcp_chunk_size; - /* maximum IP header length is 60 bytes */ - uint8_t saved_ip_header[60]; - memcpy(saved_ip_header, eth_payload_data, hlen); + /* check if this is the last frame */ + if (tcp_send_offset + tcp_chunk_size >= tcp_data_len) + { + is_last_frame = 1; + chunk_size = tcp_data_len - tcp_send_offset; + } - uint8_t *data_to_checksum = eth_payload_data + hlen - 12; - // size_t data_to_checksum_len = eth_payload_len - hlen + 12; + DPRINTF("+++ C+ mode TSO TCP seqno %08x\n", + be32_to_cpu(p_tcp_hdr->th_seq)); /* add 4 TCP pseudoheader fields */ /* copy IP source and destination fields */ memcpy(data_to_checksum, saved_ip_header + 12, 8); - if ((txdw0 & CP_TX_TCPCS) && ip_protocol == IP_PROTO_TCP) + DPRINTF("+++ C+ mode TSO calculating TCP checksum for " + "packet with %d bytes data\n", tcp_hlen + + chunk_size); + + if (tcp_send_offset) { - DPRINTF("+++ C+ mode calculating TCP checksum for " - "packet with %d bytes data\n", ip_data_len); + memcpy((uint8_t*)p_tcp_hdr + tcp_hlen, (uint8_t*)p_tcp_hdr + tcp_hlen + tcp_send_offset, chunk_size); + } - ip_pseudo_header *p_tcpip_hdr = (ip_pseudo_header *)data_to_checksum; - p_tcpip_hdr->zeros = 0; - p_tcpip_hdr->ip_proto = IP_PROTO_TCP; - p_tcpip_hdr->ip_payload = cpu_to_be16(ip_data_len); + /* keep PUSH and FIN flags only for the last frame */ + if (!is_last_frame) + { + TCP_HEADER_CLEAR_FLAGS(p_tcp_hdr, TCP_FLAG_PUSH|TCP_FLAG_FIN); + } - tcp_header* p_tcp_hdr = (tcp_header *) (data_to_checksum+12); + /* recalculate TCP checksum */ + ip_pseudo_header *p_tcpip_hdr = (ip_pseudo_header *)data_to_checksum; + p_tcpip_hdr->zeros = 0; + p_tcpip_hdr->ip_proto = IP_PROTO_TCP; + p_tcpip_hdr->ip_payload = cpu_to_be16(tcp_hlen + chunk_size); - p_tcp_hdr->th_sum = 0; + p_tcp_hdr->th_sum = 0; - int tcp_checksum = ip_checksum(data_to_checksum, ip_data_len + 12); - DPRINTF("+++ C+ mode TCP checksum %04x\n", - tcp_checksum); + int tcp_checksum = ip_checksum(data_to_checksum, tcp_hlen + chunk_size + 12); + DPRINTF("+++ C+ mode TSO TCP checksum %04x\n", + tcp_checksum); - p_tcp_hdr->th_sum = tcp_checksum; - } - else if ((txdw0 & CP_TX_UDPCS) && ip_protocol == IP_PROTO_UDP) - { - DPRINTF("+++ C+ mode calculating UDP checksum for " - "packet with %d bytes data\n", ip_data_len); + p_tcp_hdr->th_sum = tcp_checksum; - ip_pseudo_header *p_udpip_hdr = (ip_pseudo_header *)data_to_checksum; - p_udpip_hdr->zeros = 0; - p_udpip_hdr->ip_proto = IP_PROTO_UDP; - p_udpip_hdr->ip_payload = cpu_to_be16(ip_data_len); + /* restore IP header */ + memcpy(eth_payload_data, saved_ip_header, hlen); - udp_header *p_udp_hdr = (udp_header *) (data_to_checksum+12); + /* set IP data length and recalculate IP checksum */ + ip->ip_len = cpu_to_be16(hlen + tcp_hlen + chunk_size); - p_udp_hdr->uh_sum = 0; + /* increment IP id for subsequent frames */ + ip->ip_id = cpu_to_be16(tcp_send_offset/tcp_chunk_size + be16_to_cpu(ip->ip_id)); - int udp_checksum = ip_checksum(data_to_checksum, ip_data_len + 12); - DPRINTF("+++ C+ mode UDP checksum %04x\n", - udp_checksum); + ip->ip_sum = 0; + ip->ip_sum = ip_checksum(eth_payload_data, hlen); + DPRINTF("+++ C+ mode TSO IP header len=%d " + "checksum=%04x\n", hlen, ip->ip_sum); - p_udp_hdr->uh_sum = udp_checksum; - } + int tso_send_size = ETH_HLEN + hlen + tcp_hlen + chunk_size; + DPRINTF("+++ C+ mode TSO transferring packet size " + "%d\n", tso_send_size); + rtl8139_transfer_frame(s, saved_buffer, tso_send_size, + 0, (uint8_t *) dot1q_buffer); - /* restore IP header */ - memcpy(eth_payload_data, saved_ip_header, hlen); + /* add transferred count to TCP sequence number */ + p_tcp_hdr->th_seq = cpu_to_be32(chunk_size + be32_to_cpu(p_tcp_hdr->th_seq)); + ++send_count; } + + /* Stop sending this frame */ + saved_size = 0; + } + else if (txdw0 & (CP_TX_TCPCS|CP_TX_UDPCS)) + { + DPRINTF("+++ C+ mode need TCP or UDP checksum\n"); + + /* maximum IP header length is 60 bytes */ + uint8_t saved_ip_header[60]; + memcpy(saved_ip_header, eth_payload_data, hlen); + + uint8_t *data_to_checksum = eth_payload_data + hlen - 12; + // size_t data_to_checksum_len = eth_payload_len - hlen + 12; + + /* add 4 TCP pseudoheader fields */ + /* copy IP source and destination fields */ + memcpy(data_to_checksum, saved_ip_header + 12, 8); + + if ((txdw0 & CP_TX_TCPCS) && ip_protocol == IP_PROTO_TCP) + { + DPRINTF("+++ C+ mode calculating TCP checksum for " + "packet with %d bytes data\n", ip_data_len); + + ip_pseudo_header *p_tcpip_hdr = (ip_pseudo_header *)data_to_checksum; + p_tcpip_hdr->zeros = 0; + p_tcpip_hdr->ip_proto = IP_PROTO_TCP; + p_tcpip_hdr->ip_payload = cpu_to_be16(ip_data_len); + + tcp_header* p_tcp_hdr = (tcp_header *) (data_to_checksum+12); + + p_tcp_hdr->th_sum = 0; + + int tcp_checksum = ip_checksum(data_to_checksum, ip_data_len + 12); + DPRINTF("+++ C+ mode TCP checksum %04x\n", + tcp_checksum); + + p_tcp_hdr->th_sum = tcp_checksum; + } + else if ((txdw0 & CP_TX_UDPCS) && ip_protocol == IP_PROTO_UDP) + { + DPRINTF("+++ C+ mode calculating UDP checksum for " + "packet with %d bytes data\n", ip_data_len); + + ip_pseudo_header *p_udpip_hdr = (ip_pseudo_header *)data_to_checksum; + p_udpip_hdr->zeros = 0; + p_udpip_hdr->ip_proto = IP_PROTO_UDP; + p_udpip_hdr->ip_payload = cpu_to_be16(ip_data_len); + + udp_header *p_udp_hdr = (udp_header *) (data_to_checksum+12); + + p_udp_hdr->uh_sum = 0; + + int udp_checksum = ip_checksum(data_to_checksum, ip_data_len + 12); + DPRINTF("+++ C+ mode UDP checksum %04x\n", + udp_checksum); + + p_udp_hdr->uh_sum = udp_checksum; + } + + /* restore IP header */ + memcpy(eth_payload_data, saved_ip_header, hlen); } } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 07 15:23:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 15:23:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjUR-0004Tk-Bn; Fri, 07 Aug 2015 15:23:23 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjUQ-0004TU-3K for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:23:22 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id D5/96-12371-96DC4C55; Fri, 07 Aug 2015 15:23:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1438960996!38909734!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28001 invoked from network); 7 Aug 2015 15:23:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 15:23:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjUJ-0004JD-Vf for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:23:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNjUJ-0002Zu-Ue for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:23:15 +0000 Date: Fri, 07 Aug 2015 15:23:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] rtl8139: drop tautologous if (ip) {...} statement X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1f559270d11f62b0d7ea20a741876fb3f2f376af Author: Stefan Hajnoczi AuthorDate: Wed Jul 15 18:16:59 2015 +0100 Commit: Stefano Stabellini CommitDate: Mon Aug 3 13:52:13 2015 +0000 rtl8139: drop tautologous if (ip) {...} statement The previous patch stopped using the ip pointer as an indicator that the IP header is present. When we reach the if (ip) {...} statement we know ip is always non-NULL. Remove the if statement to reduce nesting. Signed-off-by: Stefan Hajnoczi Signed-off-by: Stefano Stabellini --- hw/net/rtl8139.c | 305 +++++++++++++++++++++++++++--------------------------- 1 files changed, 151 insertions(+), 154 deletions(-) diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index 91ba33b..2f12d42 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -2198,198 +2198,195 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) ip_protocol = ip->ip_p; ip_data_len = be16_to_cpu(ip->ip_len) - hlen; - if (ip) + if (txdw0 & CP_TX_IPCS) { - if (txdw0 & CP_TX_IPCS) - { - DPRINTF("+++ C+ mode need IP checksum\n"); + DPRINTF("+++ C+ mode need IP checksum\n"); - if (hleneth_payload_len) {/* min header length */ - /* bad packet header len */ - /* or packet too short */ - } - else - { - ip->ip_sum = 0; - ip->ip_sum = ip_checksum(ip, hlen); - DPRINTF("+++ C+ mode IP header len=%d checksum=%04x\n", - hlen, ip->ip_sum); - } + if (hleneth_payload_len) {/* min header length */ + /* bad packet header len */ + /* or packet too short */ } - - if ((txdw0 & CP_TX_LGSEN) && ip_protocol == IP_PROTO_TCP) + else { - int large_send_mss = (txdw0 >> 16) & CP_TC_LGSEN_MSS_MASK; + ip->ip_sum = 0; + ip->ip_sum = ip_checksum(ip, hlen); + DPRINTF("+++ C+ mode IP header len=%d checksum=%04x\n", + hlen, ip->ip_sum); + } + } - DPRINTF("+++ C+ mode offloaded task TSO MTU=%d IP data %d " - "frame data %d specified MSS=%d\n", ETH_MTU, - ip_data_len, saved_size - ETH_HLEN, large_send_mss); + if ((txdw0 & CP_TX_LGSEN) && ip_protocol == IP_PROTO_TCP) + { + int large_send_mss = (txdw0 >> 16) & CP_TC_LGSEN_MSS_MASK; - int tcp_send_offset = 0; - int send_count = 0; + DPRINTF("+++ C+ mode offloaded task TSO MTU=%d IP data %d " + "frame data %d specified MSS=%d\n", ETH_MTU, + ip_data_len, saved_size - ETH_HLEN, large_send_mss); - /* maximum IP header length is 60 bytes */ - uint8_t saved_ip_header[60]; + int tcp_send_offset = 0; + int send_count = 0; - /* save IP header template; data area is used in tcp checksum calculation */ - memcpy(saved_ip_header, eth_payload_data, hlen); + /* maximum IP header length is 60 bytes */ + uint8_t saved_ip_header[60]; - /* a placeholder for checksum calculation routine in tcp case */ - uint8_t *data_to_checksum = eth_payload_data + hlen - 12; - // size_t data_to_checksum_len = eth_payload_len - hlen + 12; + /* save IP header template; data area is used in tcp checksum calculation */ + memcpy(saved_ip_header, eth_payload_data, hlen); - /* pointer to TCP header */ - tcp_header *p_tcp_hdr = (tcp_header*)(eth_payload_data + hlen); + /* a placeholder for checksum calculation routine in tcp case */ + uint8_t *data_to_checksum = eth_payload_data + hlen - 12; + // size_t data_to_checksum_len = eth_payload_len - hlen + 12; - int tcp_hlen = TCP_HEADER_DATA_OFFSET(p_tcp_hdr); + /* pointer to TCP header */ + tcp_header *p_tcp_hdr = (tcp_header*)(eth_payload_data + hlen); - /* ETH_MTU = ip header len + tcp header len + payload */ - int tcp_data_len = ip_data_len - tcp_hlen; - int tcp_chunk_size = ETH_MTU - hlen - tcp_hlen; + int tcp_hlen = TCP_HEADER_DATA_OFFSET(p_tcp_hdr); - DPRINTF("+++ C+ mode TSO IP data len %d TCP hlen %d TCP " - "data len %d TCP chunk size %d\n", ip_data_len, - tcp_hlen, tcp_data_len, tcp_chunk_size); + /* ETH_MTU = ip header len + tcp header len + payload */ + int tcp_data_len = ip_data_len - tcp_hlen; + int tcp_chunk_size = ETH_MTU - hlen - tcp_hlen; - /* note the cycle below overwrites IP header data, - but restores it from saved_ip_header before sending packet */ + DPRINTF("+++ C+ mode TSO IP data len %d TCP hlen %d TCP " + "data len %d TCP chunk size %d\n", ip_data_len, + tcp_hlen, tcp_data_len, tcp_chunk_size); - int is_last_frame = 0; + /* note the cycle below overwrites IP header data, + but restores it from saved_ip_header before sending packet */ - for (tcp_send_offset = 0; tcp_send_offset < tcp_data_len; tcp_send_offset += tcp_chunk_size) - { - uint16_t chunk_size = tcp_chunk_size; - - /* check if this is the last frame */ - if (tcp_send_offset + tcp_chunk_size >= tcp_data_len) - { - is_last_frame = 1; - chunk_size = tcp_data_len - tcp_send_offset; - } - - DPRINTF("+++ C+ mode TSO TCP seqno %08x\n", - be32_to_cpu(p_tcp_hdr->th_seq)); - - /* add 4 TCP pseudoheader fields */ - /* copy IP source and destination fields */ - memcpy(data_to_checksum, saved_ip_header + 12, 8); - - DPRINTF("+++ C+ mode TSO calculating TCP checksum for " - "packet with %d bytes data\n", tcp_hlen + - chunk_size); - - if (tcp_send_offset) - { - memcpy((uint8_t*)p_tcp_hdr + tcp_hlen, (uint8_t*)p_tcp_hdr + tcp_hlen + tcp_send_offset, chunk_size); - } - - /* keep PUSH and FIN flags only for the last frame */ - if (!is_last_frame) - { - TCP_HEADER_CLEAR_FLAGS(p_tcp_hdr, TCP_FLAG_PUSH|TCP_FLAG_FIN); - } - - /* recalculate TCP checksum */ - ip_pseudo_header *p_tcpip_hdr = (ip_pseudo_header *)data_to_checksum; - p_tcpip_hdr->zeros = 0; - p_tcpip_hdr->ip_proto = IP_PROTO_TCP; - p_tcpip_hdr->ip_payload = cpu_to_be16(tcp_hlen + chunk_size); - - p_tcp_hdr->th_sum = 0; - - int tcp_checksum = ip_checksum(data_to_checksum, tcp_hlen + chunk_size + 12); - DPRINTF("+++ C+ mode TSO TCP checksum %04x\n", - tcp_checksum); - - p_tcp_hdr->th_sum = tcp_checksum; - - /* restore IP header */ - memcpy(eth_payload_data, saved_ip_header, hlen); - - /* set IP data length and recalculate IP checksum */ - ip->ip_len = cpu_to_be16(hlen + tcp_hlen + chunk_size); - - /* increment IP id for subsequent frames */ - ip->ip_id = cpu_to_be16(tcp_send_offset/tcp_chunk_size + be16_to_cpu(ip->ip_id)); - - ip->ip_sum = 0; - ip->ip_sum = ip_checksum(eth_payload_data, hlen); - DPRINTF("+++ C+ mode TSO IP header len=%d " - "checksum=%04x\n", hlen, ip->ip_sum); - - int tso_send_size = ETH_HLEN + hlen + tcp_hlen + chunk_size; - DPRINTF("+++ C+ mode TSO transferring packet size " - "%d\n", tso_send_size); - rtl8139_transfer_frame(s, saved_buffer, tso_send_size, - 0, (uint8_t *) dot1q_buffer); - - /* add transferred count to TCP sequence number */ - p_tcp_hdr->th_seq = cpu_to_be32(chunk_size + be32_to_cpu(p_tcp_hdr->th_seq)); - ++send_count; - } + int is_last_frame = 0; - /* Stop sending this frame */ - saved_size = 0; - } - else if (txdw0 & (CP_TX_TCPCS|CP_TX_UDPCS)) + for (tcp_send_offset = 0; tcp_send_offset < tcp_data_len; tcp_send_offset += tcp_chunk_size) { - DPRINTF("+++ C+ mode need TCP or UDP checksum\n"); + uint16_t chunk_size = tcp_chunk_size; - /* maximum IP header length is 60 bytes */ - uint8_t saved_ip_header[60]; - memcpy(saved_ip_header, eth_payload_data, hlen); + /* check if this is the last frame */ + if (tcp_send_offset + tcp_chunk_size >= tcp_data_len) + { + is_last_frame = 1; + chunk_size = tcp_data_len - tcp_send_offset; + } - uint8_t *data_to_checksum = eth_payload_data + hlen - 12; - // size_t data_to_checksum_len = eth_payload_len - hlen + 12; + DPRINTF("+++ C+ mode TSO TCP seqno %08x\n", + be32_to_cpu(p_tcp_hdr->th_seq)); /* add 4 TCP pseudoheader fields */ /* copy IP source and destination fields */ memcpy(data_to_checksum, saved_ip_header + 12, 8); - if ((txdw0 & CP_TX_TCPCS) && ip_protocol == IP_PROTO_TCP) + DPRINTF("+++ C+ mode TSO calculating TCP checksum for " + "packet with %d bytes data\n", tcp_hlen + + chunk_size); + + if (tcp_send_offset) { - DPRINTF("+++ C+ mode calculating TCP checksum for " - "packet with %d bytes data\n", ip_data_len); + memcpy((uint8_t*)p_tcp_hdr + tcp_hlen, (uint8_t*)p_tcp_hdr + tcp_hlen + tcp_send_offset, chunk_size); + } - ip_pseudo_header *p_tcpip_hdr = (ip_pseudo_header *)data_to_checksum; - p_tcpip_hdr->zeros = 0; - p_tcpip_hdr->ip_proto = IP_PROTO_TCP; - p_tcpip_hdr->ip_payload = cpu_to_be16(ip_data_len); + /* keep PUSH and FIN flags only for the last frame */ + if (!is_last_frame) + { + TCP_HEADER_CLEAR_FLAGS(p_tcp_hdr, TCP_FLAG_PUSH|TCP_FLAG_FIN); + } - tcp_header* p_tcp_hdr = (tcp_header *) (data_to_checksum+12); + /* recalculate TCP checksum */ + ip_pseudo_header *p_tcpip_hdr = (ip_pseudo_header *)data_to_checksum; + p_tcpip_hdr->zeros = 0; + p_tcpip_hdr->ip_proto = IP_PROTO_TCP; + p_tcpip_hdr->ip_payload = cpu_to_be16(tcp_hlen + chunk_size); - p_tcp_hdr->th_sum = 0; + p_tcp_hdr->th_sum = 0; - int tcp_checksum = ip_checksum(data_to_checksum, ip_data_len + 12); - DPRINTF("+++ C+ mode TCP checksum %04x\n", - tcp_checksum); + int tcp_checksum = ip_checksum(data_to_checksum, tcp_hlen + chunk_size + 12); + DPRINTF("+++ C+ mode TSO TCP checksum %04x\n", + tcp_checksum); - p_tcp_hdr->th_sum = tcp_checksum; - } - else if ((txdw0 & CP_TX_UDPCS) && ip_protocol == IP_PROTO_UDP) - { - DPRINTF("+++ C+ mode calculating UDP checksum for " - "packet with %d bytes data\n", ip_data_len); + p_tcp_hdr->th_sum = tcp_checksum; - ip_pseudo_header *p_udpip_hdr = (ip_pseudo_header *)data_to_checksum; - p_udpip_hdr->zeros = 0; - p_udpip_hdr->ip_proto = IP_PROTO_UDP; - p_udpip_hdr->ip_payload = cpu_to_be16(ip_data_len); + /* restore IP header */ + memcpy(eth_payload_data, saved_ip_header, hlen); - udp_header *p_udp_hdr = (udp_header *) (data_to_checksum+12); + /* set IP data length and recalculate IP checksum */ + ip->ip_len = cpu_to_be16(hlen + tcp_hlen + chunk_size); - p_udp_hdr->uh_sum = 0; + /* increment IP id for subsequent frames */ + ip->ip_id = cpu_to_be16(tcp_send_offset/tcp_chunk_size + be16_to_cpu(ip->ip_id)); - int udp_checksum = ip_checksum(data_to_checksum, ip_data_len + 12); - DPRINTF("+++ C+ mode UDP checksum %04x\n", - udp_checksum); + ip->ip_sum = 0; + ip->ip_sum = ip_checksum(eth_payload_data, hlen); + DPRINTF("+++ C+ mode TSO IP header len=%d " + "checksum=%04x\n", hlen, ip->ip_sum); - p_udp_hdr->uh_sum = udp_checksum; - } + int tso_send_size = ETH_HLEN + hlen + tcp_hlen + chunk_size; + DPRINTF("+++ C+ mode TSO transferring packet size " + "%d\n", tso_send_size); + rtl8139_transfer_frame(s, saved_buffer, tso_send_size, + 0, (uint8_t *) dot1q_buffer); - /* restore IP header */ - memcpy(eth_payload_data, saved_ip_header, hlen); + /* add transferred count to TCP sequence number */ + p_tcp_hdr->th_seq = cpu_to_be32(chunk_size + be32_to_cpu(p_tcp_hdr->th_seq)); + ++send_count; } + + /* Stop sending this frame */ + saved_size = 0; + } + else if (txdw0 & (CP_TX_TCPCS|CP_TX_UDPCS)) + { + DPRINTF("+++ C+ mode need TCP or UDP checksum\n"); + + /* maximum IP header length is 60 bytes */ + uint8_t saved_ip_header[60]; + memcpy(saved_ip_header, eth_payload_data, hlen); + + uint8_t *data_to_checksum = eth_payload_data + hlen - 12; + // size_t data_to_checksum_len = eth_payload_len - hlen + 12; + + /* add 4 TCP pseudoheader fields */ + /* copy IP source and destination fields */ + memcpy(data_to_checksum, saved_ip_header + 12, 8); + + if ((txdw0 & CP_TX_TCPCS) && ip_protocol == IP_PROTO_TCP) + { + DPRINTF("+++ C+ mode calculating TCP checksum for " + "packet with %d bytes data\n", ip_data_len); + + ip_pseudo_header *p_tcpip_hdr = (ip_pseudo_header *)data_to_checksum; + p_tcpip_hdr->zeros = 0; + p_tcpip_hdr->ip_proto = IP_PROTO_TCP; + p_tcpip_hdr->ip_payload = cpu_to_be16(ip_data_len); + + tcp_header* p_tcp_hdr = (tcp_header *) (data_to_checksum+12); + + p_tcp_hdr->th_sum = 0; + + int tcp_checksum = ip_checksum(data_to_checksum, ip_data_len + 12); + DPRINTF("+++ C+ mode TCP checksum %04x\n", + tcp_checksum); + + p_tcp_hdr->th_sum = tcp_checksum; + } + else if ((txdw0 & CP_TX_UDPCS) && ip_protocol == IP_PROTO_UDP) + { + DPRINTF("+++ C+ mode calculating UDP checksum for " + "packet with %d bytes data\n", ip_data_len); + + ip_pseudo_header *p_udpip_hdr = (ip_pseudo_header *)data_to_checksum; + p_udpip_hdr->zeros = 0; + p_udpip_hdr->ip_proto = IP_PROTO_UDP; + p_udpip_hdr->ip_payload = cpu_to_be16(ip_data_len); + + udp_header *p_udp_hdr = (udp_header *) (data_to_checksum+12); + + p_udp_hdr->uh_sum = 0; + + int udp_checksum = ip_checksum(data_to_checksum, ip_data_len + 12); + DPRINTF("+++ C+ mode UDP checksum %04x\n", + udp_checksum); + + p_udp_hdr->uh_sum = udp_checksum; + } + + /* restore IP header */ + memcpy(eth_payload_data, saved_ip_header, hlen); } } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 07 15:23:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 15:23:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjUX-0004Vp-GV; Fri, 07 Aug 2015 15:23:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjUW-0004Vc-N0 for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:23:28 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id 2B/00-20219-F6DC4C55; Fri, 07 Aug 2015 15:23:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1438961006!33369702!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11631 invoked from network); 7 Aug 2015 15:23:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 15:23:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjUU-0004JL-8I for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:23:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNjUU-0002bZ-3X for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:23:26 +0000 Date: Fri, 07 Aug 2015 15:23:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] rtl8139: skip offload on short Ethernet/IP header X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fa1d29345aa1140d70d4962327f382f9866e6fcb Author: Stefan Hajnoczi AuthorDate: Wed Jul 15 18:17:00 2015 +0100 Commit: Stefano Stabellini CommitDate: Mon Aug 3 13:52:16 2015 +0000 rtl8139: skip offload on short Ethernet/IP header Transmit offload features access Ethernet and IP headers the packet. If the packet is too short we must not attempt to access header fields: int proto = be16_to_cpu(*(uint16_t *)(saved_buffer + 12)); ... eth_payload_data = saved_buffer + ETH_HLEN; ... ip = (ip_header*)eth_payload_data; if (IP_HEADER_VERSION(ip) != IP_HEADER_VERSION_4) { Signed-off-by: Stefan Hajnoczi Signed-off-by: Stefano Stabellini --- hw/net/rtl8139.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index 2f12d42..d377b6b 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -2164,6 +2164,11 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) { DPRINTF("+++ C+ mode offloaded task checksum\n"); + /* Large enough for Ethernet and IP headers? */ + if (saved_size < ETH_HLEN + sizeof(ip_header)) { + goto skip_offload; + } + /* ip packet header */ ip_header *ip = NULL; int hlen = 0; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 07 15:23:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 15:23:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjUX-0004Vp-GV; Fri, 07 Aug 2015 15:23:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjUW-0004Vc-N0 for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:23:28 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id 2B/00-20219-F6DC4C55; Fri, 07 Aug 2015 15:23:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1438961006!33369702!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11631 invoked from network); 7 Aug 2015 15:23:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 15:23:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjUU-0004JL-8I for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:23:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNjUU-0002bZ-3X for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:23:26 +0000 Date: Fri, 07 Aug 2015 15:23:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] rtl8139: skip offload on short Ethernet/IP header X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fa1d29345aa1140d70d4962327f382f9866e6fcb Author: Stefan Hajnoczi AuthorDate: Wed Jul 15 18:17:00 2015 +0100 Commit: Stefano Stabellini CommitDate: Mon Aug 3 13:52:16 2015 +0000 rtl8139: skip offload on short Ethernet/IP header Transmit offload features access Ethernet and IP headers the packet. If the packet is too short we must not attempt to access header fields: int proto = be16_to_cpu(*(uint16_t *)(saved_buffer + 12)); ... eth_payload_data = saved_buffer + ETH_HLEN; ... ip = (ip_header*)eth_payload_data; if (IP_HEADER_VERSION(ip) != IP_HEADER_VERSION_4) { Signed-off-by: Stefan Hajnoczi Signed-off-by: Stefano Stabellini --- hw/net/rtl8139.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index 2f12d42..d377b6b 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -2164,6 +2164,11 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) { DPRINTF("+++ C+ mode offloaded task checksum\n"); + /* Large enough for Ethernet and IP headers? */ + if (saved_size < ETH_HLEN + sizeof(ip_header)) { + goto skip_offload; + } + /* ip packet header */ ip_header *ip = NULL; int hlen = 0; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 07 15:23:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 15:23:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjUl-0004YS-JH; Fri, 07 Aug 2015 15:23:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjUk-0004Xn-93 for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:23:42 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 45/89-03763-A7DC4C55; Fri, 07 Aug 2015 15:23:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1438961016!28975377!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20319 invoked from network); 7 Aug 2015 15:23:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 15:23:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjUe-0004Jb-EK for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:23:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNjUe-0002by-Co for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:23:36 +0000 Date: Fri, 07 Aug 2015 15:23:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] rtl8139: check IP Header Length field X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5f7cccedaaa8dac367f3dbda857f57e915d8e775 Author: Stefan Hajnoczi AuthorDate: Wed Jul 15 18:17:01 2015 +0100 Commit: Stefano Stabellini CommitDate: Mon Aug 3 13:52:18 2015 +0000 rtl8139: check IP Header Length field The IP Header Length field was only checked in the IP checksum case, but is used in other cases too. Signed-off-by: Stefan Hajnoczi Signed-off-by: Stefano Stabellini --- hw/net/rtl8139.c | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index d377b6b..cd5ac05 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -2200,6 +2200,10 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) } hlen = IP_HEADER_LENGTH(ip); + if (hlen < sizeof(ip_header) || hlen > eth_payload_len) { + goto skip_offload; + } + ip_protocol = ip->ip_p; ip_data_len = be16_to_cpu(ip->ip_len) - hlen; @@ -2207,17 +2211,10 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) { DPRINTF("+++ C+ mode need IP checksum\n"); - if (hleneth_payload_len) {/* min header length */ - /* bad packet header len */ - /* or packet too short */ - } - else - { - ip->ip_sum = 0; - ip->ip_sum = ip_checksum(ip, hlen); - DPRINTF("+++ C+ mode IP header len=%d checksum=%04x\n", - hlen, ip->ip_sum); - } + ip->ip_sum = 0; + ip->ip_sum = ip_checksum(ip, hlen); + DPRINTF("+++ C+ mode IP header len=%d checksum=%04x\n", + hlen, ip->ip_sum); } if ((txdw0 & CP_TX_LGSEN) && ip_protocol == IP_PROTO_TCP) -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 07 15:23:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 15:23:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjUl-0004YS-JH; Fri, 07 Aug 2015 15:23:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjUk-0004Xn-93 for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:23:42 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 45/89-03763-A7DC4C55; Fri, 07 Aug 2015 15:23:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1438961016!28975377!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20319 invoked from network); 7 Aug 2015 15:23:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 15:23:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjUe-0004Jb-EK for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:23:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNjUe-0002by-Co for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:23:36 +0000 Date: Fri, 07 Aug 2015 15:23:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] rtl8139: check IP Header Length field X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5f7cccedaaa8dac367f3dbda857f57e915d8e775 Author: Stefan Hajnoczi AuthorDate: Wed Jul 15 18:17:01 2015 +0100 Commit: Stefano Stabellini CommitDate: Mon Aug 3 13:52:18 2015 +0000 rtl8139: check IP Header Length field The IP Header Length field was only checked in the IP checksum case, but is used in other cases too. Signed-off-by: Stefan Hajnoczi Signed-off-by: Stefano Stabellini --- hw/net/rtl8139.c | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index d377b6b..cd5ac05 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -2200,6 +2200,10 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) } hlen = IP_HEADER_LENGTH(ip); + if (hlen < sizeof(ip_header) || hlen > eth_payload_len) { + goto skip_offload; + } + ip_protocol = ip->ip_p; ip_data_len = be16_to_cpu(ip->ip_len) - hlen; @@ -2207,17 +2211,10 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) { DPRINTF("+++ C+ mode need IP checksum\n"); - if (hleneth_payload_len) {/* min header length */ - /* bad packet header len */ - /* or packet too short */ - } - else - { - ip->ip_sum = 0; - ip->ip_sum = ip_checksum(ip, hlen); - DPRINTF("+++ C+ mode IP header len=%d checksum=%04x\n", - hlen, ip->ip_sum); - } + ip->ip_sum = 0; + ip->ip_sum = ip_checksum(ip, hlen); + DPRINTF("+++ C+ mode IP header len=%d checksum=%04x\n", + hlen, ip->ip_sum); } if ((txdw0 & CP_TX_LGSEN) && ip_protocol == IP_PROTO_TCP) -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 07 15:23:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 15:23:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjUr-0004aN-LX; Fri, 07 Aug 2015 15:23:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjUq-0004a2-NE for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:23:48 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 06/78-32615-48DC4C55; Fri, 07 Aug 2015 15:23:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1438961026!26505006!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15483 invoked from network); 7 Aug 2015 15:23:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 15:23:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjUo-0004Jj-Id for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:23:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNjUo-0002cx-Hj for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:23:46 +0000 Date: Fri, 07 Aug 2015 15:23:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] rtl8139: check IP Total Length field X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b649863740fb3b93ba716d665fbfa1ce83cb5936 Author: Stefan Hajnoczi AuthorDate: Wed Jul 15 18:17:02 2015 +0100 Commit: Stefano Stabellini CommitDate: Mon Aug 3 13:52:21 2015 +0000 rtl8139: check IP Total Length field The IP Total Length field includes the IP header and data. Make sure it is valid and does not exceed the Ethernet payload size. Signed-off-by: Stefan Hajnoczi Signed-off-by: Stefano Stabellini --- hw/net/rtl8139.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index cd5ac05..ed2b23b 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -2205,7 +2205,12 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) } ip_protocol = ip->ip_p; - ip_data_len = be16_to_cpu(ip->ip_len) - hlen; + + ip_data_len = be16_to_cpu(ip->ip_len); + if (ip_data_len < hlen || ip_data_len > eth_payload_len) { + goto skip_offload; + } + ip_data_len -= hlen; if (txdw0 & CP_TX_IPCS) { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 07 15:23:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 15:23:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjUr-0004aN-LX; Fri, 07 Aug 2015 15:23:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjUq-0004a2-NE for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:23:48 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 06/78-32615-48DC4C55; Fri, 07 Aug 2015 15:23:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1438961026!26505006!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15483 invoked from network); 7 Aug 2015 15:23:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 15:23:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjUo-0004Jj-Id for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:23:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNjUo-0002cx-Hj for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:23:46 +0000 Date: Fri, 07 Aug 2015 15:23:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] rtl8139: check IP Total Length field X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b649863740fb3b93ba716d665fbfa1ce83cb5936 Author: Stefan Hajnoczi AuthorDate: Wed Jul 15 18:17:02 2015 +0100 Commit: Stefano Stabellini CommitDate: Mon Aug 3 13:52:21 2015 +0000 rtl8139: check IP Total Length field The IP Total Length field includes the IP header and data. Make sure it is valid and does not exceed the Ethernet payload size. Signed-off-by: Stefan Hajnoczi Signed-off-by: Stefano Stabellini --- hw/net/rtl8139.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index cd5ac05..ed2b23b 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -2205,7 +2205,12 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) } ip_protocol = ip->ip_p; - ip_data_len = be16_to_cpu(ip->ip_len) - hlen; + + ip_data_len = be16_to_cpu(ip->ip_len); + if (ip_data_len < hlen || ip_data_len > eth_payload_len) { + goto skip_offload; + } + ip_data_len -= hlen; if (txdw0 & CP_TX_IPCS) { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 07 15:24:01 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 15:24:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjV2-0004cb-OR; Fri, 07 Aug 2015 15:24:00 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjV1-0004cJ-9w for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:23:59 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 39/C5-09570-E8DC4C55; Fri, 07 Aug 2015 15:23:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1438961036!28975493!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23509 invoked from network); 7 Aug 2015 15:23:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 15:23:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjUy-0004Jr-Nz for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:23:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNjUy-0002dL-MK for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:23:56 +0000 Date: Fri, 07 Aug 2015 15:23:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] rtl8139: skip offload on short TCP header X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6d75b8f79bfaa352566147ea606ca4ea504992d2 Author: Stefan Hajnoczi AuthorDate: Wed Jul 15 18:17:03 2015 +0100 Commit: Stefano Stabellini CommitDate: Mon Aug 3 13:52:23 2015 +0000 rtl8139: skip offload on short TCP header TCP Large Segment Offload accesses the TCP header in the packet. If the packet is too short we must not attempt to access header fields: tcp_header *p_tcp_hdr = (tcp_header*)(eth_payload_data + hlen); int tcp_hlen = TCP_HEADER_DATA_OFFSET(p_tcp_hdr); Signed-off-by: Stefan Hajnoczi Signed-off-by: Stefano Stabellini --- hw/net/rtl8139.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index ed2b23b..c8f0df9 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -2224,6 +2224,11 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) if ((txdw0 & CP_TX_LGSEN) && ip_protocol == IP_PROTO_TCP) { + /* Large enough for the TCP header? */ + if (ip_data_len < sizeof(tcp_header)) { + goto skip_offload; + } + int large_send_mss = (txdw0 >> 16) & CP_TC_LGSEN_MSS_MASK; DPRINTF("+++ C+ mode offloaded task TSO MTU=%d IP data %d " -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 07 15:24:01 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 15:24:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjV2-0004cb-OR; Fri, 07 Aug 2015 15:24:00 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjV1-0004cJ-9w for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:23:59 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 39/C5-09570-E8DC4C55; Fri, 07 Aug 2015 15:23:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1438961036!28975493!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23509 invoked from network); 7 Aug 2015 15:23:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 15:23:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjUy-0004Jr-Nz for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:23:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNjUy-0002dL-MK for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:23:56 +0000 Date: Fri, 07 Aug 2015 15:23:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] rtl8139: skip offload on short TCP header X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6d75b8f79bfaa352566147ea606ca4ea504992d2 Author: Stefan Hajnoczi AuthorDate: Wed Jul 15 18:17:03 2015 +0100 Commit: Stefano Stabellini CommitDate: Mon Aug 3 13:52:23 2015 +0000 rtl8139: skip offload on short TCP header TCP Large Segment Offload accesses the TCP header in the packet. If the packet is too short we must not attempt to access header fields: tcp_header *p_tcp_hdr = (tcp_header*)(eth_payload_data + hlen); int tcp_hlen = TCP_HEADER_DATA_OFFSET(p_tcp_hdr); Signed-off-by: Stefan Hajnoczi Signed-off-by: Stefano Stabellini --- hw/net/rtl8139.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index ed2b23b..c8f0df9 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -2224,6 +2224,11 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) if ((txdw0 & CP_TX_LGSEN) && ip_protocol == IP_PROTO_TCP) { + /* Large enough for the TCP header? */ + if (ip_data_len < sizeof(tcp_header)) { + goto skip_offload; + } + int large_send_mss = (txdw0 >> 16) & CP_TC_LGSEN_MSS_MASK; DPRINTF("+++ C+ mode offloaded task TSO MTU=%d IP data %d " -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 07 15:24:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 15:24:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjVC-0004eo-Qy; Fri, 07 Aug 2015 15:24:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjVB-0004eT-7g for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:24:09 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id E4/08-19220-89DC4C55; Fri, 07 Aug 2015 15:24:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1438961047!26514494!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27994 invoked from network); 7 Aug 2015 15:24:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 15:24:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjV8-0004KW-U2 for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:24:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNjV8-0002dw-S9 for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:24:06 +0000 Date: Fri, 07 Aug 2015 15:24:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] rtl8139: check TCP Data Offset field X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 94db81945c93c679fb5d2eb7d3beb98802f99d93 Author: Stefan Hajnoczi AuthorDate: Wed Jul 15 18:17:04 2015 +0100 Commit: Stefano Stabellini CommitDate: Mon Aug 3 13:52:25 2015 +0000 rtl8139: check TCP Data Offset field The TCP Data Offset field contains the length of the header. Make sure it is valid and does not exceed the IP data length. Signed-off-by: Stefan Hajnoczi Signed-off-by: Stefano Stabellini --- hw/net/rtl8139.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index c8f0df9..2df4a51 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -2253,6 +2253,11 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) int tcp_hlen = TCP_HEADER_DATA_OFFSET(p_tcp_hdr); + /* Invalid TCP data offset? */ + if (tcp_hlen < sizeof(tcp_header) || tcp_hlen > ip_data_len) { + goto skip_offload; + } + /* ETH_MTU = ip header len + tcp header len + payload */ int tcp_data_len = ip_data_len - tcp_hlen; int tcp_chunk_size = ETH_MTU - hlen - tcp_hlen; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 07 15:24:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 15:24:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjVC-0004eo-Qy; Fri, 07 Aug 2015 15:24:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjVB-0004eT-7g for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:24:09 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id E4/08-19220-89DC4C55; Fri, 07 Aug 2015 15:24:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1438961047!26514494!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27994 invoked from network); 7 Aug 2015 15:24:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 15:24:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjV8-0004KW-U2 for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:24:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNjV8-0002dw-S9 for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:24:06 +0000 Date: Fri, 07 Aug 2015 15:24:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] rtl8139: check TCP Data Offset field X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 94db81945c93c679fb5d2eb7d3beb98802f99d93 Author: Stefan Hajnoczi AuthorDate: Wed Jul 15 18:17:04 2015 +0100 Commit: Stefano Stabellini CommitDate: Mon Aug 3 13:52:25 2015 +0000 rtl8139: check TCP Data Offset field The TCP Data Offset field contains the length of the header. Make sure it is valid and does not exceed the IP data length. Signed-off-by: Stefan Hajnoczi Signed-off-by: Stefano Stabellini --- hw/net/rtl8139.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index c8f0df9..2df4a51 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -2253,6 +2253,11 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s) int tcp_hlen = TCP_HEADER_DATA_OFFSET(p_tcp_hdr); + /* Invalid TCP data offset? */ + if (tcp_hlen < sizeof(tcp_header) || tcp_hlen > ip_data_len) { + goto skip_offload; + } + /* ETH_MTU = ip header len + tcp header len + payload */ int tcp_data_len = ip_data_len - tcp_hlen; int tcp_chunk_size = ETH_MTU - hlen - tcp_hlen; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 07 15:24:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 15:24:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjVM-0004gf-Ty; Fri, 07 Aug 2015 15:24:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjVL-0004gI-H6 for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:24:19 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id D5/DA-22089-2ADC4C55; Fri, 07 Aug 2015 15:24:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1438961057!26505103!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18803 invoked from network); 7 Aug 2015 15:24:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 15:24:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjVJ-0004Kh-2s for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:24:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNjVJ-0002eI-1T for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:24:17 +0000 Date: Fri, 07 Aug 2015 15:24:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] Fix release_drive on unplugged devices (pci_piix3_xen_ide_unplug) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bcf35eec0b621c46dbf0aeb40c6bc06b5d3981aa Author: Stefano Stabellini AuthorDate: Mon Aug 3 13:56:57 2015 +0000 Commit: Stefano Stabellini CommitDate: Mon Aug 3 13:56:57 2015 +0000 Fix release_drive on unplugged devices (pci_piix3_xen_ide_unplug) pci_piix3_xen_ide_unplug should completely unhook the unplugged IDEDevice from the corresponding BlockBackend, otherwise the next call to release_drive will try to detach the drive again. Suggested-by: Kevin Wolf Signed-off-by: Stefano Stabellini --- hw/ide/piix.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/hw/ide/piix.c b/hw/ide/piix.c index b0172fb..2bacf53 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -172,6 +172,7 @@ int pci_piix3_xen_ide_unplug(DeviceState *dev) PCIIDEState *pci_ide; DriveInfo *di; int i; + IDEDevice *idedev; pci_ide = PCI_IDE(dev); @@ -184,6 +185,12 @@ int pci_piix3_xen_ide_unplug(DeviceState *dev) blk_detach_dev(blk, ds); } pci_ide->bus[di->bus].ifs[di->unit].blk = NULL; + if (!(i % 2)) { + idedev = pci_ide->bus[di->bus].master; + } else { + idedev = pci_ide->bus[di->bus].slave; + } + idedev->conf.blk = NULL; blk_unref(blk); } } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 07 15:24:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Aug 2015 15:24:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjVM-0004gf-Ty; Fri, 07 Aug 2015 15:24:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjVL-0004gI-H6 for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:24:19 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id D5/DA-22089-2ADC4C55; Fri, 07 Aug 2015 15:24:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1438961057!26505103!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18803 invoked from network); 7 Aug 2015 15:24:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 7 Aug 2015 15:24:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZNjVJ-0004Kh-2s for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:24:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZNjVJ-0002eI-1T for xen-changelog@lists.xensource.com; Fri, 07 Aug 2015 15:24:17 +0000 Date: Fri, 07 Aug 2015 15:24:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] Fix release_drive on unplugged devices (pci_piix3_xen_ide_unplug) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bcf35eec0b621c46dbf0aeb40c6bc06b5d3981aa Author: Stefano Stabellini AuthorDate: Mon Aug 3 13:56:57 2015 +0000 Commit: Stefano Stabellini CommitDate: Mon Aug 3 13:56:57 2015 +0000 Fix release_drive on unplugged devices (pci_piix3_xen_ide_unplug) pci_piix3_xen_ide_unplug should completely unhook the unplugged IDEDevice from the corresponding BlockBackend, otherwise the next call to release_drive will try to detach the drive again. Suggested-by: Kevin Wolf Signed-off-by: Stefano Stabellini --- hw/ide/piix.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/hw/ide/piix.c b/hw/ide/piix.c index b0172fb..2bacf53 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -172,6 +172,7 @@ int pci_piix3_xen_ide_unplug(DeviceState *dev) PCIIDEState *pci_ide; DriveInfo *di; int i; + IDEDevice *idedev; pci_ide = PCI_IDE(dev); @@ -184,6 +185,12 @@ int pci_piix3_xen_ide_unplug(DeviceState *dev) blk_detach_dev(blk, ds); } pci_ide->bus[di->bus].ifs[di->unit].blk = NULL; + if (!(i % 2)) { + idedev = pci_ide->bus[di->bus].master; + } else { + idedev = pci_ide->bus[di->bus].slave; + } + idedev->conf.blk = NULL; blk_unref(blk); } } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 09 04:33:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 09 Aug 2015 04:33:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZOIIH-0007hj-D9; Sun, 09 Aug 2015 04:33:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZOIIG-0007he-6e for xen-changelog@lists.xensource.com; Sun, 09 Aug 2015 04:33:08 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 6F/98-12889-308D6C55; Sun, 09 Aug 2015 04:33:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1439094785!20378535!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.8 required=7.0 tests=BODY_RANDOM_LONG, MAILTO_TO_SPAM_ADDR X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23206 invoked from network); 9 Aug 2015 04:33:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 9 Aug 2015 04:33:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZOIIA-0000m7-QG for xen-changelog@lists.xensource.com; Sun, 09 Aug 2015 04:33:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZOIIA-0008R8-LQ for xen-changelog@lists.xensource.com; Sun, 09 Aug 2015 04:33:02 +0000 Date: Sun, 09 Aug 2015 04:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VT-d: add iommu=igfx option to workaround graphics issues X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 146341187adf99cde71a8d63dbf4733d6a3932ca Author: Ting-Wei Lan AuthorDate: Thu Aug 6 01:10:06 2015 +0800 Commit: Ian Campbell CommitDate: Thu Aug 6 10:03:53 2015 +0100 VT-d: add iommu=igfx option to workaround graphics issues When using Linux >= 3.19 (commit 47591df) as dom0 on some Intel Ironlake devices, It is possible to encounter graphics issues that make screen unreadable or crash the system. It was reported in freedesktop bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90037 As we still cannot find a proper fix for this problem, this patch adds iommu=igfx option to control whether Intel graphics IOMMU is enabled. Running Xen with iommu=no-igfx is similar to running Linux with intel_iommu=igfx_off, which disables IOMMU for Intel GPU. This can be used by users to manually workaround the problem before a fix is available for i915 driver. Signed-off-by: Ting-Wei Lan Reviewed-by: Andrew Cooper Release-acked-by: Wei Liu Acked-by: Kevin Tian --- docs/misc/xen-command-line.markdown | 11 ++++++++++- xen/drivers/passthrough/iommu.c | 3 +++ xen/drivers/passthrough/vtd/quirks.c | 3 +++ xen/include/xen/iommu.h | 2 +- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 204e7a4..a2e427c 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -855,7 +855,7 @@ debug hypervisor only). > Default: `new` unless directed-EOI is supported ### iommu -> `= List of [ | force | required | intremap | qinval | snoop | sharept | dom0-passthrough | dom0-strict | amd-iommu-perdev-intremap | workaround_bios_bug | verbose | debug ]` +> `= List of [ | force | required | intremap | qinval | snoop | sharept | dom0-passthrough | dom0-strict | amd-iommu-perdev-intremap | workaround_bios_bug | igfx | verbose | debug ]` > Sub-options: @@ -929,6 +929,15 @@ debug hypervisor only). >> ignored (normally IOMMU setup fails if any of the devices listed by a DRHD >> entry aren't PCI discoverable). +> `igfx` (VT-d) + +> Default: `true` + +>> Enable IOMMU for Intel graphics devices. The intended usage of this option +>> is `no-igfx`, which is similar to Linux `intel_iommu=igfx_off` option used +>> to workaround graphics issues. If adding `no-igfx` fixes anything, you +>> should file a bug reporting the problem. + > `verbose` > Default: `false` diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c index 11d58cc..fc7831e 100644 --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -46,6 +46,7 @@ bool_t __read_mostly force_iommu; bool_t __hwdom_initdata iommu_dom0_strict; bool_t __read_mostly iommu_verbose; bool_t __read_mostly iommu_workaround_bios_bug; +bool_t __read_mostly iommu_igfx = 1; bool_t __read_mostly iommu_passthrough; bool_t __read_mostly iommu_snoop = 1; bool_t __read_mostly iommu_qinval = 1; @@ -86,6 +87,8 @@ static void __init parse_iommu_param(char *s) force_iommu = val; else if ( !strcmp(s, "workaround_bios_bug") ) iommu_workaround_bios_bug = val; + else if ( !strcmp(s, "igfx") ) + iommu_igfx = val; else if ( !strcmp(s, "verbose") ) iommu_verbose = val; else if ( !strcmp(s, "snoop") ) diff --git a/xen/drivers/passthrough/vtd/quirks.c b/xen/drivers/passthrough/vtd/quirks.c index 921e166..1888843 100644 --- a/xen/drivers/passthrough/vtd/quirks.c +++ b/xen/drivers/passthrough/vtd/quirks.c @@ -71,6 +71,9 @@ int is_igd_vt_enabled_quirk(void) { u16 ggc; + if ( !iommu_igfx ) + return 0; + if ( !IS_ILK(ioh_id) ) return 1; diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h index 705969b..8f3a20e 100644 --- a/xen/include/xen/iommu.h +++ b/xen/include/xen/iommu.h @@ -29,7 +29,7 @@ extern bool_t iommu_enable, iommu_enabled; extern bool_t force_iommu, iommu_verbose; -extern bool_t iommu_workaround_bios_bug, iommu_passthrough; +extern bool_t iommu_workaround_bios_bug, iommu_igfx, iommu_passthrough; extern bool_t iommu_snoop, iommu_qinval, iommu_intremap; extern bool_t iommu_hap_pt_share; extern bool_t iommu_debug; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 09 04:33:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 09 Aug 2015 04:33:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZOIIH-0007hj-D9; Sun, 09 Aug 2015 04:33:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZOIIG-0007he-6e for xen-changelog@lists.xensource.com; Sun, 09 Aug 2015 04:33:08 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 6F/98-12889-308D6C55; Sun, 09 Aug 2015 04:33:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1439094785!20378535!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.8 required=7.0 tests=BODY_RANDOM_LONG, MAILTO_TO_SPAM_ADDR X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23206 invoked from network); 9 Aug 2015 04:33:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 9 Aug 2015 04:33:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZOIIA-0000m7-QG for xen-changelog@lists.xensource.com; Sun, 09 Aug 2015 04:33:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZOIIA-0008R8-LQ for xen-changelog@lists.xensource.com; Sun, 09 Aug 2015 04:33:02 +0000 Date: Sun, 09 Aug 2015 04:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VT-d: add iommu=igfx option to workaround graphics issues X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 146341187adf99cde71a8d63dbf4733d6a3932ca Author: Ting-Wei Lan AuthorDate: Thu Aug 6 01:10:06 2015 +0800 Commit: Ian Campbell CommitDate: Thu Aug 6 10:03:53 2015 +0100 VT-d: add iommu=igfx option to workaround graphics issues When using Linux >= 3.19 (commit 47591df) as dom0 on some Intel Ironlake devices, It is possible to encounter graphics issues that make screen unreadable or crash the system. It was reported in freedesktop bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90037 As we still cannot find a proper fix for this problem, this patch adds iommu=igfx option to control whether Intel graphics IOMMU is enabled. Running Xen with iommu=no-igfx is similar to running Linux with intel_iommu=igfx_off, which disables IOMMU for Intel GPU. This can be used by users to manually workaround the problem before a fix is available for i915 driver. Signed-off-by: Ting-Wei Lan Reviewed-by: Andrew Cooper Release-acked-by: Wei Liu Acked-by: Kevin Tian --- docs/misc/xen-command-line.markdown | 11 ++++++++++- xen/drivers/passthrough/iommu.c | 3 +++ xen/drivers/passthrough/vtd/quirks.c | 3 +++ xen/include/xen/iommu.h | 2 +- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 204e7a4..a2e427c 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -855,7 +855,7 @@ debug hypervisor only). > Default: `new` unless directed-EOI is supported ### iommu -> `= List of [ | force | required | intremap | qinval | snoop | sharept | dom0-passthrough | dom0-strict | amd-iommu-perdev-intremap | workaround_bios_bug | verbose | debug ]` +> `= List of [ | force | required | intremap | qinval | snoop | sharept | dom0-passthrough | dom0-strict | amd-iommu-perdev-intremap | workaround_bios_bug | igfx | verbose | debug ]` > Sub-options: @@ -929,6 +929,15 @@ debug hypervisor only). >> ignored (normally IOMMU setup fails if any of the devices listed by a DRHD >> entry aren't PCI discoverable). +> `igfx` (VT-d) + +> Default: `true` + +>> Enable IOMMU for Intel graphics devices. The intended usage of this option +>> is `no-igfx`, which is similar to Linux `intel_iommu=igfx_off` option used +>> to workaround graphics issues. If adding `no-igfx` fixes anything, you +>> should file a bug reporting the problem. + > `verbose` > Default: `false` diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c index 11d58cc..fc7831e 100644 --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -46,6 +46,7 @@ bool_t __read_mostly force_iommu; bool_t __hwdom_initdata iommu_dom0_strict; bool_t __read_mostly iommu_verbose; bool_t __read_mostly iommu_workaround_bios_bug; +bool_t __read_mostly iommu_igfx = 1; bool_t __read_mostly iommu_passthrough; bool_t __read_mostly iommu_snoop = 1; bool_t __read_mostly iommu_qinval = 1; @@ -86,6 +87,8 @@ static void __init parse_iommu_param(char *s) force_iommu = val; else if ( !strcmp(s, "workaround_bios_bug") ) iommu_workaround_bios_bug = val; + else if ( !strcmp(s, "igfx") ) + iommu_igfx = val; else if ( !strcmp(s, "verbose") ) iommu_verbose = val; else if ( !strcmp(s, "snoop") ) diff --git a/xen/drivers/passthrough/vtd/quirks.c b/xen/drivers/passthrough/vtd/quirks.c index 921e166..1888843 100644 --- a/xen/drivers/passthrough/vtd/quirks.c +++ b/xen/drivers/passthrough/vtd/quirks.c @@ -71,6 +71,9 @@ int is_igd_vt_enabled_quirk(void) { u16 ggc; + if ( !iommu_igfx ) + return 0; + if ( !IS_ILK(ioh_id) ) return 1; diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h index 705969b..8f3a20e 100644 --- a/xen/include/xen/iommu.h +++ b/xen/include/xen/iommu.h @@ -29,7 +29,7 @@ extern bool_t iommu_enable, iommu_enabled; extern bool_t force_iommu, iommu_verbose; -extern bool_t iommu_workaround_bios_bug, iommu_passthrough; +extern bool_t iommu_workaround_bios_bug, iommu_igfx, iommu_passthrough; extern bool_t iommu_snoop, iommu_qinval, iommu_intremap; extern bool_t iommu_hap_pt_share; extern bool_t iommu_debug; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 09 04:33:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 09 Aug 2015 04:33:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZOIIU-0007iG-H9; Sun, 09 Aug 2015 04:33:22 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZOIIS-0007i9-V2 for xen-changelog@lists.xensource.com; Sun, 09 Aug 2015 04:33:21 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 80/6D-06179-F08D6C55; Sun, 09 Aug 2015 04:33:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1439094797!19118848!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1934 invoked from network); 9 Aug 2015 04:33:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 9 Aug 2015 04:33:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZOIIP-0000mB-Eo for xen-changelog@lists.xensource.com; Sun, 09 Aug 2015 04:33:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZOIIN-0008Rb-Km for xen-changelog@lists.xensource.com; Sun, 09 Aug 2015 04:33:15 +0000 Date: Sun, 09 Aug 2015 04:33:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mm: Make {hap, shadow}_teardown() preemptible X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0174da5b79752e2d5d6ca0faed89536e8f3d91c7 Author: Anshul Makkar AuthorDate: Wed Aug 5 16:47:59 2015 +0100 Commit: Ian Campbell CommitDate: Thu Aug 6 10:04:43 2015 +0100 x86/mm: Make {hap, shadow}_teardown() preemptible A domain with sufficient shadow allocation can cause a watchdog timeout during domain destruction. Expand the existing -ERESTART logic in paging_teardown() to allow {hap/sh}_set_allocation() to become restartable during the DOMCTL_destroydomain hypercall. Signed-off-by: Anshul Makkar Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan Reviewed-by: George Dunlap --- xen/arch/x86/mm/hap/hap.c | 22 ++++++++-------------- xen/arch/x86/mm/paging.c | 9 ++++++--- xen/arch/x86/mm/shadow/common.c | 24 +++++++++--------------- xen/include/asm-x86/hap.h | 2 +- xen/include/asm-x86/shadow.h | 4 ++-- 5 files changed, 26 insertions(+), 35 deletions(-) diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index d375c4d..e9c0080 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -551,7 +551,7 @@ void hap_final_teardown(struct domain *d) } if ( d->arch.paging.hap.total_pages != 0 ) - hap_teardown(d); + hap_teardown(d, NULL); p2m_teardown(p2m_get_hostp2m(d)); /* Free any memory that the p2m teardown released */ @@ -561,7 +561,7 @@ void hap_final_teardown(struct domain *d) paging_unlock(d); } -void hap_teardown(struct domain *d) +void hap_teardown(struct domain *d, int *preempted) { struct vcpu *v; mfn_t mfn; @@ -589,18 +589,11 @@ void hap_teardown(struct domain *d) if ( d->arch.paging.hap.total_pages != 0 ) { - HAP_PRINTK("teardown of domain %u starts." - " pages total = %u, free = %u, p2m=%u\n", - d->domain_id, - d->arch.paging.hap.total_pages, - d->arch.paging.hap.free_pages, - d->arch.paging.hap.p2m_pages); - hap_set_allocation(d, 0, NULL); - HAP_PRINTK("teardown done." - " pages total = %u, free = %u, p2m=%u\n", - d->arch.paging.hap.total_pages, - d->arch.paging.hap.free_pages, - d->arch.paging.hap.p2m_pages); + hap_set_allocation(d, 0, preempted); + + if ( preempted && *preempted ) + goto out; + ASSERT(d->arch.paging.hap.total_pages == 0); } @@ -609,6 +602,7 @@ void hap_teardown(struct domain *d) xfree(d->arch.hvm_domain.dirty_vram); d->arch.hvm_domain.dirty_vram = NULL; +out: paging_unlock(d); } diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index 618f475..5becee8 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -799,12 +799,15 @@ long paging_domctl_continuation(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) /* Call when destroying a domain */ int paging_teardown(struct domain *d) { - int rc; + int rc, preempted = 0; if ( hap_enabled(d) ) - hap_teardown(d); + hap_teardown(d, &preempted); else - shadow_teardown(d); + shadow_teardown(d, &preempted); + + if ( preempted ) + return -ERESTART; /* clean up log dirty resources. */ rc = paging_free_log_dirty_bitmap(d, 0); diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index abce8e2..0264b91 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3071,7 +3071,7 @@ int shadow_enable(struct domain *d, u32 mode) return rv; } -void shadow_teardown(struct domain *d) +void shadow_teardown(struct domain *d, int *preempted) /* Destroy the shadow pagetables of this domain and free its shadow memory. * Should only be called for dying domains. */ { @@ -3132,23 +3132,16 @@ void shadow_teardown(struct domain *d) if ( d->arch.paging.shadow.total_pages != 0 ) { - SHADOW_PRINTK("teardown of domain %u starts." - " Shadow pages total = %u, free = %u, p2m=%u\n", - d->domain_id, - d->arch.paging.shadow.total_pages, - d->arch.paging.shadow.free_pages, - d->arch.paging.shadow.p2m_pages); /* Destroy all the shadows and release memory to domheap */ - sh_set_allocation(d, 0, NULL); + sh_set_allocation(d, 0, preempted); + + if ( preempted && *preempted ) + goto out; + /* Release the hash table back to xenheap */ if (d->arch.paging.shadow.hash_table) shadow_hash_teardown(d); - /* Should not have any more memory held */ - SHADOW_PRINTK("teardown done." - " Shadow pages total = %u, free = %u, p2m=%u\n", - d->arch.paging.shadow.total_pages, - d->arch.paging.shadow.free_pages, - d->arch.paging.shadow.p2m_pages); + ASSERT(d->arch.paging.shadow.total_pages == 0); } @@ -3177,6 +3170,7 @@ void shadow_teardown(struct domain *d) d->arch.hvm_domain.dirty_vram = NULL; } +out: paging_unlock(d); /* Must be called outside the lock */ @@ -3198,7 +3192,7 @@ void shadow_final_teardown(struct domain *d) * It is possible for a domain that never got domain_kill()ed * to get here with its shadow allocation intact. */ if ( d->arch.paging.shadow.total_pages != 0 ) - shadow_teardown(d); + shadow_teardown(d, NULL); /* It is now safe to pull down the p2m map. */ p2m_teardown(p2m_get_hostp2m(d)); diff --git a/xen/include/asm-x86/hap.h b/xen/include/asm-x86/hap.h index bd87481..c613836 100644 --- a/xen/include/asm-x86/hap.h +++ b/xen/include/asm-x86/hap.h @@ -38,7 +38,7 @@ int hap_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, XEN_GUEST_HANDLE_PARAM(void) u_domctl); int hap_enable(struct domain *d, u32 mode); void hap_final_teardown(struct domain *d); -void hap_teardown(struct domain *d); +void hap_teardown(struct domain *d, int *preempted); void hap_vcpu_init(struct vcpu *v); int hap_track_dirty_vram(struct domain *d, unsigned long begin_pfn, diff --git a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h index 9cd653e..6d0aefb 100644 --- a/xen/include/asm-x86/shadow.h +++ b/xen/include/asm-x86/shadow.h @@ -73,7 +73,7 @@ int shadow_domctl(struct domain *d, XEN_GUEST_HANDLE_PARAM(void) u_domctl); /* Call when destroying a domain */ -void shadow_teardown(struct domain *d); +void shadow_teardown(struct domain *d, int *preempted); /* Call once all of the references to the domain have gone away */ void shadow_final_teardown(struct domain *d); @@ -85,7 +85,7 @@ void shadow_blow_tables_per_domain(struct domain *d); #else /* !CONFIG_SHADOW_PAGING */ -#define shadow_teardown(d) ASSERT(is_pv_domain(d)) +#define shadow_teardown(d, p) ASSERT(is_pv_domain(d)) #define shadow_final_teardown(d) ASSERT(is_pv_domain(d)) #define shadow_enable(d, mode) \ ({ ASSERT(is_pv_domain(d)); -EOPNOTSUPP; }) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 09 04:33:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 09 Aug 2015 04:33:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZOIIU-0007iG-H9; Sun, 09 Aug 2015 04:33:22 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZOIIS-0007i9-V2 for xen-changelog@lists.xensource.com; Sun, 09 Aug 2015 04:33:21 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 80/6D-06179-F08D6C55; Sun, 09 Aug 2015 04:33:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1439094797!19118848!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1934 invoked from network); 9 Aug 2015 04:33:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 9 Aug 2015 04:33:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZOIIP-0000mB-Eo for xen-changelog@lists.xensource.com; Sun, 09 Aug 2015 04:33:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZOIIN-0008Rb-Km for xen-changelog@lists.xensource.com; Sun, 09 Aug 2015 04:33:15 +0000 Date: Sun, 09 Aug 2015 04:33:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mm: Make {hap, shadow}_teardown() preemptible X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0174da5b79752e2d5d6ca0faed89536e8f3d91c7 Author: Anshul Makkar AuthorDate: Wed Aug 5 16:47:59 2015 +0100 Commit: Ian Campbell CommitDate: Thu Aug 6 10:04:43 2015 +0100 x86/mm: Make {hap, shadow}_teardown() preemptible A domain with sufficient shadow allocation can cause a watchdog timeout during domain destruction. Expand the existing -ERESTART logic in paging_teardown() to allow {hap/sh}_set_allocation() to become restartable during the DOMCTL_destroydomain hypercall. Signed-off-by: Anshul Makkar Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan Reviewed-by: George Dunlap --- xen/arch/x86/mm/hap/hap.c | 22 ++++++++-------------- xen/arch/x86/mm/paging.c | 9 ++++++--- xen/arch/x86/mm/shadow/common.c | 24 +++++++++--------------- xen/include/asm-x86/hap.h | 2 +- xen/include/asm-x86/shadow.h | 4 ++-- 5 files changed, 26 insertions(+), 35 deletions(-) diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index d375c4d..e9c0080 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -551,7 +551,7 @@ void hap_final_teardown(struct domain *d) } if ( d->arch.paging.hap.total_pages != 0 ) - hap_teardown(d); + hap_teardown(d, NULL); p2m_teardown(p2m_get_hostp2m(d)); /* Free any memory that the p2m teardown released */ @@ -561,7 +561,7 @@ void hap_final_teardown(struct domain *d) paging_unlock(d); } -void hap_teardown(struct domain *d) +void hap_teardown(struct domain *d, int *preempted) { struct vcpu *v; mfn_t mfn; @@ -589,18 +589,11 @@ void hap_teardown(struct domain *d) if ( d->arch.paging.hap.total_pages != 0 ) { - HAP_PRINTK("teardown of domain %u starts." - " pages total = %u, free = %u, p2m=%u\n", - d->domain_id, - d->arch.paging.hap.total_pages, - d->arch.paging.hap.free_pages, - d->arch.paging.hap.p2m_pages); - hap_set_allocation(d, 0, NULL); - HAP_PRINTK("teardown done." - " pages total = %u, free = %u, p2m=%u\n", - d->arch.paging.hap.total_pages, - d->arch.paging.hap.free_pages, - d->arch.paging.hap.p2m_pages); + hap_set_allocation(d, 0, preempted); + + if ( preempted && *preempted ) + goto out; + ASSERT(d->arch.paging.hap.total_pages == 0); } @@ -609,6 +602,7 @@ void hap_teardown(struct domain *d) xfree(d->arch.hvm_domain.dirty_vram); d->arch.hvm_domain.dirty_vram = NULL; +out: paging_unlock(d); } diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index 618f475..5becee8 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -799,12 +799,15 @@ long paging_domctl_continuation(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) /* Call when destroying a domain */ int paging_teardown(struct domain *d) { - int rc; + int rc, preempted = 0; if ( hap_enabled(d) ) - hap_teardown(d); + hap_teardown(d, &preempted); else - shadow_teardown(d); + shadow_teardown(d, &preempted); + + if ( preempted ) + return -ERESTART; /* clean up log dirty resources. */ rc = paging_free_log_dirty_bitmap(d, 0); diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index abce8e2..0264b91 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3071,7 +3071,7 @@ int shadow_enable(struct domain *d, u32 mode) return rv; } -void shadow_teardown(struct domain *d) +void shadow_teardown(struct domain *d, int *preempted) /* Destroy the shadow pagetables of this domain and free its shadow memory. * Should only be called for dying domains. */ { @@ -3132,23 +3132,16 @@ void shadow_teardown(struct domain *d) if ( d->arch.paging.shadow.total_pages != 0 ) { - SHADOW_PRINTK("teardown of domain %u starts." - " Shadow pages total = %u, free = %u, p2m=%u\n", - d->domain_id, - d->arch.paging.shadow.total_pages, - d->arch.paging.shadow.free_pages, - d->arch.paging.shadow.p2m_pages); /* Destroy all the shadows and release memory to domheap */ - sh_set_allocation(d, 0, NULL); + sh_set_allocation(d, 0, preempted); + + if ( preempted && *preempted ) + goto out; + /* Release the hash table back to xenheap */ if (d->arch.paging.shadow.hash_table) shadow_hash_teardown(d); - /* Should not have any more memory held */ - SHADOW_PRINTK("teardown done." - " Shadow pages total = %u, free = %u, p2m=%u\n", - d->arch.paging.shadow.total_pages, - d->arch.paging.shadow.free_pages, - d->arch.paging.shadow.p2m_pages); + ASSERT(d->arch.paging.shadow.total_pages == 0); } @@ -3177,6 +3170,7 @@ void shadow_teardown(struct domain *d) d->arch.hvm_domain.dirty_vram = NULL; } +out: paging_unlock(d); /* Must be called outside the lock */ @@ -3198,7 +3192,7 @@ void shadow_final_teardown(struct domain *d) * It is possible for a domain that never got domain_kill()ed * to get here with its shadow allocation intact. */ if ( d->arch.paging.shadow.total_pages != 0 ) - shadow_teardown(d); + shadow_teardown(d, NULL); /* It is now safe to pull down the p2m map. */ p2m_teardown(p2m_get_hostp2m(d)); diff --git a/xen/include/asm-x86/hap.h b/xen/include/asm-x86/hap.h index bd87481..c613836 100644 --- a/xen/include/asm-x86/hap.h +++ b/xen/include/asm-x86/hap.h @@ -38,7 +38,7 @@ int hap_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, XEN_GUEST_HANDLE_PARAM(void) u_domctl); int hap_enable(struct domain *d, u32 mode); void hap_final_teardown(struct domain *d); -void hap_teardown(struct domain *d); +void hap_teardown(struct domain *d, int *preempted); void hap_vcpu_init(struct vcpu *v); int hap_track_dirty_vram(struct domain *d, unsigned long begin_pfn, diff --git a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h index 9cd653e..6d0aefb 100644 --- a/xen/include/asm-x86/shadow.h +++ b/xen/include/asm-x86/shadow.h @@ -73,7 +73,7 @@ int shadow_domctl(struct domain *d, XEN_GUEST_HANDLE_PARAM(void) u_domctl); /* Call when destroying a domain */ -void shadow_teardown(struct domain *d); +void shadow_teardown(struct domain *d, int *preempted); /* Call once all of the references to the domain have gone away */ void shadow_final_teardown(struct domain *d); @@ -85,7 +85,7 @@ void shadow_blow_tables_per_domain(struct domain *d); #else /* !CONFIG_SHADOW_PAGING */ -#define shadow_teardown(d) ASSERT(is_pv_domain(d)) +#define shadow_teardown(d, p) ASSERT(is_pv_domain(d)) #define shadow_final_teardown(d) ASSERT(is_pv_domain(d)) #define shadow_enable(d, mode) \ ({ ASSERT(is_pv_domain(d)); -EOPNOTSUPP; }) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 09 04:33:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 09 Aug 2015 04:33:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZOIIe-0007jV-Kw; Sun, 09 Aug 2015 04:33:32 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZOIIc-0007jJ-R8 for xen-changelog@lists.xensource.com; Sun, 09 Aug 2015 04:33:30 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id 9C/53-15765-A18D6C55; Sun, 09 Aug 2015 04:33:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1439094808!20378576!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24562 invoked from network); 9 Aug 2015 04:33:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 9 Aug 2015 04:33:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZOIIa-0000mN-E5 for xen-changelog@lists.xensource.com; Sun, 09 Aug 2015 04:33:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZOIIZ-0008S8-Iv for xen-changelog@lists.xensource.com; Sun, 09 Aug 2015 04:33:27 +0000 Date: Sun, 09 Aug 2015 04:33:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: use correct command line for arm guests. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 201eac83831d94ba2e9a63a7eed4c128633fafb1 Author: Ian Campbell AuthorDate: Thu Aug 6 11:55:57 2015 +0100 Commit: Ian Campbell CommitDate: Thu Aug 6 13:45:49 2015 +0100 libxl: use correct command line for arm guests. We need to use libxl__domain_build_state.pv_cmdline in order to pickup the correct args when using pygrub. libxl_domain_build_info.cmdline is any args statically configured by the user. This is consistent with the call to xc_domain_allocate, which takes the cmdline too (in that case for x86/PV usage). state->pv_cmdline is also set for non-pygrub guests, since libxl__bootloader_run propagates info->cmdline if no bootloader is configured. Signed-off-by: Ian Campbell Acked-by: Wei Liu --- tools/libxl/libxl_arm.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c index 42ab6d8..a310737 100644 --- a/tools/libxl/libxl_arm.c +++ b/tools/libxl/libxl_arm.c @@ -260,6 +260,7 @@ static int make_root_properties(libxl__gc *gc, } static int make_chosen_node(libxl__gc *gc, void *fdt, bool ramdisk, + libxl__domain_build_state *state, const libxl_domain_build_info *info) { int res; @@ -268,8 +269,9 @@ static int make_chosen_node(libxl__gc *gc, void *fdt, bool ramdisk, res = fdt_begin_node(fdt, "chosen"); if (res) return res; - if (info->cmdline) { - res = fdt_property_string(fdt, "bootargs", info->cmdline); + if (state->pv_cmdline) { + LOG(DEBUG, "/chosen/bootargs = %s", state->pv_cmdline); + res = fdt_property_string(fdt, "bootargs", state->pv_cmdline); if (res) return res; } @@ -831,7 +833,7 @@ next_resize: FDT( fdt_begin_node(fdt, "") ); FDT( make_root_properties(gc, vers, fdt) ); - FDT( make_chosen_node(gc, fdt, !!dom->ramdisk_blob, info) ); + FDT( make_chosen_node(gc, fdt, !!dom->ramdisk_blob, state, info) ); FDT( make_cpus_node(gc, fdt, info->max_vcpus, ainfo) ); FDT( make_psci_node(gc, fdt) ); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Aug 09 04:33:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 09 Aug 2015 04:33:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZOIIe-0007jV-Kw; Sun, 09 Aug 2015 04:33:32 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZOIIc-0007jJ-R8 for xen-changelog@lists.xensource.com; Sun, 09 Aug 2015 04:33:30 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id 9C/53-15765-A18D6C55; Sun, 09 Aug 2015 04:33:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1439094808!20378576!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24562 invoked from network); 9 Aug 2015 04:33:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 9 Aug 2015 04:33:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZOIIa-0000mN-E5 for xen-changelog@lists.xensource.com; Sun, 09 Aug 2015 04:33:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZOIIZ-0008S8-Iv for xen-changelog@lists.xensource.com; Sun, 09 Aug 2015 04:33:27 +0000 Date: Sun, 09 Aug 2015 04:33:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: use correct command line for arm guests. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 201eac83831d94ba2e9a63a7eed4c128633fafb1 Author: Ian Campbell AuthorDate: Thu Aug 6 11:55:57 2015 +0100 Commit: Ian Campbell CommitDate: Thu Aug 6 13:45:49 2015 +0100 libxl: use correct command line for arm guests. We need to use libxl__domain_build_state.pv_cmdline in order to pickup the correct args when using pygrub. libxl_domain_build_info.cmdline is any args statically configured by the user. This is consistent with the call to xc_domain_allocate, which takes the cmdline too (in that case for x86/PV usage). state->pv_cmdline is also set for non-pygrub guests, since libxl__bootloader_run propagates info->cmdline if no bootloader is configured. Signed-off-by: Ian Campbell Acked-by: Wei Liu --- tools/libxl/libxl_arm.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c index 42ab6d8..a310737 100644 --- a/tools/libxl/libxl_arm.c +++ b/tools/libxl/libxl_arm.c @@ -260,6 +260,7 @@ static int make_root_properties(libxl__gc *gc, } static int make_chosen_node(libxl__gc *gc, void *fdt, bool ramdisk, + libxl__domain_build_state *state, const libxl_domain_build_info *info) { int res; @@ -268,8 +269,9 @@ static int make_chosen_node(libxl__gc *gc, void *fdt, bool ramdisk, res = fdt_begin_node(fdt, "chosen"); if (res) return res; - if (info->cmdline) { - res = fdt_property_string(fdt, "bootargs", info->cmdline); + if (state->pv_cmdline) { + LOG(DEBUG, "/chosen/bootargs = %s", state->pv_cmdline); + res = fdt_property_string(fdt, "bootargs", state->pv_cmdline); if (res) return res; } @@ -831,7 +833,7 @@ next_resize: FDT( fdt_begin_node(fdt, "") ); FDT( make_root_properties(gc, vers, fdt) ); - FDT( make_chosen_node(gc, fdt, !!dom->ramdisk_blob, info) ); + FDT( make_chosen_node(gc, fdt, !!dom->ramdisk_blob, state, info) ); FDT( make_cpus_node(gc, fdt, info->max_vcpus, ainfo) ); FDT( make_psci_node(gc, fdt) ); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 10 05:44:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 10 Aug 2015 05:44:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZOfsU-0000j1-DT; Mon, 10 Aug 2015 05:44:06 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZOfsT-0000iw-ND for xen-changelog@lists.xensource.com; Mon, 10 Aug 2015 05:44:05 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id E4/FA-12371-52A38C55; Mon, 10 Aug 2015 05:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1439185443!39309749!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2518 invoked from network); 10 Aug 2015 05:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 10 Aug 2015 05:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZOfsR-0007Pj-5r for xen-changelog@lists.xensource.com; Mon, 10 Aug 2015 05:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZOfsR-0005Ak-1u for xen-changelog@lists.xensource.com; Mon, 10 Aug 2015 05:44:03 +0000 Date: Mon, 10 Aug 2015 05:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7ac1a262132a3c14df4147ed98bc04d12f2bb16f Author: Ian Jackson AuthorDate: Wed Jul 29 16:33:44 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jul 29 16:33:44 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index b73e89a..9936090 100644 --- a/Config.mk +++ b/Config.mk @@ -260,9 +260,9 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= 9f9441988e7a3cd7a59fc613e1975c802b2d60d0 -# Sun May 24 10:53:44 2015 +0200 -# pcnet: force the buffer access to be in bounds during tx +QEMU_TRADITIONAL_REVISION ?= 327319a1e9bb79996e8de4df78ccde25e87692e2 +# Wed Jun 3 14:41:27 2015 +0200 +# ide: Clear DRQ after handling all expected accesses # Specify which qemu-dm to use. This may be `ioemu' to use the old # Mercurial in-tree version, or a local directory, or a git URL. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 10 05:44:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 10 Aug 2015 05:44:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZOfsU-0000j1-DT; Mon, 10 Aug 2015 05:44:06 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZOfsT-0000iw-ND for xen-changelog@lists.xensource.com; Mon, 10 Aug 2015 05:44:05 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id E4/FA-12371-52A38C55; Mon, 10 Aug 2015 05:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1439185443!39309749!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2518 invoked from network); 10 Aug 2015 05:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 10 Aug 2015 05:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZOfsR-0007Pj-5r for xen-changelog@lists.xensource.com; Mon, 10 Aug 2015 05:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZOfsR-0005Ak-1u for xen-changelog@lists.xensource.com; Mon, 10 Aug 2015 05:44:03 +0000 Date: Mon, 10 Aug 2015 05:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7ac1a262132a3c14df4147ed98bc04d12f2bb16f Author: Ian Jackson AuthorDate: Wed Jul 29 16:33:44 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jul 29 16:33:44 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index b73e89a..9936090 100644 --- a/Config.mk +++ b/Config.mk @@ -260,9 +260,9 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= 9f9441988e7a3cd7a59fc613e1975c802b2d60d0 -# Sun May 24 10:53:44 2015 +0200 -# pcnet: force the buffer access to be in bounds during tx +QEMU_TRADITIONAL_REVISION ?= 327319a1e9bb79996e8de4df78ccde25e87692e2 +# Wed Jun 3 14:41:27 2015 +0200 +# ide: Clear DRQ after handling all expected accesses # Specify which qemu-dm to use. This may be `ioemu' to use the old # Mercurial in-tree version, or a local directory, or a git URL. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 10 05:44:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 10 Aug 2015 05:44:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZOfsf-0000jW-G0; Mon, 10 Aug 2015 05:44:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZOfse-0000jM-78 for xen-changelog@lists.xensource.com; Mon, 10 Aug 2015 05:44:16 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id C9/B3-02380-F2A38C55; Mon, 10 Aug 2015 05:44:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1439185453!26824869!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32176 invoked from network); 10 Aug 2015 05:44:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 10 Aug 2015 05:44:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZOfsb-0007Pn-CW for xen-changelog@lists.xensource.com; Mon, 10 Aug 2015 05:44:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZOfsb-0005B8-Aa for xen-changelog@lists.xensource.com; Mon, 10 Aug 2015 05:44:13 +0000 Date: Mon, 10 Aug 2015 05:44:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] xl: Sane handling of extra config file arguments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6040b3aeb32b4bce2d9958ecbcbd020c46c35d61 Author: Ian Jackson AuthorDate: Mon Jun 15 14:50:42 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jul 29 16:39:56 2015 +0100 xl: Sane handling of extra config file arguments Various xl sub-commands take additional parameters containing = as additional config fragments. The handling of these config fragments has a number of bugs: 1. Use of a static 1024-byte buffer. (If truncation would occur, with semi-trusted input, a security risk arises due to quotes being lost.) 2. Mishandling of the return value from snprintf, so that if truncation occurs, the to-write pointer is updated with the wanted-to-write length, resulting in stack corruption. (This is XSA-137.) 3. Clone-and-hack of the code for constructing the appended config file. These are fixed here, by introducing a new function `string_realloc_append' and using it everywhere. The `extra_info' buffers are replaced by pointers, which start off NULL and are explicitly freed on all return paths. The separate variable which will become dom_info.extra_config is abolished (which involves moving the clearing of dom_info). Additional bugs I observe, not fixed here: 4. The functions which now call string_realloc_append use ad-hoc error returns, with multiple calls to `return'. This currently necessitates multiple new calls to `free'. 5. Many of the paths in xl call exit(-rc) where rc is a libxl status code. This is a ridiculous exit status `convention'. 6. The loops for handling extra config data are clone-and-hacks. 7. Once the extra config buffer is accumulated, it must be combined with the appropriate main config file. The code to do this combining is clone-and-hacked too. Signed-off-by: Ian Jackson Tested-by: Ian Jackson Acked-by: Ian Campbell (cherry picked from commit dd84604f35bd3855c57146eb8fe53924c10d3963) --- tools/libxl/xl_cmdimpl.c | 64 ++++++++++++++++++++++++++++----------------- 1 files changed, 40 insertions(+), 24 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index ed0d478..4a8af47 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -151,7 +151,7 @@ struct domain_create { int console_autoconnect; int checkpointed_stream; const char *config_file; - const char *extra_config; /* extra config string */ + char *extra_config; /* extra config string */ const char *restore_file; int migrate_fd; /* -1 means none */ char **migration_domname_r; /* from malloc */ @@ -4570,11 +4570,25 @@ int main_vm_list(int argc, char **argv) return 0; } +static void string_realloc_append(char **accumulate, const char *more) +{ + /* Appends more to accumulate. Accumulate is either NULL, or + * points (always) to a malloc'd nul-terminated string. */ + + size_t oldlen = *accumulate ? strlen(*accumulate) : 0; + size_t morelen = strlen(more) + 1/*nul*/; + if (oldlen > SSIZE_MAX || morelen > SSIZE_MAX - oldlen) { + fprintf(stderr,"Additional config data far too large\n"); + exit(-ERROR_FAIL); + } + + *accumulate = xrealloc(*accumulate, oldlen + morelen); + memcpy(*accumulate + oldlen, more, morelen); +} + int main_create(int argc, char **argv) { const char *filename = NULL; - char *p; - char extra_config[1024]; struct domain_create dom_info; int paused = 0, debug = 0, daemonize = 1, console_autoconnect = 0, quiet = 0, monitor = 1, vnc = 0, vncautopass = 0; @@ -4589,6 +4603,8 @@ int main_create(int argc, char **argv) {0, 0, 0, 0} }; + dom_info.extra_config = NULL; + if (argv[1] && argv[1][0] != '-' && !strchr(argv[1], '=')) { filename = argv[1]; argc--; argv++; @@ -4628,20 +4644,21 @@ int main_create(int argc, char **argv) break; } - extra_config[0] = '\0'; - for (p = extra_config; optind < argc; optind++) { + memset(&dom_info, 0, sizeof(dom_info)); + + for (; optind < argc; optind++) { if (strchr(argv[optind], '=') != NULL) { - p += snprintf(p, sizeof(extra_config) - (p - extra_config), - "%s\n", argv[optind]); + string_realloc_append(&dom_info.extra_config, argv[optind]); + string_realloc_append(&dom_info.extra_config, "\n"); } else if (!filename) { filename = argv[optind]; } else { help("create"); + free(dom_info.extra_config); return 2; } } - memset(&dom_info, 0, sizeof(dom_info)); dom_info.debug = debug; dom_info.daemonize = daemonize; dom_info.monitor = monitor; @@ -4649,16 +4666,18 @@ int main_create(int argc, char **argv) dom_info.dryrun = dryrun_only; dom_info.quiet = quiet; dom_info.config_file = filename; - dom_info.extra_config = extra_config; dom_info.migrate_fd = -1; dom_info.vnc = vnc; dom_info.vncautopass = vncautopass; dom_info.console_autoconnect = console_autoconnect; rc = create_domain(&dom_info); - if (rc < 0) + if (rc < 0) { + free(dom_info.extra_config); return -rc; + } + free(dom_info.extra_config); return 0; } @@ -4666,8 +4685,7 @@ int main_config_update(int argc, char **argv) { uint32_t domid; const char *filename = NULL; - char *p; - char extra_config[1024]; + char *extra_config = NULL; void *config_data = 0; int config_len = 0; libxl_domain_config d_config; @@ -4705,15 +4723,15 @@ int main_config_update(int argc, char **argv) break; } - extra_config[0] = '\0'; - for (p = extra_config; optind < argc; optind++) { + for (; optind < argc; optind++) { if (strchr(argv[optind], '=') != NULL) { - p += snprintf(p, sizeof(extra_config) - (p - extra_config), - "%s\n", argv[optind]); + string_realloc_append(&extra_config, argv[optind]); + string_realloc_append(&extra_config, "\n"); } else if (!filename) { filename = argv[optind]; } else { help("create"); + free(extra_config); return 2; } } @@ -4722,7 +4740,8 @@ int main_config_update(int argc, char **argv) rc = libxl_read_file_contents(ctx, filename, &config_data, &config_len); if (rc) { fprintf(stderr, "Failed to read config file: %s: %s\n", - filename, strerror(errno)); return ERROR_FAIL; } + filename, strerror(errno)); + free(extra_config); return ERROR_FAIL; } if (strlen(extra_config)) { if (config_len > INT_MAX - (strlen(extra_config) + 2 + 1)) { fprintf(stderr, "Failed to attach extra configration\n"); @@ -4763,7 +4782,7 @@ int main_config_update(int argc, char **argv) libxl_domain_config_dispose(&d_config); free(config_data); - + free(extra_config); return 0; } @@ -7020,7 +7039,7 @@ int main_cpupoolcreate(int argc, char **argv) { const char *filename = NULL, *config_src=NULL; const char *p; - char extra_config[1024]; + char *extra_config = NULL; int opt; static struct option opts[] = { {"defconfig", 1, 0, 'f'}, @@ -7054,13 +7073,10 @@ int main_cpupoolcreate(int argc, char **argv) break; } - memset(extra_config, 0, sizeof(extra_config)); while (optind < argc) { if ((p = strchr(argv[optind], '='))) { - if (strlen(extra_config) + 1 + strlen(argv[optind]) < sizeof(extra_config)) { - strcat(extra_config, "\n"); - strcat(extra_config, argv[optind]); - } + string_realloc_append(&extra_config, "\n"); + string_realloc_append(&extra_config, argv[optind]); } else if (!filename) { filename = argv[optind]; } else { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 10 05:44:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 10 Aug 2015 05:44:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZOfsf-0000jW-G0; Mon, 10 Aug 2015 05:44:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZOfse-0000jM-78 for xen-changelog@lists.xensource.com; Mon, 10 Aug 2015 05:44:16 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id C9/B3-02380-F2A38C55; Mon, 10 Aug 2015 05:44:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1439185453!26824869!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32176 invoked from network); 10 Aug 2015 05:44:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 10 Aug 2015 05:44:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZOfsb-0007Pn-CW for xen-changelog@lists.xensource.com; Mon, 10 Aug 2015 05:44:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZOfsb-0005B8-Aa for xen-changelog@lists.xensource.com; Mon, 10 Aug 2015 05:44:13 +0000 Date: Mon, 10 Aug 2015 05:44:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] xl: Sane handling of extra config file arguments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6040b3aeb32b4bce2d9958ecbcbd020c46c35d61 Author: Ian Jackson AuthorDate: Mon Jun 15 14:50:42 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jul 29 16:39:56 2015 +0100 xl: Sane handling of extra config file arguments Various xl sub-commands take additional parameters containing = as additional config fragments. The handling of these config fragments has a number of bugs: 1. Use of a static 1024-byte buffer. (If truncation would occur, with semi-trusted input, a security risk arises due to quotes being lost.) 2. Mishandling of the return value from snprintf, so that if truncation occurs, the to-write pointer is updated with the wanted-to-write length, resulting in stack corruption. (This is XSA-137.) 3. Clone-and-hack of the code for constructing the appended config file. These are fixed here, by introducing a new function `string_realloc_append' and using it everywhere. The `extra_info' buffers are replaced by pointers, which start off NULL and are explicitly freed on all return paths. The separate variable which will become dom_info.extra_config is abolished (which involves moving the clearing of dom_info). Additional bugs I observe, not fixed here: 4. The functions which now call string_realloc_append use ad-hoc error returns, with multiple calls to `return'. This currently necessitates multiple new calls to `free'. 5. Many of the paths in xl call exit(-rc) where rc is a libxl status code. This is a ridiculous exit status `convention'. 6. The loops for handling extra config data are clone-and-hacks. 7. Once the extra config buffer is accumulated, it must be combined with the appropriate main config file. The code to do this combining is clone-and-hacked too. Signed-off-by: Ian Jackson Tested-by: Ian Jackson Acked-by: Ian Campbell (cherry picked from commit dd84604f35bd3855c57146eb8fe53924c10d3963) --- tools/libxl/xl_cmdimpl.c | 64 ++++++++++++++++++++++++++++----------------- 1 files changed, 40 insertions(+), 24 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index ed0d478..4a8af47 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -151,7 +151,7 @@ struct domain_create { int console_autoconnect; int checkpointed_stream; const char *config_file; - const char *extra_config; /* extra config string */ + char *extra_config; /* extra config string */ const char *restore_file; int migrate_fd; /* -1 means none */ char **migration_domname_r; /* from malloc */ @@ -4570,11 +4570,25 @@ int main_vm_list(int argc, char **argv) return 0; } +static void string_realloc_append(char **accumulate, const char *more) +{ + /* Appends more to accumulate. Accumulate is either NULL, or + * points (always) to a malloc'd nul-terminated string. */ + + size_t oldlen = *accumulate ? strlen(*accumulate) : 0; + size_t morelen = strlen(more) + 1/*nul*/; + if (oldlen > SSIZE_MAX || morelen > SSIZE_MAX - oldlen) { + fprintf(stderr,"Additional config data far too large\n"); + exit(-ERROR_FAIL); + } + + *accumulate = xrealloc(*accumulate, oldlen + morelen); + memcpy(*accumulate + oldlen, more, morelen); +} + int main_create(int argc, char **argv) { const char *filename = NULL; - char *p; - char extra_config[1024]; struct domain_create dom_info; int paused = 0, debug = 0, daemonize = 1, console_autoconnect = 0, quiet = 0, monitor = 1, vnc = 0, vncautopass = 0; @@ -4589,6 +4603,8 @@ int main_create(int argc, char **argv) {0, 0, 0, 0} }; + dom_info.extra_config = NULL; + if (argv[1] && argv[1][0] != '-' && !strchr(argv[1], '=')) { filename = argv[1]; argc--; argv++; @@ -4628,20 +4644,21 @@ int main_create(int argc, char **argv) break; } - extra_config[0] = '\0'; - for (p = extra_config; optind < argc; optind++) { + memset(&dom_info, 0, sizeof(dom_info)); + + for (; optind < argc; optind++) { if (strchr(argv[optind], '=') != NULL) { - p += snprintf(p, sizeof(extra_config) - (p - extra_config), - "%s\n", argv[optind]); + string_realloc_append(&dom_info.extra_config, argv[optind]); + string_realloc_append(&dom_info.extra_config, "\n"); } else if (!filename) { filename = argv[optind]; } else { help("create"); + free(dom_info.extra_config); return 2; } } - memset(&dom_info, 0, sizeof(dom_info)); dom_info.debug = debug; dom_info.daemonize = daemonize; dom_info.monitor = monitor; @@ -4649,16 +4666,18 @@ int main_create(int argc, char **argv) dom_info.dryrun = dryrun_only; dom_info.quiet = quiet; dom_info.config_file = filename; - dom_info.extra_config = extra_config; dom_info.migrate_fd = -1; dom_info.vnc = vnc; dom_info.vncautopass = vncautopass; dom_info.console_autoconnect = console_autoconnect; rc = create_domain(&dom_info); - if (rc < 0) + if (rc < 0) { + free(dom_info.extra_config); return -rc; + } + free(dom_info.extra_config); return 0; } @@ -4666,8 +4685,7 @@ int main_config_update(int argc, char **argv) { uint32_t domid; const char *filename = NULL; - char *p; - char extra_config[1024]; + char *extra_config = NULL; void *config_data = 0; int config_len = 0; libxl_domain_config d_config; @@ -4705,15 +4723,15 @@ int main_config_update(int argc, char **argv) break; } - extra_config[0] = '\0'; - for (p = extra_config; optind < argc; optind++) { + for (; optind < argc; optind++) { if (strchr(argv[optind], '=') != NULL) { - p += snprintf(p, sizeof(extra_config) - (p - extra_config), - "%s\n", argv[optind]); + string_realloc_append(&extra_config, argv[optind]); + string_realloc_append(&extra_config, "\n"); } else if (!filename) { filename = argv[optind]; } else { help("create"); + free(extra_config); return 2; } } @@ -4722,7 +4740,8 @@ int main_config_update(int argc, char **argv) rc = libxl_read_file_contents(ctx, filename, &config_data, &config_len); if (rc) { fprintf(stderr, "Failed to read config file: %s: %s\n", - filename, strerror(errno)); return ERROR_FAIL; } + filename, strerror(errno)); + free(extra_config); return ERROR_FAIL; } if (strlen(extra_config)) { if (config_len > INT_MAX - (strlen(extra_config) + 2 + 1)) { fprintf(stderr, "Failed to attach extra configration\n"); @@ -4763,7 +4782,7 @@ int main_config_update(int argc, char **argv) libxl_domain_config_dispose(&d_config); free(config_data); - + free(extra_config); return 0; } @@ -7020,7 +7039,7 @@ int main_cpupoolcreate(int argc, char **argv) { const char *filename = NULL, *config_src=NULL; const char *p; - char extra_config[1024]; + char *extra_config = NULL; int opt; static struct option opts[] = { {"defconfig", 1, 0, 'f'}, @@ -7054,13 +7073,10 @@ int main_cpupoolcreate(int argc, char **argv) break; } - memset(extra_config, 0, sizeof(extra_config)); while (optind < argc) { if ((p = strchr(argv[optind], '='))) { - if (strlen(extra_config) + 1 + strlen(argv[optind]) < sizeof(extra_config)) { - strcat(extra_config, "\n"); - strcat(extra_config, argv[optind]); - } + string_realloc_append(&extra_config, "\n"); + string_realloc_append(&extra_config, argv[optind]); } else if (!filename) { filename = argv[optind]; } else { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 15 14:11:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Aug 2015 14:11:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZQcAv-0006fV-Bo; Sat, 15 Aug 2015 14:11:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZQcAt-0006fQ-IQ for xen-changelog@lists.xensource.com; Sat, 15 Aug 2015 14:11:07 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id AF/D6-31069-A784FC55; Sat, 15 Aug 2015 14:11:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1439647865!30857856!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21919 invoked from network); 15 Aug 2015 14:11:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 15 Aug 2015 14:11:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZQcAo-0002dl-Sq for xen-changelog@lists.xensource.com; Sat, 15 Aug 2015 14:11:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZQcAn-00083Y-S1 for xen-changelog@lists.xensource.com; Sat, 15 Aug 2015 14:11:01 +0000 Date: Sat, 15 Aug 2015 14:11:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: Update sonames for 4.6 RCs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 10feec4519d7a964846ed980235936a097947090 Author: Ian Jackson AuthorDate: Tue Aug 11 14:41:23 2015 +0100 Commit: Ian Jackson CommitDate: Tue Aug 11 15:39:01 2015 +0100 tools: Update sonames for 4.6 RCs Update libxc to 4.6. Update libxl to 4.6. Update libxlu to 4.6. I did git-grep 'MAJOR.*=' and also to check I had everything git-grep 'SONAME_LDFLAG' | egrep -v 'MAJOR' |less The other, un-updated, libraries are: blktap2 (control, libvhd) 1.0 in-tree users only, no ABI changes libfsimage 1.0 no ABI changes libvchan 1.0 no ABI changes libxenstat 0.0 (!) no ABI changes libxenstore 3.0 no ABI changes My assertions "no ABI changes" are based on the output of git-diff origin/stable-4.5..staging . and similar runes, sometimes limited to .h files. Signed-off-by: Ian Jackson CC: Ian Campbell Acked-by: Wei Liu --- v2: Bump libxlu too. [ Reported by Wei Liu. ] --- tools/libxc/Makefile | 2 +- tools/libxl/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 8ae0ea0..a0f899b 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -1,7 +1,7 @@ XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk -MAJOR = 4.5 +MAJOR = 4.6 MINOR = 0 ifeq ($(CONFIG_LIBXC_MINIOS),y) diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 9036076..c5ecec1 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -5,10 +5,10 @@ XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk -MAJOR = 4.5 +MAJOR = 4.6 MINOR = 0 -XLUMAJOR = 4.3 +XLUMAJOR = 4.6 XLUMINOR = 0 CFLAGS += -Werror -Wno-format-zero-length -Wmissing-declarations \ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 15 14:11:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Aug 2015 14:11:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZQcAv-0006fV-Bo; Sat, 15 Aug 2015 14:11:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZQcAt-0006fQ-IQ for xen-changelog@lists.xensource.com; Sat, 15 Aug 2015 14:11:07 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id AF/D6-31069-A784FC55; Sat, 15 Aug 2015 14:11:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1439647865!30857856!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21919 invoked from network); 15 Aug 2015 14:11:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 15 Aug 2015 14:11:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZQcAo-0002dl-Sq for xen-changelog@lists.xensource.com; Sat, 15 Aug 2015 14:11:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZQcAn-00083Y-S1 for xen-changelog@lists.xensource.com; Sat, 15 Aug 2015 14:11:01 +0000 Date: Sat, 15 Aug 2015 14:11:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: Update sonames for 4.6 RCs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 10feec4519d7a964846ed980235936a097947090 Author: Ian Jackson AuthorDate: Tue Aug 11 14:41:23 2015 +0100 Commit: Ian Jackson CommitDate: Tue Aug 11 15:39:01 2015 +0100 tools: Update sonames for 4.6 RCs Update libxc to 4.6. Update libxl to 4.6. Update libxlu to 4.6. I did git-grep 'MAJOR.*=' and also to check I had everything git-grep 'SONAME_LDFLAG' | egrep -v 'MAJOR' |less The other, un-updated, libraries are: blktap2 (control, libvhd) 1.0 in-tree users only, no ABI changes libfsimage 1.0 no ABI changes libvchan 1.0 no ABI changes libxenstat 0.0 (!) no ABI changes libxenstore 3.0 no ABI changes My assertions "no ABI changes" are based on the output of git-diff origin/stable-4.5..staging . and similar runes, sometimes limited to .h files. Signed-off-by: Ian Jackson CC: Ian Campbell Acked-by: Wei Liu --- v2: Bump libxlu too. [ Reported by Wei Liu. ] --- tools/libxc/Makefile | 2 +- tools/libxl/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 8ae0ea0..a0f899b 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -1,7 +1,7 @@ XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk -MAJOR = 4.5 +MAJOR = 4.6 MINOR = 0 ifeq ($(CONFIG_LIBXC_MINIOS),y) diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 9036076..c5ecec1 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -5,10 +5,10 @@ XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk -MAJOR = 4.5 +MAJOR = 4.6 MINOR = 0 -XLUMAJOR = 4.3 +XLUMAJOR = 4.6 XLUMINOR = 0 CFLAGS += -Werror -Wno-format-zero-length -Wmissing-declarations \ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 15 14:11:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Aug 2015 14:11:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZQcB4-0006fv-E8; Sat, 15 Aug 2015 14:11:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZQcB3-0006fd-Rr for xen-changelog@lists.xensource.com; Sat, 15 Aug 2015 14:11:17 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 47/92-29649-5884FC55; Sat, 15 Aug 2015 14:11:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1439647875!35316704!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30735 invoked from network); 15 Aug 2015 14:11:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 15 Aug 2015 14:11:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZQcB1-0002dp-9w for xen-changelog@lists.xensource.com; Sat, 15 Aug 2015 14:11:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZQcB1-000840-80 for xen-changelog@lists.xensource.com; Sat, 15 Aug 2015 14:11:15 +0000 Date: Sat, 15 Aug 2015 14:11:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Update version to Xen 4.6 RC X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 88517788ea839c367da14b514ab3d1f25994c514 Author: Ian Jackson AuthorDate: Tue Aug 11 14:51:43 2015 +0100 Commit: Ian Jackson CommitDate: Tue Aug 11 15:39:16 2015 +0100 Update version to Xen 4.6 RC * Change README to say `Xen 4.6-rc' * Change XEN_EXTRAVERSION so that we are `4.6.0-rc' Note that the RC number (eg, 1 for rc1) is not in the version string, so that we do not need to update this again when we cut the next RC. Signed-off-by: Ian Jackson Acked-by: Wei Liu Acked-by: Ian Campbell CC: Jan Beulich CC: Konrad Rzeszutek Wilk --- README | 12 ++++++------ xen/Makefile | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README b/README index 0e456b8..522f1a2 100644 --- a/README +++ b/README @@ -1,10 +1,10 @@ ################################# -__ __ _ _ __ _ _ _ -\ \/ /___ _ __ | || | / /_ _ _ _ __ ___| |_ __ _| |__ | | ___ - \ // _ \ '_ \ | || |_| '_ \ _____| | | | '_ \/ __| __/ _` | '_ \| |/ _ \ - / \ __/ | | | |__ _| (_) |_____| |_| | | | \__ \ || (_| | |_) | | __/ -/_/\_\___|_| |_| |_|(_)___/ \__,_|_| |_|___/\__\__,_|_.__/|_|\___| - +__ __ _ _ __ +\ \/ /___ _ __ | || | / /_ _ __ ___ + \ // _ \ '_ \ | || |_| '_ \ _____| '__/ __| + / \ __/ | | | |__ _| (_) |_____| | | (__ +/_/\_\___|_| |_| |_|(_)___/ |_| \___| + ################################# http://www.xen.org/ diff --git a/xen/Makefile b/xen/Makefile index 6305880..6088c9d 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 6 -export XEN_EXTRAVERSION ?= -unstable$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .0-rc$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 15 14:11:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Aug 2015 14:11:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZQcB4-0006fv-E8; Sat, 15 Aug 2015 14:11:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZQcB3-0006fd-Rr for xen-changelog@lists.xensource.com; Sat, 15 Aug 2015 14:11:17 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 47/92-29649-5884FC55; Sat, 15 Aug 2015 14:11:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1439647875!35316704!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30735 invoked from network); 15 Aug 2015 14:11:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 15 Aug 2015 14:11:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZQcB1-0002dp-9w for xen-changelog@lists.xensource.com; Sat, 15 Aug 2015 14:11:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZQcB1-000840-80 for xen-changelog@lists.xensource.com; Sat, 15 Aug 2015 14:11:15 +0000 Date: Sat, 15 Aug 2015 14:11:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Update version to Xen 4.6 RC X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 88517788ea839c367da14b514ab3d1f25994c514 Author: Ian Jackson AuthorDate: Tue Aug 11 14:51:43 2015 +0100 Commit: Ian Jackson CommitDate: Tue Aug 11 15:39:16 2015 +0100 Update version to Xen 4.6 RC * Change README to say `Xen 4.6-rc' * Change XEN_EXTRAVERSION so that we are `4.6.0-rc' Note that the RC number (eg, 1 for rc1) is not in the version string, so that we do not need to update this again when we cut the next RC. Signed-off-by: Ian Jackson Acked-by: Wei Liu Acked-by: Ian Campbell CC: Jan Beulich CC: Konrad Rzeszutek Wilk --- README | 12 ++++++------ xen/Makefile | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README b/README index 0e456b8..522f1a2 100644 --- a/README +++ b/README @@ -1,10 +1,10 @@ ################################# -__ __ _ _ __ _ _ _ -\ \/ /___ _ __ | || | / /_ _ _ _ __ ___| |_ __ _| |__ | | ___ - \ // _ \ '_ \ | || |_| '_ \ _____| | | | '_ \/ __| __/ _` | '_ \| |/ _ \ - / \ __/ | | | |__ _| (_) |_____| |_| | | | \__ \ || (_| | |_) | | __/ -/_/\_\___|_| |_| |_|(_)___/ \__,_|_| |_|___/\__\__,_|_.__/|_|\___| - +__ __ _ _ __ +\ \/ /___ _ __ | || | / /_ _ __ ___ + \ // _ \ '_ \ | || |_| '_ \ _____| '__/ __| + / \ __/ | | | |__ _| (_) |_____| | | (__ +/_/\_\___|_| |_| |_|(_)___/ |_| \___| + ################################# http://www.xen.org/ diff --git a/xen/Makefile b/xen/Makefile index 6305880..6088c9d 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 6 -export XEN_EXTRAVERSION ?= -unstable$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .0-rc$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 15 14:11:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Aug 2015 14:11:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZQcBJ-0006hH-Gt; Sat, 15 Aug 2015 14:11:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZQcBI-0006hA-TH for xen-changelog@lists.xensource.com; Sat, 15 Aug 2015 14:11:33 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 99/ED-06021-4984FC55; Sat, 15 Aug 2015 14:11:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1439647890!35213154!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16793 invoked from network); 15 Aug 2015 14:11:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 15 Aug 2015 14:11:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZQcBG-0002e1-JC for xen-changelog@lists.xensource.com; Sat, 15 Aug 2015 14:11:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZQcBB-00084P-DK for xen-changelog@lists.xensource.com; Sat, 15 Aug 2015 14:11:25 +0000 Date: Sat, 15 Aug 2015 14:11:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Update QEMU_TRADITIONAL_REVISION for 4.6 RC1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 217a91b94e356991fcf83f3f827c5098ad893e68 Author: Ian Jackson AuthorDate: Tue Aug 11 14:59:26 2015 +0100 Commit: Ian Jackson CommitDate: Tue Aug 11 15:39:25 2015 +0100 Update QEMU_TRADITIONAL_REVISION for 4.6 RC1 (We will not necessarily bump this tag number for future RCs, unless something has changed in qemu-xen-traditional.) Signed-off-by: Ian Jackson Acked-by: Wei Liu --- Config.mk | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index e9a7097..d8b650e 100644 --- a/Config.mk +++ b/Config.mk @@ -266,7 +266,8 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.8.2 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= 7f057440b31da38196e3398fd1b618fc36ad97d6 +QEMU_TRADITIONAL_REVISION ?= xen-4.6.0-rc1 +# 7f057440b31da38196e3398fd1b618fc36ad97d6 # Wed Jun 3 14:41:27 2015 +0200 # ide: Clear DRQ after handling all expected accesses -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 15 14:11:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Aug 2015 14:11:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZQcBJ-0006hH-Gt; Sat, 15 Aug 2015 14:11:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZQcBI-0006hA-TH for xen-changelog@lists.xensource.com; Sat, 15 Aug 2015 14:11:33 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 99/ED-06021-4984FC55; Sat, 15 Aug 2015 14:11:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1439647890!35213154!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16793 invoked from network); 15 Aug 2015 14:11:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 15 Aug 2015 14:11:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZQcBG-0002e1-JC for xen-changelog@lists.xensource.com; Sat, 15 Aug 2015 14:11:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZQcBB-00084P-DK for xen-changelog@lists.xensource.com; Sat, 15 Aug 2015 14:11:25 +0000 Date: Sat, 15 Aug 2015 14:11:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Update QEMU_TRADITIONAL_REVISION for 4.6 RC1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 217a91b94e356991fcf83f3f827c5098ad893e68 Author: Ian Jackson AuthorDate: Tue Aug 11 14:59:26 2015 +0100 Commit: Ian Jackson CommitDate: Tue Aug 11 15:39:25 2015 +0100 Update QEMU_TRADITIONAL_REVISION for 4.6 RC1 (We will not necessarily bump this tag number for future RCs, unless something has changed in qemu-xen-traditional.) Signed-off-by: Ian Jackson Acked-by: Wei Liu --- Config.mk | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index e9a7097..d8b650e 100644 --- a/Config.mk +++ b/Config.mk @@ -266,7 +266,8 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.8.2 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= 7f057440b31da38196e3398fd1b618fc36ad97d6 +QEMU_TRADITIONAL_REVISION ?= xen-4.6.0-rc1 +# 7f057440b31da38196e3398fd1b618fc36ad97d6 # Wed Jun 3 14:41:27 2015 +0200 # ide: Clear DRQ after handling all expected accesses -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 15 14:11:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Aug 2015 14:11:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZQcBU-0006iV-JN; Sat, 15 Aug 2015 14:11:44 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZQcBT-0006iP-F6 for xen-changelog@lists.xensource.com; Sat, 15 Aug 2015 14:11:43 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id CF/36-01143-E984FC55; Sat, 15 Aug 2015 14:11:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1439647900!40987612!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11202 invoked from network); 15 Aug 2015 14:11:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 Aug 2015 14:11:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZQcBQ-0002e9-Nz for xen-changelog@lists.xensource.com; Sat, 15 Aug 2015 14:11:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZQcBQ-00084n-Mp for xen-changelog@lists.xensource.com; Sat, 15 Aug 2015 14:11:40 +0000 Date: Sat, 15 Aug 2015 14:11:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Update QEMU_UPSTREAM_REVISION for 4.6 RC1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 145a8004a7d659668d5a3b0ad9868d7678b24822 Author: Ian Jackson AuthorDate: Tue Aug 11 15:00:20 2015 +0100 Commit: Ian Jackson CommitDate: Tue Aug 11 15:39:25 2015 +0100 Update QEMU_UPSTREAM_REVISION for 4.6 RC1 When we make RC1 we arrange to get a specific version of qemu-xen-upstream. Signed-off-by: Ian Jackson Acked-by: Wei Liu CC: Stefano Stabellini --- Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index d8b650e..75b49a3 100644 --- a/Config.mk +++ b/Config.mk @@ -254,7 +254,7 @@ SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif OVMF_UPSTREAM_REVISION ?= cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd -QEMU_UPSTREAM_REVISION ?= master +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.6.0-rc1 MINIOS_UPSTREAM_REVISION ?= b36bcb370d611ad7f41e8c21d061e6291e088c58 # Fri Jun 26 11:58:40 2015 +0100 # Correct printf formatting for tpm_tis message. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Aug 15 14:11:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 15 Aug 2015 14:11:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZQcBU-0006iV-JN; Sat, 15 Aug 2015 14:11:44 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZQcBT-0006iP-F6 for xen-changelog@lists.xensource.com; Sat, 15 Aug 2015 14:11:43 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id CF/36-01143-E984FC55; Sat, 15 Aug 2015 14:11:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1439647900!40987612!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11202 invoked from network); 15 Aug 2015 14:11:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 Aug 2015 14:11:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZQcBQ-0002e9-Nz for xen-changelog@lists.xensource.com; Sat, 15 Aug 2015 14:11:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZQcBQ-00084n-Mp for xen-changelog@lists.xensource.com; Sat, 15 Aug 2015 14:11:40 +0000 Date: Sat, 15 Aug 2015 14:11:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Update QEMU_UPSTREAM_REVISION for 4.6 RC1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 145a8004a7d659668d5a3b0ad9868d7678b24822 Author: Ian Jackson AuthorDate: Tue Aug 11 15:00:20 2015 +0100 Commit: Ian Jackson CommitDate: Tue Aug 11 15:39:25 2015 +0100 Update QEMU_UPSTREAM_REVISION for 4.6 RC1 When we make RC1 we arrange to get a specific version of qemu-xen-upstream. Signed-off-by: Ian Jackson Acked-by: Wei Liu CC: Stefano Stabellini --- Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index d8b650e..75b49a3 100644 --- a/Config.mk +++ b/Config.mk @@ -254,7 +254,7 @@ SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif OVMF_UPSTREAM_REVISION ?= cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd -QEMU_UPSTREAM_REVISION ?= master +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.6.0-rc1 MINIOS_UPSTREAM_REVISION ?= b36bcb370d611ad7f41e8c21d061e6291e088c58 # Fri Jun 26 11:58:40 2015 +0100 # Correct printf formatting for tpm_tis message. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 17 11:22:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Aug 2015 11:22:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIUR-0004IP-Bo; Mon, 17 Aug 2015 11:22:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIUQ-0004IJ-1I for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:22:06 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 5F/5D-04752-DD3C1D55; Mon, 17 Aug 2015 11:22:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1439810523!22664361!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8980 invoked from network); 17 Aug 2015 11:22:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 17 Aug 2015 11:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIUN-0003lv-I2 for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRIUN-0007qu-Ez for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:22:03 +0000 Date: Mon, 17 Aug 2015 11:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 31d0387c27a6ba7a74c1f3de7d2399489c164c73 Author: Ian Jackson AuthorDate: Wed Jul 29 16:35:24 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jul 29 16:35:24 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index eef4d23..d571ce2 100644 --- a/Config.mk +++ b/Config.mk @@ -215,9 +215,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 2b5c19892fd76d1c5b6b2a0b4fee6a35513b4999 -# Sun May 24 10:53:44 2015 +0200 -# pcnet: force the buffer access to be in bounds during tx +QEMU_TAG ?= cbde16cd1c9866a92a7a449e7df5637dd7c3e9cc +# Wed Jun 3 14:41:27 2015 +0200 +# ide: Clear DRQ after handling all expected accesses # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 17 11:22:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Aug 2015 11:22:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIUR-0004IP-Bo; Mon, 17 Aug 2015 11:22:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIUQ-0004IJ-1I for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:22:06 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 5F/5D-04752-DD3C1D55; Mon, 17 Aug 2015 11:22:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1439810523!22664361!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8980 invoked from network); 17 Aug 2015 11:22:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 17 Aug 2015 11:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIUN-0003lv-I2 for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRIUN-0007qu-Ez for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:22:03 +0000 Date: Mon, 17 Aug 2015 11:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 31d0387c27a6ba7a74c1f3de7d2399489c164c73 Author: Ian Jackson AuthorDate: Wed Jul 29 16:35:24 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jul 29 16:35:24 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index eef4d23..d571ce2 100644 --- a/Config.mk +++ b/Config.mk @@ -215,9 +215,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 2b5c19892fd76d1c5b6b2a0b4fee6a35513b4999 -# Sun May 24 10:53:44 2015 +0200 -# pcnet: force the buffer access to be in bounds during tx +QEMU_TAG ?= cbde16cd1c9866a92a7a449e7df5637dd7c3e9cc +# Wed Jun 3 14:41:27 2015 +0200 +# ide: Clear DRQ after handling all expected accesses # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 17 11:22:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Aug 2015 11:22:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIUd-0004JX-EK; Mon, 17 Aug 2015 11:22:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIUc-0004JO-BA for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:22:18 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 32/99-22089-9E3C1D55; Mon, 17 Aug 2015 11:22:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1439810535!23094689!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17546 invoked from network); 17 Aug 2015 11:22:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 17 Aug 2015 11:22:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIUY-0003m3-Lt for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRIUX-0007s0-Nc for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:22:13 +0000 Date: Mon, 17 Aug 2015 11:22:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] xl: Sane handling of extra config file arguments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b20c28064c54d345f366528a0f452ad14911e146 Author: Ian Jackson AuthorDate: Mon Jun 15 14:50:42 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jul 29 16:40:17 2015 +0100 xl: Sane handling of extra config file arguments Various xl sub-commands take additional parameters containing = as additional config fragments. The handling of these config fragments has a number of bugs: 1. Use of a static 1024-byte buffer. (If truncation would occur, with semi-trusted input, a security risk arises due to quotes being lost.) 2. Mishandling of the return value from snprintf, so that if truncation occurs, the to-write pointer is updated with the wanted-to-write length, resulting in stack corruption. (This is XSA-137.) 3. Clone-and-hack of the code for constructing the appended config file. These are fixed here, by introducing a new function `string_realloc_append' and using it everywhere. The `extra_info' buffers are replaced by pointers, which start off NULL and are explicitly freed on all return paths. The separate variable which will become dom_info.extra_config is abolished (which involves moving the clearing of dom_info). Additional bugs I observe, not fixed here: 4. The functions which now call string_realloc_append use ad-hoc error returns, with multiple calls to `return'. This currently necessitates multiple new calls to `free'. 5. Many of the paths in xl call exit(-rc) where rc is a libxl status code. This is a ridiculous exit status `convention'. 6. The loops for handling extra config data are clone-and-hacks. 7. Once the extra config buffer is accumulated, it must be combined with the appropriate main config file. The code to do this combining is clone-and-hacked too. Signed-off-by: Ian Jackson Tested-by: Ian Jackson Acked-by: Ian Campbell (cherry picked from commit dd84604f35bd3855c57146eb8fe53924c10d3963) (cherry picked from commit 6040b3aeb32b4bce2d9958ecbcbd020c46c35d61) (cherry picked from commit 214fd40a20fa5988b4ea021c2d06e8aca8dda184) (cherry picked from commit d7ab3a1c1cc245dc0683bb937467c27141754053) --- tools/libxl/xl_cmdimpl.c | 64 ++++++++++++++++++++++++++++----------------- 1 files changed, 40 insertions(+), 24 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 5eadb16..666b8cd 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -135,7 +135,7 @@ struct domain_create { int vncautopass; int console_autoconnect; const char *config_file; - const char *extra_config; /* extra config string */ + char *extra_config; /* extra config string */ const char *restore_file; int migrate_fd; /* -1 means none */ char **migration_domname_r; /* from malloc */ @@ -3815,11 +3815,25 @@ int main_vm_list(int argc, char **argv) return 0; } +static void string_realloc_append(char **accumulate, const char *more) +{ + /* Appends more to accumulate. Accumulate is either NULL, or + * points (always) to a malloc'd nul-terminated string. */ + + size_t oldlen = *accumulate ? strlen(*accumulate) : 0; + size_t morelen = strlen(more) + 1/*nul*/; + if (oldlen > SSIZE_MAX || morelen > SSIZE_MAX - oldlen) { + fprintf(stderr,"Additional config data far too large\n"); + exit(-ERROR_FAIL); + } + + *accumulate = xrealloc(*accumulate, oldlen + morelen); + memcpy(*accumulate + oldlen, more, morelen); +} + int main_create(int argc, char **argv) { const char *filename = NULL; - char *p; - char extra_config[1024]; struct domain_create dom_info; int paused = 0, debug = 0, daemonize = 1, console_autoconnect = 0, quiet = 0, monitor = 1, vnc = 0, vncautopass = 0; @@ -3835,6 +3849,8 @@ int main_create(int argc, char **argv) {0, 0, 0, 0} }; + dom_info.extra_config = NULL; + if (argv[1] && argv[1][0] != '-' && !strchr(argv[1], '=')) { filename = argv[1]; argc--; argv++; @@ -3886,20 +3902,21 @@ int main_create(int argc, char **argv) } } - extra_config[0] = '\0'; - for (p = extra_config; optind < argc; optind++) { + memset(&dom_info, 0, sizeof(dom_info)); + + for (; optind < argc; optind++) { if (strchr(argv[optind], '=') != NULL) { - p += snprintf(p, sizeof(extra_config) - (p - extra_config), - "%s\n", argv[optind]); + string_realloc_append(&dom_info.extra_config, argv[optind]); + string_realloc_append(&dom_info.extra_config, "\n"); } else if (!filename) { filename = argv[optind]; } else { help("create"); + free(dom_info.extra_config); return 2; } } - memset(&dom_info, 0, sizeof(dom_info)); dom_info.debug = debug; dom_info.daemonize = daemonize; dom_info.monitor = monitor; @@ -3907,24 +3924,25 @@ int main_create(int argc, char **argv) dom_info.dryrun = dryrun_only; dom_info.quiet = quiet; dom_info.config_file = filename; - dom_info.extra_config = extra_config; dom_info.migrate_fd = -1; dom_info.vnc = vnc; dom_info.vncautopass = vncautopass; dom_info.console_autoconnect = console_autoconnect; rc = create_domain(&dom_info); - if (rc < 0) + if (rc < 0) { + free(dom_info.extra_config); return -rc; + } + free(dom_info.extra_config); return 0; } int main_config_update(int argc, char **argv) { const char *filename = NULL; - char *p; - char extra_config[1024]; + char *extra_config = NULL; void *config_data = 0; int config_len = 0; libxl_domain_config d_config; @@ -3972,15 +3990,15 @@ int main_config_update(int argc, char **argv) } } - extra_config[0] = '\0'; - for (p = extra_config; optind < argc; optind++) { + for (; optind < argc; optind++) { if (strchr(argv[optind], '=') != NULL) { - p += snprintf(p, sizeof(extra_config) - (p - extra_config), - "%s\n", argv[optind]); + string_realloc_append(&extra_config, argv[optind]); + string_realloc_append(&extra_config, "\n"); } else if (!filename) { filename = argv[optind]; } else { help("create"); + free(extra_config); return 2; } } @@ -3989,7 +4007,8 @@ int main_config_update(int argc, char **argv) rc = libxl_read_file_contents(ctx, filename, &config_data, &config_len); if (rc) { fprintf(stderr, "Failed to read config file: %s: %s\n", - filename, strerror(errno)); return ERROR_FAIL; } + filename, strerror(errno)); + free(extra_config); return ERROR_FAIL; } if (strlen(extra_config)) { if (config_len > INT_MAX - (strlen(extra_config) + 2 + 1)) { fprintf(stderr, "Failed to attach extra configration\n"); @@ -4030,7 +4049,7 @@ int main_config_update(int argc, char **argv) libxl_domain_config_dispose(&d_config); free(config_data); - + free(extra_config); return 0; } @@ -6000,7 +6019,7 @@ int main_cpupoolcreate(int argc, char **argv) { const char *filename = NULL, *config_src=NULL; const char *p; - char extra_config[1024]; + char *extra_config = NULL; int opt; int option_index = 0; static struct option long_options[] = { @@ -6047,13 +6066,10 @@ int main_cpupoolcreate(int argc, char **argv) } } - memset(extra_config, 0, sizeof(extra_config)); while (optind < argc) { if ((p = strchr(argv[optind], '='))) { - if (strlen(extra_config) + 1 + strlen(argv[optind]) < sizeof(extra_config)) { - strcat(extra_config, "\n"); - strcat(extra_config, argv[optind]); - } + string_realloc_append(&extra_config, "\n"); + string_realloc_append(&extra_config, argv[optind]); } else if (!filename) { filename = argv[optind]; } else { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 17 11:22:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Aug 2015 11:22:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIUd-0004JX-EK; Mon, 17 Aug 2015 11:22:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIUc-0004JO-BA for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:22:18 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 32/99-22089-9E3C1D55; Mon, 17 Aug 2015 11:22:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1439810535!23094689!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17546 invoked from network); 17 Aug 2015 11:22:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 17 Aug 2015 11:22:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIUY-0003m3-Lt for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRIUX-0007s0-Nc for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:22:13 +0000 Date: Mon, 17 Aug 2015 11:22:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] xl: Sane handling of extra config file arguments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b20c28064c54d345f366528a0f452ad14911e146 Author: Ian Jackson AuthorDate: Mon Jun 15 14:50:42 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jul 29 16:40:17 2015 +0100 xl: Sane handling of extra config file arguments Various xl sub-commands take additional parameters containing = as additional config fragments. The handling of these config fragments has a number of bugs: 1. Use of a static 1024-byte buffer. (If truncation would occur, with semi-trusted input, a security risk arises due to quotes being lost.) 2. Mishandling of the return value from snprintf, so that if truncation occurs, the to-write pointer is updated with the wanted-to-write length, resulting in stack corruption. (This is XSA-137.) 3. Clone-and-hack of the code for constructing the appended config file. These are fixed here, by introducing a new function `string_realloc_append' and using it everywhere. The `extra_info' buffers are replaced by pointers, which start off NULL and are explicitly freed on all return paths. The separate variable which will become dom_info.extra_config is abolished (which involves moving the clearing of dom_info). Additional bugs I observe, not fixed here: 4. The functions which now call string_realloc_append use ad-hoc error returns, with multiple calls to `return'. This currently necessitates multiple new calls to `free'. 5. Many of the paths in xl call exit(-rc) where rc is a libxl status code. This is a ridiculous exit status `convention'. 6. The loops for handling extra config data are clone-and-hacks. 7. Once the extra config buffer is accumulated, it must be combined with the appropriate main config file. The code to do this combining is clone-and-hacked too. Signed-off-by: Ian Jackson Tested-by: Ian Jackson Acked-by: Ian Campbell (cherry picked from commit dd84604f35bd3855c57146eb8fe53924c10d3963) (cherry picked from commit 6040b3aeb32b4bce2d9958ecbcbd020c46c35d61) (cherry picked from commit 214fd40a20fa5988b4ea021c2d06e8aca8dda184) (cherry picked from commit d7ab3a1c1cc245dc0683bb937467c27141754053) --- tools/libxl/xl_cmdimpl.c | 64 ++++++++++++++++++++++++++++----------------- 1 files changed, 40 insertions(+), 24 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 5eadb16..666b8cd 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -135,7 +135,7 @@ struct domain_create { int vncautopass; int console_autoconnect; const char *config_file; - const char *extra_config; /* extra config string */ + char *extra_config; /* extra config string */ const char *restore_file; int migrate_fd; /* -1 means none */ char **migration_domname_r; /* from malloc */ @@ -3815,11 +3815,25 @@ int main_vm_list(int argc, char **argv) return 0; } +static void string_realloc_append(char **accumulate, const char *more) +{ + /* Appends more to accumulate. Accumulate is either NULL, or + * points (always) to a malloc'd nul-terminated string. */ + + size_t oldlen = *accumulate ? strlen(*accumulate) : 0; + size_t morelen = strlen(more) + 1/*nul*/; + if (oldlen > SSIZE_MAX || morelen > SSIZE_MAX - oldlen) { + fprintf(stderr,"Additional config data far too large\n"); + exit(-ERROR_FAIL); + } + + *accumulate = xrealloc(*accumulate, oldlen + morelen); + memcpy(*accumulate + oldlen, more, morelen); +} + int main_create(int argc, char **argv) { const char *filename = NULL; - char *p; - char extra_config[1024]; struct domain_create dom_info; int paused = 0, debug = 0, daemonize = 1, console_autoconnect = 0, quiet = 0, monitor = 1, vnc = 0, vncautopass = 0; @@ -3835,6 +3849,8 @@ int main_create(int argc, char **argv) {0, 0, 0, 0} }; + dom_info.extra_config = NULL; + if (argv[1] && argv[1][0] != '-' && !strchr(argv[1], '=')) { filename = argv[1]; argc--; argv++; @@ -3886,20 +3902,21 @@ int main_create(int argc, char **argv) } } - extra_config[0] = '\0'; - for (p = extra_config; optind < argc; optind++) { + memset(&dom_info, 0, sizeof(dom_info)); + + for (; optind < argc; optind++) { if (strchr(argv[optind], '=') != NULL) { - p += snprintf(p, sizeof(extra_config) - (p - extra_config), - "%s\n", argv[optind]); + string_realloc_append(&dom_info.extra_config, argv[optind]); + string_realloc_append(&dom_info.extra_config, "\n"); } else if (!filename) { filename = argv[optind]; } else { help("create"); + free(dom_info.extra_config); return 2; } } - memset(&dom_info, 0, sizeof(dom_info)); dom_info.debug = debug; dom_info.daemonize = daemonize; dom_info.monitor = monitor; @@ -3907,24 +3924,25 @@ int main_create(int argc, char **argv) dom_info.dryrun = dryrun_only; dom_info.quiet = quiet; dom_info.config_file = filename; - dom_info.extra_config = extra_config; dom_info.migrate_fd = -1; dom_info.vnc = vnc; dom_info.vncautopass = vncautopass; dom_info.console_autoconnect = console_autoconnect; rc = create_domain(&dom_info); - if (rc < 0) + if (rc < 0) { + free(dom_info.extra_config); return -rc; + } + free(dom_info.extra_config); return 0; } int main_config_update(int argc, char **argv) { const char *filename = NULL; - char *p; - char extra_config[1024]; + char *extra_config = NULL; void *config_data = 0; int config_len = 0; libxl_domain_config d_config; @@ -3972,15 +3990,15 @@ int main_config_update(int argc, char **argv) } } - extra_config[0] = '\0'; - for (p = extra_config; optind < argc; optind++) { + for (; optind < argc; optind++) { if (strchr(argv[optind], '=') != NULL) { - p += snprintf(p, sizeof(extra_config) - (p - extra_config), - "%s\n", argv[optind]); + string_realloc_append(&extra_config, argv[optind]); + string_realloc_append(&extra_config, "\n"); } else if (!filename) { filename = argv[optind]; } else { help("create"); + free(extra_config); return 2; } } @@ -3989,7 +4007,8 @@ int main_config_update(int argc, char **argv) rc = libxl_read_file_contents(ctx, filename, &config_data, &config_len); if (rc) { fprintf(stderr, "Failed to read config file: %s: %s\n", - filename, strerror(errno)); return ERROR_FAIL; } + filename, strerror(errno)); + free(extra_config); return ERROR_FAIL; } if (strlen(extra_config)) { if (config_len > INT_MAX - (strlen(extra_config) + 2 + 1)) { fprintf(stderr, "Failed to attach extra configration\n"); @@ -4030,7 +4049,7 @@ int main_config_update(int argc, char **argv) libxl_domain_config_dispose(&d_config); free(config_data); - + free(extra_config); return 0; } @@ -6000,7 +6019,7 @@ int main_cpupoolcreate(int argc, char **argv) { const char *filename = NULL, *config_src=NULL; const char *p; - char extra_config[1024]; + char *extra_config = NULL; int opt; int option_index = 0; static struct option long_options[] = { @@ -6047,13 +6066,10 @@ int main_cpupoolcreate(int argc, char **argv) } } - memset(extra_config, 0, sizeof(extra_config)); while (optind < argc) { if ((p = strchr(argv[optind], '='))) { - if (strlen(extra_config) + 1 + strlen(argv[optind]) < sizeof(extra_config)) { - strcat(extra_config, "\n"); - strcat(extra_config, argv[optind]); - } + string_realloc_append(&extra_config, "\n"); + string_realloc_append(&extra_config, argv[optind]); } else if (!filename) { filename = argv[optind]; } else { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 17 11:22:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Aug 2015 11:22:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIUm-0004Kn-Gv; Mon, 17 Aug 2015 11:22:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIUl-0004Ka-Jc for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:22:27 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 0F/01-31069-2F3C1D55; Mon, 17 Aug 2015 11:22:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1439810545!35651818!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18853 invoked from network); 17 Aug 2015 11:22:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Aug 2015 11:22:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIUi-0003mE-Qn for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:22:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRIUi-0007sN-PT for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:22:24 +0000 Date: Mon, 17 Aug 2015 11:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] docs: workaround markdown parser error in xen-command-line.markdown X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4063b8566794d849e0c0a3d7b62ad7989dcc2b58 Author: Ian Campbell AuthorDate: Wed Nov 19 10:42:18 2014 +0000 Commit: Ian Jackson CommitDate: Wed Aug 12 11:47:38 2015 +0100 docs: workaround markdown parser error in xen-command-line.markdown Some versions of markdown (specifically the one in Debian Wheezy, currently used to generate http://xenbits.xen.org/docs/unstable/misc/xen-command-line.html) seem to be confused by nested lists in the middle of multi-paragraph parent list entries as seen in the com1,com2 entry. The effect is that the "Default" section of all following entries are replace by some sort of hash or checksum (at least, a string of 32 random seeming hex digits). Workaround this issue by making the decriptions of the DPS options a nested list, moving the existing nested list describing the options for S into a third level list. This seems to avoid the issue, and is arguably better formatting in its own right (at least its not a regression IMHO) Signed-off-by: Ian Campbell Reviewed-by: Andrew Cooper (cherry picked from commit ae325e94d2076f3953824e069c062908221f7325) (cherry picked from commit 3e9054c523ed089d04cf10b7f5b417240be85760) (cherry picked from commit f558eb43bf6f381853ef010d2d7ba9327481d2de) --- docs/misc/xen-command-line.markdown | 21 ++++++++------------- 1 files changed, 8 insertions(+), 13 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 7c46f91..7a37dd8 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -208,19 +208,14 @@ Both option `com1` and `com2` follow the same format. * Optionally, a clock speed measured in hz can be specified. * `DPS` represents the number of data bits, the parity, and the number of stop bits. - - `D` is an integer between 5 and 8 for the number of data bits. - - `P` is a single character representing the type of parity: - - * `n` No - * `o` Odd - * `e` Even - * `m` Mark - * `s` Space - - `S` is an integer 1 or 2 for the number of stop bits. - + * `D` is an integer between 5 and 8 for the number of data bits. + * `P` is a single character representing the type of parity: + * `n` No + * `o` Odd + * `e` Even + * `m` Mark + * `s` Space + * `S` is an integer 1 or 2 for the number of stop bits. * `` is an integer which specifies the IO base port for UART registers. * `` is the IRQ number to use, or `0` to use the UART in poll -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 17 11:22:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Aug 2015 11:22:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIUm-0004Kn-Gv; Mon, 17 Aug 2015 11:22:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIUl-0004Ka-Jc for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:22:27 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 0F/01-31069-2F3C1D55; Mon, 17 Aug 2015 11:22:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1439810545!35651818!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18853 invoked from network); 17 Aug 2015 11:22:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Aug 2015 11:22:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIUi-0003mE-Qn for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:22:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRIUi-0007sN-PT for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:22:24 +0000 Date: Mon, 17 Aug 2015 11:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] docs: workaround markdown parser error in xen-command-line.markdown X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4063b8566794d849e0c0a3d7b62ad7989dcc2b58 Author: Ian Campbell AuthorDate: Wed Nov 19 10:42:18 2014 +0000 Commit: Ian Jackson CommitDate: Wed Aug 12 11:47:38 2015 +0100 docs: workaround markdown parser error in xen-command-line.markdown Some versions of markdown (specifically the one in Debian Wheezy, currently used to generate http://xenbits.xen.org/docs/unstable/misc/xen-command-line.html) seem to be confused by nested lists in the middle of multi-paragraph parent list entries as seen in the com1,com2 entry. The effect is that the "Default" section of all following entries are replace by some sort of hash or checksum (at least, a string of 32 random seeming hex digits). Workaround this issue by making the decriptions of the DPS options a nested list, moving the existing nested list describing the options for S into a third level list. This seems to avoid the issue, and is arguably better formatting in its own right (at least its not a regression IMHO) Signed-off-by: Ian Campbell Reviewed-by: Andrew Cooper (cherry picked from commit ae325e94d2076f3953824e069c062908221f7325) (cherry picked from commit 3e9054c523ed089d04cf10b7f5b417240be85760) (cherry picked from commit f558eb43bf6f381853ef010d2d7ba9327481d2de) --- docs/misc/xen-command-line.markdown | 21 ++++++++------------- 1 files changed, 8 insertions(+), 13 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 7c46f91..7a37dd8 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -208,19 +208,14 @@ Both option `com1` and `com2` follow the same format. * Optionally, a clock speed measured in hz can be specified. * `DPS` represents the number of data bits, the parity, and the number of stop bits. - - `D` is an integer between 5 and 8 for the number of data bits. - - `P` is a single character representing the type of parity: - - * `n` No - * `o` Odd - * `e` Even - * `m` Mark - * `s` Space - - `S` is an integer 1 or 2 for the number of stop bits. - + * `D` is an integer between 5 and 8 for the number of data bits. + * `P` is a single character representing the type of parity: + * `n` No + * `o` Odd + * `e` Even + * `m` Mark + * `s` Space + * `S` is an integer 1 or 2 for the number of stop bits. * `` is an integer which specifies the IO base port for UART registers. * `` is the IRQ number to use, or `0` to use the UART in poll -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 17 11:22:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Aug 2015 11:22:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIUw-0004MQ-JZ; Mon, 17 Aug 2015 11:22:38 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIUv-0004MC-MP for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:22:37 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 50/98-06021-CF3C1D55; Mon, 17 Aug 2015 11:22:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1439810555!35547290!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17637 invoked from network); 17 Aug 2015 11:22:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Aug 2015 11:22:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIUt-0003mM-07 for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:22:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRIUs-0007sj-Uv for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:22:34 +0000 Date: Mon, 17 Aug 2015 11:22:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] libxl: In domain death search, start search at first domid we want X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 56be637e71e5fe22bebb8045762a1fab3da8a184 Author: Ian Jackson AuthorDate: Tue Mar 17 09:30:57 2015 -0600 Commit: Ian Jackson CommitDate: Wed Aug 12 11:59:25 2015 +0100 libxl: In domain death search, start search at first domid we want From: Ian Jackson When domain_death_xswatch_callback needed a further call to xc_domain_getinfolist it would restart it with the last domain it found rather than the first one it wants. If it only wants one it will also only ask for one domain. The result would then be that it gets the previous domain again (ie, the previous one to the one it wants), which still doesn't reveal the answer to the question, and it would therefore loop again. It's completely unclear to me why I thought it was a good idea to start the xc_domain_getinfolist with the last domain previously found rather than the first one left un-confirmed. The code has been that way since it was introduced. Instead, start each xc_domain_getinfolist at the next domain whose status we need to check. We also need to move the test for !evg into the loop, we now need evg to compute the arguments to getinfolist. Signed-off-by: Ian Jackson Reported-by: Jim Fehlig Reviewed-by: Jim Fehlig Tested-by: Jim Fehlig Acked-by: Wei Liu Acked-by: Ian Campbell (cherry picked from commit 4783c99aab866f470bd59368cfbf5ad5f677b0ec) (cherry picked from commit 0b19348f3cd176e4badb173dd0054c49346a6ce1) (cherry picked from commit 13623d5d8e854f20b2da885f4d452dc870912205) (cherry picked from commit 0332b3f24b2c1be06a17b00786021aeea01c52f5) --- tools/libxl/libxl.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index b9fb822..99cfc6e 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -974,22 +974,20 @@ static void domain_death_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *w, const char *wpath, const char *epath) { EGC_GC; libxl_evgen_domain_death *evg; - uint32_t domid; int rc; CTX_LOCK; evg = LIBXL_TAILQ_FIRST(&CTX->death_list); - if (!evg) goto out; - - domid = evg->domid; for (;;) { + if (!evg) goto out; + int nentries = LIBXL_TAILQ_NEXT(evg, entry) ? 200 : 1; xc_domaininfo_t domaininfos[nentries]; const xc_domaininfo_t *got = domaininfos, *gotend; - rc = xc_domain_getinfolist(CTX->xch, domid, nentries, domaininfos); + rc = xc_domain_getinfolist(CTX->xch, evg->domid, nentries, domaininfos); if (rc == -1) { LIBXL__EVENT_DISASTER(egc, "xc_domain_getinfolist failed while" " processing @releaseDomain watch event", @@ -999,8 +997,10 @@ static void domain_death_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *w, gotend = &domaininfos[rc]; LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "[evg=%p:%"PRIu32"]" - " from domid=%"PRIu32" nentries=%d rc=%d", - evg, evg->domid, domid, nentries, rc); + " nentries=%d rc=%d %ld..%ld", + evg, evg->domid, nentries, rc, + rc>0 ? (long)domaininfos[0].domain : 0, + rc>0 ? (long)domaininfos[rc-1].domain : 0); for (;;) { if (!evg) { @@ -1063,7 +1063,6 @@ static void domain_death_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *w, } assert(rc); /* rc==0 results in us eating all evgs and quitting */ - domid = gotend[-1].domain; } all_reported: out: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 17 11:22:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Aug 2015 11:22:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIUw-0004MQ-JZ; Mon, 17 Aug 2015 11:22:38 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIUv-0004MC-MP for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:22:37 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 50/98-06021-CF3C1D55; Mon, 17 Aug 2015 11:22:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1439810555!35547290!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17637 invoked from network); 17 Aug 2015 11:22:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Aug 2015 11:22:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIUt-0003mM-07 for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:22:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRIUs-0007sj-Uv for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:22:34 +0000 Date: Mon, 17 Aug 2015 11:22:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] libxl: In domain death search, start search at first domid we want X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 56be637e71e5fe22bebb8045762a1fab3da8a184 Author: Ian Jackson AuthorDate: Tue Mar 17 09:30:57 2015 -0600 Commit: Ian Jackson CommitDate: Wed Aug 12 11:59:25 2015 +0100 libxl: In domain death search, start search at first domid we want From: Ian Jackson When domain_death_xswatch_callback needed a further call to xc_domain_getinfolist it would restart it with the last domain it found rather than the first one it wants. If it only wants one it will also only ask for one domain. The result would then be that it gets the previous domain again (ie, the previous one to the one it wants), which still doesn't reveal the answer to the question, and it would therefore loop again. It's completely unclear to me why I thought it was a good idea to start the xc_domain_getinfolist with the last domain previously found rather than the first one left un-confirmed. The code has been that way since it was introduced. Instead, start each xc_domain_getinfolist at the next domain whose status we need to check. We also need to move the test for !evg into the loop, we now need evg to compute the arguments to getinfolist. Signed-off-by: Ian Jackson Reported-by: Jim Fehlig Reviewed-by: Jim Fehlig Tested-by: Jim Fehlig Acked-by: Wei Liu Acked-by: Ian Campbell (cherry picked from commit 4783c99aab866f470bd59368cfbf5ad5f677b0ec) (cherry picked from commit 0b19348f3cd176e4badb173dd0054c49346a6ce1) (cherry picked from commit 13623d5d8e854f20b2da885f4d452dc870912205) (cherry picked from commit 0332b3f24b2c1be06a17b00786021aeea01c52f5) --- tools/libxl/libxl.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index b9fb822..99cfc6e 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -974,22 +974,20 @@ static void domain_death_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *w, const char *wpath, const char *epath) { EGC_GC; libxl_evgen_domain_death *evg; - uint32_t domid; int rc; CTX_LOCK; evg = LIBXL_TAILQ_FIRST(&CTX->death_list); - if (!evg) goto out; - - domid = evg->domid; for (;;) { + if (!evg) goto out; + int nentries = LIBXL_TAILQ_NEXT(evg, entry) ? 200 : 1; xc_domaininfo_t domaininfos[nentries]; const xc_domaininfo_t *got = domaininfos, *gotend; - rc = xc_domain_getinfolist(CTX->xch, domid, nentries, domaininfos); + rc = xc_domain_getinfolist(CTX->xch, evg->domid, nentries, domaininfos); if (rc == -1) { LIBXL__EVENT_DISASTER(egc, "xc_domain_getinfolist failed while" " processing @releaseDomain watch event", @@ -999,8 +997,10 @@ static void domain_death_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *w, gotend = &domaininfos[rc]; LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "[evg=%p:%"PRIu32"]" - " from domid=%"PRIu32" nentries=%d rc=%d", - evg, evg->domid, domid, nentries, rc); + " nentries=%d rc=%d %ld..%ld", + evg, evg->domid, nentries, rc, + rc>0 ? (long)domaininfos[0].domain : 0, + rc>0 ? (long)domaininfos[rc-1].domain : 0); for (;;) { if (!evg) { @@ -1063,7 +1063,6 @@ static void domain_death_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *w, } assert(rc); /* rc==0 results in us eating all evgs and quitting */ - domid = gotend[-1].domain; } all_reported: out: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 17 11:22:48 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Aug 2015 11:22:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIV6-0004O4-MA; Mon, 17 Aug 2015 11:22:48 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIV5-0004Nk-Kn for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:22:47 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id D1/F4-10678-604C1D55; Mon, 17 Aug 2015 11:22:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1439810565!35589819!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18579 invoked from network); 17 Aug 2015 11:22:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Aug 2015 11:22:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIV3-0003mU-6u for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:22:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRIV3-0007t8-3i for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:22:45 +0000 Date: Mon, 17 Aug 2015 11:22:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] ocaml/xenctrl: Check return values from hypercalls X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5ac28815585af2807f756518d0080b442f89429a Author: Andrew Cooper AuthorDate: Tue Jan 27 20:38:11 2015 +0000 Commit: Ian Jackson CommitDate: Wed Aug 12 11:59:30 2015 +0100 ocaml/xenctrl: Check return values from hypercalls rather than blindly continuing and possibly using negative values. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Dave Scott Acked-by: David Scott (cherry picked from commit 3380f5b6270e6fa4b24313f8808e7625e4c5a6ba) (cherry picked from commit c91ed889ea3c3781a94a30909f30c3aad56c97d5) (cherry picked from commit 10a95535b0dcde7daa3402b92f3c8d4494781c28) (cherry picked from commit 8d0ca8a5e1965e241baf32e2c8dfcd82bb924aac) --- tools/ocaml/libs/xc/xenctrl_stubs.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index a144313..55d5f94 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -455,6 +455,9 @@ CAMLprim value stub_xc_vcpu_getaffinity(value xch, value domid, int i, len = xc_get_max_cpus(_H(xch)); int retval; + if (len < 1) + failwith_xc(_H(xch)); + c_cpumap = xc_cpumap_alloc(_H(xch)); if (c_cpumap == NULL) failwith_xc(_H(xch)); @@ -805,6 +808,12 @@ CAMLprim value stub_xc_version_version(value xch) caml_enter_blocking_section(); packed = xc_version(_H(xch), XENVER_version, NULL); + caml_leave_blocking_section(); + + if (packed < 0) + failwith_xc(_H(xch)); + + caml_enter_blocking_section(); retval = xc_version(_H(xch), XENVER_extraversion, &extra); caml_leave_blocking_section(); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 17 11:22:48 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Aug 2015 11:22:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIV6-0004O4-MA; Mon, 17 Aug 2015 11:22:48 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIV5-0004Nk-Kn for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:22:47 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id D1/F4-10678-604C1D55; Mon, 17 Aug 2015 11:22:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1439810565!35589819!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18579 invoked from network); 17 Aug 2015 11:22:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Aug 2015 11:22:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIV3-0003mU-6u for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:22:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRIV3-0007t8-3i for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:22:45 +0000 Date: Mon, 17 Aug 2015 11:22:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] ocaml/xenctrl: Check return values from hypercalls X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5ac28815585af2807f756518d0080b442f89429a Author: Andrew Cooper AuthorDate: Tue Jan 27 20:38:11 2015 +0000 Commit: Ian Jackson CommitDate: Wed Aug 12 11:59:30 2015 +0100 ocaml/xenctrl: Check return values from hypercalls rather than blindly continuing and possibly using negative values. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Dave Scott Acked-by: David Scott (cherry picked from commit 3380f5b6270e6fa4b24313f8808e7625e4c5a6ba) (cherry picked from commit c91ed889ea3c3781a94a30909f30c3aad56c97d5) (cherry picked from commit 10a95535b0dcde7daa3402b92f3c8d4494781c28) (cherry picked from commit 8d0ca8a5e1965e241baf32e2c8dfcd82bb924aac) --- tools/ocaml/libs/xc/xenctrl_stubs.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index a144313..55d5f94 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -455,6 +455,9 @@ CAMLprim value stub_xc_vcpu_getaffinity(value xch, value domid, int i, len = xc_get_max_cpus(_H(xch)); int retval; + if (len < 1) + failwith_xc(_H(xch)); + c_cpumap = xc_cpumap_alloc(_H(xch)); if (c_cpumap == NULL) failwith_xc(_H(xch)); @@ -805,6 +808,12 @@ CAMLprim value stub_xc_version_version(value xch) caml_enter_blocking_section(); packed = xc_version(_H(xch), XENVER_version, NULL); + caml_leave_blocking_section(); + + if (packed < 0) + failwith_xc(_H(xch)); + + caml_enter_blocking_section(); retval = xc_version(_H(xch), XENVER_extraversion, &extra); caml_leave_blocking_section(); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 17 11:22:58 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Aug 2015 11:22:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIVG-0004Pk-P0; Mon, 17 Aug 2015 11:22:58 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIVF-0004PV-QM for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:22:57 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 31/E8-06179-114C1D55; Mon, 17 Aug 2015 11:22:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1439810575!28496042!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10302 invoked from network); 17 Aug 2015 11:22:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 17 Aug 2015 11:22:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIVD-0003mf-CB for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:22:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRIVD-0007tV-AS for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:22:55 +0000 Date: Mon, 17 Aug 2015 11:22:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] ocaml/xenctrl: Make failwith_xc() thread safe X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 97b169ac0a8b0eb90f954e22ea4cffdbb37a65d1 Author: Andrew Cooper AuthorDate: Wed Jan 28 17:55:32 2015 +0000 Commit: Ian Jackson CommitDate: Wed Aug 12 11:59:35 2015 +0100 ocaml/xenctrl: Make failwith_xc() thread safe The static error_str[] buffer is not thread-safe, and 1024 bytes is unreasonably large. Reduce to 256 bytes (which is still much larger than any current use), and move it to being a stack variable. Also, propagate the Noreturn attribute from caml_raise_with_string(). Signed-off-by: Andrew Cooper CC: Dave Scott CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Acked-by: David Scott (cherry picked from commit c8945d51613450c19e0898b1b3056c90f4929179) (cherry picked from commit 032673c8836e28d9e291e0d02235001c41aedaab) (cherry picked from commit 9702e084d09550495c2e71f2639c1c2c43aeaf63) (cherry picked from commit dea3fd1e945de74154e74989623a4272f43338fe) --- tools/ocaml/libs/xc/xenctrl_stubs.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index 55d5f94..3c1bc0e 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -51,21 +51,22 @@ i1 = (uint32_t) Int64_val(Field(input, 0)); \ i2 = ((Field(input, 1) == Val_none) ? 0xffffffff : (uint32_t) Int64_val(Field(Field(input, 1), 0))); -#define ERROR_STRLEN 1024 -void failwith_xc(xc_interface *xch) +static void Noreturn failwith_xc(xc_interface *xch) { - static char error_str[ERROR_STRLEN]; + char error_str[256]; if (xch) { const xc_error *error = xc_get_last_error(xch); if (error->code == XC_ERROR_NONE) - snprintf(error_str, ERROR_STRLEN, "%d: %s", errno, strerror(errno)); + snprintf(error_str, sizeof(error_str), + "%d: %s", errno, strerror(errno)); else - snprintf(error_str, ERROR_STRLEN, "%d: %s: %s", - error->code, + snprintf(error_str, sizeof(error_str), + "%d: %s: %s", error->code, xc_error_code_to_desc(error->code), error->message); } else { - snprintf(error_str, ERROR_STRLEN, "Unable to open XC interface"); + snprintf(error_str, sizeof(error_str), + "Unable to open XC interface"); } caml_raise_with_string(*caml_named_value("xc.error"), error_str); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 17 11:22:58 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Aug 2015 11:22:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIVG-0004Pk-P0; Mon, 17 Aug 2015 11:22:58 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIVF-0004PV-QM for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:22:57 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 31/E8-06179-114C1D55; Mon, 17 Aug 2015 11:22:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1439810575!28496042!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10302 invoked from network); 17 Aug 2015 11:22:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 17 Aug 2015 11:22:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIVD-0003mf-CB for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:22:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRIVD-0007tV-AS for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:22:55 +0000 Date: Mon, 17 Aug 2015 11:22:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] ocaml/xenctrl: Make failwith_xc() thread safe X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 97b169ac0a8b0eb90f954e22ea4cffdbb37a65d1 Author: Andrew Cooper AuthorDate: Wed Jan 28 17:55:32 2015 +0000 Commit: Ian Jackson CommitDate: Wed Aug 12 11:59:35 2015 +0100 ocaml/xenctrl: Make failwith_xc() thread safe The static error_str[] buffer is not thread-safe, and 1024 bytes is unreasonably large. Reduce to 256 bytes (which is still much larger than any current use), and move it to being a stack variable. Also, propagate the Noreturn attribute from caml_raise_with_string(). Signed-off-by: Andrew Cooper CC: Dave Scott CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Acked-by: David Scott (cherry picked from commit c8945d51613450c19e0898b1b3056c90f4929179) (cherry picked from commit 032673c8836e28d9e291e0d02235001c41aedaab) (cherry picked from commit 9702e084d09550495c2e71f2639c1c2c43aeaf63) (cherry picked from commit dea3fd1e945de74154e74989623a4272f43338fe) --- tools/ocaml/libs/xc/xenctrl_stubs.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index 55d5f94..3c1bc0e 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -51,21 +51,22 @@ i1 = (uint32_t) Int64_val(Field(input, 0)); \ i2 = ((Field(input, 1) == Val_none) ? 0xffffffff : (uint32_t) Int64_val(Field(Field(input, 1), 0))); -#define ERROR_STRLEN 1024 -void failwith_xc(xc_interface *xch) +static void Noreturn failwith_xc(xc_interface *xch) { - static char error_str[ERROR_STRLEN]; + char error_str[256]; if (xch) { const xc_error *error = xc_get_last_error(xch); if (error->code == XC_ERROR_NONE) - snprintf(error_str, ERROR_STRLEN, "%d: %s", errno, strerror(errno)); + snprintf(error_str, sizeof(error_str), + "%d: %s", errno, strerror(errno)); else - snprintf(error_str, ERROR_STRLEN, "%d: %s: %s", - error->code, + snprintf(error_str, sizeof(error_str), + "%d: %s: %s", error->code, xc_error_code_to_desc(error->code), error->message); } else { - snprintf(error_str, ERROR_STRLEN, "Unable to open XC interface"); + snprintf(error_str, sizeof(error_str), + "Unable to open XC interface"); } caml_raise_with_string(*caml_named_value("xc.error"), error_str); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 17 11:23:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Aug 2015 11:23:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIVR-0004Ry-U7; Mon, 17 Aug 2015 11:23:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIVQ-0004Rm-82 for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:23:08 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 3F/72-32615-B14C1D55; Mon, 17 Aug 2015 11:23:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1439810585!24385845!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13096 invoked from network); 17 Aug 2015 11:23:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 17 Aug 2015 11:23:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIVN-0003nJ-J5 for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:23:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRIVN-0007u4-GU for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:23:05 +0000 Date: Mon, 17 Aug 2015 11:23:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] ocaml/xenctrl: Fix stub_xc_readconsolering() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e1395c154c2ebcc218adb5b8999f74620461dfb4 Author: Andrew Cooper AuthorDate: Fri Jan 30 14:11:14 2015 +0000 Commit: Ian Jackson CommitDate: Wed Aug 12 11:59:39 2015 +0100 ocaml/xenctrl: Fix stub_xc_readconsolering() The Ocaml stub to retrieve the hypervisor console ring had a few problems. * A single 32k buffer would truncate a large console ring. * The buffer was static and not under the protection of the Ocaml GC lock so could be clobbered by concurrent accesses. * Embedded NUL characters would cause caml_copy_string() (which is strlen() based) to truncate the buffer. The function is rewritten from scratch, using the same algorithm as the python stubs, but uses the protection of the Ocaml GC lock to maintain a static running total of the ring size, to avoid redundant realloc()ing in future calls. Signed-off-by: Andrew Cooper CC: Dave Scott CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Acked-by: David Scott Acked-by: Ian Campbell (cherry picked from commit 1a010ca99e9b04c1cfbd0ee718aa22d5ebd530ab) (cherry picked from commit cfc4c43be14e60608ed0b8173365c737950afe41) (cherry picked from commit c669c244246a7e45cedb03a30d59656c95d09719) (cherry picked from commit 04f8006b66fd9f351467ad0e9c77a0a14741c6e4) --- tools/ocaml/libs/xc/xenctrl_stubs.c | 59 +++++++++++++++++++++++++++++------ 1 files changed, 49 insertions(+), 10 deletions(-) diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index 3c1bc0e..39ebbd3 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -526,26 +526,65 @@ CAMLprim value stub_xc_evtchn_reset(value xch, value domid) } -#define RING_SIZE 32768 -static char ring[RING_SIZE]; - CAMLprim value stub_xc_readconsolering(value xch) { - unsigned int size = RING_SIZE - 1; - char *ring_ptr = ring; - int retval; + /* Safe to use outside of blocking sections because of Ocaml GC lock. */ + static unsigned int conring_size = 16384 + 1; + + unsigned int count = conring_size, size = count, index = 0; + char *str = NULL, *ptr; + int ret; CAMLparam1(xch); + CAMLlocal1(ring); + str = malloc(size); + if (!str) + caml_raise_out_of_memory(); + + /* Hopefully our conring_size guess is sufficient */ caml_enter_blocking_section(); - retval = xc_readconsolering(_H(xch), ring_ptr, &size, 0, 0, NULL); + ret = xc_readconsolering(_H(xch), str, &count, 0, 0, &index); caml_leave_blocking_section(); - if (retval) + if (ret < 0) { + free(str); failwith_xc(_H(xch)); + } + + while (count == size && ret >= 0) { + size += count - 1; + if (size < count) + break; + + ptr = realloc(str, size); + if (!ptr) + break; + + str = ptr + count; + count = size - count; + + caml_enter_blocking_section(); + ret = xc_readconsolering(_H(xch), str, &count, 0, 1, &index); + caml_leave_blocking_section(); + + count += str - ptr; + str = ptr; + } + + /* + * If we didn't break because of an overflow with size, and we have + * needed to realloc() ourself more space, update our tracking of the + * real console ring size. + */ + if (size > conring_size) + conring_size = size; + + ring = caml_alloc_string(count); + memcpy(String_val(ring), str, count); + free(str); - ring[size] = '\0'; - CAMLreturn(caml_copy_string(ring)); + CAMLreturn(ring); } CAMLprim value stub_xc_send_debug_keys(value xch, value keys) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 17 11:23:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Aug 2015 11:23:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIVR-0004Ry-U7; Mon, 17 Aug 2015 11:23:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIVQ-0004Rm-82 for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:23:08 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 3F/72-32615-B14C1D55; Mon, 17 Aug 2015 11:23:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1439810585!24385845!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13096 invoked from network); 17 Aug 2015 11:23:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 17 Aug 2015 11:23:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIVN-0003nJ-J5 for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:23:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRIVN-0007u4-GU for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:23:05 +0000 Date: Mon, 17 Aug 2015 11:23:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] ocaml/xenctrl: Fix stub_xc_readconsolering() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e1395c154c2ebcc218adb5b8999f74620461dfb4 Author: Andrew Cooper AuthorDate: Fri Jan 30 14:11:14 2015 +0000 Commit: Ian Jackson CommitDate: Wed Aug 12 11:59:39 2015 +0100 ocaml/xenctrl: Fix stub_xc_readconsolering() The Ocaml stub to retrieve the hypervisor console ring had a few problems. * A single 32k buffer would truncate a large console ring. * The buffer was static and not under the protection of the Ocaml GC lock so could be clobbered by concurrent accesses. * Embedded NUL characters would cause caml_copy_string() (which is strlen() based) to truncate the buffer. The function is rewritten from scratch, using the same algorithm as the python stubs, but uses the protection of the Ocaml GC lock to maintain a static running total of the ring size, to avoid redundant realloc()ing in future calls. Signed-off-by: Andrew Cooper CC: Dave Scott CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Acked-by: David Scott Acked-by: Ian Campbell (cherry picked from commit 1a010ca99e9b04c1cfbd0ee718aa22d5ebd530ab) (cherry picked from commit cfc4c43be14e60608ed0b8173365c737950afe41) (cherry picked from commit c669c244246a7e45cedb03a30d59656c95d09719) (cherry picked from commit 04f8006b66fd9f351467ad0e9c77a0a14741c6e4) --- tools/ocaml/libs/xc/xenctrl_stubs.c | 59 +++++++++++++++++++++++++++++------ 1 files changed, 49 insertions(+), 10 deletions(-) diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index 3c1bc0e..39ebbd3 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -526,26 +526,65 @@ CAMLprim value stub_xc_evtchn_reset(value xch, value domid) } -#define RING_SIZE 32768 -static char ring[RING_SIZE]; - CAMLprim value stub_xc_readconsolering(value xch) { - unsigned int size = RING_SIZE - 1; - char *ring_ptr = ring; - int retval; + /* Safe to use outside of blocking sections because of Ocaml GC lock. */ + static unsigned int conring_size = 16384 + 1; + + unsigned int count = conring_size, size = count, index = 0; + char *str = NULL, *ptr; + int ret; CAMLparam1(xch); + CAMLlocal1(ring); + str = malloc(size); + if (!str) + caml_raise_out_of_memory(); + + /* Hopefully our conring_size guess is sufficient */ caml_enter_blocking_section(); - retval = xc_readconsolering(_H(xch), ring_ptr, &size, 0, 0, NULL); + ret = xc_readconsolering(_H(xch), str, &count, 0, 0, &index); caml_leave_blocking_section(); - if (retval) + if (ret < 0) { + free(str); failwith_xc(_H(xch)); + } + + while (count == size && ret >= 0) { + size += count - 1; + if (size < count) + break; + + ptr = realloc(str, size); + if (!ptr) + break; + + str = ptr + count; + count = size - count; + + caml_enter_blocking_section(); + ret = xc_readconsolering(_H(xch), str, &count, 0, 1, &index); + caml_leave_blocking_section(); + + count += str - ptr; + str = ptr; + } + + /* + * If we didn't break because of an overflow with size, and we have + * needed to realloc() ourself more space, update our tracking of the + * real console ring size. + */ + if (size > conring_size) + conring_size = size; + + ring = caml_alloc_string(count); + memcpy(String_val(ring), str, count); + free(str); - ring[size] = '\0'; - CAMLreturn(caml_copy_string(ring)); + CAMLreturn(ring); } CAMLprim value stub_xc_send_debug_keys(value xch, value keys) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 17 11:23:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Aug 2015 11:23:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIVc-0004TR-0K; Mon, 17 Aug 2015 11:23:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIVa-0004TI-H9 for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:23:18 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id FB/2F-12946-524C1D55; Mon, 17 Aug 2015 11:23:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1439810595!35585566!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4788 invoked from network); 17 Aug 2015 11:23:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Aug 2015 11:23:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIVX-0003nR-NH for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:23:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRIVX-0007uw-M2 for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:23:15 +0000 Date: Mon, 17 Aug 2015 11:23:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] tools/xenconsoled: Increase file descriptor limit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7a59c12cab4697a730d7a517b35339c28ed93969 Author: Andrew Cooper AuthorDate: Mon Mar 2 15:04:37 2015 +0000 Commit: Ian Jackson CommitDate: Wed Aug 12 11:59:45 2015 +0100 tools/xenconsoled: Increase file descriptor limit XenServer's VM density testing uncovered a regression when moving from sysvinit to systemd where the file descriptor limit dropped from 4096 to 1024. (XenServer had previously inserted a ulimit statement into its initscripts.) One solution is to use LimitNOFILE=4096 in xenconsoled.service to match the lost ulimit, but that is only a stopgap solution. As Xenconsoled genuinely needs a large number of file descriptors if a large number of domains are running, attempt to increase the limit. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson (cherry picked from commit 588df84c0d702e835e526ecef3af6c5444857558) (cherry picked from commit 9d5b2b01024d18b2135c1b0deebb8bfbf5dced5f) (cherry picked from commit a490f8df8c989483624ebd6befb63377be55722b) (cherry picked from commit 9d6754dc2dc488f1a5877955836fa46b4ee119bb) --- tools/console/daemon/main.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/tools/console/daemon/main.c b/tools/console/daemon/main.c index 789baa6..50e3d7f 100644 --- a/tools/console/daemon/main.c +++ b/tools/console/daemon/main.c @@ -26,6 +26,7 @@ #include #include #include +#include #include "xenctrl.h" @@ -55,6 +56,41 @@ static void version(char *name) printf("Xen Console Daemon 3.0\n"); } +static void increase_fd_limit(void) +{ + /* + * We require many file descriptors: + * - per domain: pty master, pty slave, logfile and evtchn + * - misc extra: hypervisor log, privcmd, gntdev, std... + * + * Allow a generous 1000 for misc, and calculate the maximum possible + * number of fds which could be used. + */ + unsigned min_fds = (DOMID_FIRST_RESERVED * 4) + 1000; + struct rlimit lim, new = { min_fds, min_fds }; + + if (getrlimit(RLIMIT_NOFILE, &lim) < 0) { + fprintf(stderr, "Failed to obtain fd limit: %s\n", + strerror(errno)); + exit(1); + } + + /* Do we already have sufficient? Great! */ + if (lim.rlim_cur >= min_fds) + return; + + /* Try to increase our limit. */ + if (setrlimit(RLIMIT_NOFILE, &new) < 0) + syslog(LOG_WARNING, + "Unable to increase fd limit from {%llu, %llu} to " + "{%llu, %llu}: (%s) - May run out with lots of domains", + (unsigned long long)lim.rlim_cur, + (unsigned long long)lim.rlim_max, + (unsigned long long)new.rlim_cur, + (unsigned long long)new.rlim_max, + strerror(errno)); +} + int main(int argc, char **argv) { const char *sopts = "hVvit:o:"; @@ -154,6 +190,8 @@ int main(int argc, char **argv) openlog("xenconsoled", syslog_option, LOG_DAEMON); setlogmask(syslog_mask); + increase_fd_limit(); + if (!is_interactive) { daemonize(pidfile ? pidfile : "/var/run/xenconsoled.pid"); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 17 11:23:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Aug 2015 11:23:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIVc-0004TR-0K; Mon, 17 Aug 2015 11:23:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIVa-0004TI-H9 for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:23:18 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id FB/2F-12946-524C1D55; Mon, 17 Aug 2015 11:23:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1439810595!35585566!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4788 invoked from network); 17 Aug 2015 11:23:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Aug 2015 11:23:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIVX-0003nR-NH for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:23:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRIVX-0007uw-M2 for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:23:15 +0000 Date: Mon, 17 Aug 2015 11:23:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] tools/xenconsoled: Increase file descriptor limit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7a59c12cab4697a730d7a517b35339c28ed93969 Author: Andrew Cooper AuthorDate: Mon Mar 2 15:04:37 2015 +0000 Commit: Ian Jackson CommitDate: Wed Aug 12 11:59:45 2015 +0100 tools/xenconsoled: Increase file descriptor limit XenServer's VM density testing uncovered a regression when moving from sysvinit to systemd where the file descriptor limit dropped from 4096 to 1024. (XenServer had previously inserted a ulimit statement into its initscripts.) One solution is to use LimitNOFILE=4096 in xenconsoled.service to match the lost ulimit, but that is only a stopgap solution. As Xenconsoled genuinely needs a large number of file descriptors if a large number of domains are running, attempt to increase the limit. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson (cherry picked from commit 588df84c0d702e835e526ecef3af6c5444857558) (cherry picked from commit 9d5b2b01024d18b2135c1b0deebb8bfbf5dced5f) (cherry picked from commit a490f8df8c989483624ebd6befb63377be55722b) (cherry picked from commit 9d6754dc2dc488f1a5877955836fa46b4ee119bb) --- tools/console/daemon/main.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/tools/console/daemon/main.c b/tools/console/daemon/main.c index 789baa6..50e3d7f 100644 --- a/tools/console/daemon/main.c +++ b/tools/console/daemon/main.c @@ -26,6 +26,7 @@ #include #include #include +#include #include "xenctrl.h" @@ -55,6 +56,41 @@ static void version(char *name) printf("Xen Console Daemon 3.0\n"); } +static void increase_fd_limit(void) +{ + /* + * We require many file descriptors: + * - per domain: pty master, pty slave, logfile and evtchn + * - misc extra: hypervisor log, privcmd, gntdev, std... + * + * Allow a generous 1000 for misc, and calculate the maximum possible + * number of fds which could be used. + */ + unsigned min_fds = (DOMID_FIRST_RESERVED * 4) + 1000; + struct rlimit lim, new = { min_fds, min_fds }; + + if (getrlimit(RLIMIT_NOFILE, &lim) < 0) { + fprintf(stderr, "Failed to obtain fd limit: %s\n", + strerror(errno)); + exit(1); + } + + /* Do we already have sufficient? Great! */ + if (lim.rlim_cur >= min_fds) + return; + + /* Try to increase our limit. */ + if (setrlimit(RLIMIT_NOFILE, &new) < 0) + syslog(LOG_WARNING, + "Unable to increase fd limit from {%llu, %llu} to " + "{%llu, %llu}: (%s) - May run out with lots of domains", + (unsigned long long)lim.rlim_cur, + (unsigned long long)lim.rlim_max, + (unsigned long long)new.rlim_cur, + (unsigned long long)new.rlim_max, + strerror(errno)); +} + int main(int argc, char **argv) { const char *sopts = "hVvit:o:"; @@ -154,6 +190,8 @@ int main(int argc, char **argv) openlog("xenconsoled", syslog_option, LOG_DAEMON); setlogmask(syslog_mask); + increase_fd_limit(); + if (!is_interactive) { daemonize(pidfile ? pidfile : "/var/run/xenconsoled.pid"); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 17 11:23:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Aug 2015 11:23:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIVm-0004V0-2o; Mon, 17 Aug 2015 11:23:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIVk-0004Ui-8a for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:23:28 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 04/D5-09570-F24C1D55; Mon, 17 Aug 2015 11:23:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1439810606!35652226!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29521 invoked from network); 17 Aug 2015 11:23:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Aug 2015 11:23:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIVh-0003nZ-RV for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:23:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRIVh-0007vI-Qa for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:23:25 +0000 Date: Mon, 17 Aug 2015 11:23:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 16e7d9761803a5808b65b8fce2b08cc652c0134d Author: Andrew Cooper AuthorDate: Mon Apr 13 16:11:12 2015 +0000 Commit: Ian Jackson CommitDate: Wed Aug 12 12:04:42 2015 +0100 tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125 gcc 4.1 of CentOS 5.x era does not like the typecheck in min() between uint64_t and unsigned long. Signed-off-by: Andrew Cooper CC: Konrad Rzeszutek Wilk CC: Ian Campbell CC: Ian Jackson CC: Wei Liu (cherry picked from commit 6c1cb3dba4ff97dd40909670755f24fcdf903012) Conflicts: tools/libxc/xc_domain.c Signed-off-by: Ian Jackson (cherry picked from commit c776b6429bb3be7a68e819de496a272a4d0cd2f4) --- tools/libxc/xc_domain.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 60f7137..808b867 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -1352,12 +1352,9 @@ int xc_domain_bind_pt_isa_irq( PT_IRQ_TYPE_ISA, 0, 0, 0, machine_irq)); } -#ifndef min -#define min(X, Y) ({ \ - const typeof (X) _x = (X); \ - const typeof (Y) _y = (Y); \ - (void) (&_x == &_y); \ - (_x < _y) ? _x : _y; }) +#ifndef min_t +#define min_t(type,x,y) \ + ({ type __x = (x); type __y = (y); __x < __y ? __x: __y; }) #endif int xc_domain_memory_mapping( xc_interface *xch, @@ -1380,7 +1377,7 @@ int xc_domain_memory_mapping( max_batch_sz = nr_mfns; do { - nr = min(nr_mfns - done, max_batch_sz); + nr = min_t(unsigned long, nr_mfns - done, max_batch_sz); domctl.u.memory_mapping.nr_mfns = nr; domctl.u.memory_mapping.first_gfn = first_gfn + done; domctl.u.memory_mapping.first_mfn = first_mfn + done; @@ -1416,7 +1413,7 @@ int xc_domain_memory_mapping( return ret; } -#undef min +#undef min_t int xc_domain_ioport_mapping( xc_interface *xch, uint32_t domid, -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 17 11:23:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Aug 2015 11:23:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIVm-0004V0-2o; Mon, 17 Aug 2015 11:23:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIVk-0004Ui-8a for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:23:28 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 04/D5-09570-F24C1D55; Mon, 17 Aug 2015 11:23:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1439810606!35652226!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29521 invoked from network); 17 Aug 2015 11:23:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Aug 2015 11:23:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIVh-0003nZ-RV for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:23:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRIVh-0007vI-Qa for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:23:25 +0000 Date: Mon, 17 Aug 2015 11:23:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 16e7d9761803a5808b65b8fce2b08cc652c0134d Author: Andrew Cooper AuthorDate: Mon Apr 13 16:11:12 2015 +0000 Commit: Ian Jackson CommitDate: Wed Aug 12 12:04:42 2015 +0100 tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125 gcc 4.1 of CentOS 5.x era does not like the typecheck in min() between uint64_t and unsigned long. Signed-off-by: Andrew Cooper CC: Konrad Rzeszutek Wilk CC: Ian Campbell CC: Ian Jackson CC: Wei Liu (cherry picked from commit 6c1cb3dba4ff97dd40909670755f24fcdf903012) Conflicts: tools/libxc/xc_domain.c Signed-off-by: Ian Jackson (cherry picked from commit c776b6429bb3be7a68e819de496a272a4d0cd2f4) --- tools/libxc/xc_domain.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 60f7137..808b867 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -1352,12 +1352,9 @@ int xc_domain_bind_pt_isa_irq( PT_IRQ_TYPE_ISA, 0, 0, 0, machine_irq)); } -#ifndef min -#define min(X, Y) ({ \ - const typeof (X) _x = (X); \ - const typeof (Y) _y = (Y); \ - (void) (&_x == &_y); \ - (_x < _y) ? _x : _y; }) +#ifndef min_t +#define min_t(type,x,y) \ + ({ type __x = (x); type __y = (y); __x < __y ? __x: __y; }) #endif int xc_domain_memory_mapping( xc_interface *xch, @@ -1380,7 +1377,7 @@ int xc_domain_memory_mapping( max_batch_sz = nr_mfns; do { - nr = min(nr_mfns - done, max_batch_sz); + nr = min_t(unsigned long, nr_mfns - done, max_batch_sz); domctl.u.memory_mapping.nr_mfns = nr; domctl.u.memory_mapping.first_gfn = first_gfn + done; domctl.u.memory_mapping.first_mfn = first_mfn + done; @@ -1416,7 +1413,7 @@ int xc_domain_memory_mapping( return ret; } -#undef min +#undef min_t int xc_domain_ioport_mapping( xc_interface *xch, uint32_t domid, -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 17 11:23:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Aug 2015 11:23:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIVw-0004Wb-5N; Mon, 17 Aug 2015 11:23:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIVu-0004WI-Ms for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:23:38 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id EB/89-28791-A34C1D55; Mon, 17 Aug 2015 11:23:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1439810616!41370252!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3568 invoked from network); 17 Aug 2015 11:23:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 17 Aug 2015 11:23:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIVs-0003nh-0r for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:23:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRIVr-0007vi-V7 for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:23:35 +0000 Date: Mon, 17 Aug 2015 11:23:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] libxl: In libxl_set_vcpuonline check for maximum number of VCPUs against the cpumap. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8722647e778971977dac4ce586ae5a44ae41e660 Author: Konrad Rzeszutek Wilk AuthorDate: Fri Apr 3 16:02:29 2015 -0400 Commit: Ian Jackson CommitDate: Wed Aug 12 13:09:54 2015 +0100 libxl: In libxl_set_vcpuonline check for maximum number of VCPUs against the cpumap. There is no sense in trying to online (or offline) CPUs when the size of cpumap is greater than the maximum number of VCPUs the guest can go to. As such fail the operation if the count of CPUs to online is greater than what the guest started with. For the offline case we do not check (as the bits are unset in the cpumap) and let it go through. We coalesce some of the underlying libxl_set_vcpuonline code together which was duplicated in QMP and XenStore codepaths. Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Ian Campbell (cherry picked from commit d83bf9d224eeb5b73b93c2703f7dba4473cfa89c) Conflicts: tools/libxl/libxl.c Signed-off-by: Ian Jackson (cherry picked from commit 0d8cbcad03764e42ff2f0d224aff883c3734d782) Conflicts: tools/libxl/libxl.c Signed-off-by: Ian Jackson (cherry picked from commit ca0f468192d12d8d30c2a48a37c5d3460a464a29) Conflicts: tools/libxl/libxl.c Signed-off-by: Ian Jackson (cherry picked from commit 116bbc6062cd90b98f746c3a058f4ec24347527d) Conflicts: tools/libxl/libxl.c Signed-off-by: Ian Jackson --- tools/libxl/libxl.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 99cfc6e..b0f7e8b 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -3963,12 +3963,22 @@ int libxl_set_vcpuonline(libxl_ctx *ctx, uint32_t domid, libxl_bitmap *cpumap) libxl_dominfo info; char *dompath; xs_transaction_t t; - int i, rc = ERROR_FAIL; + int i, maxcpus, rc = ERROR_FAIL; if (libxl_domain_info(ctx, &info, domid) < 0) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "getting domain info list"); goto out; } + + maxcpus = libxl_bitmap_count_set(cpumap); + if (maxcpus > info.vcpu_max_id + 1) + { + LOGE(ERROR, "Requested %d VCPUs, however maxcpus is %d!", + maxcpus, info.vcpu_max_id + 1); + rc = ERROR_FAIL; + goto out; + } + if (!(dompath = libxl__xs_get_dompath(gc, domid))) goto out; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 17 11:23:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Aug 2015 11:23:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIVw-0004Wb-5N; Mon, 17 Aug 2015 11:23:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIVu-0004WI-Ms for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:23:38 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id EB/89-28791-A34C1D55; Mon, 17 Aug 2015 11:23:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1439810616!41370252!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3568 invoked from network); 17 Aug 2015 11:23:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 17 Aug 2015 11:23:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIVs-0003nh-0r for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:23:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRIVr-0007vi-V7 for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:23:35 +0000 Date: Mon, 17 Aug 2015 11:23:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] libxl: In libxl_set_vcpuonline check for maximum number of VCPUs against the cpumap. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8722647e778971977dac4ce586ae5a44ae41e660 Author: Konrad Rzeszutek Wilk AuthorDate: Fri Apr 3 16:02:29 2015 -0400 Commit: Ian Jackson CommitDate: Wed Aug 12 13:09:54 2015 +0100 libxl: In libxl_set_vcpuonline check for maximum number of VCPUs against the cpumap. There is no sense in trying to online (or offline) CPUs when the size of cpumap is greater than the maximum number of VCPUs the guest can go to. As such fail the operation if the count of CPUs to online is greater than what the guest started with. For the offline case we do not check (as the bits are unset in the cpumap) and let it go through. We coalesce some of the underlying libxl_set_vcpuonline code together which was duplicated in QMP and XenStore codepaths. Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Ian Campbell (cherry picked from commit d83bf9d224eeb5b73b93c2703f7dba4473cfa89c) Conflicts: tools/libxl/libxl.c Signed-off-by: Ian Jackson (cherry picked from commit 0d8cbcad03764e42ff2f0d224aff883c3734d782) Conflicts: tools/libxl/libxl.c Signed-off-by: Ian Jackson (cherry picked from commit ca0f468192d12d8d30c2a48a37c5d3460a464a29) Conflicts: tools/libxl/libxl.c Signed-off-by: Ian Jackson (cherry picked from commit 116bbc6062cd90b98f746c3a058f4ec24347527d) Conflicts: tools/libxl/libxl.c Signed-off-by: Ian Jackson --- tools/libxl/libxl.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 99cfc6e..b0f7e8b 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -3963,12 +3963,22 @@ int libxl_set_vcpuonline(libxl_ctx *ctx, uint32_t domid, libxl_bitmap *cpumap) libxl_dominfo info; char *dompath; xs_transaction_t t; - int i, rc = ERROR_FAIL; + int i, maxcpus, rc = ERROR_FAIL; if (libxl_domain_info(ctx, &info, domid) < 0) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "getting domain info list"); goto out; } + + maxcpus = libxl_bitmap_count_set(cpumap); + if (maxcpus > info.vcpu_max_id + 1) + { + LOGE(ERROR, "Requested %d VCPUs, however maxcpus is %d!", + maxcpus, info.vcpu_max_id + 1); + rc = ERROR_FAIL; + goto out; + } + if (!(dompath = libxl__xs_get_dompath(gc, domid))) goto out; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 17 11:23:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Aug 2015 11:23:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIW6-0004YE-7y; Mon, 17 Aug 2015 11:23:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIW4-0004Xv-Gq for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:23:48 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 77/2D-29649-344C1D55; Mon, 17 Aug 2015 11:23:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1439810626!35630213!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19459 invoked from network); 17 Aug 2015 11:23:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Aug 2015 11:23:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIW2-0003np-5I for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:23:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRIW2-0007w8-3U for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:23:46 +0000 Date: Mon, 17 Aug 2015 11:23:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] libxl: event handling: Break out ao_work_outstanding X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit be675bcff3c6316f61debb1d98567841295f127d Author: Ian Jackson AuthorDate: Mon Feb 9 15:18:30 2015 +0000 Commit: Ian Jackson CommitDate: Wed Aug 12 13:09:54 2015 +0100 libxl: event handling: Break out ao_work_outstanding Break out the test in libxl__ao_complete_check_progress_reports, into ao_work_outstanding, which reports false if either (i) the ao is still ongoing or (ii) there is a progress report (perhaps on a different thread's callback queue) which has yet to be reported to the application. No functional change. Signed-off-by: Ian Jackson CC: Ian Campbell CC: Wei Liu CC: Jim Fehlig Acked-by: Wei Liu (cherry picked from commit 93699882d98cce9736d6e871db303275df1138a2) (cherry picked from commit ba683105b52f60e312151654d72b0b0e8508cee5) (cherry picked from commit 546960ca0572d99edff03fd1eb1436c71ff24d6d) --- tools/libxl/libxl_event.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 11e37e3..63ba4d2 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1574,19 +1574,25 @@ void libxl__ao_complete(libxl__egc *egc, libxl__ao *ao, int rc) libxl__ao_complete_check_progress_reports(egc, ao); } -void libxl__ao_complete_check_progress_reports(libxl__egc *egc, libxl__ao *ao) +static bool ao_work_outstanding(libxl__ao *ao) { /* * We don't consider an ao complete if it has any outstanding * callbacks. These callbacks might be outstanding on other * threads, queued up in the other threads' egc's. Those threads * will, after making the callback, take out the lock again, - * decrement progress_reports_outstanding, and call us again. + * decrement progress_reports_outstanding, and call + * libxl__ao_complete_check_progress_reports. */ + return !ao->complete || ao->progress_reports_outstanding; +} + +void libxl__ao_complete_check_progress_reports(libxl__egc *egc, libxl__ao *ao) +{ libxl_ctx *ctx = libxl__gc_owner(&egc->gc); assert(ao->progress_reports_outstanding >= 0); - if (!ao->complete || ao->progress_reports_outstanding) + if (ao_work_outstanding(ao)) return; if (ao->poller) { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 17 11:23:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Aug 2015 11:23:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIW6-0004YE-7y; Mon, 17 Aug 2015 11:23:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIW4-0004Xv-Gq for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:23:48 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 77/2D-29649-344C1D55; Mon, 17 Aug 2015 11:23:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1439810626!35630213!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19459 invoked from network); 17 Aug 2015 11:23:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Aug 2015 11:23:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIW2-0003np-5I for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:23:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRIW2-0007w8-3U for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:23:46 +0000 Date: Mon, 17 Aug 2015 11:23:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] libxl: event handling: Break out ao_work_outstanding X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit be675bcff3c6316f61debb1d98567841295f127d Author: Ian Jackson AuthorDate: Mon Feb 9 15:18:30 2015 +0000 Commit: Ian Jackson CommitDate: Wed Aug 12 13:09:54 2015 +0100 libxl: event handling: Break out ao_work_outstanding Break out the test in libxl__ao_complete_check_progress_reports, into ao_work_outstanding, which reports false if either (i) the ao is still ongoing or (ii) there is a progress report (perhaps on a different thread's callback queue) which has yet to be reported to the application. No functional change. Signed-off-by: Ian Jackson CC: Ian Campbell CC: Wei Liu CC: Jim Fehlig Acked-by: Wei Liu (cherry picked from commit 93699882d98cce9736d6e871db303275df1138a2) (cherry picked from commit ba683105b52f60e312151654d72b0b0e8508cee5) (cherry picked from commit 546960ca0572d99edff03fd1eb1436c71ff24d6d) --- tools/libxl/libxl_event.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 11e37e3..63ba4d2 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1574,19 +1574,25 @@ void libxl__ao_complete(libxl__egc *egc, libxl__ao *ao, int rc) libxl__ao_complete_check_progress_reports(egc, ao); } -void libxl__ao_complete_check_progress_reports(libxl__egc *egc, libxl__ao *ao) +static bool ao_work_outstanding(libxl__ao *ao) { /* * We don't consider an ao complete if it has any outstanding * callbacks. These callbacks might be outstanding on other * threads, queued up in the other threads' egc's. Those threads * will, after making the callback, take out the lock again, - * decrement progress_reports_outstanding, and call us again. + * decrement progress_reports_outstanding, and call + * libxl__ao_complete_check_progress_reports. */ + return !ao->complete || ao->progress_reports_outstanding; +} + +void libxl__ao_complete_check_progress_reports(libxl__egc *egc, libxl__ao *ao) +{ libxl_ctx *ctx = libxl__gc_owner(&egc->gc); assert(ao->progress_reports_outstanding >= 0); - if (!ao->complete || ao->progress_reports_outstanding) + if (ao_work_outstanding(ao)) return; if (ao->poller) { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 17 11:24:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Aug 2015 11:24:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIWG-0004Zx-Ac; Mon, 17 Aug 2015 11:24:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIWE-0004Zi-Oe for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:23:58 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id 17/31-18744-E44C1D55; Mon, 17 Aug 2015 11:23:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1439810636!41453847!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6248 invoked from network); 17 Aug 2015 11:23:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 17 Aug 2015 11:23:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIWC-0003nu-9a for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:23:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRIWC-0007wU-8D for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:23:56 +0000 Date: Mon, 17 Aug 2015 11:23:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] libxl: event handling: ao_inprogress does waits while reports outstanding X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a5a730a4e6445d2762c1640189eddd306d8a0ae3 Author: Ian Jackson AuthorDate: Mon Feb 9 15:20:32 2015 +0000 Commit: Ian Jackson CommitDate: Wed Aug 12 13:09:54 2015 +0100 libxl: event handling: ao_inprogress does waits while reports outstanding libxl__ao_inprogress needs to check (like libxl__ao_complete_check_progress_reports) that there are no oustanding progress callbacks. Otherwise it might happen that we would destroy the ao while another thread has an outstanding callback its egc report queue. The other thread would then, in its egc_run_callbacks, touch the destroyed ao. Instead, when this happens in libxl__ao_inprogress, simply run round the event loop again. The thread which eventually makes the callback will spot our poller in the ao, and notify the poller, waking us up. This fixes an assertion failure race seen with libvirt: libvirtd: libxl_event.c:1792: libxl__ao_complete_check_progress_reports: Assertion `ao->in_initiator' failed. or (after "Add an assert to egc_run_callbacks") libvirtd: libxl_event.c:1338: egc_run_callbacks: Assertion `aop->ao->magic == 0xA0FACE00ul' failed. Signed-off-by: Ian Jackson CC: Ian Campbell CC: Wei Liu CC: Jim Fehlig Acked-by: Wei Liu (cherry picked from commit f1335f0d7b2402e94e0c6e8a905dc309edaafcfb) (cherry picked from commit dfed6d96fd6af00c9970e2a1c600d6bb991d137e) (cherry picked from commit 32f82fa8d9f6ea0eddfd6ab38c0b867b54f99f14) --- tools/libxl/libxl_event.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 63ba4d2..81bb488 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1679,7 +1679,7 @@ int libxl__ao_inprogress(libxl__ao *ao, for (;;) { assert(ao->magic == LIBXL__AO_MAGIC); - if (ao->complete) { + if (!ao_work_outstanding(ao)) { rc = ao->rc; ao->notified = 1; break; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 17 11:24:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Aug 2015 11:24:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIWG-0004Zx-Ac; Mon, 17 Aug 2015 11:24:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIWE-0004Zi-Oe for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:23:58 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id 17/31-18744-E44C1D55; Mon, 17 Aug 2015 11:23:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1439810636!41453847!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6248 invoked from network); 17 Aug 2015 11:23:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 17 Aug 2015 11:23:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIWC-0003nu-9a for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:23:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRIWC-0007wU-8D for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:23:56 +0000 Date: Mon, 17 Aug 2015 11:23:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] libxl: event handling: ao_inprogress does waits while reports outstanding X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a5a730a4e6445d2762c1640189eddd306d8a0ae3 Author: Ian Jackson AuthorDate: Mon Feb 9 15:20:32 2015 +0000 Commit: Ian Jackson CommitDate: Wed Aug 12 13:09:54 2015 +0100 libxl: event handling: ao_inprogress does waits while reports outstanding libxl__ao_inprogress needs to check (like libxl__ao_complete_check_progress_reports) that there are no oustanding progress callbacks. Otherwise it might happen that we would destroy the ao while another thread has an outstanding callback its egc report queue. The other thread would then, in its egc_run_callbacks, touch the destroyed ao. Instead, when this happens in libxl__ao_inprogress, simply run round the event loop again. The thread which eventually makes the callback will spot our poller in the ao, and notify the poller, waking us up. This fixes an assertion failure race seen with libvirt: libvirtd: libxl_event.c:1792: libxl__ao_complete_check_progress_reports: Assertion `ao->in_initiator' failed. or (after "Add an assert to egc_run_callbacks") libvirtd: libxl_event.c:1338: egc_run_callbacks: Assertion `aop->ao->magic == 0xA0FACE00ul' failed. Signed-off-by: Ian Jackson CC: Ian Campbell CC: Wei Liu CC: Jim Fehlig Acked-by: Wei Liu (cherry picked from commit f1335f0d7b2402e94e0c6e8a905dc309edaafcfb) (cherry picked from commit dfed6d96fd6af00c9970e2a1c600d6bb991d137e) (cherry picked from commit 32f82fa8d9f6ea0eddfd6ab38c0b867b54f99f14) --- tools/libxl/libxl_event.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 63ba4d2..81bb488 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1679,7 +1679,7 @@ int libxl__ao_inprogress(libxl__ao *ao, for (;;) { assert(ao->magic == LIBXL__AO_MAGIC); - if (ao->complete) { + if (!ao_work_outstanding(ao)) { rc = ao->rc; ao->notified = 1; break; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 17 11:24:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Aug 2015 11:24:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIWQ-0004bI-DI; Mon, 17 Aug 2015 11:24:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIWO-0004b5-US for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:24:09 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id D1/9C-25435-854C1D55; Mon, 17 Aug 2015 11:24:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1439810646!33853914!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24739 invoked from network); 17 Aug 2015 11:24:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 17 Aug 2015 11:24:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIWM-0003oX-Gp for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:24:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRIWM-0007xA-DB for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:24:06 +0000 Date: Mon, 17 Aug 2015 11:24:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] libxl: don't leak memory in libxl__poller_get failure case X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 255ddccd6cec4b06f03750aa07f94c5c22af5c36 Author: Matthew Daley AuthorDate: Wed Oct 30 20:51:53 2013 +1300 Commit: Ian Jackson CommitDate: Wed Aug 12 13:09:54 2015 +0100 libxl: don't leak memory in libxl__poller_get failure case Coverity-ID: 1055894 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell (cherry picked from commit 1edd6d8da354442b860ae28b8944dbd8a102d5f7) (cherry picked from commit e9a0fc5998917b4c77067fa35b16eee4185ca2fa) --- tools/libxl/libxl_event.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 81bb488..f3c1019 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1339,7 +1339,10 @@ libxl__poller *libxl__poller_get(libxl_ctx *ctx) memset(p, 0, sizeof(*p)); rc = libxl__poller_init(ctx, p); - if (rc) return NULL; + if (rc) { + free(p); + return NULL; + } return p; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 17 11:24:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Aug 2015 11:24:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIWQ-0004bI-DI; Mon, 17 Aug 2015 11:24:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIWO-0004b5-US for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:24:09 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id D1/9C-25435-854C1D55; Mon, 17 Aug 2015 11:24:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1439810646!33853914!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24739 invoked from network); 17 Aug 2015 11:24:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 17 Aug 2015 11:24:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIWM-0003oX-Gp for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:24:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRIWM-0007xA-DB for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:24:06 +0000 Date: Mon, 17 Aug 2015 11:24:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] libxl: don't leak memory in libxl__poller_get failure case X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 255ddccd6cec4b06f03750aa07f94c5c22af5c36 Author: Matthew Daley AuthorDate: Wed Oct 30 20:51:53 2013 +1300 Commit: Ian Jackson CommitDate: Wed Aug 12 13:09:54 2015 +0100 libxl: don't leak memory in libxl__poller_get failure case Coverity-ID: 1055894 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell (cherry picked from commit 1edd6d8da354442b860ae28b8944dbd8a102d5f7) (cherry picked from commit e9a0fc5998917b4c77067fa35b16eee4185ca2fa) --- tools/libxl/libxl_event.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 81bb488..f3c1019 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1339,7 +1339,10 @@ libxl__poller *libxl__poller_get(libxl_ctx *ctx) memset(p, 0, sizeof(*p)); rc = libxl__poller_init(ctx, p); - if (rc) return NULL; + if (rc) { + free(p); + return NULL; + } return p; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 17 11:24:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Aug 2015 11:24:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIWa-0004dV-Hr; Mon, 17 Aug 2015 11:24:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIWY-0004dB-Ti for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:24:19 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 30/3D-22089-264C1D55; Mon, 17 Aug 2015 11:24:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1439810656!28477150!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20479 invoked from network); 17 Aug 2015 11:24:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 17 Aug 2015 11:24:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIWW-0003of-LC for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:24:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRIWW-0007yF-JX for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:24:16 +0000 Date: Mon, 17 Aug 2015 11:24:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] libxl: poll: Make libxl__poller_get have only one success return path X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ebc342efbf5909ed95720945d44ad17e53156f71 Author: Ian Jackson AuthorDate: Thu Jul 9 16:52:02 2015 +0100 Commit: Ian Jackson CommitDate: Wed Aug 12 13:09:54 2015 +0100 libxl: poll: Make libxl__poller_get have only one success return path In preparation for doing some more work on successful exit. No functional change. Signed-off-by: Ian Jackson CC: Jim Fehlig Acked-by: Wei Liu Tested-by: Jim Fehlig (cherry picked from commit 6fc946bc5520ebdbba5cbae4d49e53895df8b393) (cherry picked from commit 8c409135e69c7321cb6d82b8cae0868a81d05ddc) Conflicts: tools/libxl/libxl_event.c Signed-off-by: Ian Jackson (cherry picked from commit 900c7970de4cb809ba208465cb0abd094b4dec58) (cherry picked from commit dd80ee80c9bf84c3c7d4c72ffe4c1a9d9d170bf9) --- tools/libxl/libxl_event.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index f3c1019..87c04a9 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1328,20 +1328,19 @@ libxl__poller *libxl__poller_get(libxl_ctx *ctx) libxl__poller *p = LIBXL_LIST_FIRST(&ctx->pollers_idle); if (p) { LIBXL_LIST_REMOVE(p, entry); - return p; - } - - p = malloc(sizeof(*p)); - if (!p) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "cannot allocate poller"); - return 0; - } - memset(p, 0, sizeof(*p)); + } else { + p = malloc(sizeof(*p)); + if (!p) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "cannot allocate poller"); + return 0; + } + memset(p, 0, sizeof(*p)); - rc = libxl__poller_init(ctx, p); - if (rc) { - free(p); - return NULL; + rc = libxl__poller_init(ctx, p); + if (rc) { + free(p); + return NULL; + } } return p; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 17 11:24:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Aug 2015 11:24:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIWa-0004dV-Hr; Mon, 17 Aug 2015 11:24:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIWY-0004dB-Ti for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:24:19 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 30/3D-22089-264C1D55; Mon, 17 Aug 2015 11:24:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1439810656!28477150!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20479 invoked from network); 17 Aug 2015 11:24:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 17 Aug 2015 11:24:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIWW-0003of-LC for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:24:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRIWW-0007yF-JX for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:24:16 +0000 Date: Mon, 17 Aug 2015 11:24:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] libxl: poll: Make libxl__poller_get have only one success return path X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ebc342efbf5909ed95720945d44ad17e53156f71 Author: Ian Jackson AuthorDate: Thu Jul 9 16:52:02 2015 +0100 Commit: Ian Jackson CommitDate: Wed Aug 12 13:09:54 2015 +0100 libxl: poll: Make libxl__poller_get have only one success return path In preparation for doing some more work on successful exit. No functional change. Signed-off-by: Ian Jackson CC: Jim Fehlig Acked-by: Wei Liu Tested-by: Jim Fehlig (cherry picked from commit 6fc946bc5520ebdbba5cbae4d49e53895df8b393) (cherry picked from commit 8c409135e69c7321cb6d82b8cae0868a81d05ddc) Conflicts: tools/libxl/libxl_event.c Signed-off-by: Ian Jackson (cherry picked from commit 900c7970de4cb809ba208465cb0abd094b4dec58) (cherry picked from commit dd80ee80c9bf84c3c7d4c72ffe4c1a9d9d170bf9) --- tools/libxl/libxl_event.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index f3c1019..87c04a9 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1328,20 +1328,19 @@ libxl__poller *libxl__poller_get(libxl_ctx *ctx) libxl__poller *p = LIBXL_LIST_FIRST(&ctx->pollers_idle); if (p) { LIBXL_LIST_REMOVE(p, entry); - return p; - } - - p = malloc(sizeof(*p)); - if (!p) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "cannot allocate poller"); - return 0; - } - memset(p, 0, sizeof(*p)); + } else { + p = malloc(sizeof(*p)); + if (!p) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "cannot allocate poller"); + return 0; + } + memset(p, 0, sizeof(*p)); - rc = libxl__poller_init(ctx, p); - if (rc) { - free(p); - return NULL; + rc = libxl__poller_init(ctx, p); + if (rc) { + free(p); + return NULL; + } } return p; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 17 11:24:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Aug 2015 11:24:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIWk-0004fK-Kb; Mon, 17 Aug 2015 11:24:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIWj-0004f4-3j for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:24:29 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 3C/11-30270-C64C1D55; Mon, 17 Aug 2015 11:24:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1439810667!28481328!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2096 invoked from network); 17 Aug 2015 11:24:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 17 Aug 2015 11:24:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIWg-0003on-QZ for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:24:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRIWg-0007yc-PK for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:24:26 +0000 Date: Mon, 17 Aug 2015 11:24:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] libxl: poll: Use poller_get and poller_put for poller_app X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 86984116a6f8315c4134af9d6d669ca403221c9e Author: Ian Jackson AuthorDate: Thu Jul 9 17:05:07 2015 +0100 Commit: Ian Jackson CommitDate: Wed Aug 12 13:09:55 2015 +0100 libxl: poll: Use poller_get and poller_put for poller_app This makes the code more regular. We are going to want to do some more work in poller_get and poller_put, which work also wants to be done for poller_app. Two very minor functional changes: * We call malloc an extra time since poller_app is now a pointer * ERROR_FAIL on poller_get failing for poller_app is generated in libxl_ctx_init rather than passed through by libxl_poller_init from libxl__pipe_nonblock. Signed-off-by: Ian Jackson CC: Jim Fehlig Acked-by: Wei Liu Tested-by: Jim Fehlig (cherry picked from commit aae37652067eafd0f2b85050306772df0cb71f08) (cherry picked from commit 9f6f513eecbdc76ce30b5f2e6c52e02076bac30b) Conflicts: tools/libxl/libxl.c Signed-off-by: Ian Jackson (cherry picked from commit 0348c450fe253b3db6edc77568820327ff991478) (cherry picked from commit 856f59437b2fde90f44570433b4cdbb46bfd0c47) --- tools/libxl/libxl.c | 11 ++++++++--- tools/libxl/libxl_event.c | 4 ++-- tools/libxl/libxl_internal.h | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index b0f7e8b..0281c4d 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -50,6 +50,7 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, ctx->osevent_hooks = 0; + ctx->poller_app = 0; LIBXL_LIST_INIT(&ctx->pollers_event); LIBXL_LIST_INIT(&ctx->pollers_idle); @@ -83,8 +84,11 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, rc = libxl__atfork_init(ctx); if (rc) goto out; - rc = libxl__poller_init(ctx, &ctx->poller_app); - if (rc) goto out; + ctx->poller_app = libxl__poller_get(ctx); + if (!ctx->poller_app) { + rc = ERROR_FAIL; + goto out; + } if ( stat(XENSTORE_PID_FILE, &stat_buf) != 0 ) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Is xenstore daemon running?\n" @@ -160,7 +164,8 @@ int libxl_ctx_free(libxl_ctx *ctx) libxl_version_info_dispose(&ctx->version_info); if (ctx->xsh) xs_daemon_close(ctx->xsh); - libxl__poller_dispose(&ctx->poller_app); + libxl__poller_put(ctx, ctx->poller_app); + ctx->poller_app = NULL; assert(LIBXL_LIST_EMPTY(&ctx->pollers_event)); libxl__poller *poller, *poller_tmp; LIBXL_LIST_FOREACH_SAFE(poller, &ctx->pollers_idle, entry, poller_tmp) { diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 87c04a9..b990ae2 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -875,7 +875,7 @@ int libxl_osevent_beforepoll(libxl_ctx *ctx, int *nfds_io, { EGC_INIT(ctx); CTX_LOCK; - int rc = beforepoll_internal(gc, &ctx->poller_app, + int rc = beforepoll_internal(gc, ctx->poller_app, nfds_io, fds, timeout_upd, now); CTX_UNLOCK; EGC_FREE; @@ -1032,7 +1032,7 @@ void libxl_osevent_afterpoll(libxl_ctx *ctx, int nfds, const struct pollfd *fds, { EGC_INIT(ctx); CTX_LOCK; - afterpoll_internal(egc, &ctx->poller_app, nfds, fds, now); + afterpoll_internal(egc, ctx->poller_app, nfds, fds, now); CTX_UNLOCK; EGC_FREE; } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index ae96a74..2c8a56d 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -328,7 +328,7 @@ struct libxl__ctx { /* See the comment for OSEVENT_HOOK_INTERN in libxl_event.c * for restrictions on the use of the osevent fields. */ - libxl__poller poller_app; /* libxl_osevent_beforepoll and _afterpoll */ + libxl__poller *poller_app; /* libxl_osevent_beforepoll and _afterpoll */ LIBXL_LIST_HEAD(, libxl__poller) pollers_event, pollers_idle; LIBXL_SLIST_HEAD(libxl__osevent_hook_nexi, libxl__osevent_hook_nexus) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 17 11:24:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Aug 2015 11:24:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIWk-0004fK-Kb; Mon, 17 Aug 2015 11:24:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIWj-0004f4-3j for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:24:29 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 3C/11-30270-C64C1D55; Mon, 17 Aug 2015 11:24:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1439810667!28481328!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2096 invoked from network); 17 Aug 2015 11:24:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 17 Aug 2015 11:24:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIWg-0003on-QZ for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:24:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRIWg-0007yc-PK for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:24:26 +0000 Date: Mon, 17 Aug 2015 11:24:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] libxl: poll: Use poller_get and poller_put for poller_app X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 86984116a6f8315c4134af9d6d669ca403221c9e Author: Ian Jackson AuthorDate: Thu Jul 9 17:05:07 2015 +0100 Commit: Ian Jackson CommitDate: Wed Aug 12 13:09:55 2015 +0100 libxl: poll: Use poller_get and poller_put for poller_app This makes the code more regular. We are going to want to do some more work in poller_get and poller_put, which work also wants to be done for poller_app. Two very minor functional changes: * We call malloc an extra time since poller_app is now a pointer * ERROR_FAIL on poller_get failing for poller_app is generated in libxl_ctx_init rather than passed through by libxl_poller_init from libxl__pipe_nonblock. Signed-off-by: Ian Jackson CC: Jim Fehlig Acked-by: Wei Liu Tested-by: Jim Fehlig (cherry picked from commit aae37652067eafd0f2b85050306772df0cb71f08) (cherry picked from commit 9f6f513eecbdc76ce30b5f2e6c52e02076bac30b) Conflicts: tools/libxl/libxl.c Signed-off-by: Ian Jackson (cherry picked from commit 0348c450fe253b3db6edc77568820327ff991478) (cherry picked from commit 856f59437b2fde90f44570433b4cdbb46bfd0c47) --- tools/libxl/libxl.c | 11 ++++++++--- tools/libxl/libxl_event.c | 4 ++-- tools/libxl/libxl_internal.h | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index b0f7e8b..0281c4d 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -50,6 +50,7 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, ctx->osevent_hooks = 0; + ctx->poller_app = 0; LIBXL_LIST_INIT(&ctx->pollers_event); LIBXL_LIST_INIT(&ctx->pollers_idle); @@ -83,8 +84,11 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, rc = libxl__atfork_init(ctx); if (rc) goto out; - rc = libxl__poller_init(ctx, &ctx->poller_app); - if (rc) goto out; + ctx->poller_app = libxl__poller_get(ctx); + if (!ctx->poller_app) { + rc = ERROR_FAIL; + goto out; + } if ( stat(XENSTORE_PID_FILE, &stat_buf) != 0 ) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Is xenstore daemon running?\n" @@ -160,7 +164,8 @@ int libxl_ctx_free(libxl_ctx *ctx) libxl_version_info_dispose(&ctx->version_info); if (ctx->xsh) xs_daemon_close(ctx->xsh); - libxl__poller_dispose(&ctx->poller_app); + libxl__poller_put(ctx, ctx->poller_app); + ctx->poller_app = NULL; assert(LIBXL_LIST_EMPTY(&ctx->pollers_event)); libxl__poller *poller, *poller_tmp; LIBXL_LIST_FOREACH_SAFE(poller, &ctx->pollers_idle, entry, poller_tmp) { diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 87c04a9..b990ae2 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -875,7 +875,7 @@ int libxl_osevent_beforepoll(libxl_ctx *ctx, int *nfds_io, { EGC_INIT(ctx); CTX_LOCK; - int rc = beforepoll_internal(gc, &ctx->poller_app, + int rc = beforepoll_internal(gc, ctx->poller_app, nfds_io, fds, timeout_upd, now); CTX_UNLOCK; EGC_FREE; @@ -1032,7 +1032,7 @@ void libxl_osevent_afterpoll(libxl_ctx *ctx, int nfds, const struct pollfd *fds, { EGC_INIT(ctx); CTX_LOCK; - afterpoll_internal(egc, &ctx->poller_app, nfds, fds, now); + afterpoll_internal(egc, ctx->poller_app, nfds, fds, now); CTX_UNLOCK; EGC_FREE; } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index ae96a74..2c8a56d 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -328,7 +328,7 @@ struct libxl__ctx { /* See the comment for OSEVENT_HOOK_INTERN in libxl_event.c * for restrictions on the use of the osevent fields. */ - libxl__poller poller_app; /* libxl_osevent_beforepoll and _afterpoll */ + libxl__poller *poller_app; /* libxl_osevent_beforepoll and _afterpoll */ LIBXL_LIST_HEAD(, libxl__poller) pollers_event, pollers_idle; LIBXL_SLIST_HEAD(libxl__osevent_hook_nexi, libxl__osevent_hook_nexus) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 17 11:24:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Aug 2015 11:24:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIWt-0004gq-N1; Mon, 17 Aug 2015 11:24:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIWt-0004gi-Ax for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:24:39 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 9F/69-10678-674C1D55; Mon, 17 Aug 2015 11:24:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1439810677!35630532!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26610 invoked from network); 17 Aug 2015 11:24:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Aug 2015 11:24:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIWq-0003ov-VJ for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:24:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRIWq-0007z1-U4 for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:24:36 +0000 Date: Mon, 17 Aug 2015 11:24:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] libxl: make libxl__poller_put tolerate p==NULL X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a8db084ca2d0c6ec93a5aa24fb3a8db20f0a3503 Author: Ian Jackson AuthorDate: Fri Oct 11 12:10:45 2013 +0100 Commit: Ian Jackson CommitDate: Wed Aug 12 13:09:55 2015 +0100 libxl: make libxl__poller_put tolerate p==NULL This is less fragile, and more in keeping with the usual style of initialising everything to 0 and freeing things unconditionally. Correspondingly, remove the tests at the call sites. Apropos of c1f3f174. No overall functional change. Signed-off-by: Ian Jackson Acked-by: Ian Campbell (cherry picked from commit 6ed09e37722f601661fff42f80279a41773c574e) (cherry picked from commit f66f746df7983fac7f63b38b1b6bde11a791f1ed) --- tools/libxl/libxl_event.c | 3 ++- tools/libxl/libxl_internal.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index b990ae2..3abcfb5 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1348,6 +1348,7 @@ libxl__poller *libxl__poller_get(libxl_ctx *ctx) void libxl__poller_put(libxl_ctx *ctx, libxl__poller *p) { + if (!p) return; LIBXL_LIST_INSERT_HEAD(&ctx->pollers_idle, p, entry); } @@ -1540,7 +1541,7 @@ void libxl__ao__destroy(libxl_ctx *ctx, libxl__ao *ao) AO_GC; if (!ao) return; LOG(DEBUG,"ao %p: destroy",ao); - if (ao->poller) libxl__poller_put(ctx, ao->poller); + libxl__poller_put(ctx, ao->poller); ao->magic = LIBXL__AO_MAGIC_DESTROYED; libxl__free_all(&ao->gc); free(ao); diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 2c8a56d..5e2f8ea 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -826,7 +826,7 @@ _hidden void libxl__poller_dispose(libxl__poller *p); * away again afterwards. _get can fail, returning NULL. * ctx must be locked. */ _hidden libxl__poller *libxl__poller_get(libxl_ctx *ctx); -_hidden void libxl__poller_put(libxl_ctx *ctx, libxl__poller *p); +_hidden void libxl__poller_put(libxl_ctx*, libxl__poller *p /* may be NULL */); /* Notifies whoever is polling using p that they should wake up. * ctx must be locked. */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 17 11:24:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Aug 2015 11:24:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIWt-0004gq-N1; Mon, 17 Aug 2015 11:24:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIWt-0004gi-Ax for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:24:39 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 9F/69-10678-674C1D55; Mon, 17 Aug 2015 11:24:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1439810677!35630532!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26610 invoked from network); 17 Aug 2015 11:24:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Aug 2015 11:24:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIWq-0003ov-VJ for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:24:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRIWq-0007z1-U4 for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:24:36 +0000 Date: Mon, 17 Aug 2015 11:24:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] libxl: make libxl__poller_put tolerate p==NULL X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a8db084ca2d0c6ec93a5aa24fb3a8db20f0a3503 Author: Ian Jackson AuthorDate: Fri Oct 11 12:10:45 2013 +0100 Commit: Ian Jackson CommitDate: Wed Aug 12 13:09:55 2015 +0100 libxl: make libxl__poller_put tolerate p==NULL This is less fragile, and more in keeping with the usual style of initialising everything to 0 and freeing things unconditionally. Correspondingly, remove the tests at the call sites. Apropos of c1f3f174. No overall functional change. Signed-off-by: Ian Jackson Acked-by: Ian Campbell (cherry picked from commit 6ed09e37722f601661fff42f80279a41773c574e) (cherry picked from commit f66f746df7983fac7f63b38b1b6bde11a791f1ed) --- tools/libxl/libxl_event.c | 3 ++- tools/libxl/libxl_internal.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index b990ae2..3abcfb5 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1348,6 +1348,7 @@ libxl__poller *libxl__poller_get(libxl_ctx *ctx) void libxl__poller_put(libxl_ctx *ctx, libxl__poller *p) { + if (!p) return; LIBXL_LIST_INSERT_HEAD(&ctx->pollers_idle, p, entry); } @@ -1540,7 +1541,7 @@ void libxl__ao__destroy(libxl_ctx *ctx, libxl__ao *ao) AO_GC; if (!ao) return; LOG(DEBUG,"ao %p: destroy",ao); - if (ao->poller) libxl__poller_put(ctx, ao->poller); + libxl__poller_put(ctx, ao->poller); ao->magic = LIBXL__AO_MAGIC_DESTROYED; libxl__free_all(&ao->gc); free(ao); diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 2c8a56d..5e2f8ea 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -826,7 +826,7 @@ _hidden void libxl__poller_dispose(libxl__poller *p); * away again afterwards. _get can fail, returning NULL. * ctx must be locked. */ _hidden libxl__poller *libxl__poller_get(libxl_ctx *ctx); -_hidden void libxl__poller_put(libxl_ctx *ctx, libxl__poller *p); +_hidden void libxl__poller_put(libxl_ctx*, libxl__poller *p /* may be NULL */); /* Notifies whoever is polling using p that they should wake up. * ctx must be locked. */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 17 11:24:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Aug 2015 11:24:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIX4-0004iX-Pi; Mon, 17 Aug 2015 11:24:50 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIX3-0004iN-Nj for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:24:49 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id 16/6B-28791-184C1D55; Mon, 17 Aug 2015 11:24:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1439810687!41451658!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24212 invoked from network); 17 Aug 2015 11:24:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 17 Aug 2015 11:24:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIX1-0003p6-3Y for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:24:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRIX1-0007zN-2A for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:24:47 +0000 Date: Mon, 17 Aug 2015 11:24:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] libxl: poll: Avoid fd deregistration race POLLNVAL crash X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 32894093072c6ac5e680541669b0d1db263745fa Author: Ian Jackson AuthorDate: Wed Aug 12 12:50:12 2015 +0100 Commit: Ian Jackson CommitDate: Wed Aug 12 13:09:55 2015 +0100 libxl: poll: Avoid fd deregistration race POLLNVAL crash It can happen that an fd is deregistered, and closed, and then a new fd opened, and reregistered, all while another thread is in poll(). If this happens poll might report POLLNVAL, but the event loop would think that the fd was supposed to have been valid, and then fail an assertion: libxl_event.c:1183: afterpoll_check_fd: Assertion `poller->fds_changed || !(fds[slot].revents & 0x020)' failed. We can't simply ignore POLLNVAL because if we have bugs which cause messed-up fds, it is a serious problem which we really need to detect. Instead, add extra tracking to spot when this possibility arises, and abort on POLLNVAL if we are sure that it is unexpected. Reported-by: Jim Fehlig Signed-off-by: Ian Jackson CC: Jim Fehlig Acked-by: Wei Liu Tested-by: Jim Fehlig (cherry picked from commit 681ce1681622a46d111cfdc4fc07e4cb565ae131) (cherry picked from commit 7f7642f778b78e8e204fc082ce03072bb26887c7) And, adjusted for semantic conflict over CTX vs ctx. Signed-off-by: Ian Jackson (cherry picked from commit 3646b134c1673f09c0a239de10b0da4c9265c8e8) Conflicts: tools/libxl/libxl_event.c Signed-off-by: Ian Jackson (cherry picked from commit 3bcb2c062a02e3c45d3f87478d2cbe1a134d395c) --- tools/libxl/libxl.c | 2 ++ tools/libxl/libxl_event.c | 12 +++++++++++- tools/libxl/libxl_internal.h | 13 +++++++++++++ 3 files changed, 26 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 0281c4d..04b3f62 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -53,6 +53,7 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, ctx->poller_app = 0; LIBXL_LIST_INIT(&ctx->pollers_event); LIBXL_LIST_INIT(&ctx->pollers_idle); + LIBXL_LIST_INIT(&ctx->pollers_fds_changed); LIBXL_LIST_INIT(&ctx->efds); LIBXL_TAILQ_INIT(&ctx->etimes); @@ -167,6 +168,7 @@ int libxl_ctx_free(libxl_ctx *ctx) libxl__poller_put(ctx, ctx->poller_app); ctx->poller_app = NULL; assert(LIBXL_LIST_EMPTY(&ctx->pollers_event)); + assert(LIBXL_LIST_EMPTY(&ctx->pollers_fds_changed)); libxl__poller *poller, *poller_tmp; LIBXL_LIST_FOREACH_SAFE(poller, &ctx->pollers_idle, entry, poller_tmp) { libxl__poller_dispose(poller); diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 3abcfb5..21ded9a 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -220,6 +220,7 @@ int libxl__ev_fd_modify(libxl__gc *gc, libxl__ev_fd *ev, short events) void libxl__ev_fd_deregister(libxl__gc *gc, libxl__ev_fd *ev) { CTX_LOCK; + libxl__poller *poller; if (!libxl__ev_fd_isregistered(ev)) { DBG("ev_fd=%p deregister unregistered",ev); @@ -232,6 +233,9 @@ void libxl__ev_fd_deregister(libxl__gc *gc, libxl__ev_fd *ev) LIBXL_LIST_REMOVE(ev, entry); ev->fd = -1; + LIBXL_LIST_FOREACH(poller, &CTX->pollers_fds_changed, fds_changed_entry) + poller->fds_changed = 1; + out: CTX_UNLOCK; } @@ -847,6 +851,8 @@ static int beforepoll_internal(libxl__gc *gc, libxl__poller *poller, *nfds_io = used; + poller->fds_changed = 0; + libxl__ev_time *etime = LIBXL_TAILQ_FIRST(&CTX->etimes); if (etime) { int our_timeout; @@ -911,7 +917,7 @@ static int afterpoll_check_fd(libxl__poller *poller, /* again, stale slot entry */ continue; - assert(!(fds[slot].revents & POLLNVAL)); + assert(poller->fds_changed || !(fds[slot].revents & POLLNVAL)); /* we mask in case requested events have changed */ int slot_revents = fds[slot].revents & events; @@ -1291,6 +1297,7 @@ int libxl__poller_init(libxl_ctx *ctx, libxl__poller *p) int r, rc; p->fd_polls = 0; p->fd_rindices = 0; + p->fds_changed = 0; r = pipe(p->wakeup_pipe); if (r) { @@ -1343,12 +1350,15 @@ libxl__poller *libxl__poller_get(libxl_ctx *ctx) } } + LIBXL_LIST_INSERT_HEAD(&ctx->pollers_fds_changed, p, + fds_changed_entry); return p; } void libxl__poller_put(libxl_ctx *ctx, libxl__poller *p) { if (!p) return; + LIBXL_LIST_REMOVE(p, fds_changed_entry); LIBXL_LIST_INSERT_HEAD(&ctx->pollers_idle, p, entry); } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 5e2f8ea..636c91b 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -289,6 +289,18 @@ struct libxl__poller { int (*fd_rindices)[3]; /* see libxl_event.c:beforepoll_internal */ int wakeup_pipe[2]; /* 0 means no fd allocated */ + + /* + * We also use the poller to record whether any fds have been + * deregistered since we entered poll. Each poller which is not + * idle is on the list pollers_fds_changed. fds_changed is + * cleared by beforepoll, and tested by afterpoll. Whenever an fd + * event is deregistered, we set the fds_changed of all non-idle + * pollers. So afterpoll can tell whether any POLLNVAL is + * plausibly due to an fd being closed and reopened. + */ + LIBXL_LIST_ENTRY(libxl__poller) fds_changed_entry; + bool fds_changed; }; struct libxl__gc { @@ -330,6 +342,7 @@ struct libxl__ctx { libxl__poller *poller_app; /* libxl_osevent_beforepoll and _afterpoll */ LIBXL_LIST_HEAD(, libxl__poller) pollers_event, pollers_idle; + LIBXL_LIST_HEAD(, libxl__poller) pollers_fds_changed; LIBXL_SLIST_HEAD(libxl__osevent_hook_nexi, libxl__osevent_hook_nexus) hook_fd_nexi_idle, hook_timeout_nexi_idle; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 17 11:24:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Aug 2015 11:24:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIX4-0004iX-Pi; Mon, 17 Aug 2015 11:24:50 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIX3-0004iN-Nj for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:24:49 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id 16/6B-28791-184C1D55; Mon, 17 Aug 2015 11:24:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1439810687!41451658!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24212 invoked from network); 17 Aug 2015 11:24:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 17 Aug 2015 11:24:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRIX1-0003p6-3Y for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:24:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRIX1-0007zN-2A for xen-changelog@lists.xensource.com; Mon, 17 Aug 2015 11:24:47 +0000 Date: Mon, 17 Aug 2015 11:24:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] libxl: poll: Avoid fd deregistration race POLLNVAL crash X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 32894093072c6ac5e680541669b0d1db263745fa Author: Ian Jackson AuthorDate: Wed Aug 12 12:50:12 2015 +0100 Commit: Ian Jackson CommitDate: Wed Aug 12 13:09:55 2015 +0100 libxl: poll: Avoid fd deregistration race POLLNVAL crash It can happen that an fd is deregistered, and closed, and then a new fd opened, and reregistered, all while another thread is in poll(). If this happens poll might report POLLNVAL, but the event loop would think that the fd was supposed to have been valid, and then fail an assertion: libxl_event.c:1183: afterpoll_check_fd: Assertion `poller->fds_changed || !(fds[slot].revents & 0x020)' failed. We can't simply ignore POLLNVAL because if we have bugs which cause messed-up fds, it is a serious problem which we really need to detect. Instead, add extra tracking to spot when this possibility arises, and abort on POLLNVAL if we are sure that it is unexpected. Reported-by: Jim Fehlig Signed-off-by: Ian Jackson CC: Jim Fehlig Acked-by: Wei Liu Tested-by: Jim Fehlig (cherry picked from commit 681ce1681622a46d111cfdc4fc07e4cb565ae131) (cherry picked from commit 7f7642f778b78e8e204fc082ce03072bb26887c7) And, adjusted for semantic conflict over CTX vs ctx. Signed-off-by: Ian Jackson (cherry picked from commit 3646b134c1673f09c0a239de10b0da4c9265c8e8) Conflicts: tools/libxl/libxl_event.c Signed-off-by: Ian Jackson (cherry picked from commit 3bcb2c062a02e3c45d3f87478d2cbe1a134d395c) --- tools/libxl/libxl.c | 2 ++ tools/libxl/libxl_event.c | 12 +++++++++++- tools/libxl/libxl_internal.h | 13 +++++++++++++ 3 files changed, 26 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 0281c4d..04b3f62 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -53,6 +53,7 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, ctx->poller_app = 0; LIBXL_LIST_INIT(&ctx->pollers_event); LIBXL_LIST_INIT(&ctx->pollers_idle); + LIBXL_LIST_INIT(&ctx->pollers_fds_changed); LIBXL_LIST_INIT(&ctx->efds); LIBXL_TAILQ_INIT(&ctx->etimes); @@ -167,6 +168,7 @@ int libxl_ctx_free(libxl_ctx *ctx) libxl__poller_put(ctx, ctx->poller_app); ctx->poller_app = NULL; assert(LIBXL_LIST_EMPTY(&ctx->pollers_event)); + assert(LIBXL_LIST_EMPTY(&ctx->pollers_fds_changed)); libxl__poller *poller, *poller_tmp; LIBXL_LIST_FOREACH_SAFE(poller, &ctx->pollers_idle, entry, poller_tmp) { libxl__poller_dispose(poller); diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 3abcfb5..21ded9a 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -220,6 +220,7 @@ int libxl__ev_fd_modify(libxl__gc *gc, libxl__ev_fd *ev, short events) void libxl__ev_fd_deregister(libxl__gc *gc, libxl__ev_fd *ev) { CTX_LOCK; + libxl__poller *poller; if (!libxl__ev_fd_isregistered(ev)) { DBG("ev_fd=%p deregister unregistered",ev); @@ -232,6 +233,9 @@ void libxl__ev_fd_deregister(libxl__gc *gc, libxl__ev_fd *ev) LIBXL_LIST_REMOVE(ev, entry); ev->fd = -1; + LIBXL_LIST_FOREACH(poller, &CTX->pollers_fds_changed, fds_changed_entry) + poller->fds_changed = 1; + out: CTX_UNLOCK; } @@ -847,6 +851,8 @@ static int beforepoll_internal(libxl__gc *gc, libxl__poller *poller, *nfds_io = used; + poller->fds_changed = 0; + libxl__ev_time *etime = LIBXL_TAILQ_FIRST(&CTX->etimes); if (etime) { int our_timeout; @@ -911,7 +917,7 @@ static int afterpoll_check_fd(libxl__poller *poller, /* again, stale slot entry */ continue; - assert(!(fds[slot].revents & POLLNVAL)); + assert(poller->fds_changed || !(fds[slot].revents & POLLNVAL)); /* we mask in case requested events have changed */ int slot_revents = fds[slot].revents & events; @@ -1291,6 +1297,7 @@ int libxl__poller_init(libxl_ctx *ctx, libxl__poller *p) int r, rc; p->fd_polls = 0; p->fd_rindices = 0; + p->fds_changed = 0; r = pipe(p->wakeup_pipe); if (r) { @@ -1343,12 +1350,15 @@ libxl__poller *libxl__poller_get(libxl_ctx *ctx) } } + LIBXL_LIST_INSERT_HEAD(&ctx->pollers_fds_changed, p, + fds_changed_entry); return p; } void libxl__poller_put(libxl_ctx *ctx, libxl__poller *p) { if (!p) return; + LIBXL_LIST_REMOVE(p, fds_changed_entry); LIBXL_LIST_INSERT_HEAD(&ctx->pollers_idle, p, entry); } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 5e2f8ea..636c91b 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -289,6 +289,18 @@ struct libxl__poller { int (*fd_rindices)[3]; /* see libxl_event.c:beforepoll_internal */ int wakeup_pipe[2]; /* 0 means no fd allocated */ + + /* + * We also use the poller to record whether any fds have been + * deregistered since we entered poll. Each poller which is not + * idle is on the list pollers_fds_changed. fds_changed is + * cleared by beforepoll, and tested by afterpoll. Whenever an fd + * event is deregistered, we set the fds_changed of all non-idle + * pollers. So afterpoll can tell whether any POLLNVAL is + * plausibly due to an fd being closed and reopened. + */ + LIBXL_LIST_ENTRY(libxl__poller) fds_changed_entry; + bool fds_changed; }; struct libxl__gc { @@ -330,6 +342,7 @@ struct libxl__ctx { libxl__poller *poller_app; /* libxl_osevent_beforepoll and _afterpoll */ LIBXL_LIST_HEAD(, libxl__poller) pollers_event, pollers_idle; + LIBXL_LIST_HEAD(, libxl__poller) pollers_fds_changed; LIBXL_SLIST_HEAD(libxl__osevent_hook_nexi, libxl__osevent_hook_nexus) hook_fd_nexi_idle, hook_timeout_nexi_idle; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 03:55:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 03:55:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRuT4-0007mX-0l; Wed, 19 Aug 2015 03:55:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRuT2-0007mS-I1 for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 03:55:12 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id CA/4C-10715-F1EF3D55; Wed, 19 Aug 2015 03:55:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1439956509!41992303!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18770 invoked from network); 19 Aug 2015 03:55:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 03:55:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRuSt-0002G6-MJ for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 03:55:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRuSt-0007gW-KG for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 03:55:03 +0000 Date: Wed, 19 Aug 2015 03:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] tools: libxl: Handle failure to create qemu dm logfile X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9a4c62515c2cac2db23f88957579792b3bdb81b3 Author: Ian Campbell AuthorDate: Mon Jul 13 13:31:23 2015 +0100 Commit: Ian Jackson CommitDate: Wed Aug 12 12:26:35 2015 +0100 tools: libxl: Handle failure to create qemu dm logfile If libxl_create_logfile fails for some reason then libxl__create_qemu_logfile previously just carried on and dereferenced the uninitialised logfile. Check for the error from libxl_create_logfile, which has already logged for us. This was reported as Debian bug #784880. Reported-by: Russell Coker Signed-off-by: Ian Campbell Cc: 784880@bugs.debian.org Acked-by: Wei Liu (cherry picked from commit e9d3a859977913704605e0fd87887451b12d4722) --- tools/libxl/libxl_dm.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 094a133..b4ce523 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -46,9 +46,11 @@ static const char *qemu_xen_path(libxl__gc *gc) static int libxl__create_qemu_logfile(libxl__gc *gc, char *name) { char *logfile; - int logfile_w; + int rc, logfile_w; + + rc = libxl_create_logfile(CTX, name, &logfile); + if (rc) return rc; - libxl_create_logfile(CTX, name, &logfile); logfile_w = open(logfile, O_WRONLY|O_CREAT|O_APPEND, 0644); free(logfile); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 03:55:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 03:55:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRuT4-0007mX-0l; Wed, 19 Aug 2015 03:55:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRuT2-0007mS-I1 for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 03:55:12 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id CA/4C-10715-F1EF3D55; Wed, 19 Aug 2015 03:55:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1439956509!41992303!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18770 invoked from network); 19 Aug 2015 03:55:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 03:55:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRuSt-0002G6-MJ for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 03:55:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRuSt-0007gW-KG for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 03:55:03 +0000 Date: Wed, 19 Aug 2015 03:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] tools: libxl: Handle failure to create qemu dm logfile X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9a4c62515c2cac2db23f88957579792b3bdb81b3 Author: Ian Campbell AuthorDate: Mon Jul 13 13:31:23 2015 +0100 Commit: Ian Jackson CommitDate: Wed Aug 12 12:26:35 2015 +0100 tools: libxl: Handle failure to create qemu dm logfile If libxl_create_logfile fails for some reason then libxl__create_qemu_logfile previously just carried on and dereferenced the uninitialised logfile. Check for the error from libxl_create_logfile, which has already logged for us. This was reported as Debian bug #784880. Reported-by: Russell Coker Signed-off-by: Ian Campbell Cc: 784880@bugs.debian.org Acked-by: Wei Liu (cherry picked from commit e9d3a859977913704605e0fd87887451b12d4722) --- tools/libxl/libxl_dm.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 094a133..b4ce523 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -46,9 +46,11 @@ static const char *qemu_xen_path(libxl__gc *gc) static int libxl__create_qemu_logfile(libxl__gc *gc, char *name) { char *logfile; - int logfile_w; + int rc, logfile_w; + + rc = libxl_create_logfile(CTX, name, &logfile); + if (rc) return rc; - libxl_create_logfile(CTX, name, &logfile); logfile_w = open(logfile, O_WRONLY|O_CREAT|O_APPEND, 0644); free(logfile); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 03:55:26 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 03:55:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRuTG-0007n9-3I; Wed, 19 Aug 2015 03:55:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRuTE-0007ms-U9 for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 03:55:25 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 06/DF-31069-92EF3D55; Wed, 19 Aug 2015 03:55:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1439956519!31731758!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23560 invoked from network); 19 Aug 2015 03:55:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 03:55:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRuT9-0002GX-Jc for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 03:55:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRuT9-0007h8-ED for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 03:55:19 +0000 Date: Wed, 19 Aug 2015 03:55:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] libxl: poll: Make libxl__poller_get have only one success return path X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8c409135e69c7321cb6d82b8cae0868a81d05ddc Author: Ian Jackson AuthorDate: Thu Jul 9 16:52:02 2015 +0100 Commit: Ian Jackson CommitDate: Wed Aug 12 12:28:24 2015 +0100 libxl: poll: Make libxl__poller_get have only one success return path In preparation for doing some more work on successful exit. No functional change. Signed-off-by: Ian Jackson CC: Jim Fehlig Acked-by: Wei Liu Tested-by: Jim Fehlig (cherry picked from commit 6fc946bc5520ebdbba5cbae4d49e53895df8b393) --- tools/libxl/libxl_event.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 9a7c644..de7c67f 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1557,15 +1557,14 @@ libxl__poller *libxl__poller_get(libxl__gc *gc) libxl__poller *p = LIBXL_LIST_FIRST(&CTX->pollers_idle); if (p) { LIBXL_LIST_REMOVE(p, entry); - return p; - } - - p = libxl__zalloc(NOGC, sizeof(*p)); + } else { + p = libxl__zalloc(NOGC, sizeof(*p)); - rc = libxl__poller_init(gc, p); - if (rc) { - free(p); - return NULL; + rc = libxl__poller_init(gc, p); + if (rc) { + free(p); + return NULL; + } } return p; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 03:55:26 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 03:55:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRuTG-0007n9-3I; Wed, 19 Aug 2015 03:55:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRuTE-0007ms-U9 for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 03:55:25 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 06/DF-31069-92EF3D55; Wed, 19 Aug 2015 03:55:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1439956519!31731758!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23560 invoked from network); 19 Aug 2015 03:55:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 03:55:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRuT9-0002GX-Jc for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 03:55:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRuT9-0007h8-ED for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 03:55:19 +0000 Date: Wed, 19 Aug 2015 03:55:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] libxl: poll: Make libxl__poller_get have only one success return path X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8c409135e69c7321cb6d82b8cae0868a81d05ddc Author: Ian Jackson AuthorDate: Thu Jul 9 16:52:02 2015 +0100 Commit: Ian Jackson CommitDate: Wed Aug 12 12:28:24 2015 +0100 libxl: poll: Make libxl__poller_get have only one success return path In preparation for doing some more work on successful exit. No functional change. Signed-off-by: Ian Jackson CC: Jim Fehlig Acked-by: Wei Liu Tested-by: Jim Fehlig (cherry picked from commit 6fc946bc5520ebdbba5cbae4d49e53895df8b393) --- tools/libxl/libxl_event.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 9a7c644..de7c67f 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1557,15 +1557,14 @@ libxl__poller *libxl__poller_get(libxl__gc *gc) libxl__poller *p = LIBXL_LIST_FIRST(&CTX->pollers_idle); if (p) { LIBXL_LIST_REMOVE(p, entry); - return p; - } - - p = libxl__zalloc(NOGC, sizeof(*p)); + } else { + p = libxl__zalloc(NOGC, sizeof(*p)); - rc = libxl__poller_init(gc, p); - if (rc) { - free(p); - return NULL; + rc = libxl__poller_init(gc, p); + if (rc) { + free(p); + return NULL; + } } return p; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 03:55:34 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 03:55:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRuTO-0007oL-5i; Wed, 19 Aug 2015 03:55:34 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRuTM-0007o5-E4 for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 03:55:32 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id D8/BA-19110-33EF3D55; Wed, 19 Aug 2015 03:55:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1439956529!41902895!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25911 invoked from network); 19 Aug 2015 03:55:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 03:55:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRuTJ-0002Gj-Ov for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 03:55:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRuTJ-0007hc-Nq for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 03:55:29 +0000 Date: Wed, 19 Aug 2015 03:55:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] libxl: poll: Use poller_get and poller_put for poller_app X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9f6f513eecbdc76ce30b5f2e6c52e02076bac30b Author: Ian Jackson AuthorDate: Thu Jul 9 17:05:07 2015 +0100 Commit: Ian Jackson CommitDate: Wed Aug 12 12:39:57 2015 +0100 libxl: poll: Use poller_get and poller_put for poller_app This makes the code more regular. We are going to want to do some more work in poller_get and poller_put, which work also wants to be done for poller_app. Two very minor functional changes: * We call malloc an extra time since poller_app is now a pointer * ERROR_FAIL on poller_get failing for poller_app is generated in libxl_ctx_init rather than passed through by libxl_poller_init from libxl__pipe_nonblock. Signed-off-by: Ian Jackson CC: Jim Fehlig Acked-by: Wei Liu Tested-by: Jim Fehlig (cherry picked from commit aae37652067eafd0f2b85050306772df0cb71f08) --- tools/libxl/libxl.c | 11 ++++++++--- tools/libxl/libxl_event.c | 4 ++-- tools/libxl/libxl_internal.h | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 489d5f8..939e077 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -59,6 +59,7 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, ctx->osevent_hooks = 0; + ctx->poller_app = 0; LIBXL_LIST_INIT(&ctx->pollers_event); LIBXL_LIST_INIT(&ctx->pollers_idle); @@ -101,8 +102,11 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, rc = libxl__atfork_init(ctx); if (rc) goto out; - rc = libxl__poller_init(gc, &ctx->poller_app); - if (rc) goto out; + ctx->poller_app = libxl__poller_get(gc); + if (!ctx->poller_app) { + rc = ERROR_FAIL; + goto out; + } ctx->xch = xc_interface_open(lg,lg,0); if (!ctx->xch) { @@ -178,7 +182,8 @@ int libxl_ctx_free(libxl_ctx *ctx) if (ctx->xsh) xs_daemon_close(ctx->xsh); if (ctx->xce) xc_evtchn_close(ctx->xce); - libxl__poller_dispose(&ctx->poller_app); + libxl__poller_put(ctx, ctx->poller_app); + ctx->poller_app = NULL; assert(LIBXL_LIST_EMPTY(&ctx->pollers_event)); libxl__poller *poller, *poller_tmp; LIBXL_LIST_FOREACH_SAFE(poller, &ctx->pollers_idle, entry, poller_tmp) { diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index de7c67f..06ad284 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1059,7 +1059,7 @@ int libxl_osevent_beforepoll(libxl_ctx *ctx, int *nfds_io, { EGC_INIT(ctx); CTX_LOCK; - int rc = beforepoll_internal(gc, &ctx->poller_app, + int rc = beforepoll_internal(gc, ctx->poller_app, nfds_io, fds, timeout_upd, now); CTX_UNLOCK; EGC_FREE; @@ -1204,7 +1204,7 @@ void libxl_osevent_afterpoll(libxl_ctx *ctx, int nfds, const struct pollfd *fds, { EGC_INIT(ctx); CTX_LOCK; - afterpoll_internal(egc, &ctx->poller_app, nfds, fds, now); + afterpoll_internal(egc, ctx->poller_app, nfds, fds, now); CTX_UNLOCK; EGC_FREE; } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index a1624fd..4120feb 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -343,7 +343,7 @@ struct libxl__ctx { /* See the comment for OSEVENT_HOOK_INTERN in libxl_event.c * for restrictions on the use of the osevent fields. */ - libxl__poller poller_app; /* libxl_osevent_beforepoll and _afterpoll */ + libxl__poller *poller_app; /* libxl_osevent_beforepoll and _afterpoll */ LIBXL_LIST_HEAD(, libxl__poller) pollers_event, pollers_idle; LIBXL_SLIST_HEAD(libxl__osevent_hook_nexi, libxl__osevent_hook_nexus) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 03:55:34 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 03:55:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRuTO-0007oL-5i; Wed, 19 Aug 2015 03:55:34 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRuTM-0007o5-E4 for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 03:55:32 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id D8/BA-19110-33EF3D55; Wed, 19 Aug 2015 03:55:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1439956529!41902895!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25911 invoked from network); 19 Aug 2015 03:55:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 03:55:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRuTJ-0002Gj-Ov for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 03:55:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRuTJ-0007hc-Nq for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 03:55:29 +0000 Date: Wed, 19 Aug 2015 03:55:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] libxl: poll: Use poller_get and poller_put for poller_app X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9f6f513eecbdc76ce30b5f2e6c52e02076bac30b Author: Ian Jackson AuthorDate: Thu Jul 9 17:05:07 2015 +0100 Commit: Ian Jackson CommitDate: Wed Aug 12 12:39:57 2015 +0100 libxl: poll: Use poller_get and poller_put for poller_app This makes the code more regular. We are going to want to do some more work in poller_get and poller_put, which work also wants to be done for poller_app. Two very minor functional changes: * We call malloc an extra time since poller_app is now a pointer * ERROR_FAIL on poller_get failing for poller_app is generated in libxl_ctx_init rather than passed through by libxl_poller_init from libxl__pipe_nonblock. Signed-off-by: Ian Jackson CC: Jim Fehlig Acked-by: Wei Liu Tested-by: Jim Fehlig (cherry picked from commit aae37652067eafd0f2b85050306772df0cb71f08) --- tools/libxl/libxl.c | 11 ++++++++--- tools/libxl/libxl_event.c | 4 ++-- tools/libxl/libxl_internal.h | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 489d5f8..939e077 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -59,6 +59,7 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, ctx->osevent_hooks = 0; + ctx->poller_app = 0; LIBXL_LIST_INIT(&ctx->pollers_event); LIBXL_LIST_INIT(&ctx->pollers_idle); @@ -101,8 +102,11 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, rc = libxl__atfork_init(ctx); if (rc) goto out; - rc = libxl__poller_init(gc, &ctx->poller_app); - if (rc) goto out; + ctx->poller_app = libxl__poller_get(gc); + if (!ctx->poller_app) { + rc = ERROR_FAIL; + goto out; + } ctx->xch = xc_interface_open(lg,lg,0); if (!ctx->xch) { @@ -178,7 +182,8 @@ int libxl_ctx_free(libxl_ctx *ctx) if (ctx->xsh) xs_daemon_close(ctx->xsh); if (ctx->xce) xc_evtchn_close(ctx->xce); - libxl__poller_dispose(&ctx->poller_app); + libxl__poller_put(ctx, ctx->poller_app); + ctx->poller_app = NULL; assert(LIBXL_LIST_EMPTY(&ctx->pollers_event)); libxl__poller *poller, *poller_tmp; LIBXL_LIST_FOREACH_SAFE(poller, &ctx->pollers_idle, entry, poller_tmp) { diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index de7c67f..06ad284 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1059,7 +1059,7 @@ int libxl_osevent_beforepoll(libxl_ctx *ctx, int *nfds_io, { EGC_INIT(ctx); CTX_LOCK; - int rc = beforepoll_internal(gc, &ctx->poller_app, + int rc = beforepoll_internal(gc, ctx->poller_app, nfds_io, fds, timeout_upd, now); CTX_UNLOCK; EGC_FREE; @@ -1204,7 +1204,7 @@ void libxl_osevent_afterpoll(libxl_ctx *ctx, int nfds, const struct pollfd *fds, { EGC_INIT(ctx); CTX_LOCK; - afterpoll_internal(egc, &ctx->poller_app, nfds, fds, now); + afterpoll_internal(egc, ctx->poller_app, nfds, fds, now); CTX_UNLOCK; EGC_FREE; } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index a1624fd..4120feb 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -343,7 +343,7 @@ struct libxl__ctx { /* See the comment for OSEVENT_HOOK_INTERN in libxl_event.c * for restrictions on the use of the osevent fields. */ - libxl__poller poller_app; /* libxl_osevent_beforepoll and _afterpoll */ + libxl__poller *poller_app; /* libxl_osevent_beforepoll and _afterpoll */ LIBXL_LIST_HEAD(, libxl__poller) pollers_event, pollers_idle; LIBXL_SLIST_HEAD(libxl__osevent_hook_nexi, libxl__osevent_hook_nexus) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 03:55:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 03:55:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRuTY-0007pW-8J; Wed, 19 Aug 2015 03:55:44 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRuTW-0007pO-TA for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 03:55:43 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 08/DE-01143-E3EF3D55; Wed, 19 Aug 2015 03:55:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1439956540!41992363!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20364 invoked from network); 19 Aug 2015 03:55:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 03:55:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRuTU-0002Gr-7g for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 03:55:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRuTU-0007iE-1K for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 03:55:40 +0000 Date: Wed, 19 Aug 2015 03:55:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] libxl: poll: Avoid fd deregistration race POLLNVAL crash X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7f7642f778b78e8e204fc082ce03072bb26887c7 Author: Ian Jackson AuthorDate: Thu Jul 9 17:28:48 2015 +0100 Commit: Ian Jackson CommitDate: Wed Aug 12 12:44:30 2015 +0100 libxl: poll: Avoid fd deregistration race POLLNVAL crash It can happen that an fd is deregistered, and closed, and then a new fd opened, and reregistered, all while another thread is in poll(). If this happens poll might report POLLNVAL, but the event loop would think that the fd was supposed to have been valid, and then fail an assertion: libxl_event.c:1183: afterpoll_check_fd: Assertion `poller->fds_changed || !(fds[slot].revents & 0x020)' failed. We can't simply ignore POLLNVAL because if we have bugs which cause messed-up fds, it is a serious problem which we really need to detect. Instead, add extra tracking to spot when this possibility arises, and abort on POLLNVAL if we are sure that it is unexpected. Reported-by: Jim Fehlig Signed-off-by: Ian Jackson CC: Jim Fehlig Acked-by: Wei Liu Tested-by: Jim Fehlig (cherry picked from commit 681ce1681622a46d111cfdc4fc07e4cb565ae131) --- tools/libxl/libxl.c | 2 ++ tools/libxl/libxl_event.c | 12 +++++++++++- tools/libxl/libxl_internal.h | 13 +++++++++++++ 3 files changed, 26 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 939e077..3536b5d 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -62,6 +62,7 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, ctx->poller_app = 0; LIBXL_LIST_INIT(&ctx->pollers_event); LIBXL_LIST_INIT(&ctx->pollers_idle); + LIBXL_LIST_INIT(&ctx->pollers_fds_changed); LIBXL_LIST_INIT(&ctx->efds); LIBXL_TAILQ_INIT(&ctx->etimes); @@ -185,6 +186,7 @@ int libxl_ctx_free(libxl_ctx *ctx) libxl__poller_put(ctx, ctx->poller_app); ctx->poller_app = NULL; assert(LIBXL_LIST_EMPTY(&ctx->pollers_event)); + assert(LIBXL_LIST_EMPTY(&ctx->pollers_fds_changed)); libxl__poller *poller, *poller_tmp; LIBXL_LIST_FOREACH_SAFE(poller, &ctx->pollers_idle, entry, poller_tmp) { libxl__poller_dispose(poller); diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 06ad284..597f65d 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -220,6 +220,7 @@ int libxl__ev_fd_modify(libxl__gc *gc, libxl__ev_fd *ev, short events) void libxl__ev_fd_deregister(libxl__gc *gc, libxl__ev_fd *ev) { CTX_LOCK; + libxl__poller *poller; if (!libxl__ev_fd_isregistered(ev)) { DBG("ev_fd=%p deregister unregistered",ev); @@ -232,6 +233,9 @@ void libxl__ev_fd_deregister(libxl__gc *gc, libxl__ev_fd *ev) LIBXL_LIST_REMOVE(ev, entry); ev->fd = -1; + LIBXL_LIST_FOREACH(poller, &CTX->pollers_fds_changed, fds_changed_entry) + poller->fds_changed = 1; + out: CTX_UNLOCK; } @@ -1031,6 +1035,8 @@ static int beforepoll_internal(libxl__gc *gc, libxl__poller *poller, *nfds_io = used; + poller->fds_changed = 0; + libxl__ev_time *etime = LIBXL_TAILQ_FIRST(&CTX->etimes); if (etime) { int our_timeout; @@ -1095,7 +1101,7 @@ static int afterpoll_check_fd(libxl__poller *poller, /* again, stale slot entry */ continue; - assert(!(fds[slot].revents & POLLNVAL)); + assert(poller->fds_changed || !(fds[slot].revents & POLLNVAL)); /* we mask in case requested events have changed */ int slot_revents = fds[slot].revents & events; @@ -1531,6 +1537,7 @@ int libxl__poller_init(libxl__gc *gc, libxl__poller *p) int rc; p->fd_polls = 0; p->fd_rindices = 0; + p->fds_changed = 0; rc = libxl__pipe_nonblock(CTX, p->wakeup_pipe); if (rc) goto out; @@ -1567,12 +1574,15 @@ libxl__poller *libxl__poller_get(libxl__gc *gc) } } + LIBXL_LIST_INSERT_HEAD(&CTX->pollers_fds_changed, p, + fds_changed_entry); return p; } void libxl__poller_put(libxl_ctx *ctx, libxl__poller *p) { if (!p) return; + LIBXL_LIST_REMOVE(p, fds_changed_entry); LIBXL_LIST_INSERT_HEAD(&ctx->pollers_idle, p, entry); } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 4120feb..bb2ebc0 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -304,6 +304,18 @@ struct libxl__poller { int (*fd_rindices)[3]; /* see libxl_event.c:beforepoll_internal */ int wakeup_pipe[2]; /* 0 means no fd allocated */ + + /* + * We also use the poller to record whether any fds have been + * deregistered since we entered poll. Each poller which is not + * idle is on the list pollers_fds_changed. fds_changed is + * cleared by beforepoll, and tested by afterpoll. Whenever an fd + * event is deregistered, we set the fds_changed of all non-idle + * pollers. So afterpoll can tell whether any POLLNVAL is + * plausibly due to an fd being closed and reopened. + */ + LIBXL_LIST_ENTRY(libxl__poller) fds_changed_entry; + bool fds_changed; }; struct libxl__gc { @@ -345,6 +357,7 @@ struct libxl__ctx { libxl__poller *poller_app; /* libxl_osevent_beforepoll and _afterpoll */ LIBXL_LIST_HEAD(, libxl__poller) pollers_event, pollers_idle; + LIBXL_LIST_HEAD(, libxl__poller) pollers_fds_changed; LIBXL_SLIST_HEAD(libxl__osevent_hook_nexi, libxl__osevent_hook_nexus) hook_fd_nexi_idle, hook_timeout_nexi_idle; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 03:55:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 03:55:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRuTY-0007pW-8J; Wed, 19 Aug 2015 03:55:44 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRuTW-0007pO-TA for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 03:55:43 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 08/DE-01143-E3EF3D55; Wed, 19 Aug 2015 03:55:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1439956540!41992363!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20364 invoked from network); 19 Aug 2015 03:55:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 03:55:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRuTU-0002Gr-7g for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 03:55:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRuTU-0007iE-1K for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 03:55:40 +0000 Date: Wed, 19 Aug 2015 03:55:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] libxl: poll: Avoid fd deregistration race POLLNVAL crash X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7f7642f778b78e8e204fc082ce03072bb26887c7 Author: Ian Jackson AuthorDate: Thu Jul 9 17:28:48 2015 +0100 Commit: Ian Jackson CommitDate: Wed Aug 12 12:44:30 2015 +0100 libxl: poll: Avoid fd deregistration race POLLNVAL crash It can happen that an fd is deregistered, and closed, and then a new fd opened, and reregistered, all while another thread is in poll(). If this happens poll might report POLLNVAL, but the event loop would think that the fd was supposed to have been valid, and then fail an assertion: libxl_event.c:1183: afterpoll_check_fd: Assertion `poller->fds_changed || !(fds[slot].revents & 0x020)' failed. We can't simply ignore POLLNVAL because if we have bugs which cause messed-up fds, it is a serious problem which we really need to detect. Instead, add extra tracking to spot when this possibility arises, and abort on POLLNVAL if we are sure that it is unexpected. Reported-by: Jim Fehlig Signed-off-by: Ian Jackson CC: Jim Fehlig Acked-by: Wei Liu Tested-by: Jim Fehlig (cherry picked from commit 681ce1681622a46d111cfdc4fc07e4cb565ae131) --- tools/libxl/libxl.c | 2 ++ tools/libxl/libxl_event.c | 12 +++++++++++- tools/libxl/libxl_internal.h | 13 +++++++++++++ 3 files changed, 26 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 939e077..3536b5d 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -62,6 +62,7 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, ctx->poller_app = 0; LIBXL_LIST_INIT(&ctx->pollers_event); LIBXL_LIST_INIT(&ctx->pollers_idle); + LIBXL_LIST_INIT(&ctx->pollers_fds_changed); LIBXL_LIST_INIT(&ctx->efds); LIBXL_TAILQ_INIT(&ctx->etimes); @@ -185,6 +186,7 @@ int libxl_ctx_free(libxl_ctx *ctx) libxl__poller_put(ctx, ctx->poller_app); ctx->poller_app = NULL; assert(LIBXL_LIST_EMPTY(&ctx->pollers_event)); + assert(LIBXL_LIST_EMPTY(&ctx->pollers_fds_changed)); libxl__poller *poller, *poller_tmp; LIBXL_LIST_FOREACH_SAFE(poller, &ctx->pollers_idle, entry, poller_tmp) { libxl__poller_dispose(poller); diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 06ad284..597f65d 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -220,6 +220,7 @@ int libxl__ev_fd_modify(libxl__gc *gc, libxl__ev_fd *ev, short events) void libxl__ev_fd_deregister(libxl__gc *gc, libxl__ev_fd *ev) { CTX_LOCK; + libxl__poller *poller; if (!libxl__ev_fd_isregistered(ev)) { DBG("ev_fd=%p deregister unregistered",ev); @@ -232,6 +233,9 @@ void libxl__ev_fd_deregister(libxl__gc *gc, libxl__ev_fd *ev) LIBXL_LIST_REMOVE(ev, entry); ev->fd = -1; + LIBXL_LIST_FOREACH(poller, &CTX->pollers_fds_changed, fds_changed_entry) + poller->fds_changed = 1; + out: CTX_UNLOCK; } @@ -1031,6 +1035,8 @@ static int beforepoll_internal(libxl__gc *gc, libxl__poller *poller, *nfds_io = used; + poller->fds_changed = 0; + libxl__ev_time *etime = LIBXL_TAILQ_FIRST(&CTX->etimes); if (etime) { int our_timeout; @@ -1095,7 +1101,7 @@ static int afterpoll_check_fd(libxl__poller *poller, /* again, stale slot entry */ continue; - assert(!(fds[slot].revents & POLLNVAL)); + assert(poller->fds_changed || !(fds[slot].revents & POLLNVAL)); /* we mask in case requested events have changed */ int slot_revents = fds[slot].revents & events; @@ -1531,6 +1537,7 @@ int libxl__poller_init(libxl__gc *gc, libxl__poller *p) int rc; p->fd_polls = 0; p->fd_rindices = 0; + p->fds_changed = 0; rc = libxl__pipe_nonblock(CTX, p->wakeup_pipe); if (rc) goto out; @@ -1567,12 +1574,15 @@ libxl__poller *libxl__poller_get(libxl__gc *gc) } } + LIBXL_LIST_INSERT_HEAD(&CTX->pollers_fds_changed, p, + fds_changed_entry); return p; } void libxl__poller_put(libxl_ctx *ctx, libxl__poller *p) { if (!p) return; + LIBXL_LIST_REMOVE(p, fds_changed_entry); LIBXL_LIST_INSERT_HEAD(&ctx->pollers_idle, p, entry); } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 4120feb..bb2ebc0 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -304,6 +304,18 @@ struct libxl__poller { int (*fd_rindices)[3]; /* see libxl_event.c:beforepoll_internal */ int wakeup_pipe[2]; /* 0 means no fd allocated */ + + /* + * We also use the poller to record whether any fds have been + * deregistered since we entered poll. Each poller which is not + * idle is on the list pollers_fds_changed. fds_changed is + * cleared by beforepoll, and tested by afterpoll. Whenever an fd + * event is deregistered, we set the fds_changed of all non-idle + * pollers. So afterpoll can tell whether any POLLNVAL is + * plausibly due to an fd being closed and reopened. + */ + LIBXL_LIST_ENTRY(libxl__poller) fds_changed_entry; + bool fds_changed; }; struct libxl__gc { @@ -345,6 +357,7 @@ struct libxl__ctx { libxl__poller *poller_app; /* libxl_osevent_beforepoll and _afterpoll */ LIBXL_LIST_HEAD(, libxl__poller) pollers_event, pollers_idle; + LIBXL_LIST_HEAD(, libxl__poller) pollers_fds_changed; LIBXL_SLIST_HEAD(libxl__osevent_hook_nexi, libxl__osevent_hook_nexus) hook_fd_nexi_idle, hook_timeout_nexi_idle; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 07:11:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 07:11:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRxWd-00007V-7b; Wed, 19 Aug 2015 07:11:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRxWb-00007Q-Jr for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 07:11:05 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id E2/D2-03747-80C24D55; Wed, 19 Aug 2015 07:11:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1439968263!13247689!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6646 invoked from network); 19 Aug 2015 07:11:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 07:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRxWZ-0004Uc-8A for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 07:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRxWY-0000v0-4r for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 07:11:02 +0000 Date: Wed, 19 Aug 2015 07:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] docs: workaround markdown parser error in xen-command-line.markdown X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3e9054c523ed089d04cf10b7f5b417240be85760 Author: Ian Campbell AuthorDate: Wed Nov 19 10:42:18 2014 +0000 Commit: Ian Jackson CommitDate: Wed Aug 12 11:46:41 2015 +0100 docs: workaround markdown parser error in xen-command-line.markdown Some versions of markdown (specifically the one in Debian Wheezy, currently used to generate http://xenbits.xen.org/docs/unstable/misc/xen-command-line.html) seem to be confused by nested lists in the middle of multi-paragraph parent list entries as seen in the com1,com2 entry. The effect is that the "Default" section of all following entries are replace by some sort of hash or checksum (at least, a string of 32 random seeming hex digits). Workaround this issue by making the decriptions of the DPS options a nested list, moving the existing nested list describing the options for S into a third level list. This seems to avoid the issue, and is arguably better formatting in its own right (at least its not a regression IMHO) Signed-off-by: Ian Campbell Reviewed-by: Andrew Cooper (cherry picked from commit ae325e94d2076f3953824e069c062908221f7325) --- docs/misc/xen-command-line.markdown | 21 ++++++++------------- 1 files changed, 8 insertions(+), 13 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 77790af..2ebb7c6 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -220,19 +220,14 @@ Both option `com1` and `com2` follow the same format. * Optionally, a clock speed measured in hz can be specified. * `DPS` represents the number of data bits, the parity, and the number of stop bits. - - `D` is an integer between 5 and 8 for the number of data bits. - - `P` is a single character representing the type of parity: - - * `n` No - * `o` Odd - * `e` Even - * `m` Mark - * `s` Space - - `S` is an integer 1 or 2 for the number of stop bits. - + * `D` is an integer between 5 and 8 for the number of data bits. + * `P` is a single character representing the type of parity: + * `n` No + * `o` Odd + * `e` Even + * `m` Mark + * `s` Space + * `S` is an integer 1 or 2 for the number of stop bits. * `` is an integer which specifies the IO base port for UART registers. * `` is the IRQ number to use, or `0` to use the UART in poll -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 07:11:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 07:11:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRxWd-00007V-7b; Wed, 19 Aug 2015 07:11:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRxWb-00007Q-Jr for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 07:11:05 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id E2/D2-03747-80C24D55; Wed, 19 Aug 2015 07:11:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1439968263!13247689!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6646 invoked from network); 19 Aug 2015 07:11:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 07:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRxWZ-0004Uc-8A for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 07:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRxWY-0000v0-4r for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 07:11:02 +0000 Date: Wed, 19 Aug 2015 07:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] docs: workaround markdown parser error in xen-command-line.markdown X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3e9054c523ed089d04cf10b7f5b417240be85760 Author: Ian Campbell AuthorDate: Wed Nov 19 10:42:18 2014 +0000 Commit: Ian Jackson CommitDate: Wed Aug 12 11:46:41 2015 +0100 docs: workaround markdown parser error in xen-command-line.markdown Some versions of markdown (specifically the one in Debian Wheezy, currently used to generate http://xenbits.xen.org/docs/unstable/misc/xen-command-line.html) seem to be confused by nested lists in the middle of multi-paragraph parent list entries as seen in the com1,com2 entry. The effect is that the "Default" section of all following entries are replace by some sort of hash or checksum (at least, a string of 32 random seeming hex digits). Workaround this issue by making the decriptions of the DPS options a nested list, moving the existing nested list describing the options for S into a third level list. This seems to avoid the issue, and is arguably better formatting in its own right (at least its not a regression IMHO) Signed-off-by: Ian Campbell Reviewed-by: Andrew Cooper (cherry picked from commit ae325e94d2076f3953824e069c062908221f7325) --- docs/misc/xen-command-line.markdown | 21 ++++++++------------- 1 files changed, 8 insertions(+), 13 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 77790af..2ebb7c6 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -220,19 +220,14 @@ Both option `com1` and `com2` follow the same format. * Optionally, a clock speed measured in hz can be specified. * `DPS` represents the number of data bits, the parity, and the number of stop bits. - - `D` is an integer between 5 and 8 for the number of data bits. - - `P` is a single character representing the type of parity: - - * `n` No - * `o` Odd - * `e` Even - * `m` Mark - * `s` Space - - `S` is an integer 1 or 2 for the number of stop bits. - + * `D` is an integer between 5 and 8 for the number of data bits. + * `P` is a single character representing the type of parity: + * `n` No + * `o` Odd + * `e` Even + * `m` Mark + * `s` Space + * `S` is an integer 1 or 2 for the number of stop bits. * `` is an integer which specifies the IO base port for UART registers. * `` is the IRQ number to use, or `0` to use the UART in poll -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 07:11:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 07:11:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRxWo-000088-AF; Wed, 19 Aug 2015 07:11:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRxWm-00007y-Hy for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 07:11:16 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id FE/B3-29649-31C24D55; Wed, 19 Aug 2015 07:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1439968273!36052285!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26739 invoked from network); 19 Aug 2015 07:11:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 07:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRxWj-0004Uk-DH for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 07:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRxWj-0000vT-BN for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 07:11:13 +0000 Date: Wed, 19 Aug 2015 07:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] libxl: In libxl_set_vcpuonline check for maximum number of VCPUs against the cpumap. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ca0f468192d12d8d30c2a48a37c5d3460a464a29 Author: Konrad Rzeszutek Wilk AuthorDate: Fri Apr 3 16:02:29 2015 -0400 Commit: Ian Jackson CommitDate: Wed Aug 12 12:11:23 2015 +0100 libxl: In libxl_set_vcpuonline check for maximum number of VCPUs against the cpumap. There is no sense in trying to online (or offline) CPUs when the size of cpumap is greater than the maximum number of VCPUs the guest can go to. As such fail the operation if the count of CPUs to online is greater than what the guest started with. For the offline case we do not check (as the bits are unset in the cpumap) and let it go through. We coalesce some of the underlying libxl_set_vcpuonline code together which was duplicated in QMP and XenStore codepaths. Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Ian Campbell (cherry picked from commit d83bf9d224eeb5b73b93c2703f7dba4473cfa89c) Conflicts: tools/libxl/libxl.c Signed-off-by: Ian Jackson (cherry picked from commit 0d8cbcad03764e42ff2f0d224aff883c3734d782) Conflicts: tools/libxl/libxl.c Signed-off-by: Ian Jackson --- tools/libxl/libxl.c | 46 ++++++++++++++++++++++++++++------------------ 1 files changed, 28 insertions(+), 18 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 2805e6c..ad8adb0 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4638,23 +4638,19 @@ int libxl_domain_get_nodeaffinity(libxl_ctx *ctx, uint32_t domid, } static int libxl__set_vcpuonline_xenstore(libxl__gc *gc, uint32_t domid, - libxl_bitmap *cpumap) + libxl_bitmap *cpumap, + const libxl_dominfo *info) { - libxl_dominfo info; char *dompath; xs_transaction_t t; int i, rc = ERROR_FAIL; - if (libxl_domain_info(CTX, &info, domid) < 0) { - LOGE(ERROR, "getting domain info list"); - goto out; - } if (!(dompath = libxl__xs_get_dompath(gc, domid))) goto out; retry_transaction: t = xs_transaction_start(CTX->xsh); - for (i = 0; i <= info.vcpu_max_id; i++) + for (i = 0; i <= info->vcpu_max_id; i++) libxl__xs_write(gc, t, libxl__sprintf(gc, "%s/cpu/%u/availability", dompath, i), "%s", libxl_bitmap_test(cpumap, i) ? "online" : "offline"); @@ -4668,16 +4664,12 @@ out: } static int libxl__set_vcpuonline_qmp(libxl__gc *gc, uint32_t domid, - libxl_bitmap *cpumap) + libxl_bitmap *cpumap, + const libxl_dominfo *info) { - libxl_dominfo info; int i; - if (libxl_domain_info(CTX, &info, domid) < 0) { - LOGE(ERROR, "getting domain info list"); - return ERROR_FAIL; - } - for (i = 0; i <= info.vcpu_max_id; i++) { + for (i = 0; i <= info->vcpu_max_id; i++) { if (libxl_bitmap_test(cpumap, i)) { /* Return value is ignore because it does not tell anything useful * on the completion of the command. @@ -4693,26 +4685,44 @@ static int libxl__set_vcpuonline_qmp(libxl__gc *gc, uint32_t domid, int libxl_set_vcpuonline(libxl_ctx *ctx, uint32_t domid, libxl_bitmap *cpumap) { GC_INIT(ctx); - int rc; + int rc, maxcpus; + libxl_dominfo info; + + rc = libxl_domain_info(CTX, &info, domid); + if (rc < 0) { + LOGE(ERROR, "getting domain info list"); + goto out; + } + + maxcpus = libxl_bitmap_count_set(cpumap); + if (maxcpus > info.vcpu_max_id + 1) + { + LOGE(ERROR, "Requested %d VCPUs, however maxcpus is %d!", + maxcpus, info.vcpu_max_id + 1); + rc = ERROR_FAIL; + goto out; + } + switch (libxl__domain_type(gc, domid)) { case LIBXL_DOMAIN_TYPE_HVM: switch (libxl__device_model_version_running(gc, domid)) { case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - rc = libxl__set_vcpuonline_xenstore(gc, domid, cpumap); + rc = libxl__set_vcpuonline_xenstore(gc, domid, cpumap, &info); break; case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: - rc = libxl__set_vcpuonline_qmp(gc, domid, cpumap); + rc = libxl__set_vcpuonline_qmp(gc, domid, cpumap, &info); break; default: rc = ERROR_INVAL; } break; case LIBXL_DOMAIN_TYPE_PV: - rc = libxl__set_vcpuonline_xenstore(gc, domid, cpumap); + rc = libxl__set_vcpuonline_xenstore(gc, domid, cpumap, &info); break; default: rc = ERROR_INVAL; } +out: GC_FREE; return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 07:11:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 07:11:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRxWo-000088-AF; Wed, 19 Aug 2015 07:11:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRxWm-00007y-Hy for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 07:11:16 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id FE/B3-29649-31C24D55; Wed, 19 Aug 2015 07:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1439968273!36052285!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26739 invoked from network); 19 Aug 2015 07:11:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 07:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRxWj-0004Uk-DH for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 07:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRxWj-0000vT-BN for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 07:11:13 +0000 Date: Wed, 19 Aug 2015 07:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] libxl: In libxl_set_vcpuonline check for maximum number of VCPUs against the cpumap. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ca0f468192d12d8d30c2a48a37c5d3460a464a29 Author: Konrad Rzeszutek Wilk AuthorDate: Fri Apr 3 16:02:29 2015 -0400 Commit: Ian Jackson CommitDate: Wed Aug 12 12:11:23 2015 +0100 libxl: In libxl_set_vcpuonline check for maximum number of VCPUs against the cpumap. There is no sense in trying to online (or offline) CPUs when the size of cpumap is greater than the maximum number of VCPUs the guest can go to. As such fail the operation if the count of CPUs to online is greater than what the guest started with. For the offline case we do not check (as the bits are unset in the cpumap) and let it go through. We coalesce some of the underlying libxl_set_vcpuonline code together which was duplicated in QMP and XenStore codepaths. Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Ian Campbell (cherry picked from commit d83bf9d224eeb5b73b93c2703f7dba4473cfa89c) Conflicts: tools/libxl/libxl.c Signed-off-by: Ian Jackson (cherry picked from commit 0d8cbcad03764e42ff2f0d224aff883c3734d782) Conflicts: tools/libxl/libxl.c Signed-off-by: Ian Jackson --- tools/libxl/libxl.c | 46 ++++++++++++++++++++++++++++------------------ 1 files changed, 28 insertions(+), 18 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 2805e6c..ad8adb0 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4638,23 +4638,19 @@ int libxl_domain_get_nodeaffinity(libxl_ctx *ctx, uint32_t domid, } static int libxl__set_vcpuonline_xenstore(libxl__gc *gc, uint32_t domid, - libxl_bitmap *cpumap) + libxl_bitmap *cpumap, + const libxl_dominfo *info) { - libxl_dominfo info; char *dompath; xs_transaction_t t; int i, rc = ERROR_FAIL; - if (libxl_domain_info(CTX, &info, domid) < 0) { - LOGE(ERROR, "getting domain info list"); - goto out; - } if (!(dompath = libxl__xs_get_dompath(gc, domid))) goto out; retry_transaction: t = xs_transaction_start(CTX->xsh); - for (i = 0; i <= info.vcpu_max_id; i++) + for (i = 0; i <= info->vcpu_max_id; i++) libxl__xs_write(gc, t, libxl__sprintf(gc, "%s/cpu/%u/availability", dompath, i), "%s", libxl_bitmap_test(cpumap, i) ? "online" : "offline"); @@ -4668,16 +4664,12 @@ out: } static int libxl__set_vcpuonline_qmp(libxl__gc *gc, uint32_t domid, - libxl_bitmap *cpumap) + libxl_bitmap *cpumap, + const libxl_dominfo *info) { - libxl_dominfo info; int i; - if (libxl_domain_info(CTX, &info, domid) < 0) { - LOGE(ERROR, "getting domain info list"); - return ERROR_FAIL; - } - for (i = 0; i <= info.vcpu_max_id; i++) { + for (i = 0; i <= info->vcpu_max_id; i++) { if (libxl_bitmap_test(cpumap, i)) { /* Return value is ignore because it does not tell anything useful * on the completion of the command. @@ -4693,26 +4685,44 @@ static int libxl__set_vcpuonline_qmp(libxl__gc *gc, uint32_t domid, int libxl_set_vcpuonline(libxl_ctx *ctx, uint32_t domid, libxl_bitmap *cpumap) { GC_INIT(ctx); - int rc; + int rc, maxcpus; + libxl_dominfo info; + + rc = libxl_domain_info(CTX, &info, domid); + if (rc < 0) { + LOGE(ERROR, "getting domain info list"); + goto out; + } + + maxcpus = libxl_bitmap_count_set(cpumap); + if (maxcpus > info.vcpu_max_id + 1) + { + LOGE(ERROR, "Requested %d VCPUs, however maxcpus is %d!", + maxcpus, info.vcpu_max_id + 1); + rc = ERROR_FAIL; + goto out; + } + switch (libxl__domain_type(gc, domid)) { case LIBXL_DOMAIN_TYPE_HVM: switch (libxl__device_model_version_running(gc, domid)) { case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - rc = libxl__set_vcpuonline_xenstore(gc, domid, cpumap); + rc = libxl__set_vcpuonline_xenstore(gc, domid, cpumap, &info); break; case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: - rc = libxl__set_vcpuonline_qmp(gc, domid, cpumap); + rc = libxl__set_vcpuonline_qmp(gc, domid, cpumap, &info); break; default: rc = ERROR_INVAL; } break; case LIBXL_DOMAIN_TYPE_PV: - rc = libxl__set_vcpuonline_xenstore(gc, domid, cpumap); + rc = libxl__set_vcpuonline_xenstore(gc, domid, cpumap, &info); break; default: rc = ERROR_INVAL; } +out: GC_FREE; return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 07:11:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 07:11:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRxWx-00009a-Ev; Wed, 19 Aug 2015 07:11:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRxWw-00009S-PK for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 07:11:26 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id 0B/10-00475-E1C24D55; Wed, 19 Aug 2015 07:11:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1439968284!42024519!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6221 invoked from network); 19 Aug 2015 07:11:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 07:11:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRxWu-0004Uw-BV for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 07:11:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRxWt-0000vp-GT for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 07:11:23 +0000 Date: Wed, 19 Aug 2015 07:11:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] tools: libxl: Handle failure to create qemu dm logfile X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1749addcc6a213aef9c57ed7e8548d72d475c36f Author: Ian Campbell AuthorDate: Mon Jul 13 13:31:23 2015 +0100 Commit: Ian Jackson CommitDate: Wed Aug 12 12:26:46 2015 +0100 tools: libxl: Handle failure to create qemu dm logfile If libxl_create_logfile fails for some reason then libxl__create_qemu_logfile previously just carried on and dereferenced the uninitialised logfile. Check for the error from libxl_create_logfile, which has already logged for us. This was reported as Debian bug #784880. Reported-by: Russell Coker Signed-off-by: Ian Campbell Cc: 784880@bugs.debian.org Acked-by: Wei Liu (cherry picked from commit e9d3a859977913704605e0fd87887451b12d4722) (cherry picked from commit 9a4c62515c2cac2db23f88957579792b3bdb81b3) --- tools/libxl/libxl_dm.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 4dbfddc..d7d2d3b 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -45,9 +45,11 @@ static const char *qemu_xen_path(libxl__gc *gc) static int libxl__create_qemu_logfile(libxl__gc *gc, char *name) { char *logfile; - int logfile_w; + int rc, logfile_w; + + rc = libxl_create_logfile(CTX, name, &logfile); + if (rc) return rc; - libxl_create_logfile(CTX, name, &logfile); logfile_w = open(logfile, O_WRONLY|O_CREAT|O_APPEND, 0644); free(logfile); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 07:11:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 07:11:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRxWx-00009a-Ev; Wed, 19 Aug 2015 07:11:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRxWw-00009S-PK for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 07:11:26 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id 0B/10-00475-E1C24D55; Wed, 19 Aug 2015 07:11:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1439968284!42024519!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6221 invoked from network); 19 Aug 2015 07:11:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 07:11:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRxWu-0004Uw-BV for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 07:11:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRxWt-0000vp-GT for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 07:11:23 +0000 Date: Wed, 19 Aug 2015 07:11:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] tools: libxl: Handle failure to create qemu dm logfile X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1749addcc6a213aef9c57ed7e8548d72d475c36f Author: Ian Campbell AuthorDate: Mon Jul 13 13:31:23 2015 +0100 Commit: Ian Jackson CommitDate: Wed Aug 12 12:26:46 2015 +0100 tools: libxl: Handle failure to create qemu dm logfile If libxl_create_logfile fails for some reason then libxl__create_qemu_logfile previously just carried on and dereferenced the uninitialised logfile. Check for the error from libxl_create_logfile, which has already logged for us. This was reported as Debian bug #784880. Reported-by: Russell Coker Signed-off-by: Ian Campbell Cc: 784880@bugs.debian.org Acked-by: Wei Liu (cherry picked from commit e9d3a859977913704605e0fd87887451b12d4722) (cherry picked from commit 9a4c62515c2cac2db23f88957579792b3bdb81b3) --- tools/libxl/libxl_dm.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 4dbfddc..d7d2d3b 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -45,9 +45,11 @@ static const char *qemu_xen_path(libxl__gc *gc) static int libxl__create_qemu_logfile(libxl__gc *gc, char *name) { char *logfile; - int logfile_w; + int rc, logfile_w; + + rc = libxl_create_logfile(CTX, name, &logfile); + if (rc) return rc; - libxl_create_logfile(CTX, name, &logfile); logfile_w = open(logfile, O_WRONLY|O_CREAT|O_APPEND, 0644); free(logfile); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 07:11:37 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 07:11:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRxX7-0000Ah-HP; Wed, 19 Aug 2015 07:11:37 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRxX6-0000Ab-UK for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 07:11:37 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id F8/7F-12889-82C24D55; Wed, 19 Aug 2015 07:11:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1439968294!41991997!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25472 invoked from network); 19 Aug 2015 07:11:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 07:11:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRxX4-0004V5-GY for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 07:11:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRxX4-0000wk-EQ for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 07:11:34 +0000 Date: Wed, 19 Aug 2015 07:11:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] libxl: poll: Make libxl__poller_get have only one success return path X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 900c7970de4cb809ba208465cb0abd094b4dec58 Author: Ian Jackson AuthorDate: Thu Jul 9 16:52:02 2015 +0100 Commit: Ian Jackson CommitDate: Wed Aug 12 12:37:22 2015 +0100 libxl: poll: Make libxl__poller_get have only one success return path In preparation for doing some more work on successful exit. No functional change. Signed-off-by: Ian Jackson CC: Jim Fehlig Acked-by: Wei Liu Tested-by: Jim Fehlig (cherry picked from commit 6fc946bc5520ebdbba5cbae4d49e53895df8b393) (cherry picked from commit 8c409135e69c7321cb6d82b8cae0868a81d05ddc) Conflicts: tools/libxl/libxl_event.c Signed-off-by: Ian Jackson --- tools/libxl/libxl_event.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 98cf565..6111deb 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1378,20 +1378,19 @@ libxl__poller *libxl__poller_get(libxl_ctx *ctx) libxl__poller *p = LIBXL_LIST_FIRST(&ctx->pollers_idle); if (p) { LIBXL_LIST_REMOVE(p, entry); - return p; - } - - p = malloc(sizeof(*p)); - if (!p) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "cannot allocate poller"); - return 0; - } - memset(p, 0, sizeof(*p)); + } else { + p = malloc(sizeof(*p)); + if (!p) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "cannot allocate poller"); + return 0; + } + memset(p, 0, sizeof(*p)); - rc = libxl__poller_init(ctx, p); - if (rc) { - free(p); - return NULL; + rc = libxl__poller_init(ctx, p); + if (rc) { + free(p); + return NULL; + } } return p; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 07:11:37 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 07:11:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRxX7-0000Ah-HP; Wed, 19 Aug 2015 07:11:37 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRxX6-0000Ab-UK for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 07:11:37 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id F8/7F-12889-82C24D55; Wed, 19 Aug 2015 07:11:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1439968294!41991997!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25472 invoked from network); 19 Aug 2015 07:11:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 07:11:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRxX4-0004V5-GY for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 07:11:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRxX4-0000wk-EQ for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 07:11:34 +0000 Date: Wed, 19 Aug 2015 07:11:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] libxl: poll: Make libxl__poller_get have only one success return path X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 900c7970de4cb809ba208465cb0abd094b4dec58 Author: Ian Jackson AuthorDate: Thu Jul 9 16:52:02 2015 +0100 Commit: Ian Jackson CommitDate: Wed Aug 12 12:37:22 2015 +0100 libxl: poll: Make libxl__poller_get have only one success return path In preparation for doing some more work on successful exit. No functional change. Signed-off-by: Ian Jackson CC: Jim Fehlig Acked-by: Wei Liu Tested-by: Jim Fehlig (cherry picked from commit 6fc946bc5520ebdbba5cbae4d49e53895df8b393) (cherry picked from commit 8c409135e69c7321cb6d82b8cae0868a81d05ddc) Conflicts: tools/libxl/libxl_event.c Signed-off-by: Ian Jackson --- tools/libxl/libxl_event.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 98cf565..6111deb 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1378,20 +1378,19 @@ libxl__poller *libxl__poller_get(libxl_ctx *ctx) libxl__poller *p = LIBXL_LIST_FIRST(&ctx->pollers_idle); if (p) { LIBXL_LIST_REMOVE(p, entry); - return p; - } - - p = malloc(sizeof(*p)); - if (!p) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "cannot allocate poller"); - return 0; - } - memset(p, 0, sizeof(*p)); + } else { + p = malloc(sizeof(*p)); + if (!p) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "cannot allocate poller"); + return 0; + } + memset(p, 0, sizeof(*p)); - rc = libxl__poller_init(ctx, p); - if (rc) { - free(p); - return NULL; + rc = libxl__poller_init(ctx, p); + if (rc) { + free(p); + return NULL; + } } return p; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 07:11:47 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 07:11:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRxXH-0000CL-K1; Wed, 19 Aug 2015 07:11:47 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRxXH-0000C4-5z for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 07:11:47 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 87/C9-01753-23C24D55; Wed, 19 Aug 2015 07:11:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1439968304!34927763!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21922 invoked from network); 19 Aug 2015 07:11:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 07:11:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRxXE-0004VD-LU for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 07:11:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRxXE-0000x8-K6 for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 07:11:44 +0000 Date: Wed, 19 Aug 2015 07:11:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] libxl: poll: Use poller_get and poller_put for poller_app X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0348c450fe253b3db6edc77568820327ff991478 Author: Ian Jackson AuthorDate: Thu Jul 9 17:05:07 2015 +0100 Commit: Ian Jackson CommitDate: Wed Aug 12 12:43:08 2015 +0100 libxl: poll: Use poller_get and poller_put for poller_app This makes the code more regular. We are going to want to do some more work in poller_get and poller_put, which work also wants to be done for poller_app. Two very minor functional changes: * We call malloc an extra time since poller_app is now a pointer * ERROR_FAIL on poller_get failing for poller_app is generated in libxl_ctx_init rather than passed through by libxl_poller_init from libxl__pipe_nonblock. Signed-off-by: Ian Jackson CC: Jim Fehlig Acked-by: Wei Liu Tested-by: Jim Fehlig (cherry picked from commit aae37652067eafd0f2b85050306772df0cb71f08) (cherry picked from commit 9f6f513eecbdc76ce30b5f2e6c52e02076bac30b) Conflicts: tools/libxl/libxl.c Signed-off-by: Ian Jackson --- tools/libxl/libxl.c | 11 ++++++++--- tools/libxl/libxl_event.c | 4 ++-- tools/libxl/libxl_internal.h | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index ad8adb0..748845d 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -49,6 +49,7 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, ctx->osevent_hooks = 0; + ctx->poller_app = 0; LIBXL_LIST_INIT(&ctx->pollers_event); LIBXL_LIST_INIT(&ctx->pollers_idle); @@ -83,8 +84,11 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, rc = libxl__atfork_init(ctx); if (rc) goto out; - rc = libxl__poller_init(ctx, &ctx->poller_app); - if (rc) goto out; + ctx->poller_app = libxl__poller_get(ctx); + if (!ctx->poller_app) { + rc = ERROR_FAIL; + goto out; + } ctx->xch = xc_interface_open(lg,lg,0); if (!ctx->xch) { @@ -155,7 +159,8 @@ int libxl_ctx_free(libxl_ctx *ctx) libxl_version_info_dispose(&ctx->version_info); if (ctx->xsh) xs_daemon_close(ctx->xsh); - libxl__poller_dispose(&ctx->poller_app); + libxl__poller_put(ctx, ctx->poller_app); + ctx->poller_app = NULL; assert(LIBXL_LIST_EMPTY(&ctx->pollers_event)); libxl__poller *poller, *poller_tmp; LIBXL_LIST_FOREACH_SAFE(poller, &ctx->pollers_idle, entry, poller_tmp) { diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 6111deb..916d87e 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -882,7 +882,7 @@ int libxl_osevent_beforepoll(libxl_ctx *ctx, int *nfds_io, { EGC_INIT(ctx); CTX_LOCK; - int rc = beforepoll_internal(gc, &ctx->poller_app, + int rc = beforepoll_internal(gc, ctx->poller_app, nfds_io, fds, timeout_upd, now); CTX_UNLOCK; EGC_FREE; @@ -1027,7 +1027,7 @@ void libxl_osevent_afterpoll(libxl_ctx *ctx, int nfds, const struct pollfd *fds, { EGC_INIT(ctx); CTX_LOCK; - afterpoll_internal(egc, &ctx->poller_app, nfds, fds, now); + afterpoll_internal(egc, ctx->poller_app, nfds, fds, now); CTX_UNLOCK; EGC_FREE; } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 9d17586..fbac868 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -329,7 +329,7 @@ struct libxl__ctx { /* See the comment for OSEVENT_HOOK_INTERN in libxl_event.c * for restrictions on the use of the osevent fields. */ - libxl__poller poller_app; /* libxl_osevent_beforepoll and _afterpoll */ + libxl__poller *poller_app; /* libxl_osevent_beforepoll and _afterpoll */ LIBXL_LIST_HEAD(, libxl__poller) pollers_event, pollers_idle; LIBXL_SLIST_HEAD(libxl__osevent_hook_nexi, libxl__osevent_hook_nexus) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 07:11:47 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 07:11:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRxXH-0000CL-K1; Wed, 19 Aug 2015 07:11:47 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRxXH-0000C4-5z for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 07:11:47 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 87/C9-01753-23C24D55; Wed, 19 Aug 2015 07:11:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1439968304!34927763!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21922 invoked from network); 19 Aug 2015 07:11:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 07:11:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRxXE-0004VD-LU for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 07:11:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRxXE-0000x8-K6 for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 07:11:44 +0000 Date: Wed, 19 Aug 2015 07:11:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] libxl: poll: Use poller_get and poller_put for poller_app X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0348c450fe253b3db6edc77568820327ff991478 Author: Ian Jackson AuthorDate: Thu Jul 9 17:05:07 2015 +0100 Commit: Ian Jackson CommitDate: Wed Aug 12 12:43:08 2015 +0100 libxl: poll: Use poller_get and poller_put for poller_app This makes the code more regular. We are going to want to do some more work in poller_get and poller_put, which work also wants to be done for poller_app. Two very minor functional changes: * We call malloc an extra time since poller_app is now a pointer * ERROR_FAIL on poller_get failing for poller_app is generated in libxl_ctx_init rather than passed through by libxl_poller_init from libxl__pipe_nonblock. Signed-off-by: Ian Jackson CC: Jim Fehlig Acked-by: Wei Liu Tested-by: Jim Fehlig (cherry picked from commit aae37652067eafd0f2b85050306772df0cb71f08) (cherry picked from commit 9f6f513eecbdc76ce30b5f2e6c52e02076bac30b) Conflicts: tools/libxl/libxl.c Signed-off-by: Ian Jackson --- tools/libxl/libxl.c | 11 ++++++++--- tools/libxl/libxl_event.c | 4 ++-- tools/libxl/libxl_internal.h | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index ad8adb0..748845d 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -49,6 +49,7 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, ctx->osevent_hooks = 0; + ctx->poller_app = 0; LIBXL_LIST_INIT(&ctx->pollers_event); LIBXL_LIST_INIT(&ctx->pollers_idle); @@ -83,8 +84,11 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, rc = libxl__atfork_init(ctx); if (rc) goto out; - rc = libxl__poller_init(ctx, &ctx->poller_app); - if (rc) goto out; + ctx->poller_app = libxl__poller_get(ctx); + if (!ctx->poller_app) { + rc = ERROR_FAIL; + goto out; + } ctx->xch = xc_interface_open(lg,lg,0); if (!ctx->xch) { @@ -155,7 +159,8 @@ int libxl_ctx_free(libxl_ctx *ctx) libxl_version_info_dispose(&ctx->version_info); if (ctx->xsh) xs_daemon_close(ctx->xsh); - libxl__poller_dispose(&ctx->poller_app); + libxl__poller_put(ctx, ctx->poller_app); + ctx->poller_app = NULL; assert(LIBXL_LIST_EMPTY(&ctx->pollers_event)); libxl__poller *poller, *poller_tmp; LIBXL_LIST_FOREACH_SAFE(poller, &ctx->pollers_idle, entry, poller_tmp) { diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 6111deb..916d87e 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -882,7 +882,7 @@ int libxl_osevent_beforepoll(libxl_ctx *ctx, int *nfds_io, { EGC_INIT(ctx); CTX_LOCK; - int rc = beforepoll_internal(gc, &ctx->poller_app, + int rc = beforepoll_internal(gc, ctx->poller_app, nfds_io, fds, timeout_upd, now); CTX_UNLOCK; EGC_FREE; @@ -1027,7 +1027,7 @@ void libxl_osevent_afterpoll(libxl_ctx *ctx, int nfds, const struct pollfd *fds, { EGC_INIT(ctx); CTX_LOCK; - afterpoll_internal(egc, &ctx->poller_app, nfds, fds, now); + afterpoll_internal(egc, ctx->poller_app, nfds, fds, now); CTX_UNLOCK; EGC_FREE; } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 9d17586..fbac868 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -329,7 +329,7 @@ struct libxl__ctx { /* See the comment for OSEVENT_HOOK_INTERN in libxl_event.c * for restrictions on the use of the osevent fields. */ - libxl__poller poller_app; /* libxl_osevent_beforepoll and _afterpoll */ + libxl__poller *poller_app; /* libxl_osevent_beforepoll and _afterpoll */ LIBXL_LIST_HEAD(, libxl__poller) pollers_event, pollers_idle; LIBXL_SLIST_HEAD(libxl__osevent_hook_nexi, libxl__osevent_hook_nexus) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 07:11:58 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 07:11:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRxXS-0000Eb-MX; Wed, 19 Aug 2015 07:11:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRxXR-0000EL-IS for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 07:11:57 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 01/15-29649-C3C24D55; Wed, 19 Aug 2015 07:11:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1439968315!36052539!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 808 invoked from network); 19 Aug 2015 07:11:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 07:11:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRxXO-0004VL-Pj for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 07:11:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRxXO-0000xW-Of for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 07:11:54 +0000 Date: Wed, 19 Aug 2015 07:11:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] libxl: poll: Avoid fd deregistration race POLLNVAL crash X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3646b134c1673f09c0a239de10b0da4c9265c8e8 Author: Ian Jackson AuthorDate: Thu Jul 9 17:28:48 2015 +0100 Commit: Ian Jackson CommitDate: Wed Aug 12 12:45:23 2015 +0100 libxl: poll: Avoid fd deregistration race POLLNVAL crash It can happen that an fd is deregistered, and closed, and then a new fd opened, and reregistered, all while another thread is in poll(). If this happens poll might report POLLNVAL, but the event loop would think that the fd was supposed to have been valid, and then fail an assertion: libxl_event.c:1183: afterpoll_check_fd: Assertion `poller->fds_changed || !(fds[slot].revents & 0x020)' failed. We can't simply ignore POLLNVAL because if we have bugs which cause messed-up fds, it is a serious problem which we really need to detect. Instead, add extra tracking to spot when this possibility arises, and abort on POLLNVAL if we are sure that it is unexpected. Reported-by: Jim Fehlig Signed-off-by: Ian Jackson CC: Jim Fehlig Acked-by: Wei Liu Tested-by: Jim Fehlig (cherry picked from commit 681ce1681622a46d111cfdc4fc07e4cb565ae131) (cherry picked from commit 7f7642f778b78e8e204fc082ce03072bb26887c7) And, adjusted for semantic conflict over CTX vs ctx. Signed-off-by: Ian Jackson --- tools/libxl/libxl.c | 2 ++ tools/libxl/libxl_event.c | 12 +++++++++++- tools/libxl/libxl_internal.h | 13 +++++++++++++ 3 files changed, 26 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 748845d..24c3f6e 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -52,6 +52,7 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, ctx->poller_app = 0; LIBXL_LIST_INIT(&ctx->pollers_event); LIBXL_LIST_INIT(&ctx->pollers_idle); + LIBXL_LIST_INIT(&ctx->pollers_fds_changed); LIBXL_LIST_INIT(&ctx->efds); LIBXL_TAILQ_INIT(&ctx->etimes); @@ -162,6 +163,7 @@ int libxl_ctx_free(libxl_ctx *ctx) libxl__poller_put(ctx, ctx->poller_app); ctx->poller_app = NULL; assert(LIBXL_LIST_EMPTY(&ctx->pollers_event)); + assert(LIBXL_LIST_EMPTY(&ctx->pollers_fds_changed)); libxl__poller *poller, *poller_tmp; LIBXL_LIST_FOREACH_SAFE(poller, &ctx->pollers_idle, entry, poller_tmp) { libxl__poller_dispose(poller); diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 916d87e..eb94521 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -220,6 +220,7 @@ int libxl__ev_fd_modify(libxl__gc *gc, libxl__ev_fd *ev, short events) void libxl__ev_fd_deregister(libxl__gc *gc, libxl__ev_fd *ev) { CTX_LOCK; + libxl__poller *poller; if (!libxl__ev_fd_isregistered(ev)) { DBG("ev_fd=%p deregister unregistered",ev); @@ -232,6 +233,9 @@ void libxl__ev_fd_deregister(libxl__gc *gc, libxl__ev_fd *ev) LIBXL_LIST_REMOVE(ev, entry); ev->fd = -1; + LIBXL_LIST_FOREACH(poller, &CTX->pollers_fds_changed, fds_changed_entry) + poller->fds_changed = 1; + out: CTX_UNLOCK; } @@ -854,6 +858,8 @@ static int beforepoll_internal(libxl__gc *gc, libxl__poller *poller, *nfds_io = used; + poller->fds_changed = 0; + libxl__ev_time *etime = LIBXL_TAILQ_FIRST(&CTX->etimes); if (etime) { int our_timeout; @@ -918,7 +924,7 @@ static int afterpoll_check_fd(libxl__poller *poller, /* again, stale slot entry */ continue; - assert(!(fds[slot].revents & POLLNVAL)); + assert(poller->fds_changed || !(fds[slot].revents & POLLNVAL)); /* we mask in case requested events have changed */ int slot_revents = fds[slot].revents & events; @@ -1352,6 +1358,7 @@ int libxl__poller_init(libxl_ctx *ctx, libxl__poller *p) int rc; p->fd_polls = 0; p->fd_rindices = 0; + p->fds_changed = 0; rc = libxl__pipe_nonblock(ctx, p->wakeup_pipe); if (rc) goto out; @@ -1393,12 +1400,15 @@ libxl__poller *libxl__poller_get(libxl_ctx *ctx) } } + LIBXL_LIST_INSERT_HEAD(&ctx->pollers_fds_changed, p, + fds_changed_entry); return p; } void libxl__poller_put(libxl_ctx *ctx, libxl__poller *p) { if (!p) return; + LIBXL_LIST_REMOVE(p, fds_changed_entry); LIBXL_LIST_INSERT_HEAD(&ctx->pollers_idle, p, entry); } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index fbac868..798b68d 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -290,6 +290,18 @@ struct libxl__poller { int (*fd_rindices)[3]; /* see libxl_event.c:beforepoll_internal */ int wakeup_pipe[2]; /* 0 means no fd allocated */ + + /* + * We also use the poller to record whether any fds have been + * deregistered since we entered poll. Each poller which is not + * idle is on the list pollers_fds_changed. fds_changed is + * cleared by beforepoll, and tested by afterpoll. Whenever an fd + * event is deregistered, we set the fds_changed of all non-idle + * pollers. So afterpoll can tell whether any POLLNVAL is + * plausibly due to an fd being closed and reopened. + */ + LIBXL_LIST_ENTRY(libxl__poller) fds_changed_entry; + bool fds_changed; }; struct libxl__gc { @@ -331,6 +343,7 @@ struct libxl__ctx { libxl__poller *poller_app; /* libxl_osevent_beforepoll and _afterpoll */ LIBXL_LIST_HEAD(, libxl__poller) pollers_event, pollers_idle; + LIBXL_LIST_HEAD(, libxl__poller) pollers_fds_changed; LIBXL_SLIST_HEAD(libxl__osevent_hook_nexi, libxl__osevent_hook_nexus) hook_fd_nexi_idle, hook_timeout_nexi_idle; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 07:11:58 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 07:11:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRxXS-0000Eb-MX; Wed, 19 Aug 2015 07:11:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRxXR-0000EL-IS for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 07:11:57 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 01/15-29649-C3C24D55; Wed, 19 Aug 2015 07:11:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1439968315!36052539!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 808 invoked from network); 19 Aug 2015 07:11:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 07:11:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZRxXO-0004VL-Pj for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 07:11:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZRxXO-0000xW-Of for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 07:11:54 +0000 Date: Wed, 19 Aug 2015 07:11:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] libxl: poll: Avoid fd deregistration race POLLNVAL crash X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3646b134c1673f09c0a239de10b0da4c9265c8e8 Author: Ian Jackson AuthorDate: Thu Jul 9 17:28:48 2015 +0100 Commit: Ian Jackson CommitDate: Wed Aug 12 12:45:23 2015 +0100 libxl: poll: Avoid fd deregistration race POLLNVAL crash It can happen that an fd is deregistered, and closed, and then a new fd opened, and reregistered, all while another thread is in poll(). If this happens poll might report POLLNVAL, but the event loop would think that the fd was supposed to have been valid, and then fail an assertion: libxl_event.c:1183: afterpoll_check_fd: Assertion `poller->fds_changed || !(fds[slot].revents & 0x020)' failed. We can't simply ignore POLLNVAL because if we have bugs which cause messed-up fds, it is a serious problem which we really need to detect. Instead, add extra tracking to spot when this possibility arises, and abort on POLLNVAL if we are sure that it is unexpected. Reported-by: Jim Fehlig Signed-off-by: Ian Jackson CC: Jim Fehlig Acked-by: Wei Liu Tested-by: Jim Fehlig (cherry picked from commit 681ce1681622a46d111cfdc4fc07e4cb565ae131) (cherry picked from commit 7f7642f778b78e8e204fc082ce03072bb26887c7) And, adjusted for semantic conflict over CTX vs ctx. Signed-off-by: Ian Jackson --- tools/libxl/libxl.c | 2 ++ tools/libxl/libxl_event.c | 12 +++++++++++- tools/libxl/libxl_internal.h | 13 +++++++++++++ 3 files changed, 26 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 748845d..24c3f6e 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -52,6 +52,7 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, ctx->poller_app = 0; LIBXL_LIST_INIT(&ctx->pollers_event); LIBXL_LIST_INIT(&ctx->pollers_idle); + LIBXL_LIST_INIT(&ctx->pollers_fds_changed); LIBXL_LIST_INIT(&ctx->efds); LIBXL_TAILQ_INIT(&ctx->etimes); @@ -162,6 +163,7 @@ int libxl_ctx_free(libxl_ctx *ctx) libxl__poller_put(ctx, ctx->poller_app); ctx->poller_app = NULL; assert(LIBXL_LIST_EMPTY(&ctx->pollers_event)); + assert(LIBXL_LIST_EMPTY(&ctx->pollers_fds_changed)); libxl__poller *poller, *poller_tmp; LIBXL_LIST_FOREACH_SAFE(poller, &ctx->pollers_idle, entry, poller_tmp) { libxl__poller_dispose(poller); diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 916d87e..eb94521 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -220,6 +220,7 @@ int libxl__ev_fd_modify(libxl__gc *gc, libxl__ev_fd *ev, short events) void libxl__ev_fd_deregister(libxl__gc *gc, libxl__ev_fd *ev) { CTX_LOCK; + libxl__poller *poller; if (!libxl__ev_fd_isregistered(ev)) { DBG("ev_fd=%p deregister unregistered",ev); @@ -232,6 +233,9 @@ void libxl__ev_fd_deregister(libxl__gc *gc, libxl__ev_fd *ev) LIBXL_LIST_REMOVE(ev, entry); ev->fd = -1; + LIBXL_LIST_FOREACH(poller, &CTX->pollers_fds_changed, fds_changed_entry) + poller->fds_changed = 1; + out: CTX_UNLOCK; } @@ -854,6 +858,8 @@ static int beforepoll_internal(libxl__gc *gc, libxl__poller *poller, *nfds_io = used; + poller->fds_changed = 0; + libxl__ev_time *etime = LIBXL_TAILQ_FIRST(&CTX->etimes); if (etime) { int our_timeout; @@ -918,7 +924,7 @@ static int afterpoll_check_fd(libxl__poller *poller, /* again, stale slot entry */ continue; - assert(!(fds[slot].revents & POLLNVAL)); + assert(poller->fds_changed || !(fds[slot].revents & POLLNVAL)); /* we mask in case requested events have changed */ int slot_revents = fds[slot].revents & events; @@ -1352,6 +1358,7 @@ int libxl__poller_init(libxl_ctx *ctx, libxl__poller *p) int rc; p->fd_polls = 0; p->fd_rindices = 0; + p->fds_changed = 0; rc = libxl__pipe_nonblock(ctx, p->wakeup_pipe); if (rc) goto out; @@ -1393,12 +1400,15 @@ libxl__poller *libxl__poller_get(libxl_ctx *ctx) } } + LIBXL_LIST_INSERT_HEAD(&ctx->pollers_fds_changed, p, + fds_changed_entry); return p; } void libxl__poller_put(libxl_ctx *ctx, libxl__poller *p) { if (!p) return; + LIBXL_LIST_REMOVE(p, fds_changed_entry); LIBXL_LIST_INSERT_HEAD(&ctx->pollers_idle, p, entry); } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index fbac868..798b68d 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -290,6 +290,18 @@ struct libxl__poller { int (*fd_rindices)[3]; /* see libxl_event.c:beforepoll_internal */ int wakeup_pipe[2]; /* 0 means no fd allocated */ + + /* + * We also use the poller to record whether any fds have been + * deregistered since we entered poll. Each poller which is not + * idle is on the list pollers_fds_changed. fds_changed is + * cleared by beforepoll, and tested by afterpoll. Whenever an fd + * event is deregistered, we set the fds_changed of all non-idle + * pollers. So afterpoll can tell whether any POLLNVAL is + * plausibly due to an fd being closed and reopened. + */ + LIBXL_LIST_ENTRY(libxl__poller) fds_changed_entry; + bool fds_changed; }; struct libxl__gc { @@ -331,6 +343,7 @@ struct libxl__ctx { libxl__poller *poller_app; /* libxl_osevent_beforepoll and _afterpoll */ LIBXL_LIST_HEAD(, libxl__poller) pollers_event, pollers_idle; + LIBXL_LIST_HEAD(, libxl__poller) pollers_fds_changed; LIBXL_SLIST_HEAD(libxl__osevent_hook_nexi, libxl__osevent_hook_nexus) hook_fd_nexi_idle, hook_timeout_nexi_idle; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 10:22:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 10:22:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0VU-0001vc-3n; Wed, 19 Aug 2015 10:22:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0VS-0001vX-7O for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:22:06 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id DF/EA-00475-DC854D55; Wed, 19 Aug 2015 10:22:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1439979723!35972425!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2294 invoked from network); 19 Aug 2015 10:22:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 10:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0VP-0006qq-MU for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZS0VP-0002gN-JM for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:22:03 +0000 Date: Wed, 19 Aug 2015 10:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 25f9f143b9e958ffce04f9d6a498c8315818f49b Author: Ian Jackson AuthorDate: Wed Jul 29 16:34:52 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jul 29 16:34:52 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 5e5d453..95c2875 100644 --- a/Config.mk +++ b/Config.mk @@ -224,9 +224,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 8d882026216a2b9afe74d4b1ef99433620e0ba0a -# Sun May 24 10:53:44 2015 +0200 -# pcnet: force the buffer access to be in bounds during tx +QEMU_TAG ?= e1db2596d7c5f8be876481148d407f0cb207b494 +# Wed Jun 3 14:41:27 2015 +0200 +# ide: Clear DRQ after handling all expected accesses # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 10:22:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 10:22:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0VU-0001vc-3n; Wed, 19 Aug 2015 10:22:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0VS-0001vX-7O for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:22:06 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id DF/EA-00475-DC854D55; Wed, 19 Aug 2015 10:22:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1439979723!35972425!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2294 invoked from network); 19 Aug 2015 10:22:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 10:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0VP-0006qq-MU for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZS0VP-0002gN-JM for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:22:03 +0000 Date: Wed, 19 Aug 2015 10:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 25f9f143b9e958ffce04f9d6a498c8315818f49b Author: Ian Jackson AuthorDate: Wed Jul 29 16:34:52 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jul 29 16:34:52 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 5e5d453..95c2875 100644 --- a/Config.mk +++ b/Config.mk @@ -224,9 +224,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 8d882026216a2b9afe74d4b1ef99433620e0ba0a -# Sun May 24 10:53:44 2015 +0200 -# pcnet: force the buffer access to be in bounds during tx +QEMU_TAG ?= e1db2596d7c5f8be876481148d407f0cb207b494 +# Wed Jun 3 14:41:27 2015 +0200 +# ide: Clear DRQ after handling all expected accesses # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 10:22:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 10:22:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Ve-0001wI-6G; Wed, 19 Aug 2015 10:22:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Vd-0001wA-BY for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:22:17 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 38/30-10678-8D854D55; Wed, 19 Aug 2015 10:22:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1439979734!36135439!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10369 invoked from network); 19 Aug 2015 10:22:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 10:22:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Va-0006qy-1g for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZS0VZ-0002hT-US for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:22:13 +0000 Date: Wed, 19 Aug 2015 10:22:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] xl: Sane handling of extra config file arguments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d7ab3a1c1cc245dc0683bb937467c27141754053 Author: Ian Jackson AuthorDate: Mon Jun 15 14:50:42 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jul 29 16:40:08 2015 +0100 xl: Sane handling of extra config file arguments Various xl sub-commands take additional parameters containing = as additional config fragments. The handling of these config fragments has a number of bugs: 1. Use of a static 1024-byte buffer. (If truncation would occur, with semi-trusted input, a security risk arises due to quotes being lost.) 2. Mishandling of the return value from snprintf, so that if truncation occurs, the to-write pointer is updated with the wanted-to-write length, resulting in stack corruption. (This is XSA-137.) 3. Clone-and-hack of the code for constructing the appended config file. These are fixed here, by introducing a new function `string_realloc_append' and using it everywhere. The `extra_info' buffers are replaced by pointers, which start off NULL and are explicitly freed on all return paths. The separate variable which will become dom_info.extra_config is abolished (which involves moving the clearing of dom_info). Additional bugs I observe, not fixed here: 4. The functions which now call string_realloc_append use ad-hoc error returns, with multiple calls to `return'. This currently necessitates multiple new calls to `free'. 5. Many of the paths in xl call exit(-rc) where rc is a libxl status code. This is a ridiculous exit status `convention'. 6. The loops for handling extra config data are clone-and-hacks. 7. Once the extra config buffer is accumulated, it must be combined with the appropriate main config file. The code to do this combining is clone-and-hacked too. Signed-off-by: Ian Jackson Tested-by: Ian Jackson Acked-by: Ian Campbell (cherry picked from commit dd84604f35bd3855c57146eb8fe53924c10d3963) (cherry picked from commit 6040b3aeb32b4bce2d9958ecbcbd020c46c35d61) (cherry picked from commit 214fd40a20fa5988b4ea021c2d06e8aca8dda184) --- tools/libxl/xl_cmdimpl.c | 64 ++++++++++++++++++++++++++++----------------- 1 files changed, 40 insertions(+), 24 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index b251f4c..95919eb 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -133,7 +133,7 @@ struct domain_create { int vncautopass; int console_autoconnect; const char *config_file; - const char *extra_config; /* extra config string */ + char *extra_config; /* extra config string */ const char *restore_file; int migrate_fd; /* -1 means none */ char **migration_domname_r; /* from malloc */ @@ -4123,11 +4123,25 @@ int main_vm_list(int argc, char **argv) return 0; } +static void string_realloc_append(char **accumulate, const char *more) +{ + /* Appends more to accumulate. Accumulate is either NULL, or + * points (always) to a malloc'd nul-terminated string. */ + + size_t oldlen = *accumulate ? strlen(*accumulate) : 0; + size_t morelen = strlen(more) + 1/*nul*/; + if (oldlen > SSIZE_MAX || morelen > SSIZE_MAX - oldlen) { + fprintf(stderr,"Additional config data far too large\n"); + exit(-ERROR_FAIL); + } + + *accumulate = xrealloc(*accumulate, oldlen + morelen); + memcpy(*accumulate + oldlen, more, morelen); +} + int main_create(int argc, char **argv) { const char *filename = NULL; - char *p; - char extra_config[1024]; struct domain_create dom_info; int paused = 0, debug = 0, daemonize = 1, console_autoconnect = 0, quiet = 0, monitor = 1, vnc = 0, vncautopass = 0; @@ -4142,6 +4156,8 @@ int main_create(int argc, char **argv) {0, 0, 0, 0} }; + dom_info.extra_config = NULL; + if (argv[1] && argv[1][0] != '-' && !strchr(argv[1], '=')) { filename = argv[1]; argc--; argv++; @@ -4181,20 +4197,21 @@ int main_create(int argc, char **argv) break; } - extra_config[0] = '\0'; - for (p = extra_config; optind < argc; optind++) { + memset(&dom_info, 0, sizeof(dom_info)); + + for (; optind < argc; optind++) { if (strchr(argv[optind], '=') != NULL) { - p += snprintf(p, sizeof(extra_config) - (p - extra_config), - "%s\n", argv[optind]); + string_realloc_append(&dom_info.extra_config, argv[optind]); + string_realloc_append(&dom_info.extra_config, "\n"); } else if (!filename) { filename = argv[optind]; } else { help("create"); + free(dom_info.extra_config); return 2; } } - memset(&dom_info, 0, sizeof(dom_info)); dom_info.debug = debug; dom_info.daemonize = daemonize; dom_info.monitor = monitor; @@ -4202,16 +4219,18 @@ int main_create(int argc, char **argv) dom_info.dryrun = dryrun_only; dom_info.quiet = quiet; dom_info.config_file = filename; - dom_info.extra_config = extra_config; dom_info.migrate_fd = -1; dom_info.vnc = vnc; dom_info.vncautopass = vncautopass; dom_info.console_autoconnect = console_autoconnect; rc = create_domain(&dom_info); - if (rc < 0) + if (rc < 0) { + free(dom_info.extra_config); return -rc; + } + free(dom_info.extra_config); return 0; } @@ -4219,8 +4238,7 @@ int main_config_update(int argc, char **argv) { uint32_t domid; const char *filename = NULL; - char *p; - char extra_config[1024]; + char *extra_config = NULL; void *config_data = 0; int config_len = 0; libxl_domain_config d_config; @@ -4255,15 +4273,15 @@ int main_config_update(int argc, char **argv) break; } - extra_config[0] = '\0'; - for (p = extra_config; optind < argc; optind++) { + for (; optind < argc; optind++) { if (strchr(argv[optind], '=') != NULL) { - p += snprintf(p, sizeof(extra_config) - (p - extra_config), - "%s\n", argv[optind]); + string_realloc_append(&extra_config, argv[optind]); + string_realloc_append(&extra_config, "\n"); } else if (!filename) { filename = argv[optind]; } else { help("create"); + free(extra_config); return 2; } } @@ -4272,7 +4290,8 @@ int main_config_update(int argc, char **argv) rc = libxl_read_file_contents(ctx, filename, &config_data, &config_len); if (rc) { fprintf(stderr, "Failed to read config file: %s: %s\n", - filename, strerror(errno)); return ERROR_FAIL; } + filename, strerror(errno)); + free(extra_config); return ERROR_FAIL; } if (strlen(extra_config)) { if (config_len > INT_MAX - (strlen(extra_config) + 2 + 1)) { fprintf(stderr, "Failed to attach extra configration\n"); @@ -4313,7 +4332,7 @@ int main_config_update(int argc, char **argv) libxl_domain_config_dispose(&d_config); free(config_data); - + free(extra_config); return 0; } @@ -6333,7 +6352,7 @@ int main_cpupoolcreate(int argc, char **argv) { const char *filename = NULL, *config_src=NULL; const char *p; - char extra_config[1024]; + char *extra_config = NULL; int opt; static struct option opts[] = { {"defconfig", 1, 0, 'f'}, @@ -6367,13 +6386,10 @@ int main_cpupoolcreate(int argc, char **argv) break; } - memset(extra_config, 0, sizeof(extra_config)); while (optind < argc) { if ((p = strchr(argv[optind], '='))) { - if (strlen(extra_config) + 1 + strlen(argv[optind]) < sizeof(extra_config)) { - strcat(extra_config, "\n"); - strcat(extra_config, argv[optind]); - } + string_realloc_append(&extra_config, "\n"); + string_realloc_append(&extra_config, argv[optind]); } else if (!filename) { filename = argv[optind]; } else { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 10:22:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 10:22:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Ve-0001wI-6G; Wed, 19 Aug 2015 10:22:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Vd-0001wA-BY for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:22:17 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 38/30-10678-8D854D55; Wed, 19 Aug 2015 10:22:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1439979734!36135439!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10369 invoked from network); 19 Aug 2015 10:22:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 10:22:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Va-0006qy-1g for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZS0VZ-0002hT-US for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:22:13 +0000 Date: Wed, 19 Aug 2015 10:22:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] xl: Sane handling of extra config file arguments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d7ab3a1c1cc245dc0683bb937467c27141754053 Author: Ian Jackson AuthorDate: Mon Jun 15 14:50:42 2015 +0100 Commit: Ian Jackson CommitDate: Wed Jul 29 16:40:08 2015 +0100 xl: Sane handling of extra config file arguments Various xl sub-commands take additional parameters containing = as additional config fragments. The handling of these config fragments has a number of bugs: 1. Use of a static 1024-byte buffer. (If truncation would occur, with semi-trusted input, a security risk arises due to quotes being lost.) 2. Mishandling of the return value from snprintf, so that if truncation occurs, the to-write pointer is updated with the wanted-to-write length, resulting in stack corruption. (This is XSA-137.) 3. Clone-and-hack of the code for constructing the appended config file. These are fixed here, by introducing a new function `string_realloc_append' and using it everywhere. The `extra_info' buffers are replaced by pointers, which start off NULL and are explicitly freed on all return paths. The separate variable which will become dom_info.extra_config is abolished (which involves moving the clearing of dom_info). Additional bugs I observe, not fixed here: 4. The functions which now call string_realloc_append use ad-hoc error returns, with multiple calls to `return'. This currently necessitates multiple new calls to `free'. 5. Many of the paths in xl call exit(-rc) where rc is a libxl status code. This is a ridiculous exit status `convention'. 6. The loops for handling extra config data are clone-and-hacks. 7. Once the extra config buffer is accumulated, it must be combined with the appropriate main config file. The code to do this combining is clone-and-hacked too. Signed-off-by: Ian Jackson Tested-by: Ian Jackson Acked-by: Ian Campbell (cherry picked from commit dd84604f35bd3855c57146eb8fe53924c10d3963) (cherry picked from commit 6040b3aeb32b4bce2d9958ecbcbd020c46c35d61) (cherry picked from commit 214fd40a20fa5988b4ea021c2d06e8aca8dda184) --- tools/libxl/xl_cmdimpl.c | 64 ++++++++++++++++++++++++++++----------------- 1 files changed, 40 insertions(+), 24 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index b251f4c..95919eb 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -133,7 +133,7 @@ struct domain_create { int vncautopass; int console_autoconnect; const char *config_file; - const char *extra_config; /* extra config string */ + char *extra_config; /* extra config string */ const char *restore_file; int migrate_fd; /* -1 means none */ char **migration_domname_r; /* from malloc */ @@ -4123,11 +4123,25 @@ int main_vm_list(int argc, char **argv) return 0; } +static void string_realloc_append(char **accumulate, const char *more) +{ + /* Appends more to accumulate. Accumulate is either NULL, or + * points (always) to a malloc'd nul-terminated string. */ + + size_t oldlen = *accumulate ? strlen(*accumulate) : 0; + size_t morelen = strlen(more) + 1/*nul*/; + if (oldlen > SSIZE_MAX || morelen > SSIZE_MAX - oldlen) { + fprintf(stderr,"Additional config data far too large\n"); + exit(-ERROR_FAIL); + } + + *accumulate = xrealloc(*accumulate, oldlen + morelen); + memcpy(*accumulate + oldlen, more, morelen); +} + int main_create(int argc, char **argv) { const char *filename = NULL; - char *p; - char extra_config[1024]; struct domain_create dom_info; int paused = 0, debug = 0, daemonize = 1, console_autoconnect = 0, quiet = 0, monitor = 1, vnc = 0, vncautopass = 0; @@ -4142,6 +4156,8 @@ int main_create(int argc, char **argv) {0, 0, 0, 0} }; + dom_info.extra_config = NULL; + if (argv[1] && argv[1][0] != '-' && !strchr(argv[1], '=')) { filename = argv[1]; argc--; argv++; @@ -4181,20 +4197,21 @@ int main_create(int argc, char **argv) break; } - extra_config[0] = '\0'; - for (p = extra_config; optind < argc; optind++) { + memset(&dom_info, 0, sizeof(dom_info)); + + for (; optind < argc; optind++) { if (strchr(argv[optind], '=') != NULL) { - p += snprintf(p, sizeof(extra_config) - (p - extra_config), - "%s\n", argv[optind]); + string_realloc_append(&dom_info.extra_config, argv[optind]); + string_realloc_append(&dom_info.extra_config, "\n"); } else if (!filename) { filename = argv[optind]; } else { help("create"); + free(dom_info.extra_config); return 2; } } - memset(&dom_info, 0, sizeof(dom_info)); dom_info.debug = debug; dom_info.daemonize = daemonize; dom_info.monitor = monitor; @@ -4202,16 +4219,18 @@ int main_create(int argc, char **argv) dom_info.dryrun = dryrun_only; dom_info.quiet = quiet; dom_info.config_file = filename; - dom_info.extra_config = extra_config; dom_info.migrate_fd = -1; dom_info.vnc = vnc; dom_info.vncautopass = vncautopass; dom_info.console_autoconnect = console_autoconnect; rc = create_domain(&dom_info); - if (rc < 0) + if (rc < 0) { + free(dom_info.extra_config); return -rc; + } + free(dom_info.extra_config); return 0; } @@ -4219,8 +4238,7 @@ int main_config_update(int argc, char **argv) { uint32_t domid; const char *filename = NULL; - char *p; - char extra_config[1024]; + char *extra_config = NULL; void *config_data = 0; int config_len = 0; libxl_domain_config d_config; @@ -4255,15 +4273,15 @@ int main_config_update(int argc, char **argv) break; } - extra_config[0] = '\0'; - for (p = extra_config; optind < argc; optind++) { + for (; optind < argc; optind++) { if (strchr(argv[optind], '=') != NULL) { - p += snprintf(p, sizeof(extra_config) - (p - extra_config), - "%s\n", argv[optind]); + string_realloc_append(&extra_config, argv[optind]); + string_realloc_append(&extra_config, "\n"); } else if (!filename) { filename = argv[optind]; } else { help("create"); + free(extra_config); return 2; } } @@ -4272,7 +4290,8 @@ int main_config_update(int argc, char **argv) rc = libxl_read_file_contents(ctx, filename, &config_data, &config_len); if (rc) { fprintf(stderr, "Failed to read config file: %s: %s\n", - filename, strerror(errno)); return ERROR_FAIL; } + filename, strerror(errno)); + free(extra_config); return ERROR_FAIL; } if (strlen(extra_config)) { if (config_len > INT_MAX - (strlen(extra_config) + 2 + 1)) { fprintf(stderr, "Failed to attach extra configration\n"); @@ -4313,7 +4332,7 @@ int main_config_update(int argc, char **argv) libxl_domain_config_dispose(&d_config); free(config_data); - + free(extra_config); return 0; } @@ -6333,7 +6352,7 @@ int main_cpupoolcreate(int argc, char **argv) { const char *filename = NULL, *config_src=NULL; const char *p; - char extra_config[1024]; + char *extra_config = NULL; int opt; static struct option opts[] = { {"defconfig", 1, 0, 'f'}, @@ -6367,13 +6386,10 @@ int main_cpupoolcreate(int argc, char **argv) break; } - memset(extra_config, 0, sizeof(extra_config)); while (optind < argc) { if ((p = strchr(argv[optind], '='))) { - if (strlen(extra_config) + 1 + strlen(argv[optind]) < sizeof(extra_config)) { - strcat(extra_config, "\n"); - strcat(extra_config, argv[optind]); - } + string_realloc_append(&extra_config, "\n"); + string_realloc_append(&extra_config, argv[optind]); } else if (!filename) { filename = argv[optind]; } else { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 10:22:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 10:22:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Vo-0001xn-Av; Wed, 19 Aug 2015 10:22:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Vn-0001xd-Hp for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:22:27 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id 18/5C-19125-2E854D55; Wed, 19 Aug 2015 10:22:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1439979745!29014820!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13495 invoked from network); 19 Aug 2015 10:22:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 10:22:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Vl-0006rA-6f for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:22:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZS0Vk-0002i7-Aj for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:22:24 +0000 Date: Wed, 19 Aug 2015 10:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] docs: workaround markdown parser error in xen-command-line.markdown X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f558eb43bf6f381853ef010d2d7ba9327481d2de Author: Ian Campbell AuthorDate: Wed Nov 19 10:42:18 2014 +0000 Commit: Ian Jackson CommitDate: Wed Aug 12 11:46:50 2015 +0100 docs: workaround markdown parser error in xen-command-line.markdown Some versions of markdown (specifically the one in Debian Wheezy, currently used to generate http://xenbits.xen.org/docs/unstable/misc/xen-command-line.html) seem to be confused by nested lists in the middle of multi-paragraph parent list entries as seen in the com1,com2 entry. The effect is that the "Default" section of all following entries are replace by some sort of hash or checksum (at least, a string of 32 random seeming hex digits). Workaround this issue by making the decriptions of the DPS options a nested list, moving the existing nested list describing the options for S into a third level list. This seems to avoid the issue, and is arguably better formatting in its own right (at least its not a regression IMHO) Signed-off-by: Ian Campbell Reviewed-by: Andrew Cooper (cherry picked from commit ae325e94d2076f3953824e069c062908221f7325) (cherry picked from commit 3e9054c523ed089d04cf10b7f5b417240be85760) --- docs/misc/xen-command-line.markdown | 21 ++++++++------------- 1 files changed, 8 insertions(+), 13 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 64c6fb7..963936c 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -211,19 +211,14 @@ Both option `com1` and `com2` follow the same format. * Optionally, a clock speed measured in hz can be specified. * `DPS` represents the number of data bits, the parity, and the number of stop bits. - - `D` is an integer between 5 and 8 for the number of data bits. - - `P` is a single character representing the type of parity: - - * `n` No - * `o` Odd - * `e` Even - * `m` Mark - * `s` Space - - `S` is an integer 1 or 2 for the number of stop bits. - + * `D` is an integer between 5 and 8 for the number of data bits. + * `P` is a single character representing the type of parity: + * `n` No + * `o` Odd + * `e` Even + * `m` Mark + * `s` Space + * `S` is an integer 1 or 2 for the number of stop bits. * `` is an integer which specifies the IO base port for UART registers. * `` is the IRQ number to use, or `0` to use the UART in poll -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 10:22:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 10:22:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Vo-0001xn-Av; Wed, 19 Aug 2015 10:22:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Vn-0001xd-Hp for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:22:27 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id 18/5C-19125-2E854D55; Wed, 19 Aug 2015 10:22:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1439979745!29014820!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13495 invoked from network); 19 Aug 2015 10:22:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 10:22:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Vl-0006rA-6f for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:22:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZS0Vk-0002i7-Aj for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:22:24 +0000 Date: Wed, 19 Aug 2015 10:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] docs: workaround markdown parser error in xen-command-line.markdown X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f558eb43bf6f381853ef010d2d7ba9327481d2de Author: Ian Campbell AuthorDate: Wed Nov 19 10:42:18 2014 +0000 Commit: Ian Jackson CommitDate: Wed Aug 12 11:46:50 2015 +0100 docs: workaround markdown parser error in xen-command-line.markdown Some versions of markdown (specifically the one in Debian Wheezy, currently used to generate http://xenbits.xen.org/docs/unstable/misc/xen-command-line.html) seem to be confused by nested lists in the middle of multi-paragraph parent list entries as seen in the com1,com2 entry. The effect is that the "Default" section of all following entries are replace by some sort of hash or checksum (at least, a string of 32 random seeming hex digits). Workaround this issue by making the decriptions of the DPS options a nested list, moving the existing nested list describing the options for S into a third level list. This seems to avoid the issue, and is arguably better formatting in its own right (at least its not a regression IMHO) Signed-off-by: Ian Campbell Reviewed-by: Andrew Cooper (cherry picked from commit ae325e94d2076f3953824e069c062908221f7325) (cherry picked from commit 3e9054c523ed089d04cf10b7f5b417240be85760) --- docs/misc/xen-command-line.markdown | 21 ++++++++------------- 1 files changed, 8 insertions(+), 13 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 64c6fb7..963936c 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -211,19 +211,14 @@ Both option `com1` and `com2` follow the same format. * Optionally, a clock speed measured in hz can be specified. * `DPS` represents the number of data bits, the parity, and the number of stop bits. - - `D` is an integer between 5 and 8 for the number of data bits. - - `P` is a single character representing the type of parity: - - * `n` No - * `o` Odd - * `e` Even - * `m` Mark - * `s` Space - - `S` is an integer 1 or 2 for the number of stop bits. - + * `D` is an integer between 5 and 8 for the number of data bits. + * `P` is a single character representing the type of parity: + * `n` No + * `o` Odd + * `e` Even + * `m` Mark + * `s` Space + * `S` is an integer 1 or 2 for the number of stop bits. * `` is an integer which specifies the IO base port for UART registers. * `` is the IRQ number to use, or `0` to use the UART in poll -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 10:22:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 10:22:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Vy-0001yx-DN; Wed, 19 Aug 2015 10:22:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Vx-0001yp-VS for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:22:38 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id C4/7A-19220-DE854D55; Wed, 19 Aug 2015 10:22:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1439979755!29014895!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14989 invoked from network); 19 Aug 2015 10:22:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 10:22:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Vv-0006rI-JY for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:22:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZS0Vv-0002io-GJ for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:22:35 +0000 Date: Wed, 19 Aug 2015 10:22:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxl: In domain death search, start search at first domid we want X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0332b3f24b2c1be06a17b00786021aeea01c52f5 Author: Ian Jackson AuthorDate: Tue Mar 17 09:30:57 2015 -0600 Commit: Ian Jackson CommitDate: Wed Aug 12 11:52:25 2015 +0100 libxl: In domain death search, start search at first domid we want From: Ian Jackson When domain_death_xswatch_callback needed a further call to xc_domain_getinfolist it would restart it with the last domain it found rather than the first one it wants. If it only wants one it will also only ask for one domain. The result would then be that it gets the previous domain again (ie, the previous one to the one it wants), which still doesn't reveal the answer to the question, and it would therefore loop again. It's completely unclear to me why I thought it was a good idea to start the xc_domain_getinfolist with the last domain previously found rather than the first one left un-confirmed. The code has been that way since it was introduced. Instead, start each xc_domain_getinfolist at the next domain whose status we need to check. We also need to move the test for !evg into the loop, we now need evg to compute the arguments to getinfolist. Signed-off-by: Ian Jackson Reported-by: Jim Fehlig Reviewed-by: Jim Fehlig Tested-by: Jim Fehlig Acked-by: Wei Liu Acked-by: Ian Campbell (cherry picked from commit 4783c99aab866f470bd59368cfbf5ad5f677b0ec) (cherry picked from commit 0b19348f3cd176e4badb173dd0054c49346a6ce1) (cherry picked from commit 13623d5d8e854f20b2da885f4d452dc870912205) --- tools/libxl/libxl.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index ece9a1f..4a2ba84 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -975,22 +975,20 @@ static void domain_death_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *w, const char *wpath, const char *epath) { EGC_GC; libxl_evgen_domain_death *evg; - uint32_t domid; int rc; CTX_LOCK; evg = LIBXL_TAILQ_FIRST(&CTX->death_list); - if (!evg) goto out; - - domid = evg->domid; for (;;) { + if (!evg) goto out; + int nentries = LIBXL_TAILQ_NEXT(evg, entry) ? 200 : 1; xc_domaininfo_t domaininfos[nentries]; const xc_domaininfo_t *got = domaininfos, *gotend; - rc = xc_domain_getinfolist(CTX->xch, domid, nentries, domaininfos); + rc = xc_domain_getinfolist(CTX->xch, evg->domid, nentries, domaininfos); if (rc == -1) { LIBXL__EVENT_DISASTER(egc, "xc_domain_getinfolist failed while" " processing @releaseDomain watch event", @@ -1000,8 +998,10 @@ static void domain_death_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *w, gotend = &domaininfos[rc]; LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "[evg=%p:%"PRIu32"]" - " from domid=%"PRIu32" nentries=%d rc=%d", - evg, evg->domid, domid, nentries, rc); + " nentries=%d rc=%d %ld..%ld", + evg, evg->domid, nentries, rc, + rc>0 ? (long)domaininfos[0].domain : 0, + rc>0 ? (long)domaininfos[rc-1].domain : 0); for (;;) { if (!evg) { @@ -1064,7 +1064,6 @@ static void domain_death_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *w, } assert(rc); /* rc==0 results in us eating all evgs and quitting */ - domid = gotend[-1].domain; } all_reported: out: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 10:22:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 10:22:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Vy-0001yx-DN; Wed, 19 Aug 2015 10:22:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Vx-0001yp-VS for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:22:38 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id C4/7A-19220-DE854D55; Wed, 19 Aug 2015 10:22:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1439979755!29014895!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14989 invoked from network); 19 Aug 2015 10:22:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 10:22:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Vv-0006rI-JY for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:22:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZS0Vv-0002io-GJ for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:22:35 +0000 Date: Wed, 19 Aug 2015 10:22:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxl: In domain death search, start search at first domid we want X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0332b3f24b2c1be06a17b00786021aeea01c52f5 Author: Ian Jackson AuthorDate: Tue Mar 17 09:30:57 2015 -0600 Commit: Ian Jackson CommitDate: Wed Aug 12 11:52:25 2015 +0100 libxl: In domain death search, start search at first domid we want From: Ian Jackson When domain_death_xswatch_callback needed a further call to xc_domain_getinfolist it would restart it with the last domain it found rather than the first one it wants. If it only wants one it will also only ask for one domain. The result would then be that it gets the previous domain again (ie, the previous one to the one it wants), which still doesn't reveal the answer to the question, and it would therefore loop again. It's completely unclear to me why I thought it was a good idea to start the xc_domain_getinfolist with the last domain previously found rather than the first one left un-confirmed. The code has been that way since it was introduced. Instead, start each xc_domain_getinfolist at the next domain whose status we need to check. We also need to move the test for !evg into the loop, we now need evg to compute the arguments to getinfolist. Signed-off-by: Ian Jackson Reported-by: Jim Fehlig Reviewed-by: Jim Fehlig Tested-by: Jim Fehlig Acked-by: Wei Liu Acked-by: Ian Campbell (cherry picked from commit 4783c99aab866f470bd59368cfbf5ad5f677b0ec) (cherry picked from commit 0b19348f3cd176e4badb173dd0054c49346a6ce1) (cherry picked from commit 13623d5d8e854f20b2da885f4d452dc870912205) --- tools/libxl/libxl.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index ece9a1f..4a2ba84 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -975,22 +975,20 @@ static void domain_death_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *w, const char *wpath, const char *epath) { EGC_GC; libxl_evgen_domain_death *evg; - uint32_t domid; int rc; CTX_LOCK; evg = LIBXL_TAILQ_FIRST(&CTX->death_list); - if (!evg) goto out; - - domid = evg->domid; for (;;) { + if (!evg) goto out; + int nentries = LIBXL_TAILQ_NEXT(evg, entry) ? 200 : 1; xc_domaininfo_t domaininfos[nentries]; const xc_domaininfo_t *got = domaininfos, *gotend; - rc = xc_domain_getinfolist(CTX->xch, domid, nentries, domaininfos); + rc = xc_domain_getinfolist(CTX->xch, evg->domid, nentries, domaininfos); if (rc == -1) { LIBXL__EVENT_DISASTER(egc, "xc_domain_getinfolist failed while" " processing @releaseDomain watch event", @@ -1000,8 +998,10 @@ static void domain_death_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *w, gotend = &domaininfos[rc]; LIBXL__LOG(CTX, LIBXL__LOG_DEBUG, "[evg=%p:%"PRIu32"]" - " from domid=%"PRIu32" nentries=%d rc=%d", - evg, evg->domid, domid, nentries, rc); + " nentries=%d rc=%d %ld..%ld", + evg, evg->domid, nentries, rc, + rc>0 ? (long)domaininfos[0].domain : 0, + rc>0 ? (long)domaininfos[rc-1].domain : 0); for (;;) { if (!evg) { @@ -1064,7 +1064,6 @@ static void domain_death_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *w, } assert(rc); /* rc==0 results in us eating all evgs and quitting */ - domid = gotend[-1].domain; } all_reported: out: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 10:22:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 10:22:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0W9-00020a-Fp; Wed, 19 Aug 2015 10:22:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0W8-00020S-F4 for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:22:48 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id C1/D1-03819-7F854D55; Wed, 19 Aug 2015 10:22:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1439979766!29015639!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20680 invoked from network); 19 Aug 2015 10:22:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 10:22:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0W6-0006rQ-6E for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:22:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZS0W6-0002jx-1q for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:22:46 +0000 Date: Wed, 19 Aug 2015 10:22:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] ocaml/xenctrl: Check return values from hypercalls X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8d0ca8a5e1965e241baf32e2c8dfcd82bb924aac Author: Andrew Cooper AuthorDate: Tue Jan 27 20:38:11 2015 +0000 Commit: Ian Jackson CommitDate: Wed Aug 12 11:57:18 2015 +0100 ocaml/xenctrl: Check return values from hypercalls rather than blindly continuing and possibly using negative values. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Dave Scott Acked-by: David Scott (cherry picked from commit 3380f5b6270e6fa4b24313f8808e7625e4c5a6ba) (cherry picked from commit c91ed889ea3c3781a94a30909f30c3aad56c97d5) (cherry picked from commit 10a95535b0dcde7daa3402b92f3c8d4494781c28) --- tools/ocaml/libs/xc/xenctrl_stubs.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index f5cf0ed..c27c897 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -455,6 +455,9 @@ CAMLprim value stub_xc_vcpu_getaffinity(value xch, value domid, int i, len = xc_get_max_cpus(_H(xch)); int retval; + if (len < 1) + failwith_xc(_H(xch)); + c_cpumap = xc_cpumap_alloc(_H(xch)); if (c_cpumap == NULL) failwith_xc(_H(xch)); @@ -805,6 +808,12 @@ CAMLprim value stub_xc_version_version(value xch) caml_enter_blocking_section(); packed = xc_version(_H(xch), XENVER_version, NULL); + caml_leave_blocking_section(); + + if (packed < 0) + failwith_xc(_H(xch)); + + caml_enter_blocking_section(); retval = xc_version(_H(xch), XENVER_extraversion, &extra); caml_leave_blocking_section(); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 10:22:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 10:22:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0W9-00020a-Fp; Wed, 19 Aug 2015 10:22:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0W8-00020S-F4 for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:22:48 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id C1/D1-03819-7F854D55; Wed, 19 Aug 2015 10:22:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1439979766!29015639!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20680 invoked from network); 19 Aug 2015 10:22:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 10:22:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0W6-0006rQ-6E for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:22:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZS0W6-0002jx-1q for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:22:46 +0000 Date: Wed, 19 Aug 2015 10:22:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] ocaml/xenctrl: Check return values from hypercalls X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8d0ca8a5e1965e241baf32e2c8dfcd82bb924aac Author: Andrew Cooper AuthorDate: Tue Jan 27 20:38:11 2015 +0000 Commit: Ian Jackson CommitDate: Wed Aug 12 11:57:18 2015 +0100 ocaml/xenctrl: Check return values from hypercalls rather than blindly continuing and possibly using negative values. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Dave Scott Acked-by: David Scott (cherry picked from commit 3380f5b6270e6fa4b24313f8808e7625e4c5a6ba) (cherry picked from commit c91ed889ea3c3781a94a30909f30c3aad56c97d5) (cherry picked from commit 10a95535b0dcde7daa3402b92f3c8d4494781c28) --- tools/ocaml/libs/xc/xenctrl_stubs.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index f5cf0ed..c27c897 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -455,6 +455,9 @@ CAMLprim value stub_xc_vcpu_getaffinity(value xch, value domid, int i, len = xc_get_max_cpus(_H(xch)); int retval; + if (len < 1) + failwith_xc(_H(xch)); + c_cpumap = xc_cpumap_alloc(_H(xch)); if (c_cpumap == NULL) failwith_xc(_H(xch)); @@ -805,6 +808,12 @@ CAMLprim value stub_xc_version_version(value xch) caml_enter_blocking_section(); packed = xc_version(_H(xch), XENVER_version, NULL); + caml_leave_blocking_section(); + + if (packed < 0) + failwith_xc(_H(xch)); + + caml_enter_blocking_section(); retval = xc_version(_H(xch), XENVER_extraversion, &extra); caml_leave_blocking_section(); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 10:23:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 10:23:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0WK-00022V-Iu; Wed, 19 Aug 2015 10:23:00 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0WJ-00022E-Aq for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:22:59 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id CB/63-09570-20954D55; Wed, 19 Aug 2015 10:22:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1439979776!33841392!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3350 invoked from network); 19 Aug 2015 10:22:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 10:22:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0WG-0006rb-Ib for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:22:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZS0WG-0002kV-Fe for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:22:56 +0000 Date: Wed, 19 Aug 2015 10:22:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] ocaml/xenctrl: Make failwith_xc() thread safe X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dea3fd1e945de74154e74989623a4272f43338fe Author: Andrew Cooper AuthorDate: Wed Jan 28 17:55:32 2015 +0000 Commit: Ian Jackson CommitDate: Wed Aug 12 11:57:40 2015 +0100 ocaml/xenctrl: Make failwith_xc() thread safe The static error_str[] buffer is not thread-safe, and 1024 bytes is unreasonably large. Reduce to 256 bytes (which is still much larger than any current use), and move it to being a stack variable. Also, propagate the Noreturn attribute from caml_raise_with_string(). Signed-off-by: Andrew Cooper CC: Dave Scott CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Acked-by: David Scott (cherry picked from commit c8945d51613450c19e0898b1b3056c90f4929179) (cherry picked from commit 032673c8836e28d9e291e0d02235001c41aedaab) (cherry picked from commit 9702e084d09550495c2e71f2639c1c2c43aeaf63) --- tools/ocaml/libs/xc/xenctrl_stubs.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index c27c897..10d4b14 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -51,21 +51,22 @@ i1 = (uint32_t) Int64_val(Field(input, 0)); \ i2 = ((Field(input, 1) == Val_none) ? 0xffffffff : (uint32_t) Int64_val(Field(Field(input, 1), 0))); -#define ERROR_STRLEN 1024 -void failwith_xc(xc_interface *xch) +static void Noreturn failwith_xc(xc_interface *xch) { - static char error_str[ERROR_STRLEN]; + char error_str[256]; if (xch) { const xc_error *error = xc_get_last_error(xch); if (error->code == XC_ERROR_NONE) - snprintf(error_str, ERROR_STRLEN, "%d: %s", errno, strerror(errno)); + snprintf(error_str, sizeof(error_str), + "%d: %s", errno, strerror(errno)); else - snprintf(error_str, ERROR_STRLEN, "%d: %s: %s", - error->code, + snprintf(error_str, sizeof(error_str), + "%d: %s: %s", error->code, xc_error_code_to_desc(error->code), error->message); } else { - snprintf(error_str, ERROR_STRLEN, "Unable to open XC interface"); + snprintf(error_str, sizeof(error_str), + "Unable to open XC interface"); } caml_raise_with_string(*caml_named_value("xc.error"), error_str); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 10:23:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 10:23:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0WK-00022V-Iu; Wed, 19 Aug 2015 10:23:00 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0WJ-00022E-Aq for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:22:59 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id CB/63-09570-20954D55; Wed, 19 Aug 2015 10:22:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1439979776!33841392!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3350 invoked from network); 19 Aug 2015 10:22:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 10:22:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0WG-0006rb-Ib for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:22:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZS0WG-0002kV-Fe for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:22:56 +0000 Date: Wed, 19 Aug 2015 10:22:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] ocaml/xenctrl: Make failwith_xc() thread safe X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dea3fd1e945de74154e74989623a4272f43338fe Author: Andrew Cooper AuthorDate: Wed Jan 28 17:55:32 2015 +0000 Commit: Ian Jackson CommitDate: Wed Aug 12 11:57:40 2015 +0100 ocaml/xenctrl: Make failwith_xc() thread safe The static error_str[] buffer is not thread-safe, and 1024 bytes is unreasonably large. Reduce to 256 bytes (which is still much larger than any current use), and move it to being a stack variable. Also, propagate the Noreturn attribute from caml_raise_with_string(). Signed-off-by: Andrew Cooper CC: Dave Scott CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Acked-by: David Scott (cherry picked from commit c8945d51613450c19e0898b1b3056c90f4929179) (cherry picked from commit 032673c8836e28d9e291e0d02235001c41aedaab) (cherry picked from commit 9702e084d09550495c2e71f2639c1c2c43aeaf63) --- tools/ocaml/libs/xc/xenctrl_stubs.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index c27c897..10d4b14 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -51,21 +51,22 @@ i1 = (uint32_t) Int64_val(Field(input, 0)); \ i2 = ((Field(input, 1) == Val_none) ? 0xffffffff : (uint32_t) Int64_val(Field(Field(input, 1), 0))); -#define ERROR_STRLEN 1024 -void failwith_xc(xc_interface *xch) +static void Noreturn failwith_xc(xc_interface *xch) { - static char error_str[ERROR_STRLEN]; + char error_str[256]; if (xch) { const xc_error *error = xc_get_last_error(xch); if (error->code == XC_ERROR_NONE) - snprintf(error_str, ERROR_STRLEN, "%d: %s", errno, strerror(errno)); + snprintf(error_str, sizeof(error_str), + "%d: %s", errno, strerror(errno)); else - snprintf(error_str, ERROR_STRLEN, "%d: %s: %s", - error->code, + snprintf(error_str, sizeof(error_str), + "%d: %s: %s", error->code, xc_error_code_to_desc(error->code), error->message); } else { - snprintf(error_str, ERROR_STRLEN, "Unable to open XC interface"); + snprintf(error_str, sizeof(error_str), + "Unable to open XC interface"); } caml_raise_with_string(*caml_named_value("xc.error"), error_str); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 10:23:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 10:23:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0WU-00023w-Ln; Wed, 19 Aug 2015 10:23:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0WT-00023l-Q6 for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:23:09 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 6E/6D-12371-D0954D55; Wed, 19 Aug 2015 10:23:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1439979786!42045314!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1183 invoked from network); 19 Aug 2015 10:23:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 10:23:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0WQ-0006sC-Pn for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:23:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZS0WQ-0002lE-NG for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:23:06 +0000 Date: Wed, 19 Aug 2015 10:23:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] ocaml/xenctrl: Fix stub_xc_readconsolering() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 04f8006b66fd9f351467ad0e9c77a0a14741c6e4 Author: Andrew Cooper AuthorDate: Fri Jan 30 14:11:14 2015 +0000 Commit: Ian Jackson CommitDate: Wed Aug 12 11:58:33 2015 +0100 ocaml/xenctrl: Fix stub_xc_readconsolering() The Ocaml stub to retrieve the hypervisor console ring had a few problems. * A single 32k buffer would truncate a large console ring. * The buffer was static and not under the protection of the Ocaml GC lock so could be clobbered by concurrent accesses. * Embedded NUL characters would cause caml_copy_string() (which is strlen() based) to truncate the buffer. The function is rewritten from scratch, using the same algorithm as the python stubs, but uses the protection of the Ocaml GC lock to maintain a static running total of the ring size, to avoid redundant realloc()ing in future calls. Signed-off-by: Andrew Cooper CC: Dave Scott CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Acked-by: David Scott Acked-by: Ian Campbell (cherry picked from commit 1a010ca99e9b04c1cfbd0ee718aa22d5ebd530ab) (cherry picked from commit cfc4c43be14e60608ed0b8173365c737950afe41) (cherry picked from commit c669c244246a7e45cedb03a30d59656c95d09719) --- tools/ocaml/libs/xc/xenctrl_stubs.c | 59 +++++++++++++++++++++++++++++------ 1 files changed, 49 insertions(+), 10 deletions(-) diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index 10d4b14..68b8561 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -526,26 +526,65 @@ CAMLprim value stub_xc_evtchn_reset(value xch, value domid) } -#define RING_SIZE 32768 -static char ring[RING_SIZE]; - CAMLprim value stub_xc_readconsolering(value xch) { - unsigned int size = RING_SIZE - 1; - char *ring_ptr = ring; - int retval; + /* Safe to use outside of blocking sections because of Ocaml GC lock. */ + static unsigned int conring_size = 16384 + 1; + + unsigned int count = conring_size, size = count, index = 0; + char *str = NULL, *ptr; + int ret; CAMLparam1(xch); + CAMLlocal1(ring); + str = malloc(size); + if (!str) + caml_raise_out_of_memory(); + + /* Hopefully our conring_size guess is sufficient */ caml_enter_blocking_section(); - retval = xc_readconsolering(_H(xch), ring_ptr, &size, 0, 0, NULL); + ret = xc_readconsolering(_H(xch), str, &count, 0, 0, &index); caml_leave_blocking_section(); - if (retval) + if (ret < 0) { + free(str); failwith_xc(_H(xch)); + } + + while (count == size && ret >= 0) { + size += count - 1; + if (size < count) + break; + + ptr = realloc(str, size); + if (!ptr) + break; + + str = ptr + count; + count = size - count; + + caml_enter_blocking_section(); + ret = xc_readconsolering(_H(xch), str, &count, 0, 1, &index); + caml_leave_blocking_section(); + + count += str - ptr; + str = ptr; + } + + /* + * If we didn't break because of an overflow with size, and we have + * needed to realloc() ourself more space, update our tracking of the + * real console ring size. + */ + if (size > conring_size) + conring_size = size; + + ring = caml_alloc_string(count); + memcpy(String_val(ring), str, count); + free(str); - ring[size] = '\0'; - CAMLreturn(caml_copy_string(ring)); + CAMLreturn(ring); } CAMLprim value stub_xc_send_debug_keys(value xch, value keys) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 10:23:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 10:23:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0WU-00023w-Ln; Wed, 19 Aug 2015 10:23:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0WT-00023l-Q6 for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:23:09 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 6E/6D-12371-D0954D55; Wed, 19 Aug 2015 10:23:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1439979786!42045314!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1183 invoked from network); 19 Aug 2015 10:23:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 10:23:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0WQ-0006sC-Pn for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:23:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZS0WQ-0002lE-NG for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:23:06 +0000 Date: Wed, 19 Aug 2015 10:23:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] ocaml/xenctrl: Fix stub_xc_readconsolering() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 04f8006b66fd9f351467ad0e9c77a0a14741c6e4 Author: Andrew Cooper AuthorDate: Fri Jan 30 14:11:14 2015 +0000 Commit: Ian Jackson CommitDate: Wed Aug 12 11:58:33 2015 +0100 ocaml/xenctrl: Fix stub_xc_readconsolering() The Ocaml stub to retrieve the hypervisor console ring had a few problems. * A single 32k buffer would truncate a large console ring. * The buffer was static and not under the protection of the Ocaml GC lock so could be clobbered by concurrent accesses. * Embedded NUL characters would cause caml_copy_string() (which is strlen() based) to truncate the buffer. The function is rewritten from scratch, using the same algorithm as the python stubs, but uses the protection of the Ocaml GC lock to maintain a static running total of the ring size, to avoid redundant realloc()ing in future calls. Signed-off-by: Andrew Cooper CC: Dave Scott CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Acked-by: David Scott Acked-by: Ian Campbell (cherry picked from commit 1a010ca99e9b04c1cfbd0ee718aa22d5ebd530ab) (cherry picked from commit cfc4c43be14e60608ed0b8173365c737950afe41) (cherry picked from commit c669c244246a7e45cedb03a30d59656c95d09719) --- tools/ocaml/libs/xc/xenctrl_stubs.c | 59 +++++++++++++++++++++++++++++------ 1 files changed, 49 insertions(+), 10 deletions(-) diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index 10d4b14..68b8561 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -526,26 +526,65 @@ CAMLprim value stub_xc_evtchn_reset(value xch, value domid) } -#define RING_SIZE 32768 -static char ring[RING_SIZE]; - CAMLprim value stub_xc_readconsolering(value xch) { - unsigned int size = RING_SIZE - 1; - char *ring_ptr = ring; - int retval; + /* Safe to use outside of blocking sections because of Ocaml GC lock. */ + static unsigned int conring_size = 16384 + 1; + + unsigned int count = conring_size, size = count, index = 0; + char *str = NULL, *ptr; + int ret; CAMLparam1(xch); + CAMLlocal1(ring); + str = malloc(size); + if (!str) + caml_raise_out_of_memory(); + + /* Hopefully our conring_size guess is sufficient */ caml_enter_blocking_section(); - retval = xc_readconsolering(_H(xch), ring_ptr, &size, 0, 0, NULL); + ret = xc_readconsolering(_H(xch), str, &count, 0, 0, &index); caml_leave_blocking_section(); - if (retval) + if (ret < 0) { + free(str); failwith_xc(_H(xch)); + } + + while (count == size && ret >= 0) { + size += count - 1; + if (size < count) + break; + + ptr = realloc(str, size); + if (!ptr) + break; + + str = ptr + count; + count = size - count; + + caml_enter_blocking_section(); + ret = xc_readconsolering(_H(xch), str, &count, 0, 1, &index); + caml_leave_blocking_section(); + + count += str - ptr; + str = ptr; + } + + /* + * If we didn't break because of an overflow with size, and we have + * needed to realloc() ourself more space, update our tracking of the + * real console ring size. + */ + if (size > conring_size) + conring_size = size; + + ring = caml_alloc_string(count); + memcpy(String_val(ring), str, count); + free(str); - ring[size] = '\0'; - CAMLreturn(caml_copy_string(ring)); + CAMLreturn(ring); } CAMLprim value stub_xc_send_debug_keys(value xch, value keys) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 10:23:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 10:23:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0We-00025J-OU; Wed, 19 Aug 2015 10:23:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Wd-000257-M8 for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:23:19 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id C9/01-05269-61954D55; Wed, 19 Aug 2015 10:23:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1439979797!36313147!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7709 invoked from network); 19 Aug 2015 10:23:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 10:23:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Wb-0006sK-2Y for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:23:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZS0Wb-0002ll-0P for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:23:17 +0000 Date: Wed, 19 Aug 2015 10:23:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] tools/xenconsoled: Increase file descriptor limit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9d6754dc2dc488f1a5877955836fa46b4ee119bb Author: Andrew Cooper AuthorDate: Mon Mar 2 15:04:37 2015 +0000 Commit: Ian Jackson CommitDate: Wed Aug 12 11:58:40 2015 +0100 tools/xenconsoled: Increase file descriptor limit XenServer's VM density testing uncovered a regression when moving from sysvinit to systemd where the file descriptor limit dropped from 4096 to 1024. (XenServer had previously inserted a ulimit statement into its initscripts.) One solution is to use LimitNOFILE=4096 in xenconsoled.service to match the lost ulimit, but that is only a stopgap solution. As Xenconsoled genuinely needs a large number of file descriptors if a large number of domains are running, attempt to increase the limit. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson (cherry picked from commit 588df84c0d702e835e526ecef3af6c5444857558) (cherry picked from commit 9d5b2b01024d18b2135c1b0deebb8bfbf5dced5f) (cherry picked from commit a490f8df8c989483624ebd6befb63377be55722b) --- tools/console/daemon/main.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/tools/console/daemon/main.c b/tools/console/daemon/main.c index 92d2fc4..11de5c9 100644 --- a/tools/console/daemon/main.c +++ b/tools/console/daemon/main.c @@ -26,6 +26,7 @@ #include #include #include +#include #include "xenctrl.h" @@ -55,6 +56,41 @@ static void version(char *name) printf("Xen Console Daemon 3.0\n"); } +static void increase_fd_limit(void) +{ + /* + * We require many file descriptors: + * - per domain: pty master, pty slave, logfile and evtchn + * - misc extra: hypervisor log, privcmd, gntdev, std... + * + * Allow a generous 1000 for misc, and calculate the maximum possible + * number of fds which could be used. + */ + unsigned min_fds = (DOMID_FIRST_RESERVED * 4) + 1000; + struct rlimit lim, new = { min_fds, min_fds }; + + if (getrlimit(RLIMIT_NOFILE, &lim) < 0) { + fprintf(stderr, "Failed to obtain fd limit: %s\n", + strerror(errno)); + exit(1); + } + + /* Do we already have sufficient? Great! */ + if (lim.rlim_cur >= min_fds) + return; + + /* Try to increase our limit. */ + if (setrlimit(RLIMIT_NOFILE, &new) < 0) + syslog(LOG_WARNING, + "Unable to increase fd limit from {%llu, %llu} to " + "{%llu, %llu}: (%s) - May run out with lots of domains", + (unsigned long long)lim.rlim_cur, + (unsigned long long)lim.rlim_max, + (unsigned long long)new.rlim_cur, + (unsigned long long)new.rlim_max, + strerror(errno)); +} + int main(int argc, char **argv) { const char *sopts = "hVvit:o:"; @@ -154,6 +190,8 @@ int main(int argc, char **argv) openlog("xenconsoled", syslog_option, LOG_DAEMON); setlogmask(syslog_mask); + increase_fd_limit(); + if (!is_interactive) { daemonize(pidfile ? pidfile : "/var/run/xenconsoled.pid"); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 10:23:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 10:23:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0We-00025J-OU; Wed, 19 Aug 2015 10:23:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Wd-000257-M8 for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:23:19 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id C9/01-05269-61954D55; Wed, 19 Aug 2015 10:23:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1439979797!36313147!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7709 invoked from network); 19 Aug 2015 10:23:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 10:23:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Wb-0006sK-2Y for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:23:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZS0Wb-0002ll-0P for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:23:17 +0000 Date: Wed, 19 Aug 2015 10:23:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] tools/xenconsoled: Increase file descriptor limit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9d6754dc2dc488f1a5877955836fa46b4ee119bb Author: Andrew Cooper AuthorDate: Mon Mar 2 15:04:37 2015 +0000 Commit: Ian Jackson CommitDate: Wed Aug 12 11:58:40 2015 +0100 tools/xenconsoled: Increase file descriptor limit XenServer's VM density testing uncovered a regression when moving from sysvinit to systemd where the file descriptor limit dropped from 4096 to 1024. (XenServer had previously inserted a ulimit statement into its initscripts.) One solution is to use LimitNOFILE=4096 in xenconsoled.service to match the lost ulimit, but that is only a stopgap solution. As Xenconsoled genuinely needs a large number of file descriptors if a large number of domains are running, attempt to increase the limit. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson (cherry picked from commit 588df84c0d702e835e526ecef3af6c5444857558) (cherry picked from commit 9d5b2b01024d18b2135c1b0deebb8bfbf5dced5f) (cherry picked from commit a490f8df8c989483624ebd6befb63377be55722b) --- tools/console/daemon/main.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/tools/console/daemon/main.c b/tools/console/daemon/main.c index 92d2fc4..11de5c9 100644 --- a/tools/console/daemon/main.c +++ b/tools/console/daemon/main.c @@ -26,6 +26,7 @@ #include #include #include +#include #include "xenctrl.h" @@ -55,6 +56,41 @@ static void version(char *name) printf("Xen Console Daemon 3.0\n"); } +static void increase_fd_limit(void) +{ + /* + * We require many file descriptors: + * - per domain: pty master, pty slave, logfile and evtchn + * - misc extra: hypervisor log, privcmd, gntdev, std... + * + * Allow a generous 1000 for misc, and calculate the maximum possible + * number of fds which could be used. + */ + unsigned min_fds = (DOMID_FIRST_RESERVED * 4) + 1000; + struct rlimit lim, new = { min_fds, min_fds }; + + if (getrlimit(RLIMIT_NOFILE, &lim) < 0) { + fprintf(stderr, "Failed to obtain fd limit: %s\n", + strerror(errno)); + exit(1); + } + + /* Do we already have sufficient? Great! */ + if (lim.rlim_cur >= min_fds) + return; + + /* Try to increase our limit. */ + if (setrlimit(RLIMIT_NOFILE, &new) < 0) + syslog(LOG_WARNING, + "Unable to increase fd limit from {%llu, %llu} to " + "{%llu, %llu}: (%s) - May run out with lots of domains", + (unsigned long long)lim.rlim_cur, + (unsigned long long)lim.rlim_max, + (unsigned long long)new.rlim_cur, + (unsigned long long)new.rlim_max, + strerror(errno)); +} + int main(int argc, char **argv) { const char *sopts = "hVvit:o:"; @@ -154,6 +190,8 @@ int main(int argc, char **argv) openlog("xenconsoled", syslog_option, LOG_DAEMON); setlogmask(syslog_mask); + increase_fd_limit(); + if (!is_interactive) { daemonize(pidfile ? pidfile : "/var/run/xenconsoled.pid"); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 10:23:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 10:23:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Wo-00026t-UC; Wed, 19 Aug 2015 10:23:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Wn-00026j-NH for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:23:29 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id D6/F5-19110-12954D55; Wed, 19 Aug 2015 10:23:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1439979807!42100784!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1170 invoked from network); 19 Aug 2015 10:23:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 10:23:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Wl-0006sS-96 for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:23:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZS0Wl-0002mK-7u for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:23:27 +0000 Date: Wed, 19 Aug 2015 10:23:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c776b6429bb3be7a68e819de496a272a4d0cd2f4 Author: Andrew Cooper AuthorDate: Mon Apr 13 16:11:12 2015 +0000 Commit: Ian Jackson CommitDate: Wed Aug 12 12:04:09 2015 +0100 tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125 gcc 4.1 of CentOS 5.x era does not like the typecheck in min() between uint64_t and unsigned long. Signed-off-by: Andrew Cooper CC: Konrad Rzeszutek Wilk CC: Ian Campbell CC: Ian Jackson CC: Wei Liu (cherry picked from commit 6c1cb3dba4ff97dd40909670755f24fcdf903012) Conflicts: tools/libxc/xc_domain.c Signed-off-by: Ian Jackson --- tools/libxc/xc_domain.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 7386e58..a1a09fb 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -1467,12 +1467,9 @@ int xc_domain_bind_pt_isa_irq( PT_IRQ_TYPE_ISA, 0, 0, 0, machine_irq)); } -#ifndef min -#define min(X, Y) ({ \ - const typeof (X) _x = (X); \ - const typeof (Y) _y = (Y); \ - (void) (&_x == &_y); \ - (_x < _y) ? _x : _y; }) +#ifndef min_t +#define min_t(type,x,y) \ + ({ type __x = (x); type __y = (y); __x < __y ? __x: __y; }) #endif int xc_domain_memory_mapping( xc_interface *xch, @@ -1495,7 +1492,7 @@ int xc_domain_memory_mapping( max_batch_sz = nr_mfns; do { - nr = min(nr_mfns - done, max_batch_sz); + nr = min_t(unsigned long, nr_mfns - done, max_batch_sz); domctl.u.memory_mapping.nr_mfns = nr; domctl.u.memory_mapping.first_gfn = first_gfn + done; domctl.u.memory_mapping.first_mfn = first_mfn + done; @@ -1531,7 +1528,7 @@ int xc_domain_memory_mapping( return ret; } -#undef min +#undef min_t int xc_domain_ioport_mapping( xc_interface *xch, uint32_t domid, -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 10:23:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 10:23:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Wo-00026t-UC; Wed, 19 Aug 2015 10:23:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Wn-00026j-NH for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:23:29 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id D6/F5-19110-12954D55; Wed, 19 Aug 2015 10:23:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1439979807!42100784!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1170 invoked from network); 19 Aug 2015 10:23:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 10:23:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Wl-0006sS-96 for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:23:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZS0Wl-0002mK-7u for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:23:27 +0000 Date: Wed, 19 Aug 2015 10:23:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c776b6429bb3be7a68e819de496a272a4d0cd2f4 Author: Andrew Cooper AuthorDate: Mon Apr 13 16:11:12 2015 +0000 Commit: Ian Jackson CommitDate: Wed Aug 12 12:04:09 2015 +0100 tools/libxc: Fix build of 32bit toolstacks on CentOS 5.x following XSA-125 gcc 4.1 of CentOS 5.x era does not like the typecheck in min() between uint64_t and unsigned long. Signed-off-by: Andrew Cooper CC: Konrad Rzeszutek Wilk CC: Ian Campbell CC: Ian Jackson CC: Wei Liu (cherry picked from commit 6c1cb3dba4ff97dd40909670755f24fcdf903012) Conflicts: tools/libxc/xc_domain.c Signed-off-by: Ian Jackson --- tools/libxc/xc_domain.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 7386e58..a1a09fb 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -1467,12 +1467,9 @@ int xc_domain_bind_pt_isa_irq( PT_IRQ_TYPE_ISA, 0, 0, 0, machine_irq)); } -#ifndef min -#define min(X, Y) ({ \ - const typeof (X) _x = (X); \ - const typeof (Y) _y = (Y); \ - (void) (&_x == &_y); \ - (_x < _y) ? _x : _y; }) +#ifndef min_t +#define min_t(type,x,y) \ + ({ type __x = (x); type __y = (y); __x < __y ? __x: __y; }) #endif int xc_domain_memory_mapping( xc_interface *xch, @@ -1495,7 +1492,7 @@ int xc_domain_memory_mapping( max_batch_sz = nr_mfns; do { - nr = min(nr_mfns - done, max_batch_sz); + nr = min_t(unsigned long, nr_mfns - done, max_batch_sz); domctl.u.memory_mapping.nr_mfns = nr; domctl.u.memory_mapping.first_gfn = first_gfn + done; domctl.u.memory_mapping.first_mfn = first_mfn + done; @@ -1531,7 +1528,7 @@ int xc_domain_memory_mapping( return ret; } -#undef min +#undef min_t int xc_domain_ioport_mapping( xc_interface *xch, uint32_t domid, -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 10:23:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 10:23:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Wz-00028S-0T; Wed, 19 Aug 2015 10:23:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Wy-00028K-0W for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:23:40 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id FE/36-19110-B2954D55; Wed, 19 Aug 2015 10:23:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1439979817!42121285!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31330 invoked from network); 19 Aug 2015 10:23:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 10:23:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Wv-0006sa-DA for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:23:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZS0Wv-0002mn-C7 for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:23:37 +0000 Date: Wed, 19 Aug 2015 10:23:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxl: In libxl_set_vcpuonline check for maximum number of VCPUs against the cpumap. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 116bbc6062cd90b98f746c3a058f4ec24347527d Author: Konrad Rzeszutek Wilk AuthorDate: Fri Apr 3 16:02:29 2015 -0400 Commit: Ian Jackson CommitDate: Wed Aug 12 12:15:20 2015 +0100 libxl: In libxl_set_vcpuonline check for maximum number of VCPUs against the cpumap. There is no sense in trying to online (or offline) CPUs when the size of cpumap is greater than the maximum number of VCPUs the guest can go to. As such fail the operation if the count of CPUs to online is greater than what the guest started with. For the offline case we do not check (as the bits are unset in the cpumap) and let it go through. We coalesce some of the underlying libxl_set_vcpuonline code together which was duplicated in QMP and XenStore codepaths. Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Ian Campbell (cherry picked from commit d83bf9d224eeb5b73b93c2703f7dba4473cfa89c) Conflicts: tools/libxl/libxl.c Signed-off-by: Ian Jackson (cherry picked from commit 0d8cbcad03764e42ff2f0d224aff883c3734d782) Conflicts: tools/libxl/libxl.c Signed-off-by: Ian Jackson (cherry picked from commit ca0f468192d12d8d30c2a48a37c5d3460a464a29) Conflicts: tools/libxl/libxl.c Signed-off-by: Ian Jackson --- tools/libxl/libxl.c | 44 +++++++++++++++++++++++++++----------------- 1 files changed, 27 insertions(+), 17 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 4a2ba84..15d4ec4 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4254,23 +4254,19 @@ int libxl_domain_get_nodeaffinity(libxl_ctx *ctx, uint32_t domid, } static int libxl__set_vcpuonline_xenstore(libxl__gc *gc, uint32_t domid, - libxl_bitmap *cpumap) + libxl_bitmap *cpumap, + const libxl_dominfo *info) { - libxl_dominfo info; char *dompath; xs_transaction_t t; int i, rc = ERROR_FAIL; - if (libxl_domain_info(CTX, &info, domid) < 0) { - LOGE(ERROR, "getting domain info list"); - goto out; - } if (!(dompath = libxl__xs_get_dompath(gc, domid))) goto out; retry_transaction: t = xs_transaction_start(CTX->xsh); - for (i = 0; i <= info.vcpu_max_id; i++) + for (i = 0; i <= info->vcpu_max_id; i++) libxl__xs_write(gc, t, libxl__sprintf(gc, "%s/cpu/%u/availability", dompath, i), "%s", libxl_bitmap_test(cpumap, i) ? "online" : "offline"); @@ -4284,16 +4280,12 @@ out: } static int libxl__set_vcpuonline_qmp(libxl__gc *gc, uint32_t domid, - libxl_bitmap *cpumap) + libxl_bitmap *cpumap, + const libxl_dominfo *info) { - libxl_dominfo info; int i; - if (libxl_domain_info(CTX, &info, domid) < 0) { - LOGE(ERROR, "getting domain info list"); - return ERROR_FAIL; - } - for (i = 0; i <= info.vcpu_max_id; i++) { + for (i = 0; i <= info->vcpu_max_id; i++) { if (libxl_bitmap_test(cpumap, i)) { /* Return value is ignore because it does not tell anything useful * on the completion of the command. @@ -4309,17 +4301,35 @@ static int libxl__set_vcpuonline_qmp(libxl__gc *gc, uint32_t domid, int libxl_set_vcpuonline(libxl_ctx *ctx, uint32_t domid, libxl_bitmap *cpumap) { GC_INIT(ctx); - int rc; + int rc, maxcpus; + libxl_dominfo info; + + rc = libxl_domain_info(CTX, &info, domid); + if (rc < 0) { + LOGE(ERROR, "getting domain info list"); + goto out; + } + + maxcpus = libxl_bitmap_count_set(cpumap); + if (maxcpus > info.vcpu_max_id + 1) + { + LOGE(ERROR, "Requested %d VCPUs, however maxcpus is %d!", + maxcpus, info.vcpu_max_id + 1); + rc = ERROR_FAIL; + goto out; + } + switch (libxl__device_model_version_running(gc, domid)) { case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - rc = libxl__set_vcpuonline_xenstore(gc, domid, cpumap); + rc = libxl__set_vcpuonline_xenstore(gc, domid, cpumap, &info); break; case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: - rc = libxl__set_vcpuonline_qmp(gc, domid, cpumap); + rc = libxl__set_vcpuonline_qmp(gc, domid, cpumap, &info); break; default: rc = ERROR_INVAL; } +out: GC_FREE; return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 10:23:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 10:23:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Wz-00028S-0T; Wed, 19 Aug 2015 10:23:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Wy-00028K-0W for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:23:40 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id FE/36-19110-B2954D55; Wed, 19 Aug 2015 10:23:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1439979817!42121285!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31330 invoked from network); 19 Aug 2015 10:23:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 10:23:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Wv-0006sa-DA for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:23:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZS0Wv-0002mn-C7 for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:23:37 +0000 Date: Wed, 19 Aug 2015 10:23:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxl: In libxl_set_vcpuonline check for maximum number of VCPUs against the cpumap. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 116bbc6062cd90b98f746c3a058f4ec24347527d Author: Konrad Rzeszutek Wilk AuthorDate: Fri Apr 3 16:02:29 2015 -0400 Commit: Ian Jackson CommitDate: Wed Aug 12 12:15:20 2015 +0100 libxl: In libxl_set_vcpuonline check for maximum number of VCPUs against the cpumap. There is no sense in trying to online (or offline) CPUs when the size of cpumap is greater than the maximum number of VCPUs the guest can go to. As such fail the operation if the count of CPUs to online is greater than what the guest started with. For the offline case we do not check (as the bits are unset in the cpumap) and let it go through. We coalesce some of the underlying libxl_set_vcpuonline code together which was duplicated in QMP and XenStore codepaths. Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Ian Campbell (cherry picked from commit d83bf9d224eeb5b73b93c2703f7dba4473cfa89c) Conflicts: tools/libxl/libxl.c Signed-off-by: Ian Jackson (cherry picked from commit 0d8cbcad03764e42ff2f0d224aff883c3734d782) Conflicts: tools/libxl/libxl.c Signed-off-by: Ian Jackson (cherry picked from commit ca0f468192d12d8d30c2a48a37c5d3460a464a29) Conflicts: tools/libxl/libxl.c Signed-off-by: Ian Jackson --- tools/libxl/libxl.c | 44 +++++++++++++++++++++++++++----------------- 1 files changed, 27 insertions(+), 17 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 4a2ba84..15d4ec4 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4254,23 +4254,19 @@ int libxl_domain_get_nodeaffinity(libxl_ctx *ctx, uint32_t domid, } static int libxl__set_vcpuonline_xenstore(libxl__gc *gc, uint32_t domid, - libxl_bitmap *cpumap) + libxl_bitmap *cpumap, + const libxl_dominfo *info) { - libxl_dominfo info; char *dompath; xs_transaction_t t; int i, rc = ERROR_FAIL; - if (libxl_domain_info(CTX, &info, domid) < 0) { - LOGE(ERROR, "getting domain info list"); - goto out; - } if (!(dompath = libxl__xs_get_dompath(gc, domid))) goto out; retry_transaction: t = xs_transaction_start(CTX->xsh); - for (i = 0; i <= info.vcpu_max_id; i++) + for (i = 0; i <= info->vcpu_max_id; i++) libxl__xs_write(gc, t, libxl__sprintf(gc, "%s/cpu/%u/availability", dompath, i), "%s", libxl_bitmap_test(cpumap, i) ? "online" : "offline"); @@ -4284,16 +4280,12 @@ out: } static int libxl__set_vcpuonline_qmp(libxl__gc *gc, uint32_t domid, - libxl_bitmap *cpumap) + libxl_bitmap *cpumap, + const libxl_dominfo *info) { - libxl_dominfo info; int i; - if (libxl_domain_info(CTX, &info, domid) < 0) { - LOGE(ERROR, "getting domain info list"); - return ERROR_FAIL; - } - for (i = 0; i <= info.vcpu_max_id; i++) { + for (i = 0; i <= info->vcpu_max_id; i++) { if (libxl_bitmap_test(cpumap, i)) { /* Return value is ignore because it does not tell anything useful * on the completion of the command. @@ -4309,17 +4301,35 @@ static int libxl__set_vcpuonline_qmp(libxl__gc *gc, uint32_t domid, int libxl_set_vcpuonline(libxl_ctx *ctx, uint32_t domid, libxl_bitmap *cpumap) { GC_INIT(ctx); - int rc; + int rc, maxcpus; + libxl_dominfo info; + + rc = libxl_domain_info(CTX, &info, domid); + if (rc < 0) { + LOGE(ERROR, "getting domain info list"); + goto out; + } + + maxcpus = libxl_bitmap_count_set(cpumap); + if (maxcpus > info.vcpu_max_id + 1) + { + LOGE(ERROR, "Requested %d VCPUs, however maxcpus is %d!", + maxcpus, info.vcpu_max_id + 1); + rc = ERROR_FAIL; + goto out; + } + switch (libxl__device_model_version_running(gc, domid)) { case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - rc = libxl__set_vcpuonline_xenstore(gc, domid, cpumap); + rc = libxl__set_vcpuonline_xenstore(gc, domid, cpumap, &info); break; case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: - rc = libxl__set_vcpuonline_qmp(gc, domid, cpumap); + rc = libxl__set_vcpuonline_qmp(gc, domid, cpumap, &info); break; default: rc = ERROR_INVAL; } +out: GC_FREE; return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 10:23:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 10:23:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0X9-00029y-2y; Wed, 19 Aug 2015 10:23:51 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0X8-00029k-3I for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:23:50 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 6E/AD-04752-53954D55; Wed, 19 Aug 2015 10:23:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1439979827!42072818!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22111 invoked from network); 19 Aug 2015 10:23:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 10:23:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0X5-0006si-Lx for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:23:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZS0X5-0002o1-H2 for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:23:47 +0000 Date: Wed, 19 Aug 2015 10:23:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxl: event handling: Break out ao_work_outstanding X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 546960ca0572d99edff03fd1eb1436c71ff24d6d Author: Ian Jackson AuthorDate: Mon Feb 9 15:18:30 2015 +0000 Commit: Ian Jackson CommitDate: Wed Aug 12 12:25:13 2015 +0100 libxl: event handling: Break out ao_work_outstanding Break out the test in libxl__ao_complete_check_progress_reports, into ao_work_outstanding, which reports false if either (i) the ao is still ongoing or (ii) there is a progress report (perhaps on a different thread's callback queue) which has yet to be reported to the application. No functional change. Signed-off-by: Ian Jackson CC: Ian Campbell CC: Wei Liu CC: Jim Fehlig Acked-by: Wei Liu (cherry picked from commit 93699882d98cce9736d6e871db303275df1138a2) (cherry picked from commit ba683105b52f60e312151654d72b0b0e8508cee5) --- tools/libxl/libxl_event.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index e42b371..85465e8 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1575,19 +1575,25 @@ void libxl__ao_complete(libxl__egc *egc, libxl__ao *ao, int rc) libxl__ao_complete_check_progress_reports(egc, ao); } -void libxl__ao_complete_check_progress_reports(libxl__egc *egc, libxl__ao *ao) +static bool ao_work_outstanding(libxl__ao *ao) { /* * We don't consider an ao complete if it has any outstanding * callbacks. These callbacks might be outstanding on other * threads, queued up in the other threads' egc's. Those threads * will, after making the callback, take out the lock again, - * decrement progress_reports_outstanding, and call us again. + * decrement progress_reports_outstanding, and call + * libxl__ao_complete_check_progress_reports. */ + return !ao->complete || ao->progress_reports_outstanding; +} + +void libxl__ao_complete_check_progress_reports(libxl__egc *egc, libxl__ao *ao) +{ libxl_ctx *ctx = libxl__gc_owner(&egc->gc); assert(ao->progress_reports_outstanding >= 0); - if (!ao->complete || ao->progress_reports_outstanding) + if (ao_work_outstanding(ao)) return; if (ao->poller) { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 10:23:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 10:23:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0X9-00029y-2y; Wed, 19 Aug 2015 10:23:51 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0X8-00029k-3I for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:23:50 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 6E/AD-04752-53954D55; Wed, 19 Aug 2015 10:23:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1439979827!42072818!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22111 invoked from network); 19 Aug 2015 10:23:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 10:23:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0X5-0006si-Lx for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:23:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZS0X5-0002o1-H2 for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:23:47 +0000 Date: Wed, 19 Aug 2015 10:23:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxl: event handling: Break out ao_work_outstanding X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 546960ca0572d99edff03fd1eb1436c71ff24d6d Author: Ian Jackson AuthorDate: Mon Feb 9 15:18:30 2015 +0000 Commit: Ian Jackson CommitDate: Wed Aug 12 12:25:13 2015 +0100 libxl: event handling: Break out ao_work_outstanding Break out the test in libxl__ao_complete_check_progress_reports, into ao_work_outstanding, which reports false if either (i) the ao is still ongoing or (ii) there is a progress report (perhaps on a different thread's callback queue) which has yet to be reported to the application. No functional change. Signed-off-by: Ian Jackson CC: Ian Campbell CC: Wei Liu CC: Jim Fehlig Acked-by: Wei Liu (cherry picked from commit 93699882d98cce9736d6e871db303275df1138a2) (cherry picked from commit ba683105b52f60e312151654d72b0b0e8508cee5) --- tools/libxl/libxl_event.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index e42b371..85465e8 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1575,19 +1575,25 @@ void libxl__ao_complete(libxl__egc *egc, libxl__ao *ao, int rc) libxl__ao_complete_check_progress_reports(egc, ao); } -void libxl__ao_complete_check_progress_reports(libxl__egc *egc, libxl__ao *ao) +static bool ao_work_outstanding(libxl__ao *ao) { /* * We don't consider an ao complete if it has any outstanding * callbacks. These callbacks might be outstanding on other * threads, queued up in the other threads' egc's. Those threads * will, after making the callback, take out the lock again, - * decrement progress_reports_outstanding, and call us again. + * decrement progress_reports_outstanding, and call + * libxl__ao_complete_check_progress_reports. */ + return !ao->complete || ao->progress_reports_outstanding; +} + +void libxl__ao_complete_check_progress_reports(libxl__egc *egc, libxl__ao *ao) +{ libxl_ctx *ctx = libxl__gc_owner(&egc->gc); assert(ao->progress_reports_outstanding >= 0); - if (!ao->complete || ao->progress_reports_outstanding) + if (ao_work_outstanding(ao)) return; if (ao->poller) { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 10:24:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 10:24:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0XK-0002BR-5W; Wed, 19 Aug 2015 10:24:02 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0XI-0002BH-Bs for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:24:00 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id B2/95-31069-F3954D55; Wed, 19 Aug 2015 10:23:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1439979838!36249642!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30828 invoked from network); 19 Aug 2015 10:23:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 10:23:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0XF-0006sq-UH for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:23:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZS0XF-0002ot-Rl for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:23:57 +0000 Date: Wed, 19 Aug 2015 10:23:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxl: event handling: ao_inprogress does waits while reports outstanding X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 32f82fa8d9f6ea0eddfd6ab38c0b867b54f99f14 Author: Ian Jackson AuthorDate: Mon Feb 9 15:20:32 2015 +0000 Commit: Ian Jackson CommitDate: Wed Aug 12 12:25:32 2015 +0100 libxl: event handling: ao_inprogress does waits while reports outstanding libxl__ao_inprogress needs to check (like libxl__ao_complete_check_progress_reports) that there are no oustanding progress callbacks. Otherwise it might happen that we would destroy the ao while another thread has an outstanding callback its egc report queue. The other thread would then, in its egc_run_callbacks, touch the destroyed ao. Instead, when this happens in libxl__ao_inprogress, simply run round the event loop again. The thread which eventually makes the callback will spot our poller in the ao, and notify the poller, waking us up. This fixes an assertion failure race seen with libvirt: libvirtd: libxl_event.c:1792: libxl__ao_complete_check_progress_reports: Assertion `ao->in_initiator' failed. or (after "Add an assert to egc_run_callbacks") libvirtd: libxl_event.c:1338: egc_run_callbacks: Assertion `aop->ao->magic == 0xA0FACE00ul' failed. Signed-off-by: Ian Jackson CC: Ian Campbell CC: Wei Liu CC: Jim Fehlig Acked-by: Wei Liu (cherry picked from commit f1335f0d7b2402e94e0c6e8a905dc309edaafcfb) (cherry picked from commit dfed6d96fd6af00c9970e2a1c600d6bb991d137e) --- tools/libxl/libxl_event.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 85465e8..6d1dece 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1680,7 +1680,7 @@ int libxl__ao_inprogress(libxl__ao *ao, for (;;) { assert(ao->magic == LIBXL__AO_MAGIC); - if (ao->complete) { + if (!ao_work_outstanding(ao)) { rc = ao->rc; ao->notified = 1; break; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 10:24:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 10:24:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0XK-0002BR-5W; Wed, 19 Aug 2015 10:24:02 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0XI-0002BH-Bs for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:24:00 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id B2/95-31069-F3954D55; Wed, 19 Aug 2015 10:23:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1439979838!36249642!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30828 invoked from network); 19 Aug 2015 10:23:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 10:23:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0XF-0006sq-UH for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:23:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZS0XF-0002ot-Rl for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:23:57 +0000 Date: Wed, 19 Aug 2015 10:23:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxl: event handling: ao_inprogress does waits while reports outstanding X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 32f82fa8d9f6ea0eddfd6ab38c0b867b54f99f14 Author: Ian Jackson AuthorDate: Mon Feb 9 15:20:32 2015 +0000 Commit: Ian Jackson CommitDate: Wed Aug 12 12:25:32 2015 +0100 libxl: event handling: ao_inprogress does waits while reports outstanding libxl__ao_inprogress needs to check (like libxl__ao_complete_check_progress_reports) that there are no oustanding progress callbacks. Otherwise it might happen that we would destroy the ao while another thread has an outstanding callback its egc report queue. The other thread would then, in its egc_run_callbacks, touch the destroyed ao. Instead, when this happens in libxl__ao_inprogress, simply run round the event loop again. The thread which eventually makes the callback will spot our poller in the ao, and notify the poller, waking us up. This fixes an assertion failure race seen with libvirt: libvirtd: libxl_event.c:1792: libxl__ao_complete_check_progress_reports: Assertion `ao->in_initiator' failed. or (after "Add an assert to egc_run_callbacks") libvirtd: libxl_event.c:1338: egc_run_callbacks: Assertion `aop->ao->magic == 0xA0FACE00ul' failed. Signed-off-by: Ian Jackson CC: Ian Campbell CC: Wei Liu CC: Jim Fehlig Acked-by: Wei Liu (cherry picked from commit f1335f0d7b2402e94e0c6e8a905dc309edaafcfb) (cherry picked from commit dfed6d96fd6af00c9970e2a1c600d6bb991d137e) --- tools/libxl/libxl_event.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 85465e8..6d1dece 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1680,7 +1680,7 @@ int libxl__ao_inprogress(libxl__ao *ao, for (;;) { assert(ao->magic == LIBXL__AO_MAGIC); - if (ao->complete) { + if (!ao_work_outstanding(ao)) { rc = ao->rc; ao->notified = 1; break; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 10:24:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 10:24:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0XT-0002Cj-81; Wed, 19 Aug 2015 10:24:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0XS-0002Ca-LQ for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:24:10 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id ED/F3-29649-94954D55; Wed, 19 Aug 2015 10:24:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1439979848!36267848!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7320 invoked from network); 19 Aug 2015 10:24:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 10:24:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0XQ-0006tR-8F for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:24:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZS0XQ-0002py-5m for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:24:08 +0000 Date: Wed, 19 Aug 2015 10:24:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxl: don't leak memory in libxl__poller_get failure case X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e9a0fc5998917b4c77067fa35b16eee4185ca2fa Author: Matthew Daley AuthorDate: Wed Oct 30 20:51:53 2013 +1300 Commit: Ian Jackson CommitDate: Wed Aug 12 12:39:10 2015 +0100 libxl: don't leak memory in libxl__poller_get failure case Coverity-ID: 1055894 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell (cherry picked from commit 1edd6d8da354442b860ae28b8944dbd8a102d5f7) --- tools/libxl/libxl_event.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 6d1dece..5f539b1 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1340,7 +1340,10 @@ libxl__poller *libxl__poller_get(libxl_ctx *ctx) memset(p, 0, sizeof(*p)); rc = libxl__poller_init(ctx, p); - if (rc) return NULL; + if (rc) { + free(p); + return NULL; + } return p; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 10:24:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 10:24:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0XT-0002Cj-81; Wed, 19 Aug 2015 10:24:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0XS-0002Ca-LQ for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:24:10 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id ED/F3-29649-94954D55; Wed, 19 Aug 2015 10:24:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1439979848!36267848!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7320 invoked from network); 19 Aug 2015 10:24:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 10:24:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0XQ-0006tR-8F for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:24:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZS0XQ-0002py-5m for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:24:08 +0000 Date: Wed, 19 Aug 2015 10:24:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxl: don't leak memory in libxl__poller_get failure case X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e9a0fc5998917b4c77067fa35b16eee4185ca2fa Author: Matthew Daley AuthorDate: Wed Oct 30 20:51:53 2013 +1300 Commit: Ian Jackson CommitDate: Wed Aug 12 12:39:10 2015 +0100 libxl: don't leak memory in libxl__poller_get failure case Coverity-ID: 1055894 Signed-off-by: Matthew Daley Reviewed-by: Andrew Cooper Acked-by: Ian Campbell (cherry picked from commit 1edd6d8da354442b860ae28b8944dbd8a102d5f7) --- tools/libxl/libxl_event.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 6d1dece..5f539b1 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1340,7 +1340,10 @@ libxl__poller *libxl__poller_get(libxl_ctx *ctx) memset(p, 0, sizeof(*p)); rc = libxl__poller_init(ctx, p); - if (rc) return NULL; + if (rc) { + free(p); + return NULL; + } return p; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 10:24:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 10:24:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Xe-0002EC-AV; Wed, 19 Aug 2015 10:24:22 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Xd-0002E4-3G for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:24:21 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id BB/30-10715-45954D55; Wed, 19 Aug 2015 10:24:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1439979858!42073027!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27724 invoked from network); 19 Aug 2015 10:24:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 10:24:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Xa-0006tZ-KK for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:24:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZS0Xa-0002qZ-GY for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:24:18 +0000 Date: Wed, 19 Aug 2015 10:24:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxl: poll: Make libxl__poller_get have only one success return path X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dd80ee80c9bf84c3c7d4c72ffe4c1a9d9d170bf9 Author: Ian Jackson AuthorDate: Thu Jul 9 16:52:02 2015 +0100 Commit: Ian Jackson CommitDate: Wed Aug 12 12:39:36 2015 +0100 libxl: poll: Make libxl__poller_get have only one success return path In preparation for doing some more work on successful exit. No functional change. Signed-off-by: Ian Jackson CC: Jim Fehlig Acked-by: Wei Liu Tested-by: Jim Fehlig (cherry picked from commit 6fc946bc5520ebdbba5cbae4d49e53895df8b393) (cherry picked from commit 8c409135e69c7321cb6d82b8cae0868a81d05ddc) Conflicts: tools/libxl/libxl_event.c Signed-off-by: Ian Jackson (cherry picked from commit 900c7970de4cb809ba208465cb0abd094b4dec58) --- tools/libxl/libxl_event.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 5f539b1..9536018 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1329,20 +1329,19 @@ libxl__poller *libxl__poller_get(libxl_ctx *ctx) libxl__poller *p = LIBXL_LIST_FIRST(&ctx->pollers_idle); if (p) { LIBXL_LIST_REMOVE(p, entry); - return p; - } - - p = malloc(sizeof(*p)); - if (!p) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "cannot allocate poller"); - return 0; - } - memset(p, 0, sizeof(*p)); + } else { + p = malloc(sizeof(*p)); + if (!p) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "cannot allocate poller"); + return 0; + } + memset(p, 0, sizeof(*p)); - rc = libxl__poller_init(ctx, p); - if (rc) { - free(p); - return NULL; + rc = libxl__poller_init(ctx, p); + if (rc) { + free(p); + return NULL; + } } return p; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 10:24:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 10:24:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Xe-0002EC-AV; Wed, 19 Aug 2015 10:24:22 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Xd-0002E4-3G for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:24:21 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id BB/30-10715-45954D55; Wed, 19 Aug 2015 10:24:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1439979858!42073027!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27724 invoked from network); 19 Aug 2015 10:24:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 10:24:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Xa-0006tZ-KK for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:24:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZS0Xa-0002qZ-GY for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:24:18 +0000 Date: Wed, 19 Aug 2015 10:24:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxl: poll: Make libxl__poller_get have only one success return path X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dd80ee80c9bf84c3c7d4c72ffe4c1a9d9d170bf9 Author: Ian Jackson AuthorDate: Thu Jul 9 16:52:02 2015 +0100 Commit: Ian Jackson CommitDate: Wed Aug 12 12:39:36 2015 +0100 libxl: poll: Make libxl__poller_get have only one success return path In preparation for doing some more work on successful exit. No functional change. Signed-off-by: Ian Jackson CC: Jim Fehlig Acked-by: Wei Liu Tested-by: Jim Fehlig (cherry picked from commit 6fc946bc5520ebdbba5cbae4d49e53895df8b393) (cherry picked from commit 8c409135e69c7321cb6d82b8cae0868a81d05ddc) Conflicts: tools/libxl/libxl_event.c Signed-off-by: Ian Jackson (cherry picked from commit 900c7970de4cb809ba208465cb0abd094b4dec58) --- tools/libxl/libxl_event.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 5f539b1..9536018 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1329,20 +1329,19 @@ libxl__poller *libxl__poller_get(libxl_ctx *ctx) libxl__poller *p = LIBXL_LIST_FIRST(&ctx->pollers_idle); if (p) { LIBXL_LIST_REMOVE(p, entry); - return p; - } - - p = malloc(sizeof(*p)); - if (!p) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "cannot allocate poller"); - return 0; - } - memset(p, 0, sizeof(*p)); + } else { + p = malloc(sizeof(*p)); + if (!p) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "cannot allocate poller"); + return 0; + } + memset(p, 0, sizeof(*p)); - rc = libxl__poller_init(ctx, p); - if (rc) { - free(p); - return NULL; + rc = libxl__poller_init(ctx, p); + if (rc) { + free(p); + return NULL; + } } return p; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 10:24:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 10:24:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Xo-0002FZ-DA; Wed, 19 Aug 2015 10:24:32 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Xn-0002FL-I7 for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:24:31 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id DD/33-05269-E5954D55; Wed, 19 Aug 2015 10:24:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1439979869!36247584!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16976 invoked from network); 19 Aug 2015 10:24:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 10:24:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Xl-0006th-0m for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:24:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZS0Xk-0002rB-UI for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:24:28 +0000 Date: Wed, 19 Aug 2015 10:24:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxl: poll: Use poller_get and poller_put for poller_app X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 856f59437b2fde90f44570433b4cdbb46bfd0c47 Author: Ian Jackson AuthorDate: Thu Jul 9 17:05:07 2015 +0100 Commit: Ian Jackson CommitDate: Wed Aug 12 12:43:27 2015 +0100 libxl: poll: Use poller_get and poller_put for poller_app This makes the code more regular. We are going to want to do some more work in poller_get and poller_put, which work also wants to be done for poller_app. Two very minor functional changes: * We call malloc an extra time since poller_app is now a pointer * ERROR_FAIL on poller_get failing for poller_app is generated in libxl_ctx_init rather than passed through by libxl_poller_init from libxl__pipe_nonblock. Signed-off-by: Ian Jackson CC: Jim Fehlig Acked-by: Wei Liu Tested-by: Jim Fehlig (cherry picked from commit aae37652067eafd0f2b85050306772df0cb71f08) (cherry picked from commit 9f6f513eecbdc76ce30b5f2e6c52e02076bac30b) Conflicts: tools/libxl/libxl.c Signed-off-by: Ian Jackson (cherry picked from commit 0348c450fe253b3db6edc77568820327ff991478) --- tools/libxl/libxl.c | 11 ++++++++--- tools/libxl/libxl_event.c | 4 ++-- tools/libxl/libxl_internal.h | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 15d4ec4..db85605 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -50,6 +50,7 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, ctx->osevent_hooks = 0; + ctx->poller_app = 0; LIBXL_LIST_INIT(&ctx->pollers_event); LIBXL_LIST_INIT(&ctx->pollers_idle); @@ -83,8 +84,11 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, rc = libxl__atfork_init(ctx); if (rc) goto out; - rc = libxl__poller_init(ctx, &ctx->poller_app); - if (rc) goto out; + ctx->poller_app = libxl__poller_get(ctx); + if (!ctx->poller_app) { + rc = ERROR_FAIL; + goto out; + } if ( stat(XENSTORE_PID_FILE, &stat_buf) != 0 ) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Is xenstore daemon running?\n" @@ -160,7 +164,8 @@ int libxl_ctx_free(libxl_ctx *ctx) libxl_version_info_dispose(&ctx->version_info); if (ctx->xsh) xs_daemon_close(ctx->xsh); - libxl__poller_dispose(&ctx->poller_app); + libxl__poller_put(ctx, ctx->poller_app); + ctx->poller_app = NULL; assert(LIBXL_LIST_EMPTY(&ctx->pollers_event)); libxl__poller *poller, *poller_tmp; LIBXL_LIST_FOREACH_SAFE(poller, &ctx->pollers_idle, entry, poller_tmp) { diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 9536018..a614e96 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -876,7 +876,7 @@ int libxl_osevent_beforepoll(libxl_ctx *ctx, int *nfds_io, { EGC_INIT(ctx); CTX_LOCK; - int rc = beforepoll_internal(gc, &ctx->poller_app, + int rc = beforepoll_internal(gc, ctx->poller_app, nfds_io, fds, timeout_upd, now); CTX_UNLOCK; EGC_FREE; @@ -1033,7 +1033,7 @@ void libxl_osevent_afterpoll(libxl_ctx *ctx, int nfds, const struct pollfd *fds, { EGC_INIT(ctx); CTX_LOCK; - afterpoll_internal(egc, &ctx->poller_app, nfds, fds, now); + afterpoll_internal(egc, ctx->poller_app, nfds, fds, now); CTX_UNLOCK; EGC_FREE; } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index f051d91..c5fb07d 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -328,7 +328,7 @@ struct libxl__ctx { /* See the comment for OSEVENT_HOOK_INTERN in libxl_event.c * for restrictions on the use of the osevent fields. */ - libxl__poller poller_app; /* libxl_osevent_beforepoll and _afterpoll */ + libxl__poller *poller_app; /* libxl_osevent_beforepoll and _afterpoll */ LIBXL_LIST_HEAD(, libxl__poller) pollers_event, pollers_idle; LIBXL_SLIST_HEAD(libxl__osevent_hook_nexi, libxl__osevent_hook_nexus) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 10:24:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 10:24:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Xo-0002FZ-DA; Wed, 19 Aug 2015 10:24:32 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Xn-0002FL-I7 for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:24:31 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id DD/33-05269-E5954D55; Wed, 19 Aug 2015 10:24:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1439979869!36247584!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16976 invoked from network); 19 Aug 2015 10:24:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 10:24:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Xl-0006th-0m for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:24:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZS0Xk-0002rB-UI for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:24:28 +0000 Date: Wed, 19 Aug 2015 10:24:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxl: poll: Use poller_get and poller_put for poller_app X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 856f59437b2fde90f44570433b4cdbb46bfd0c47 Author: Ian Jackson AuthorDate: Thu Jul 9 17:05:07 2015 +0100 Commit: Ian Jackson CommitDate: Wed Aug 12 12:43:27 2015 +0100 libxl: poll: Use poller_get and poller_put for poller_app This makes the code more regular. We are going to want to do some more work in poller_get and poller_put, which work also wants to be done for poller_app. Two very minor functional changes: * We call malloc an extra time since poller_app is now a pointer * ERROR_FAIL on poller_get failing for poller_app is generated in libxl_ctx_init rather than passed through by libxl_poller_init from libxl__pipe_nonblock. Signed-off-by: Ian Jackson CC: Jim Fehlig Acked-by: Wei Liu Tested-by: Jim Fehlig (cherry picked from commit aae37652067eafd0f2b85050306772df0cb71f08) (cherry picked from commit 9f6f513eecbdc76ce30b5f2e6c52e02076bac30b) Conflicts: tools/libxl/libxl.c Signed-off-by: Ian Jackson (cherry picked from commit 0348c450fe253b3db6edc77568820327ff991478) --- tools/libxl/libxl.c | 11 ++++++++--- tools/libxl/libxl_event.c | 4 ++-- tools/libxl/libxl_internal.h | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 15d4ec4..db85605 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -50,6 +50,7 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, ctx->osevent_hooks = 0; + ctx->poller_app = 0; LIBXL_LIST_INIT(&ctx->pollers_event); LIBXL_LIST_INIT(&ctx->pollers_idle); @@ -83,8 +84,11 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, rc = libxl__atfork_init(ctx); if (rc) goto out; - rc = libxl__poller_init(ctx, &ctx->poller_app); - if (rc) goto out; + ctx->poller_app = libxl__poller_get(ctx); + if (!ctx->poller_app) { + rc = ERROR_FAIL; + goto out; + } if ( stat(XENSTORE_PID_FILE, &stat_buf) != 0 ) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Is xenstore daemon running?\n" @@ -160,7 +164,8 @@ int libxl_ctx_free(libxl_ctx *ctx) libxl_version_info_dispose(&ctx->version_info); if (ctx->xsh) xs_daemon_close(ctx->xsh); - libxl__poller_dispose(&ctx->poller_app); + libxl__poller_put(ctx, ctx->poller_app); + ctx->poller_app = NULL; assert(LIBXL_LIST_EMPTY(&ctx->pollers_event)); libxl__poller *poller, *poller_tmp; LIBXL_LIST_FOREACH_SAFE(poller, &ctx->pollers_idle, entry, poller_tmp) { diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 9536018..a614e96 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -876,7 +876,7 @@ int libxl_osevent_beforepoll(libxl_ctx *ctx, int *nfds_io, { EGC_INIT(ctx); CTX_LOCK; - int rc = beforepoll_internal(gc, &ctx->poller_app, + int rc = beforepoll_internal(gc, ctx->poller_app, nfds_io, fds, timeout_upd, now); CTX_UNLOCK; EGC_FREE; @@ -1033,7 +1033,7 @@ void libxl_osevent_afterpoll(libxl_ctx *ctx, int nfds, const struct pollfd *fds, { EGC_INIT(ctx); CTX_LOCK; - afterpoll_internal(egc, &ctx->poller_app, nfds, fds, now); + afterpoll_internal(egc, ctx->poller_app, nfds, fds, now); CTX_UNLOCK; EGC_FREE; } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index f051d91..c5fb07d 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -328,7 +328,7 @@ struct libxl__ctx { /* See the comment for OSEVENT_HOOK_INTERN in libxl_event.c * for restrictions on the use of the osevent fields. */ - libxl__poller poller_app; /* libxl_osevent_beforepoll and _afterpoll */ + libxl__poller *poller_app; /* libxl_osevent_beforepoll and _afterpoll */ LIBXL_LIST_HEAD(, libxl__poller) pollers_event, pollers_idle; LIBXL_SLIST_HEAD(libxl__osevent_hook_nexi, libxl__osevent_hook_nexus) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 10:24:42 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 10:24:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Xy-0002He-Hu; Wed, 19 Aug 2015 10:24:42 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Xx-0002HR-MZ for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:24:41 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 28/9A-06021-96954D55; Wed, 19 Aug 2015 10:24:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1439979879!36313725!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22352 invoked from network); 19 Aug 2015 10:24:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 10:24:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Xv-0006ts-Bl for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:24:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZS0Xv-0002rq-93 for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:24:39 +0000 Date: Wed, 19 Aug 2015 10:24:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxl: make libxl__poller_put tolerate p==NULL X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f66f746df7983fac7f63b38b1b6bde11a791f1ed Author: Ian Jackson AuthorDate: Fri Oct 11 12:10:45 2013 +0100 Commit: Ian Jackson CommitDate: Wed Aug 12 12:50:06 2015 +0100 libxl: make libxl__poller_put tolerate p==NULL This is less fragile, and more in keeping with the usual style of initialising everything to 0 and freeing things unconditionally. Correspondingly, remove the tests at the call sites. Apropos of c1f3f174. No overall functional change. Signed-off-by: Ian Jackson Acked-by: Ian Campbell (cherry picked from commit 6ed09e37722f601661fff42f80279a41773c574e) --- tools/libxl/libxl_event.c | 3 ++- tools/libxl/libxl_internal.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index a614e96..1c65029 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1349,6 +1349,7 @@ libxl__poller *libxl__poller_get(libxl_ctx *ctx) void libxl__poller_put(libxl_ctx *ctx, libxl__poller *p) { + if (!p) return; LIBXL_LIST_INSERT_HEAD(&ctx->pollers_idle, p, entry); } @@ -1541,7 +1542,7 @@ void libxl__ao__destroy(libxl_ctx *ctx, libxl__ao *ao) AO_GC; if (!ao) return; LOG(DEBUG,"ao %p: destroy",ao); - if (ao->poller) libxl__poller_put(ctx, ao->poller); + libxl__poller_put(ctx, ao->poller); ao->magic = LIBXL__AO_MAGIC_DESTROYED; libxl__free_all(&ao->gc); free(ao); diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index c5fb07d..311dac5 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -829,7 +829,7 @@ _hidden void libxl__poller_dispose(libxl__poller *p); * away again afterwards. _get can fail, returning NULL. * ctx must be locked. */ _hidden libxl__poller *libxl__poller_get(libxl_ctx *ctx); -_hidden void libxl__poller_put(libxl_ctx *ctx, libxl__poller *p); +_hidden void libxl__poller_put(libxl_ctx*, libxl__poller *p /* may be NULL */); /* Notifies whoever is polling using p that they should wake up. * ctx must be locked. */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 10:24:42 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 10:24:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Xy-0002He-Hu; Wed, 19 Aug 2015 10:24:42 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Xx-0002HR-MZ for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:24:41 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 28/9A-06021-96954D55; Wed, 19 Aug 2015 10:24:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1439979879!36313725!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22352 invoked from network); 19 Aug 2015 10:24:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 10:24:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Xv-0006ts-Bl for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:24:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZS0Xv-0002rq-93 for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:24:39 +0000 Date: Wed, 19 Aug 2015 10:24:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxl: make libxl__poller_put tolerate p==NULL X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f66f746df7983fac7f63b38b1b6bde11a791f1ed Author: Ian Jackson AuthorDate: Fri Oct 11 12:10:45 2013 +0100 Commit: Ian Jackson CommitDate: Wed Aug 12 12:50:06 2015 +0100 libxl: make libxl__poller_put tolerate p==NULL This is less fragile, and more in keeping with the usual style of initialising everything to 0 and freeing things unconditionally. Correspondingly, remove the tests at the call sites. Apropos of c1f3f174. No overall functional change. Signed-off-by: Ian Jackson Acked-by: Ian Campbell (cherry picked from commit 6ed09e37722f601661fff42f80279a41773c574e) --- tools/libxl/libxl_event.c | 3 ++- tools/libxl/libxl_internal.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index a614e96..1c65029 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1349,6 +1349,7 @@ libxl__poller *libxl__poller_get(libxl_ctx *ctx) void libxl__poller_put(libxl_ctx *ctx, libxl__poller *p) { + if (!p) return; LIBXL_LIST_INSERT_HEAD(&ctx->pollers_idle, p, entry); } @@ -1541,7 +1542,7 @@ void libxl__ao__destroy(libxl_ctx *ctx, libxl__ao *ao) AO_GC; if (!ao) return; LOG(DEBUG,"ao %p: destroy",ao); - if (ao->poller) libxl__poller_put(ctx, ao->poller); + libxl__poller_put(ctx, ao->poller); ao->magic = LIBXL__AO_MAGIC_DESTROYED; libxl__free_all(&ao->gc); free(ao); diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index c5fb07d..311dac5 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -829,7 +829,7 @@ _hidden void libxl__poller_dispose(libxl__poller *p); * away again afterwards. _get can fail, returning NULL. * ctx must be locked. */ _hidden libxl__poller *libxl__poller_get(libxl_ctx *ctx); -_hidden void libxl__poller_put(libxl_ctx *ctx, libxl__poller *p); +_hidden void libxl__poller_put(libxl_ctx*, libxl__poller *p /* may be NULL */); /* Notifies whoever is polling using p that they should wake up. * ctx must be locked. */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 10:24:53 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 10:24:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Y9-0002Iy-Ka; Wed, 19 Aug 2015 10:24:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Y8-0002Io-CY for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:24:52 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id EB/B7-01421-37954D55; Wed, 19 Aug 2015 10:24:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1439979889!36240377!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4966 invoked from network); 19 Aug 2015 10:24:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 10:24:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Y5-0006u0-NA for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:24:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZS0Y5-0002ss-HB for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:24:49 +0000 Date: Wed, 19 Aug 2015 10:24:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxl: poll: Avoid fd deregistration race POLLNVAL crash X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3bcb2c062a02e3c45d3f87478d2cbe1a134d395c Author: Ian Jackson AuthorDate: Wed Aug 12 12:50:12 2015 +0100 Commit: Ian Jackson CommitDate: Wed Aug 12 12:54:29 2015 +0100 libxl: poll: Avoid fd deregistration race POLLNVAL crash It can happen that an fd is deregistered, and closed, and then a new fd opened, and reregistered, all while another thread is in poll(). If this happens poll might report POLLNVAL, but the event loop would think that the fd was supposed to have been valid, and then fail an assertion: libxl_event.c:1183: afterpoll_check_fd: Assertion `poller->fds_changed || !(fds[slot].revents & 0x020)' failed. We can't simply ignore POLLNVAL because if we have bugs which cause messed-up fds, it is a serious problem which we really need to detect. Instead, add extra tracking to spot when this possibility arises, and abort on POLLNVAL if we are sure that it is unexpected. Reported-by: Jim Fehlig Signed-off-by: Ian Jackson CC: Jim Fehlig Acked-by: Wei Liu Tested-by: Jim Fehlig (cherry picked from commit 681ce1681622a46d111cfdc4fc07e4cb565ae131) (cherry picked from commit 7f7642f778b78e8e204fc082ce03072bb26887c7) And, adjusted for semantic conflict over CTX vs ctx. Signed-off-by: Ian Jackson (cherry picked from commit 3646b134c1673f09c0a239de10b0da4c9265c8e8) Conflicts: tools/libxl/libxl_event.c Signed-off-by: Ian Jackson --- tools/libxl/libxl.c | 2 ++ tools/libxl/libxl_event.c | 12 +++++++++++- tools/libxl/libxl_internal.h | 13 +++++++++++++ 3 files changed, 26 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index db85605..4d1d977 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -53,6 +53,7 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, ctx->poller_app = 0; LIBXL_LIST_INIT(&ctx->pollers_event); LIBXL_LIST_INIT(&ctx->pollers_idle); + LIBXL_LIST_INIT(&ctx->pollers_fds_changed); LIBXL_LIST_INIT(&ctx->efds); LIBXL_TAILQ_INIT(&ctx->etimes); @@ -167,6 +168,7 @@ int libxl_ctx_free(libxl_ctx *ctx) libxl__poller_put(ctx, ctx->poller_app); ctx->poller_app = NULL; assert(LIBXL_LIST_EMPTY(&ctx->pollers_event)); + assert(LIBXL_LIST_EMPTY(&ctx->pollers_fds_changed)); libxl__poller *poller, *poller_tmp; LIBXL_LIST_FOREACH_SAFE(poller, &ctx->pollers_idle, entry, poller_tmp) { libxl__poller_dispose(poller); diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 1c65029..69381f4 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -220,6 +220,7 @@ int libxl__ev_fd_modify(libxl__gc *gc, libxl__ev_fd *ev, short events) void libxl__ev_fd_deregister(libxl__gc *gc, libxl__ev_fd *ev) { CTX_LOCK; + libxl__poller *poller; if (!libxl__ev_fd_isregistered(ev)) { DBG("ev_fd=%p deregister unregistered",ev); @@ -232,6 +233,9 @@ void libxl__ev_fd_deregister(libxl__gc *gc, libxl__ev_fd *ev) LIBXL_LIST_REMOVE(ev, entry); ev->fd = -1; + LIBXL_LIST_FOREACH(poller, &CTX->pollers_fds_changed, fds_changed_entry) + poller->fds_changed = 1; + out: CTX_UNLOCK; } @@ -848,6 +852,8 @@ static int beforepoll_internal(libxl__gc *gc, libxl__poller *poller, *nfds_io = used; + poller->fds_changed = 0; + libxl__ev_time *etime = LIBXL_TAILQ_FIRST(&CTX->etimes); if (etime) { int our_timeout; @@ -912,7 +918,7 @@ static int afterpoll_check_fd(libxl__poller *poller, /* again, stale slot entry */ continue; - assert(!(fds[slot].revents & POLLNVAL)); + assert(poller->fds_changed || !(fds[slot].revents & POLLNVAL)); /* we mask in case requested events have changed */ int slot_revents = fds[slot].revents & events; @@ -1292,6 +1298,7 @@ int libxl__poller_init(libxl_ctx *ctx, libxl__poller *p) int r, rc; p->fd_polls = 0; p->fd_rindices = 0; + p->fds_changed = 0; r = pipe(p->wakeup_pipe); if (r) { @@ -1344,12 +1351,15 @@ libxl__poller *libxl__poller_get(libxl_ctx *ctx) } } + LIBXL_LIST_INSERT_HEAD(&ctx->pollers_fds_changed, p, + fds_changed_entry); return p; } void libxl__poller_put(libxl_ctx *ctx, libxl__poller *p) { if (!p) return; + LIBXL_LIST_REMOVE(p, fds_changed_entry); LIBXL_LIST_INSERT_HEAD(&ctx->pollers_idle, p, entry); } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 311dac5..63e206e 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -289,6 +289,18 @@ struct libxl__poller { int (*fd_rindices)[3]; /* see libxl_event.c:beforepoll_internal */ int wakeup_pipe[2]; /* 0 means no fd allocated */ + + /* + * We also use the poller to record whether any fds have been + * deregistered since we entered poll. Each poller which is not + * idle is on the list pollers_fds_changed. fds_changed is + * cleared by beforepoll, and tested by afterpoll. Whenever an fd + * event is deregistered, we set the fds_changed of all non-idle + * pollers. So afterpoll can tell whether any POLLNVAL is + * plausibly due to an fd being closed and reopened. + */ + LIBXL_LIST_ENTRY(libxl__poller) fds_changed_entry; + bool fds_changed; }; struct libxl__gc { @@ -330,6 +342,7 @@ struct libxl__ctx { libxl__poller *poller_app; /* libxl_osevent_beforepoll and _afterpoll */ LIBXL_LIST_HEAD(, libxl__poller) pollers_event, pollers_idle; + LIBXL_LIST_HEAD(, libxl__poller) pollers_fds_changed; LIBXL_SLIST_HEAD(libxl__osevent_hook_nexi, libxl__osevent_hook_nexus) hook_fd_nexi_idle, hook_timeout_nexi_idle; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Aug 19 10:24:53 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Aug 2015 10:24:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Y9-0002Iy-Ka; Wed, 19 Aug 2015 10:24:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Y8-0002Io-CY for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:24:52 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id EB/B7-01421-37954D55; Wed, 19 Aug 2015 10:24:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1439979889!36240377!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4966 invoked from network); 19 Aug 2015 10:24:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Aug 2015 10:24:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZS0Y5-0006u0-NA for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:24:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZS0Y5-0002ss-HB for xen-changelog@lists.xensource.com; Wed, 19 Aug 2015 10:24:49 +0000 Date: Wed, 19 Aug 2015 10:24:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxl: poll: Avoid fd deregistration race POLLNVAL crash X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3bcb2c062a02e3c45d3f87478d2cbe1a134d395c Author: Ian Jackson AuthorDate: Wed Aug 12 12:50:12 2015 +0100 Commit: Ian Jackson CommitDate: Wed Aug 12 12:54:29 2015 +0100 libxl: poll: Avoid fd deregistration race POLLNVAL crash It can happen that an fd is deregistered, and closed, and then a new fd opened, and reregistered, all while another thread is in poll(). If this happens poll might report POLLNVAL, but the event loop would think that the fd was supposed to have been valid, and then fail an assertion: libxl_event.c:1183: afterpoll_check_fd: Assertion `poller->fds_changed || !(fds[slot].revents & 0x020)' failed. We can't simply ignore POLLNVAL because if we have bugs which cause messed-up fds, it is a serious problem which we really need to detect. Instead, add extra tracking to spot when this possibility arises, and abort on POLLNVAL if we are sure that it is unexpected. Reported-by: Jim Fehlig Signed-off-by: Ian Jackson CC: Jim Fehlig Acked-by: Wei Liu Tested-by: Jim Fehlig (cherry picked from commit 681ce1681622a46d111cfdc4fc07e4cb565ae131) (cherry picked from commit 7f7642f778b78e8e204fc082ce03072bb26887c7) And, adjusted for semantic conflict over CTX vs ctx. Signed-off-by: Ian Jackson (cherry picked from commit 3646b134c1673f09c0a239de10b0da4c9265c8e8) Conflicts: tools/libxl/libxl_event.c Signed-off-by: Ian Jackson --- tools/libxl/libxl.c | 2 ++ tools/libxl/libxl_event.c | 12 +++++++++++- tools/libxl/libxl_internal.h | 13 +++++++++++++ 3 files changed, 26 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index db85605..4d1d977 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -53,6 +53,7 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, ctx->poller_app = 0; LIBXL_LIST_INIT(&ctx->pollers_event); LIBXL_LIST_INIT(&ctx->pollers_idle); + LIBXL_LIST_INIT(&ctx->pollers_fds_changed); LIBXL_LIST_INIT(&ctx->efds); LIBXL_TAILQ_INIT(&ctx->etimes); @@ -167,6 +168,7 @@ int libxl_ctx_free(libxl_ctx *ctx) libxl__poller_put(ctx, ctx->poller_app); ctx->poller_app = NULL; assert(LIBXL_LIST_EMPTY(&ctx->pollers_event)); + assert(LIBXL_LIST_EMPTY(&ctx->pollers_fds_changed)); libxl__poller *poller, *poller_tmp; LIBXL_LIST_FOREACH_SAFE(poller, &ctx->pollers_idle, entry, poller_tmp) { libxl__poller_dispose(poller); diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 1c65029..69381f4 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -220,6 +220,7 @@ int libxl__ev_fd_modify(libxl__gc *gc, libxl__ev_fd *ev, short events) void libxl__ev_fd_deregister(libxl__gc *gc, libxl__ev_fd *ev) { CTX_LOCK; + libxl__poller *poller; if (!libxl__ev_fd_isregistered(ev)) { DBG("ev_fd=%p deregister unregistered",ev); @@ -232,6 +233,9 @@ void libxl__ev_fd_deregister(libxl__gc *gc, libxl__ev_fd *ev) LIBXL_LIST_REMOVE(ev, entry); ev->fd = -1; + LIBXL_LIST_FOREACH(poller, &CTX->pollers_fds_changed, fds_changed_entry) + poller->fds_changed = 1; + out: CTX_UNLOCK; } @@ -848,6 +852,8 @@ static int beforepoll_internal(libxl__gc *gc, libxl__poller *poller, *nfds_io = used; + poller->fds_changed = 0; + libxl__ev_time *etime = LIBXL_TAILQ_FIRST(&CTX->etimes); if (etime) { int our_timeout; @@ -912,7 +918,7 @@ static int afterpoll_check_fd(libxl__poller *poller, /* again, stale slot entry */ continue; - assert(!(fds[slot].revents & POLLNVAL)); + assert(poller->fds_changed || !(fds[slot].revents & POLLNVAL)); /* we mask in case requested events have changed */ int slot_revents = fds[slot].revents & events; @@ -1292,6 +1298,7 @@ int libxl__poller_init(libxl_ctx *ctx, libxl__poller *p) int r, rc; p->fd_polls = 0; p->fd_rindices = 0; + p->fds_changed = 0; r = pipe(p->wakeup_pipe); if (r) { @@ -1344,12 +1351,15 @@ libxl__poller *libxl__poller_get(libxl_ctx *ctx) } } + LIBXL_LIST_INSERT_HEAD(&ctx->pollers_fds_changed, p, + fds_changed_entry); return p; } void libxl__poller_put(libxl_ctx *ctx, libxl__poller *p) { if (!p) return; + LIBXL_LIST_REMOVE(p, fds_changed_entry); LIBXL_LIST_INSERT_HEAD(&ctx->pollers_idle, p, entry); } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 311dac5..63e206e 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -289,6 +289,18 @@ struct libxl__poller { int (*fd_rindices)[3]; /* see libxl_event.c:beforepoll_internal */ int wakeup_pipe[2]; /* 0 means no fd allocated */ + + /* + * We also use the poller to record whether any fds have been + * deregistered since we entered poll. Each poller which is not + * idle is on the list pollers_fds_changed. fds_changed is + * cleared by beforepoll, and tested by afterpoll. Whenever an fd + * event is deregistered, we set the fds_changed of all non-idle + * pollers. So afterpoll can tell whether any POLLNVAL is + * plausibly due to an fd being closed and reopened. + */ + LIBXL_LIST_ENTRY(libxl__poller) fds_changed_entry; + bool fds_changed; }; struct libxl__gc { @@ -330,6 +342,7 @@ struct libxl__ctx { libxl__poller *poller_app; /* libxl_osevent_beforepoll and _afterpoll */ LIBXL_LIST_HEAD(, libxl__poller) pollers_event, pollers_idle; + LIBXL_LIST_HEAD(, libxl__poller) pollers_fds_changed; LIBXL_SLIST_HEAD(libxl__osevent_hook_nexi, libxl__osevent_hook_nexus) hook_fd_nexi_idle, hook_timeout_nexi_idle; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 24 06:55:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Aug 2015 06:55:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZTleu-0000UR-BE; Mon, 24 Aug 2015 06:55:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZTles-0000UL-LZ for xen-changelog@lists.xensource.com; Mon, 24 Aug 2015 06:55:06 +0000 Content-Length: 4303 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 0F/1E-04752-ACFBAD55; Mon, 24 Aug 2015 06:55:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1440399304!43289370!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16888 invoked from network); 24 Aug 2015 06:55:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2015 06:55:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZTleq-0000KC-1M for xen-changelog@lists.xensource.com; Mon, 24 Aug 2015 06:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZTlep-0006Wx-Ut for xen-changelog@lists.xensource.com; Mon, 24 Aug 2015 06:55:03 +0000 Date: Mon, 24 Aug 2015 06:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] vnc: fix memory corruption (CVE-2015-5225) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5977362208828819748==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5977362208828819748== Content-Length: 3933 Content-Transfer-Encoding: quoted-printable commit 604ad155f685162b18ddb2446ca03ec9fe7901ce Author: Gerd Hoffmann AuthorDate: Fri Aug 21 20:59:27 2015 +0200 Commit: Stefano Stabellini CommitDate: Fri Aug 21 22:10:58 2015 +0000 vnc: fix memory corruption (CVE-2015-5225) The _cmp_bytes variable added by commit "bea60dd ui/vnc: fix potential memory corruption issues" can become negative. Result is (possibly exploitable) memory corruption. Reason for that is it uses the stride instead of bytes per scanline to apply limits. For the server surface is is actually fine. vnc creates that itself, there is never any padding and thus scanline length always equals stride. For the guest surface scanline length and stride are typically identical too, but it doesn't has to be that way. So add and use a new variable (guest_ll) for the guest scanline length. Also rename min_stride to line_bytes to make more clear what it actually is. Finally sprinkle in an assert() to make sure we never use a negative _cmp_bytes again. Reported-by: =E8=8C=83=E7=A5=9A=E8=87=B3(=E5=BA=93=E7=89=B9) Reviewed-by: P J P Signed-off-by: Gerd Hoffmann Signed-off-by: Stefano Stabellini --- ui/vnc.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index 5707015..db4d97e 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -2689,7 +2689,7 @@ static int vnc_refresh_server_surface(VncDisplay *vd) pixman_image_get_width(vd->server)); int height =3D MIN(pixman_image_get_height(vd->guest.fb), pixman_image_get_height(vd->server)); - int cmp_bytes, server_stride, min_stride, guest_stride, y =3D 0; + int cmp_bytes, server_stride, line_bytes, guest_ll, guest_stride, y =3D 0; uint8_t *guest_row0 =3D NULL, *server_row0; VncState *vs; int has_dirty =3D 0; @@ -2708,17 +2708,21 @@ static int vnc_refresh_server_surface(VncDisplay *vd) * Update server dirty map. */ server_row0 =3D (uint8_t *)pixman_image_get_data(vd->server); - server_stride =3D guest_stride =3D pixman_image_get_stride(vd->server); + server_stride =3D guest_stride =3D guest_ll =3D + pixman_image_get_stride(vd->server); cmp_bytes =3D MIN(VNC_DIRTY_PIXELS_PER_BIT * VNC_SERVER_FB_BYTES, server_stride); if (vd->guest.format !=3D VNC_SERVER_FB_FORMAT) { int width =3D pixman_image_get_width(vd->server); tmpbuf =3D qemu_pixman_linebuf_create(VNC_SERVER_FB_FORMAT, width); } else { + int guest_bpp =3D + PIXMAN_FORMAT_BPP(pixman_image_get_format(vd->guest.fb)); guest_row0 =3D (uint8_t *)pixman_image_get_data(vd->guest.fb); guest_stride =3D pixman_image_get_stride(vd->guest.fb); + guest_ll =3D pixman_image_get_width(vd->guest.fb) * ((guest_bpp + 7) / 8); } - min_stride =3D MIN(server_stride, guest_stride); + line_bytes =3D MIN(server_stride, guest_ll); for (;;) { int x; @@ -2749,9 +2753,10 @@ static int vnc_refresh_server_surface(VncDisplay *vd) if (!test_and_clear_bit(x, vd->guest.dirty[y])) { continue; } - if ((x + 1) * cmp_bytes > min_stride) { - _cmp_bytes =3D min_stride - x * cmp_bytes; + if ((x + 1) * cmp_bytes > line_bytes) { + _cmp_bytes =3D line_bytes - x * cmp_bytes; } + assert(_cmp_bytes >=3D 0); if (memcmp(server_ptr, guest_ptr, _cmp_bytes) =3D=3D 0) { continue; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git --===============5977362208828819748== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============5977362208828819748==-- From xen-changelog-bounces@lists.xen.org Mon Aug 24 06:55:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Aug 2015 06:55:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZTleu-0000UR-BE; Mon, 24 Aug 2015 06:55:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZTles-0000UL-LZ for xen-changelog@lists.xensource.com; Mon, 24 Aug 2015 06:55:06 +0000 Content-Length: 4303 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 0F/1E-04752-ACFBAD55; Mon, 24 Aug 2015 06:55:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1440399304!43289370!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16888 invoked from network); 24 Aug 2015 06:55:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2015 06:55:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZTleq-0000KC-1M for xen-changelog@lists.xensource.com; Mon, 24 Aug 2015 06:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZTlep-0006Wx-Ut for xen-changelog@lists.xensource.com; Mon, 24 Aug 2015 06:55:03 +0000 Date: Mon, 24 Aug 2015 06:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] vnc: fix memory corruption (CVE-2015-5225) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5977362208828819748==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5977362208828819748== Content-Length: 3933 Content-Transfer-Encoding: quoted-printable commit 604ad155f685162b18ddb2446ca03ec9fe7901ce Author: Gerd Hoffmann AuthorDate: Fri Aug 21 20:59:27 2015 +0200 Commit: Stefano Stabellini CommitDate: Fri Aug 21 22:10:58 2015 +0000 vnc: fix memory corruption (CVE-2015-5225) The _cmp_bytes variable added by commit "bea60dd ui/vnc: fix potential memory corruption issues" can become negative. Result is (possibly exploitable) memory corruption. Reason for that is it uses the stride instead of bytes per scanline to apply limits. For the server surface is is actually fine. vnc creates that itself, there is never any padding and thus scanline length always equals stride. For the guest surface scanline length and stride are typically identical too, but it doesn't has to be that way. So add and use a new variable (guest_ll) for the guest scanline length. Also rename min_stride to line_bytes to make more clear what it actually is. Finally sprinkle in an assert() to make sure we never use a negative _cmp_bytes again. Reported-by: =E8=8C=83=E7=A5=9A=E8=87=B3(=E5=BA=93=E7=89=B9) Reviewed-by: P J P Signed-off-by: Gerd Hoffmann Signed-off-by: Stefano Stabellini --- ui/vnc.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index 5707015..db4d97e 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -2689,7 +2689,7 @@ static int vnc_refresh_server_surface(VncDisplay *vd) pixman_image_get_width(vd->server)); int height =3D MIN(pixman_image_get_height(vd->guest.fb), pixman_image_get_height(vd->server)); - int cmp_bytes, server_stride, min_stride, guest_stride, y =3D 0; + int cmp_bytes, server_stride, line_bytes, guest_ll, guest_stride, y =3D 0; uint8_t *guest_row0 =3D NULL, *server_row0; VncState *vs; int has_dirty =3D 0; @@ -2708,17 +2708,21 @@ static int vnc_refresh_server_surface(VncDisplay *vd) * Update server dirty map. */ server_row0 =3D (uint8_t *)pixman_image_get_data(vd->server); - server_stride =3D guest_stride =3D pixman_image_get_stride(vd->server); + server_stride =3D guest_stride =3D guest_ll =3D + pixman_image_get_stride(vd->server); cmp_bytes =3D MIN(VNC_DIRTY_PIXELS_PER_BIT * VNC_SERVER_FB_BYTES, server_stride); if (vd->guest.format !=3D VNC_SERVER_FB_FORMAT) { int width =3D pixman_image_get_width(vd->server); tmpbuf =3D qemu_pixman_linebuf_create(VNC_SERVER_FB_FORMAT, width); } else { + int guest_bpp =3D + PIXMAN_FORMAT_BPP(pixman_image_get_format(vd->guest.fb)); guest_row0 =3D (uint8_t *)pixman_image_get_data(vd->guest.fb); guest_stride =3D pixman_image_get_stride(vd->guest.fb); + guest_ll =3D pixman_image_get_width(vd->guest.fb) * ((guest_bpp + 7) / 8); } - min_stride =3D MIN(server_stride, guest_stride); + line_bytes =3D MIN(server_stride, guest_ll); for (;;) { int x; @@ -2749,9 +2753,10 @@ static int vnc_refresh_server_surface(VncDisplay *vd) if (!test_and_clear_bit(x, vd->guest.dirty[y])) { continue; } - if ((x + 1) * cmp_bytes > min_stride) { - _cmp_bytes =3D min_stride - x * cmp_bytes; + if ((x + 1) * cmp_bytes > line_bytes) { + _cmp_bytes =3D line_bytes - x * cmp_bytes; } + assert(_cmp_bytes >=3D 0); if (memcmp(server_ptr, guest_ptr, _cmp_bytes) =3D=3D 0) { continue; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git --===============5977362208828819748== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============5977362208828819748==-- From xen-changelog-bounces@lists.xen.org Mon Aug 24 06:55:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Aug 2015 06:55:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZTlf4-0000VA-Dl; Mon, 24 Aug 2015 06:55:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZTlf2-0000V0-Ku for xen-changelog@lists.xensource.com; Mon, 24 Aug 2015 06:55:16 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id A1/AC-06179-4DFBAD55; Mon, 24 Aug 2015 06:55:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1440399314!29957942!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5717 invoked from network); 24 Aug 2015 06:55:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2015 06:55:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZTlf0-0000KL-8S for xen-changelog@lists.xensource.com; Mon, 24 Aug 2015 06:55:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZTlf0-0006XK-73 for xen-changelog@lists.xensource.com; Mon, 24 Aug 2015 06:55:14 +0000 Date: Mon, 24 Aug 2015 06:55:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] virtio-rng: fix check for period_ms validity X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b05befcbea71a979509ce04f02929969a790c923 Author: Amit Shah AuthorDate: Thu Dec 11 13:17:42 2014 +0530 Commit: Stefano Stabellini CommitDate: Fri Aug 21 22:19:34 2015 +0000 virtio-rng: fix check for period_ms validity This was reported for this warning: hw/virtio/virtio-rng.c:150:31: warning: logical not is only applied to the left hand side of comparison [-Wlogical-not-parentheses] upstream-commit-id: a3a292c420d2fec3c07a7ca56fbb064cd57a298a Reported-by: dcb Suggested-by: dcb Bug: https://bugs.launchpad.net/qemu/+bug/1393486 Reviewed-by: Gonglei Reviewed-by: Amos Kong Signed-off-by: Amit Shah Signed-off-by: Stefano Stabellini --- hw/virtio/virtio-rng.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c index 473c044..06e7178 100644 --- a/hw/virtio/virtio-rng.c +++ b/hw/virtio/virtio-rng.c @@ -149,7 +149,7 @@ static void virtio_rng_device_realize(DeviceState *dev, Error **errp) VirtIORNG *vrng = VIRTIO_RNG(dev); Error *local_err = NULL; - if (!vrng->conf.period_ms > 0) { + if (vrng->conf.period_ms <= 0) { error_setg(errp, "'period' parameter expects a positive integer"); return; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Aug 24 06:55:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Aug 2015 06:55:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZTlf4-0000VA-Dl; Mon, 24 Aug 2015 06:55:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZTlf2-0000V0-Ku for xen-changelog@lists.xensource.com; Mon, 24 Aug 2015 06:55:16 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id A1/AC-06179-4DFBAD55; Mon, 24 Aug 2015 06:55:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1440399314!29957942!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5717 invoked from network); 24 Aug 2015 06:55:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 24 Aug 2015 06:55:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZTlf0-0000KL-8S for xen-changelog@lists.xensource.com; Mon, 24 Aug 2015 06:55:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZTlf0-0006XK-73 for xen-changelog@lists.xensource.com; Mon, 24 Aug 2015 06:55:14 +0000 Date: Mon, 24 Aug 2015 06:55:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] virtio-rng: fix check for period_ms validity X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b05befcbea71a979509ce04f02929969a790c923 Author: Amit Shah AuthorDate: Thu Dec 11 13:17:42 2014 +0530 Commit: Stefano Stabellini CommitDate: Fri Aug 21 22:19:34 2015 +0000 virtio-rng: fix check for period_ms validity This was reported for this warning: hw/virtio/virtio-rng.c:150:31: warning: logical not is only applied to the left hand side of comparison [-Wlogical-not-parentheses] upstream-commit-id: a3a292c420d2fec3c07a7ca56fbb064cd57a298a Reported-by: dcb Suggested-by: dcb Bug: https://bugs.launchpad.net/qemu/+bug/1393486 Reviewed-by: Gonglei Reviewed-by: Amos Kong Signed-off-by: Amit Shah Signed-off-by: Stefano Stabellini --- hw/virtio/virtio-rng.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c index 473c044..06e7178 100644 --- a/hw/virtio/virtio-rng.c +++ b/hw/virtio/virtio-rng.c @@ -149,7 +149,7 @@ static void virtio_rng_device_realize(DeviceState *dev, Error **errp) VirtIORNG *vrng = VIRTIO_RNG(dev); Error *local_err = NULL; - if (!vrng->conf.period_ms > 0) { + if (vrng->conf.period_ms <= 0) { error_setg(errp, "'period' parameter expects a positive integer"); return; } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:22:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:22:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJnL-0001zq-9N; Tue, 25 Aug 2015 19:22:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJnJ-0001zl-Vy for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:22:06 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 57/57-10678-D50CCD55; Tue, 25 Aug 2015 19:22:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1440530523!38044562!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11785 invoked from network); 25 Aug 2015 19:22:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJnH-0006Ug-BX for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJnH-00085i-6B for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:22:03 +0000 Date: Tue, 25 Aug 2015 19:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] cxenstored: fix systemd socket activation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 81d758afca7c3c1e3ccbd78154b33d64fd7757fb Author: Wei Liu AuthorDate: Mon Aug 10 09:00:16 2015 +0100 Commit: Ian Campbell CommitDate: Thu Aug 13 10:23:58 2015 +0100 cxenstored: fix systemd socket activation There were two problems with original code: 1. sd_booted() was used to determined if the process was started by systemd, which was wrong. 2. Exit with error if pidfile was specified, which was too harsh. These two combined made cxenstored unable to start by hand if it ran on a system which had systemd. Fix issues with following changes: 1. Use sd_listen_fds to determine if the process is started by systemd. 2. Don't exit if pidfile is specified. Rename function and restructure code to make things clearer. A side effect of this patch is that gcc 4.8 with -Wmaybe-uninitialized in non-debug build spits out spurious warning about sock and ro_sock might be uninitialized. Since CentOS 7 ships gcc 4.8, we need to work around that by setting sock and ro_sock to NULL at the beginning of main. Signed-off-by: Wei Liu Tested-by: George Dunlap Acked-by: Ian Campbell --- tools/xenstore/xenstored_core.c | 29 ++++++++++++++++++++--------- 1 files changed, 20 insertions(+), 9 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index b7e4936..87cb715 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -1781,7 +1781,10 @@ static int xs_validate_active_socket(const char *connect_to) return xs_get_sd_fd(connect_to); } -static void xen_claim_active_sockets(int **psock, int **pro_sock) +/* Return true if started by systemd and false if not. Exit with + * error if things go wrong. + */ +static bool systemd_checkin(int **psock, int **pro_sock) { int *sock, *ro_sock; const char *soc_str = xs_daemon_socket(); @@ -1789,7 +1792,11 @@ static void xen_claim_active_sockets(int **psock, int **pro_sock) int n; n = sd_listen_fds(0); - if (n <= 0) { + + if (n == 0) + return false; + + if (n < 0) { sd_notifyf(0, "STATUS=Failed to get any active sockets: %s\n" "ERRNO=%i", strerror(errno), @@ -1816,6 +1823,8 @@ static void xen_claim_active_sockets(int **psock, int **pro_sock) talloc_set_destructor(sock, destroy_fd); talloc_set_destructor(ro_sock, destroy_fd); + + return true; } #endif @@ -1922,13 +1931,16 @@ int priv_domid = 0; int main(int argc, char *argv[]) { - int opt, *sock, *ro_sock; + int opt, *sock = NULL, *ro_sock = NULL; int sock_pollfd_idx = -1, ro_sock_pollfd_idx = -1; bool dofork = true; bool outputpid = false; bool no_domain_init = false; const char *pidfile = NULL; int timeout; +#if defined(XEN_SYSTEMD_ENABLED) + bool systemd; +#endif while ((opt = getopt_long(argc, argv, "DE:F:HNPS:t:T:RLVW:", options, NULL)) != -1) { @@ -1990,10 +2002,11 @@ int main(int argc, char *argv[]) barf("%s: No arguments desired", argv[0]); #if defined(XEN_SYSTEMD_ENABLED) - if (sd_booted()) { + systemd = systemd_checkin(&sock, &ro_sock); + if (systemd) { dofork = false; if (pidfile) - barf("%s: PID file not needed on systemd", argv[0]); + xprintf("%s: PID file not needed on systemd", argv[0]); pidfile = NULL; } #endif @@ -2020,9 +2033,7 @@ int main(int argc, char *argv[]) signal(SIGPIPE, SIG_IGN); #if defined(XEN_SYSTEMD_ENABLED) - if (sd_booted()) - xen_claim_active_sockets(&sock, &ro_sock); - else + if (!systemd) #endif init_sockets(&sock, &ro_sock); @@ -2057,7 +2068,7 @@ int main(int argc, char *argv[]) xenbus_notify_running(); #if defined(XEN_SYSTEMD_ENABLED) - if (sd_booted()) { + if (systemd) { sd_notify(1, "READY=1"); fprintf(stderr, SD_NOTICE "xenstored is ready\n"); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:22:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:22:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJnL-0001zq-9N; Tue, 25 Aug 2015 19:22:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJnJ-0001zl-Vy for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:22:06 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 57/57-10678-D50CCD55; Tue, 25 Aug 2015 19:22:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1440530523!38044562!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11785 invoked from network); 25 Aug 2015 19:22:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJnH-0006Ug-BX for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJnH-00085i-6B for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:22:03 +0000 Date: Tue, 25 Aug 2015 19:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] cxenstored: fix systemd socket activation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 81d758afca7c3c1e3ccbd78154b33d64fd7757fb Author: Wei Liu AuthorDate: Mon Aug 10 09:00:16 2015 +0100 Commit: Ian Campbell CommitDate: Thu Aug 13 10:23:58 2015 +0100 cxenstored: fix systemd socket activation There were two problems with original code: 1. sd_booted() was used to determined if the process was started by systemd, which was wrong. 2. Exit with error if pidfile was specified, which was too harsh. These two combined made cxenstored unable to start by hand if it ran on a system which had systemd. Fix issues with following changes: 1. Use sd_listen_fds to determine if the process is started by systemd. 2. Don't exit if pidfile is specified. Rename function and restructure code to make things clearer. A side effect of this patch is that gcc 4.8 with -Wmaybe-uninitialized in non-debug build spits out spurious warning about sock and ro_sock might be uninitialized. Since CentOS 7 ships gcc 4.8, we need to work around that by setting sock and ro_sock to NULL at the beginning of main. Signed-off-by: Wei Liu Tested-by: George Dunlap Acked-by: Ian Campbell --- tools/xenstore/xenstored_core.c | 29 ++++++++++++++++++++--------- 1 files changed, 20 insertions(+), 9 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index b7e4936..87cb715 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -1781,7 +1781,10 @@ static int xs_validate_active_socket(const char *connect_to) return xs_get_sd_fd(connect_to); } -static void xen_claim_active_sockets(int **psock, int **pro_sock) +/* Return true if started by systemd and false if not. Exit with + * error if things go wrong. + */ +static bool systemd_checkin(int **psock, int **pro_sock) { int *sock, *ro_sock; const char *soc_str = xs_daemon_socket(); @@ -1789,7 +1792,11 @@ static void xen_claim_active_sockets(int **psock, int **pro_sock) int n; n = sd_listen_fds(0); - if (n <= 0) { + + if (n == 0) + return false; + + if (n < 0) { sd_notifyf(0, "STATUS=Failed to get any active sockets: %s\n" "ERRNO=%i", strerror(errno), @@ -1816,6 +1823,8 @@ static void xen_claim_active_sockets(int **psock, int **pro_sock) talloc_set_destructor(sock, destroy_fd); talloc_set_destructor(ro_sock, destroy_fd); + + return true; } #endif @@ -1922,13 +1931,16 @@ int priv_domid = 0; int main(int argc, char *argv[]) { - int opt, *sock, *ro_sock; + int opt, *sock = NULL, *ro_sock = NULL; int sock_pollfd_idx = -1, ro_sock_pollfd_idx = -1; bool dofork = true; bool outputpid = false; bool no_domain_init = false; const char *pidfile = NULL; int timeout; +#if defined(XEN_SYSTEMD_ENABLED) + bool systemd; +#endif while ((opt = getopt_long(argc, argv, "DE:F:HNPS:t:T:RLVW:", options, NULL)) != -1) { @@ -1990,10 +2002,11 @@ int main(int argc, char *argv[]) barf("%s: No arguments desired", argv[0]); #if defined(XEN_SYSTEMD_ENABLED) - if (sd_booted()) { + systemd = systemd_checkin(&sock, &ro_sock); + if (systemd) { dofork = false; if (pidfile) - barf("%s: PID file not needed on systemd", argv[0]); + xprintf("%s: PID file not needed on systemd", argv[0]); pidfile = NULL; } #endif @@ -2020,9 +2033,7 @@ int main(int argc, char *argv[]) signal(SIGPIPE, SIG_IGN); #if defined(XEN_SYSTEMD_ENABLED) - if (sd_booted()) - xen_claim_active_sockets(&sock, &ro_sock); - else + if (!systemd) #endif init_sockets(&sock, &ro_sock); @@ -2057,7 +2068,7 @@ int main(int argc, char *argv[]) xenbus_notify_running(); #if defined(XEN_SYSTEMD_ENABLED) - if (sd_booted()) { + if (systemd) { sd_notify(1, "READY=1"); fprintf(stderr, SD_NOTICE "xenstored is ready\n"); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:22:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:22:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJna-00020Z-C1; Tue, 25 Aug 2015 19:22:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJnZ-00020O-32 for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:22:21 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id D5/BD-09570-C60CCD55; Tue, 25 Aug 2015 19:22:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1440530538!36801718!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16499 invoked from network); 25 Aug 2015 19:22:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:22:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJnW-0006Un-IK for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:22:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJnR-000864-Fo for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:22:13 +0000 Date: Tue, 25 Aug 2015 19:22:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] cxenstored: document a bunch of short options in help string X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 72ade132335b412edc7253f8099c63abdb13249c Author: Wei Liu AuthorDate: Mon Aug 10 09:00:17 2015 +0100 Commit: Ian Campbell CommitDate: Thu Aug 13 10:24:02 2015 +0100 cxenstored: document a bunch of short options in help string Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/xenstore/xenstored_core.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 87cb715..25a548d 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -1886,21 +1886,21 @@ static void usage(void) "\n" "where options may include:\n" "\n" -" --no-domain-init to state that xenstored should not initialise dom0,\n" -" --pid-file giving a file for the daemon's pid to be written,\n" -" --help to output this message,\n" -" --no-fork to request that the daemon does not fork,\n" -" --output-pid to request that the pid of the daemon is output,\n" -" --trace-file giving the file for logging, and\n" -" --entry-nb limit the number of entries per domain,\n" -" --entry-size limit the size of entry per domain, and\n" -" --watch-nb limit the number of watches per domain,\n" -" --transaction limit the number of transaction allowed per domain,\n" -" --no-recovery to request that no recovery should be attempted when\n" -" the store is corrupted (debug only),\n" -" --internal-db store database in memory, not on disk\n" -" --preserve-local to request that /local is preserved on start-up,\n" -" --verbose to request verbose execution.\n"); +" -D, --no-domain-init to state that xenstored should not initialise dom0,\n" +" -F, --pid-file giving a file for the daemon's pid to be written,\n" +" -H, --help to output this message,\n" +" -N, --no-fork to request that the daemon does not fork,\n" +" -P, --output-pid to request that the pid of the daemon is output,\n" +" -T, --trace-file giving the file for logging, and\n" +" -E, --entry-nb limit the number of entries per domain,\n" +" -S, --entry-size limit the size of entry per domain, and\n" +" -W, --watch-nb limit the number of watches per domain,\n" +" -t, --transaction limit the number of transaction allowed per domain,\n" +" -R, --no-recovery to request that no recovery should be attempted when\n" +" the store is corrupted (debug only),\n" +" -I, --internal-db store database in memory, not on disk\n" +" -L, --preserve-local to request that /local is preserved on start-up,\n" +" -V, --verbose to request verbose execution.\n"); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:22:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:22:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJna-00020Z-C1; Tue, 25 Aug 2015 19:22:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJnZ-00020O-32 for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:22:21 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id D5/BD-09570-C60CCD55; Tue, 25 Aug 2015 19:22:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1440530538!36801718!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16499 invoked from network); 25 Aug 2015 19:22:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:22:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJnW-0006Un-IK for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:22:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJnR-000864-Fo for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:22:13 +0000 Date: Tue, 25 Aug 2015 19:22:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] cxenstored: document a bunch of short options in help string X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 72ade132335b412edc7253f8099c63abdb13249c Author: Wei Liu AuthorDate: Mon Aug 10 09:00:17 2015 +0100 Commit: Ian Campbell CommitDate: Thu Aug 13 10:24:02 2015 +0100 cxenstored: document a bunch of short options in help string Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/xenstore/xenstored_core.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 87cb715..25a548d 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -1886,21 +1886,21 @@ static void usage(void) "\n" "where options may include:\n" "\n" -" --no-domain-init to state that xenstored should not initialise dom0,\n" -" --pid-file giving a file for the daemon's pid to be written,\n" -" --help to output this message,\n" -" --no-fork to request that the daemon does not fork,\n" -" --output-pid to request that the pid of the daemon is output,\n" -" --trace-file giving the file for logging, and\n" -" --entry-nb limit the number of entries per domain,\n" -" --entry-size limit the size of entry per domain, and\n" -" --watch-nb limit the number of watches per domain,\n" -" --transaction limit the number of transaction allowed per domain,\n" -" --no-recovery to request that no recovery should be attempted when\n" -" the store is corrupted (debug only),\n" -" --internal-db store database in memory, not on disk\n" -" --preserve-local to request that /local is preserved on start-up,\n" -" --verbose to request verbose execution.\n"); +" -D, --no-domain-init to state that xenstored should not initialise dom0,\n" +" -F, --pid-file giving a file for the daemon's pid to be written,\n" +" -H, --help to output this message,\n" +" -N, --no-fork to request that the daemon does not fork,\n" +" -P, --output-pid to request that the pid of the daemon is output,\n" +" -T, --trace-file giving the file for logging, and\n" +" -E, --entry-nb limit the number of entries per domain,\n" +" -S, --entry-size limit the size of entry per domain, and\n" +" -W, --watch-nb limit the number of watches per domain,\n" +" -t, --transaction limit the number of transaction allowed per domain,\n" +" -R, --no-recovery to request that no recovery should be attempted when\n" +" the store is corrupted (debug only),\n" +" -I, --internal-db store database in memory, not on disk\n" +" -L, --preserve-local to request that /local is preserved on start-up,\n" +" -V, --verbose to request verbose execution.\n"); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:22:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:22:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJnl-00021t-F2; Tue, 25 Aug 2015 19:22:33 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJnj-00021i-NR for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:22:31 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id 90/19-00475-670CCD55; Tue, 25 Aug 2015 19:22:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1440530548!43936094!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27284 invoked from network); 25 Aug 2015 19:22:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:22:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJng-0006Uz-Na for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:22:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJng-00086Q-MH for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:22:28 +0000 Date: Tue, 25 Aug 2015 19:22:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] oxenstored: fix systemd socket activation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit da743d1c9091e3f2046dee35bae9ae23e73b84f0 Author: Wei Liu AuthorDate: Mon Aug 10 09:00:18 2015 +0100 Commit: Ian Campbell CommitDate: Thu Aug 13 10:24:02 2015 +0100 oxenstored: fix systemd socket activation Use the correct API sd_listen_fds to determine whether the process is started by systemd. Change sd_booted to launched_by_systemd to avoid confusion with systemd's API. Signed-off-by: Wei Liu Acked-by: Dave Scott Acked-by: Ian Campbell Tested-by: Andrew Cooper --- tools/ocaml/xenstored/systemd.ml | 2 +- tools/ocaml/xenstored/systemd.mli | 4 ++-- tools/ocaml/xenstored/systemd_stubs.c | 6 +++--- tools/ocaml/xenstored/utils.ml | 2 +- tools/ocaml/xenstored/xenstored.ml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/ocaml/xenstored/systemd.ml b/tools/ocaml/xenstored/systemd.ml index 2aa39ea..732446d 100644 --- a/tools/ocaml/xenstored/systemd.ml +++ b/tools/ocaml/xenstored/systemd.ml @@ -13,5 +13,5 @@ *) external sd_listen_fds: string -> Unix.file_descr = "ocaml_sd_listen_fds" -external sd_booted: unit -> bool = "ocaml_sd_booted" +external launched_by_systemd: unit -> bool = "ocaml_launched_by_systemd" external sd_notify_ready: unit -> unit = "ocaml_sd_notify_ready" diff --git a/tools/ocaml/xenstored/systemd.mli b/tools/ocaml/xenstored/systemd.mli index 85c9f2e..538fc5e 100644 --- a/tools/ocaml/xenstored/systemd.mli +++ b/tools/ocaml/xenstored/systemd.mli @@ -17,8 +17,8 @@ * us do sanity checks on the expected sockets *) val sd_listen_fds: string -> Unix.file_descr -(** Tells us whether or not systemd support was compiled in *) -val sd_booted: unit -> bool +(** Tells us whether the process is launched by systemd *) +val launched_by_systemd: unit -> bool (** Tells systemd we're ready *) external sd_notify_ready: unit -> unit = "ocaml_sd_notify_ready" diff --git a/tools/ocaml/xenstored/systemd_stubs.c b/tools/ocaml/xenstored/systemd_stubs.c index d924ff1..1bd5dea 100644 --- a/tools/ocaml/xenstored/systemd_stubs.c +++ b/tools/ocaml/xenstored/systemd_stubs.c @@ -92,14 +92,14 @@ CAMLprim value ocaml_sd_listen_fds(value connect_to) CAMLreturn(sock_ret); } -CAMLprim value ocaml_sd_booted(value ignore) +CAMLprim value ocaml_launched_by_systemd(value ignore) { CAMLparam1(ignore); CAMLlocal1(ret); ret = Val_false; - if (sd_booted()) + if (sd_listen_fds(0) > 0) ret = Val_true; CAMLreturn(ret); @@ -129,7 +129,7 @@ CAMLprim value ocaml_sd_listen_fds(value connect_to) CAMLreturn(sock_ret); } -CAMLprim value ocaml_sd_booted(value ignore) +CAMLprim value ocaml_launched_by_systemd(value ignore) { CAMLparam1(ignore); CAMLlocal1(ret); diff --git a/tools/ocaml/xenstored/utils.ml b/tools/ocaml/xenstored/utils.ml index 61321c6..9f82c1c 100644 --- a/tools/ocaml/xenstored/utils.ml +++ b/tools/ocaml/xenstored/utils.ml @@ -84,7 +84,7 @@ let create_regular_unix_socket name = sock let create_unix_socket name = - if Systemd.sd_booted() then + if Systemd.launched_by_systemd() then Systemd.sd_listen_fds name else create_regular_unix_socket name diff --git a/tools/ocaml/xenstored/xenstored.ml b/tools/ocaml/xenstored/xenstored.ml index bfe689b..f484024 100644 --- a/tools/ocaml/xenstored/xenstored.ml +++ b/tools/ocaml/xenstored/xenstored.ml @@ -431,7 +431,7 @@ let _ = while not !quit do try - if Systemd.sd_booted() then + if Systemd.launched_by_systemd() then Systemd.sd_notify_ready (); main_loop () with exc -> -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:22:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:22:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJnl-00021t-F2; Tue, 25 Aug 2015 19:22:33 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJnj-00021i-NR for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:22:31 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id 90/19-00475-670CCD55; Tue, 25 Aug 2015 19:22:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1440530548!43936094!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27284 invoked from network); 25 Aug 2015 19:22:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:22:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJng-0006Uz-Na for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:22:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJng-00086Q-MH for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:22:28 +0000 Date: Tue, 25 Aug 2015 19:22:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] oxenstored: fix systemd socket activation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit da743d1c9091e3f2046dee35bae9ae23e73b84f0 Author: Wei Liu AuthorDate: Mon Aug 10 09:00:18 2015 +0100 Commit: Ian Campbell CommitDate: Thu Aug 13 10:24:02 2015 +0100 oxenstored: fix systemd socket activation Use the correct API sd_listen_fds to determine whether the process is started by systemd. Change sd_booted to launched_by_systemd to avoid confusion with systemd's API. Signed-off-by: Wei Liu Acked-by: Dave Scott Acked-by: Ian Campbell Tested-by: Andrew Cooper --- tools/ocaml/xenstored/systemd.ml | 2 +- tools/ocaml/xenstored/systemd.mli | 4 ++-- tools/ocaml/xenstored/systemd_stubs.c | 6 +++--- tools/ocaml/xenstored/utils.ml | 2 +- tools/ocaml/xenstored/xenstored.ml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/ocaml/xenstored/systemd.ml b/tools/ocaml/xenstored/systemd.ml index 2aa39ea..732446d 100644 --- a/tools/ocaml/xenstored/systemd.ml +++ b/tools/ocaml/xenstored/systemd.ml @@ -13,5 +13,5 @@ *) external sd_listen_fds: string -> Unix.file_descr = "ocaml_sd_listen_fds" -external sd_booted: unit -> bool = "ocaml_sd_booted" +external launched_by_systemd: unit -> bool = "ocaml_launched_by_systemd" external sd_notify_ready: unit -> unit = "ocaml_sd_notify_ready" diff --git a/tools/ocaml/xenstored/systemd.mli b/tools/ocaml/xenstored/systemd.mli index 85c9f2e..538fc5e 100644 --- a/tools/ocaml/xenstored/systemd.mli +++ b/tools/ocaml/xenstored/systemd.mli @@ -17,8 +17,8 @@ * us do sanity checks on the expected sockets *) val sd_listen_fds: string -> Unix.file_descr -(** Tells us whether or not systemd support was compiled in *) -val sd_booted: unit -> bool +(** Tells us whether the process is launched by systemd *) +val launched_by_systemd: unit -> bool (** Tells systemd we're ready *) external sd_notify_ready: unit -> unit = "ocaml_sd_notify_ready" diff --git a/tools/ocaml/xenstored/systemd_stubs.c b/tools/ocaml/xenstored/systemd_stubs.c index d924ff1..1bd5dea 100644 --- a/tools/ocaml/xenstored/systemd_stubs.c +++ b/tools/ocaml/xenstored/systemd_stubs.c @@ -92,14 +92,14 @@ CAMLprim value ocaml_sd_listen_fds(value connect_to) CAMLreturn(sock_ret); } -CAMLprim value ocaml_sd_booted(value ignore) +CAMLprim value ocaml_launched_by_systemd(value ignore) { CAMLparam1(ignore); CAMLlocal1(ret); ret = Val_false; - if (sd_booted()) + if (sd_listen_fds(0) > 0) ret = Val_true; CAMLreturn(ret); @@ -129,7 +129,7 @@ CAMLprim value ocaml_sd_listen_fds(value connect_to) CAMLreturn(sock_ret); } -CAMLprim value ocaml_sd_booted(value ignore) +CAMLprim value ocaml_launched_by_systemd(value ignore) { CAMLparam1(ignore); CAMLlocal1(ret); diff --git a/tools/ocaml/xenstored/utils.ml b/tools/ocaml/xenstored/utils.ml index 61321c6..9f82c1c 100644 --- a/tools/ocaml/xenstored/utils.ml +++ b/tools/ocaml/xenstored/utils.ml @@ -84,7 +84,7 @@ let create_regular_unix_socket name = sock let create_unix_socket name = - if Systemd.sd_booted() then + if Systemd.launched_by_systemd() then Systemd.sd_listen_fds name else create_regular_unix_socket name diff --git a/tools/ocaml/xenstored/xenstored.ml b/tools/ocaml/xenstored/xenstored.ml index bfe689b..f484024 100644 --- a/tools/ocaml/xenstored/xenstored.ml +++ b/tools/ocaml/xenstored/xenstored.ml @@ -431,7 +431,7 @@ let _ = while not !quit do try - if Systemd.sd_booted() then + if Systemd.launched_by_systemd() then Systemd.sd_notify_ready (); main_loop () with exc -> -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:22:42 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:22:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJnu-000234-HW; Tue, 25 Aug 2015 19:22:42 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJnt-00022p-AI for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:22:41 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id AA/DE-30270-080CCD55; Tue, 25 Aug 2015 19:22:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1440530559!22877061!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18230 invoked from network); 25 Aug 2015 19:22:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:22:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJnq-0006V7-Sq for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:22:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJnq-00086m-RY for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:22:38 +0000 Date: Tue, 25 Aug 2015 19:22:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] oxenstored: move sd_notify_ready out of main loop X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 18dd9f7fc27fbe3c802c4e8f7e8ac3150eb7d624 Author: Wei Liu AuthorDate: Mon Aug 10 09:00:19 2015 +0100 Commit: Ian Campbell CommitDate: Thu Aug 13 10:24:03 2015 +0100 oxenstored: move sd_notify_ready out of main loop Oxenstored only needs to notify systemd its readiness state once. Move sd_notify_ready out of main loop. Signed-off-by: Wei Liu Acked-by: Dave Scott Tested-by: Andrew Cooper --- tools/ocaml/xenstored/xenstored.ml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ocaml/xenstored/xenstored.ml b/tools/ocaml/xenstored/xenstored.ml index f484024..42b8183 100644 --- a/tools/ocaml/xenstored/xenstored.ml +++ b/tools/ocaml/xenstored/xenstored.ml @@ -428,11 +428,11 @@ let _ = process_domains store cons domains in + if Systemd.launched_by_systemd () then + Systemd.sd_notify_ready (); while not !quit do try - if Systemd.launched_by_systemd() then - Systemd.sd_notify_ready (); main_loop () with exc -> error "caught exception %s" (Printexc.to_string exc); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:22:42 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:22:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJnu-000234-HW; Tue, 25 Aug 2015 19:22:42 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJnt-00022p-AI for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:22:41 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id AA/DE-30270-080CCD55; Tue, 25 Aug 2015 19:22:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1440530559!22877061!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18230 invoked from network); 25 Aug 2015 19:22:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:22:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJnq-0006V7-Sq for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:22:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJnq-00086m-RY for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:22:38 +0000 Date: Tue, 25 Aug 2015 19:22:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] oxenstored: move sd_notify_ready out of main loop X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 18dd9f7fc27fbe3c802c4e8f7e8ac3150eb7d624 Author: Wei Liu AuthorDate: Mon Aug 10 09:00:19 2015 +0100 Commit: Ian Campbell CommitDate: Thu Aug 13 10:24:03 2015 +0100 oxenstored: move sd_notify_ready out of main loop Oxenstored only needs to notify systemd its readiness state once. Move sd_notify_ready out of main loop. Signed-off-by: Wei Liu Acked-by: Dave Scott Tested-by: Andrew Cooper --- tools/ocaml/xenstored/xenstored.ml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ocaml/xenstored/xenstored.ml b/tools/ocaml/xenstored/xenstored.ml index f484024..42b8183 100644 --- a/tools/ocaml/xenstored/xenstored.ml +++ b/tools/ocaml/xenstored/xenstored.ml @@ -428,11 +428,11 @@ let _ = process_domains store cons domains in + if Systemd.launched_by_systemd () then + Systemd.sd_notify_ready (); while not !quit do try - if Systemd.launched_by_systemd() then - Systemd.sd_notify_ready (); main_loop () with exc -> error "caught exception %s" (Printexc.to_string exc); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:22:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:22:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJo4-00024f-K3; Tue, 25 Aug 2015 19:22:52 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJo3-00024V-G9 for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:22:51 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id F9/EA-02380-A80CCD55; Tue, 25 Aug 2015 19:22:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1440530569!30446890!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7631 invoked from network); 25 Aug 2015 19:22:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:22:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJo1-0006VF-2D for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:22:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJo1-000879-0a for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:22:49 +0000 Date: Tue, 25 Aug 2015 19:22:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: linux: Don't use getpagesize() when unmapping the grants X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 31cf2ca7518188ec154d1d82c38970883183fa3b Author: Julien Grall AuthorDate: Fri Aug 7 19:53:55 2015 +0100 Commit: Ian Campbell CommitDate: Thu Aug 13 10:25:11 2015 +0100 tools/libxc: linux: Don't use getpagesize() when unmapping the grants The grants are based on the Xen granularity (i.e 4KB). While the function to map grants for Linux (linux_gnttab_grant_map) is using the correct size (XC_PAGE_SIZE), the unmap one (linux_gnttab_munmap) is using getpagesize(). On domain using a page granularity different than Xen (this is the case for AARCH64 guest using 64KB page), the unmap will be called with the wrong size. Signed-off-by: Julien Grall Acked-by: Wei Liu Acked-by: Ian Campbell --- tools/libxc/xc_linux_osdep.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_linux_osdep.c b/tools/libxc/xc_linux_osdep.c index e375428..76c55ff 100644 --- a/tools/libxc/xc_linux_osdep.c +++ b/tools/libxc/xc_linux_osdep.c @@ -742,7 +742,7 @@ static int linux_gnttab_munmap(xc_gnttab *xcg, xc_osdep_handle h, } /* Next, unmap the memory. */ - if ( (rc = munmap(start_address, count * getpagesize())) ) + if ( (rc = munmap(start_address, count * XC_PAGE_SIZE)) ) return rc; /* Finally, unmap the driver slots used to store the grant information. */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:22:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:22:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJo4-00024f-K3; Tue, 25 Aug 2015 19:22:52 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJo3-00024V-G9 for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:22:51 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id F9/EA-02380-A80CCD55; Tue, 25 Aug 2015 19:22:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1440530569!30446890!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7631 invoked from network); 25 Aug 2015 19:22:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:22:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJo1-0006VF-2D for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:22:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJo1-000879-0a for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:22:49 +0000 Date: Tue, 25 Aug 2015 19:22:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: linux: Don't use getpagesize() when unmapping the grants X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 31cf2ca7518188ec154d1d82c38970883183fa3b Author: Julien Grall AuthorDate: Fri Aug 7 19:53:55 2015 +0100 Commit: Ian Campbell CommitDate: Thu Aug 13 10:25:11 2015 +0100 tools/libxc: linux: Don't use getpagesize() when unmapping the grants The grants are based on the Xen granularity (i.e 4KB). While the function to map grants for Linux (linux_gnttab_grant_map) is using the correct size (XC_PAGE_SIZE), the unmap one (linux_gnttab_munmap) is using getpagesize(). On domain using a page granularity different than Xen (this is the case for AARCH64 guest using 64KB page), the unmap will be called with the wrong size. Signed-off-by: Julien Grall Acked-by: Wei Liu Acked-by: Ian Campbell --- tools/libxc/xc_linux_osdep.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_linux_osdep.c b/tools/libxc/xc_linux_osdep.c index e375428..76c55ff 100644 --- a/tools/libxc/xc_linux_osdep.c +++ b/tools/libxc/xc_linux_osdep.c @@ -742,7 +742,7 @@ static int linux_gnttab_munmap(xc_gnttab *xcg, xc_osdep_handle h, } /* Next, unmap the memory. */ - if ( (rc = munmap(start_address, count * getpagesize())) ) + if ( (rc = munmap(start_address, count * XC_PAGE_SIZE)) ) return rc; /* Finally, unmap the driver slots used to store the grant information. */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:23:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:23:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJoF-00026G-Ma; Tue, 25 Aug 2015 19:23:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJoE-000263-6S for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:23:02 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id 95/71-12946-590CCD55; Tue, 25 Aug 2015 19:23:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1440530579!37923647!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25479 invoked from network); 25 Aug 2015 19:23:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:23:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJoB-0006VN-76 for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:22:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJoB-00087V-5s for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:22:59 +0000 Date: Tue, 25 Aug 2015 19:22:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: Assert success of memory allocation in testidl X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4289820507df2913300d9fe6caf733e0600f0d54 Author: Andrew Cooper AuthorDate: Fri Aug 7 15:06:23 2015 +0100 Commit: Ian Campbell CommitDate: Thu Aug 13 10:46:48 2015 +0100 tools/libxl: Assert success of memory allocation in testidl The chances of an allocation failing are slim but nonzero. Assert success of each allocation to quieten Coverity, which re-notices defects each time the IDL changes. Signed-off-by: Andrew Cooper Acked-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/gentest.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/libxl/gentest.py b/tools/libxl/gentest.py index 7621a1e..85311e7 100644 --- a/tools/libxl/gentest.py +++ b/tools/libxl/gentest.py @@ -33,6 +33,7 @@ def gen_rand_init(ty, v, indent = " ", parent = None): s += "%s = rand()%%8;\n" % (parent + ty.lenvar.name) s += "%s = calloc(%s, sizeof(*%s));\n" % \ (v, parent + ty.lenvar.name, v) + s += "assert(%s);\n" % (v, ) s += "{\n" s += " int i;\n" s += " for (i=0; i<%s; i++)\n" % (parent + ty.lenvar.name) @@ -98,6 +99,7 @@ if __name__ == '__main__': #include #include #include +#include #include "libxl.h" #include "libxl_utils.h" @@ -106,6 +108,7 @@ static char *rand_str(void) { int i, sz = rand() % 32; char *s = malloc(sz+1); + assert(s); for (i=0; isize = rand() % 16; bitmap->map = calloc(bitmap->size, sizeof(*bitmap->map)); + assert(bitmap->map); libxl_for_each_bit(i, *bitmap) { if (rand() % 2) libxl_bitmap_set(bitmap, i); @@ -136,6 +140,7 @@ static void libxl_key_value_list_rand_init(libxl_key_value_list *pkvl) { int i, nr_kvp = rand() % 16; libxl_key_value_list kvl = calloc(nr_kvp+1, 2*sizeof(char *)); + assert(kvl); for (i = 0; i<2*nr_kvp; i += 2) { kvl[i] = rand_str(); @@ -196,6 +201,7 @@ static void libxl_string_list_rand_init(libxl_string_list *p) { int i, nr = rand() % 16; libxl_string_list l = calloc(nr+1, sizeof(char *)); + assert(l); for (i = 0; i Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:23:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJoF-00026G-Ma; Tue, 25 Aug 2015 19:23:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJoE-000263-6S for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:23:02 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id 95/71-12946-590CCD55; Tue, 25 Aug 2015 19:23:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1440530579!37923647!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25479 invoked from network); 25 Aug 2015 19:23:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:23:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJoB-0006VN-76 for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:22:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJoB-00087V-5s for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:22:59 +0000 Date: Tue, 25 Aug 2015 19:22:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: Assert success of memory allocation in testidl X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4289820507df2913300d9fe6caf733e0600f0d54 Author: Andrew Cooper AuthorDate: Fri Aug 7 15:06:23 2015 +0100 Commit: Ian Campbell CommitDate: Thu Aug 13 10:46:48 2015 +0100 tools/libxl: Assert success of memory allocation in testidl The chances of an allocation failing are slim but nonzero. Assert success of each allocation to quieten Coverity, which re-notices defects each time the IDL changes. Signed-off-by: Andrew Cooper Acked-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/gentest.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/libxl/gentest.py b/tools/libxl/gentest.py index 7621a1e..85311e7 100644 --- a/tools/libxl/gentest.py +++ b/tools/libxl/gentest.py @@ -33,6 +33,7 @@ def gen_rand_init(ty, v, indent = " ", parent = None): s += "%s = rand()%%8;\n" % (parent + ty.lenvar.name) s += "%s = calloc(%s, sizeof(*%s));\n" % \ (v, parent + ty.lenvar.name, v) + s += "assert(%s);\n" % (v, ) s += "{\n" s += " int i;\n" s += " for (i=0; i<%s; i++)\n" % (parent + ty.lenvar.name) @@ -98,6 +99,7 @@ if __name__ == '__main__': #include #include #include +#include #include "libxl.h" #include "libxl_utils.h" @@ -106,6 +108,7 @@ static char *rand_str(void) { int i, sz = rand() % 32; char *s = malloc(sz+1); + assert(s); for (i=0; isize = rand() % 16; bitmap->map = calloc(bitmap->size, sizeof(*bitmap->map)); + assert(bitmap->map); libxl_for_each_bit(i, *bitmap) { if (rand() % 2) libxl_bitmap_set(bitmap, i); @@ -136,6 +140,7 @@ static void libxl_key_value_list_rand_init(libxl_key_value_list *pkvl) { int i, nr_kvp = rand() % 16; libxl_key_value_list kvl = calloc(nr_kvp+1, 2*sizeof(char *)); + assert(kvl); for (i = 0; i<2*nr_kvp; i += 2) { kvl[i] = rand_str(); @@ -196,6 +201,7 @@ static void libxl_string_list_rand_init(libxl_string_list *p) { int i, nr = rand() % 16; libxl_string_list l = calloc(nr+1, sizeof(char *)); + assert(l); for (i = 0; i Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:23:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJoR-00027m-PE; Tue, 25 Aug 2015 19:23:15 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJoQ-00027b-HX for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:23:14 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 17/0A-01143-1A0CCD55; Tue, 25 Aug 2015 19:23:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1440530589!43924391!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17237 invoked from network); 25 Aug 2015 19:23:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:23:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJoL-0006Vy-CX for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:23:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJoL-00088Z-B1 for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:23:09 +0000 Date: Tue, 25 Aug 2015 19:23:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: Alter the use of rand() in testidl X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c91d0f58dc94074cdc77c40c39ecf8e80d7b82e4 Author: Andrew Cooper AuthorDate: Fri Aug 7 15:06:24 2015 +0100 Commit: Ian Campbell CommitDate: Thu Aug 13 10:47:08 2015 +0100 tools/libxl: Alter the use of rand() in testidl Coverity warns for every occurrence of rand(), which is made worse because each time the IDL changes, some of the calls get re-flagged. Collect all calls to rand() in a single function, test_rand(), which takes a modulo parameter for convenience. This turns 40 defects currently into 1, which won't get re-flagged when the IDL changes. In addition, fix the erroneous random choice for libxl_defbool_set(). "!!rand() % 1" is unconditionally 0, and even without the "% 1" would still be very heavily skewed in one direction. Signed-off-by: Andrew Cooper Acked-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/gentest.py | 36 +++++++++++++++++++++--------------- 1 files changed, 21 insertions(+), 15 deletions(-) diff --git a/tools/libxl/gentest.py b/tools/libxl/gentest.py index 85311e7..989959f 100644 --- a/tools/libxl/gentest.py +++ b/tools/libxl/gentest.py @@ -30,7 +30,7 @@ def gen_rand_init(ty, v, indent = " ", parent = None): elif isinstance(ty, idl.Array): if parent is None: raise Exception("Array type must have a parent") - s += "%s = rand()%%8;\n" % (parent + ty.lenvar.name) + s += "%s = test_rand(8);\n" % (parent + ty.lenvar.name) s += "%s = calloc(%s, sizeof(*%s));\n" % \ (v, parent + ty.lenvar.name, v) s += "assert(%s);\n" % (v, ) @@ -64,13 +64,13 @@ def gen_rand_init(ty, v, indent = " ", parent = None): elif ty.typename in ["libxl_uuid", "libxl_mac", "libxl_hwcap", "libxl_ms_vm_genid"]: s += "rand_bytes((uint8_t *)%s, sizeof(*%s));\n" % (v,v) elif ty.typename in ["libxl_domid", "libxl_devid"] or isinstance(ty, idl.Number): - s += "%s = rand() %% (sizeof(%s)*8);\n" % \ + s += "%s = test_rand(sizeof(%s) * 8);\n" % \ (ty.pass_arg(v, parent is None), ty.pass_arg(v, parent is None)) elif ty.typename in ["bool"]: - s += "%s = rand() %% 2;\n" % v + s += "%s = test_rand(2);\n" % v elif ty.typename in ["libxl_defbool"]: - s += "libxl_defbool_set(%s, !!rand() %% 1);\n" % v + s += "libxl_defbool_set(%s, test_rand(2));\n" % v elif ty.typename in ["char *"]: s += "%s = rand_str();\n" % v elif ty.private: @@ -104,13 +104,19 @@ if __name__ == '__main__': #include "libxl.h" #include "libxl_utils.h" +static int test_rand(unsigned max) +{ + /* We are not using rand() for its cryptographic properies. */ + return rand() % max; +} + static char *rand_str(void) { - int i, sz = rand() % 32; + int i, sz = test_rand(32); char *s = malloc(sz+1); assert(s); for (i=0; isize = rand() % 16; + bitmap->size = test_rand(16); bitmap->map = calloc(bitmap->size, sizeof(*bitmap->map)); assert(bitmap->map); libxl_for_each_bit(i, *bitmap) { - if (rand() % 2) + if (test_rand(2)) libxl_bitmap_set(bitmap, i); else libxl_bitmap_reset(bitmap, i); @@ -138,13 +144,13 @@ static void libxl_bitmap_rand_init(libxl_bitmap *bitmap) static void libxl_key_value_list_rand_init(libxl_key_value_list *pkvl) { - int i, nr_kvp = rand() % 16; + int i, nr_kvp = test_rand(16); libxl_key_value_list kvl = calloc(nr_kvp+1, 2*sizeof(char *)); assert(kvl); for (i = 0; i<2*nr_kvp; i += 2) { kvl[i] = rand_str(); - if (rand() % 8) + if (test_rand(8)) kvl[i+1] = rand_str(); else kvl[i+1] = NULL; @@ -156,7 +162,7 @@ static void libxl_key_value_list_rand_init(libxl_key_value_list *pkvl) static void libxl_cpuid_policy_list_rand_init(libxl_cpuid_policy_list *pp) { - int i, nr_policies = rand() % 16; + int i, nr_policies = test_rand(16); struct { const char *n; int w; @@ -189,8 +195,8 @@ static void libxl_cpuid_policy_list_rand_init(libxl_cpuid_policy_list *pp) libxl_cpuid_policy_list p = NULL; for (i = 0; i < nr_policies; i++) { - int opt = rand() % nr_options; - int val = rand() % (1< Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:23:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJoR-00027m-PE; Tue, 25 Aug 2015 19:23:15 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJoQ-00027b-HX for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:23:14 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 17/0A-01143-1A0CCD55; Tue, 25 Aug 2015 19:23:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1440530589!43924391!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17237 invoked from network); 25 Aug 2015 19:23:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:23:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJoL-0006Vy-CX for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:23:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJoL-00088Z-B1 for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:23:09 +0000 Date: Tue, 25 Aug 2015 19:23:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: Alter the use of rand() in testidl X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c91d0f58dc94074cdc77c40c39ecf8e80d7b82e4 Author: Andrew Cooper AuthorDate: Fri Aug 7 15:06:24 2015 +0100 Commit: Ian Campbell CommitDate: Thu Aug 13 10:47:08 2015 +0100 tools/libxl: Alter the use of rand() in testidl Coverity warns for every occurrence of rand(), which is made worse because each time the IDL changes, some of the calls get re-flagged. Collect all calls to rand() in a single function, test_rand(), which takes a modulo parameter for convenience. This turns 40 defects currently into 1, which won't get re-flagged when the IDL changes. In addition, fix the erroneous random choice for libxl_defbool_set(). "!!rand() % 1" is unconditionally 0, and even without the "% 1" would still be very heavily skewed in one direction. Signed-off-by: Andrew Cooper Acked-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/gentest.py | 36 +++++++++++++++++++++--------------- 1 files changed, 21 insertions(+), 15 deletions(-) diff --git a/tools/libxl/gentest.py b/tools/libxl/gentest.py index 85311e7..989959f 100644 --- a/tools/libxl/gentest.py +++ b/tools/libxl/gentest.py @@ -30,7 +30,7 @@ def gen_rand_init(ty, v, indent = " ", parent = None): elif isinstance(ty, idl.Array): if parent is None: raise Exception("Array type must have a parent") - s += "%s = rand()%%8;\n" % (parent + ty.lenvar.name) + s += "%s = test_rand(8);\n" % (parent + ty.lenvar.name) s += "%s = calloc(%s, sizeof(*%s));\n" % \ (v, parent + ty.lenvar.name, v) s += "assert(%s);\n" % (v, ) @@ -64,13 +64,13 @@ def gen_rand_init(ty, v, indent = " ", parent = None): elif ty.typename in ["libxl_uuid", "libxl_mac", "libxl_hwcap", "libxl_ms_vm_genid"]: s += "rand_bytes((uint8_t *)%s, sizeof(*%s));\n" % (v,v) elif ty.typename in ["libxl_domid", "libxl_devid"] or isinstance(ty, idl.Number): - s += "%s = rand() %% (sizeof(%s)*8);\n" % \ + s += "%s = test_rand(sizeof(%s) * 8);\n" % \ (ty.pass_arg(v, parent is None), ty.pass_arg(v, parent is None)) elif ty.typename in ["bool"]: - s += "%s = rand() %% 2;\n" % v + s += "%s = test_rand(2);\n" % v elif ty.typename in ["libxl_defbool"]: - s += "libxl_defbool_set(%s, !!rand() %% 1);\n" % v + s += "libxl_defbool_set(%s, test_rand(2));\n" % v elif ty.typename in ["char *"]: s += "%s = rand_str();\n" % v elif ty.private: @@ -104,13 +104,19 @@ if __name__ == '__main__': #include "libxl.h" #include "libxl_utils.h" +static int test_rand(unsigned max) +{ + /* We are not using rand() for its cryptographic properies. */ + return rand() % max; +} + static char *rand_str(void) { - int i, sz = rand() % 32; + int i, sz = test_rand(32); char *s = malloc(sz+1); assert(s); for (i=0; isize = rand() % 16; + bitmap->size = test_rand(16); bitmap->map = calloc(bitmap->size, sizeof(*bitmap->map)); assert(bitmap->map); libxl_for_each_bit(i, *bitmap) { - if (rand() % 2) + if (test_rand(2)) libxl_bitmap_set(bitmap, i); else libxl_bitmap_reset(bitmap, i); @@ -138,13 +144,13 @@ static void libxl_bitmap_rand_init(libxl_bitmap *bitmap) static void libxl_key_value_list_rand_init(libxl_key_value_list *pkvl) { - int i, nr_kvp = rand() % 16; + int i, nr_kvp = test_rand(16); libxl_key_value_list kvl = calloc(nr_kvp+1, 2*sizeof(char *)); assert(kvl); for (i = 0; i<2*nr_kvp; i += 2) { kvl[i] = rand_str(); - if (rand() % 8) + if (test_rand(8)) kvl[i+1] = rand_str(); else kvl[i+1] = NULL; @@ -156,7 +162,7 @@ static void libxl_key_value_list_rand_init(libxl_key_value_list *pkvl) static void libxl_cpuid_policy_list_rand_init(libxl_cpuid_policy_list *pp) { - int i, nr_policies = rand() % 16; + int i, nr_policies = test_rand(16); struct { const char *n; int w; @@ -189,8 +195,8 @@ static void libxl_cpuid_policy_list_rand_init(libxl_cpuid_policy_list *pp) libxl_cpuid_policy_list p = NULL; for (i = 0; i < nr_policies; i++) { - int opt = rand() % nr_options; - int val = rand() % (1< Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:23:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJod-00029e-Tj; Tue, 25 Aug 2015 19:23:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJoc-000290-MK for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:23:26 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 5A/BB-10422-9A0CCD55; Tue, 25 Aug 2015 19:23:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1440530599!30451556!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9473 invoked from network); 25 Aug 2015 19:23:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:23:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJoV-0006W6-HA for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:23:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJoV-00089K-G6 for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:23:19 +0000 Date: Tue, 25 Aug 2015 19:23:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xenstore: Correct use of va_end() after va_copy() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit de8c3e826499dbf69d01ee935a67b5d67a131496 Author: Andrew Cooper AuthorDate: Fri Aug 7 14:51:59 2015 +0100 Commit: Ian Campbell CommitDate: Thu Aug 13 10:58:43 2015 +0100 tools/xenstore: Correct use of va_end() after va_copy() C requires that every use of va_copy() is matched with a va_end() call. This is especially important for x86_64 as va_{start,copy}() may need to allocate memory to generate a va_list containing parameters which were previously in registers. Signed-off-by: Andrew Cooper Acked-by: Wei Liu --- tools/xenstore/talloc.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/xenstore/talloc.c b/tools/xenstore/talloc.c index 54dbd02..d7edcf3 100644 --- a/tools/xenstore/talloc.c +++ b/tools/xenstore/talloc.c @@ -1101,13 +1101,16 @@ char *talloc_vasprintf(const void *t, const char *fmt, va_list ap) /* this call looks strange, but it makes it work on older solaris boxes */ if ((len = vsnprintf(&c, 1, fmt, ap2)) < 0) { + va_end(ap2); return NULL; } + va_end(ap2); ret = _talloc(t, len+1); if (ret) { VA_COPY(ap2, ap); vsnprintf(ret, len+1, fmt, ap2); + va_end(ap2); talloc_set_name_const(ret, ret); } @@ -1161,8 +1164,10 @@ static char *talloc_vasprintf_append(char *s, const char *fmt, va_list ap) * the original string. Most current callers of this * function expect it to never return NULL. */ + va_end(ap2); return s; } + va_end(ap2); s = talloc_realloc(NULL, s, char, s_len + len+1); if (!s) return NULL; @@ -1170,6 +1175,7 @@ static char *talloc_vasprintf_append(char *s, const char *fmt, va_list ap) VA_COPY(ap2, ap); vsnprintf(s+s_len, len+1, fmt, ap2); + va_end(ap2); talloc_set_name_const(s, s); return s; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:23:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:23:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJod-00029e-Tj; Tue, 25 Aug 2015 19:23:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJoc-000290-MK for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:23:26 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 5A/BB-10422-9A0CCD55; Tue, 25 Aug 2015 19:23:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1440530599!30451556!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9473 invoked from network); 25 Aug 2015 19:23:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:23:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJoV-0006W6-HA for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:23:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJoV-00089K-G6 for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:23:19 +0000 Date: Tue, 25 Aug 2015 19:23:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xenstore: Correct use of va_end() after va_copy() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit de8c3e826499dbf69d01ee935a67b5d67a131496 Author: Andrew Cooper AuthorDate: Fri Aug 7 14:51:59 2015 +0100 Commit: Ian Campbell CommitDate: Thu Aug 13 10:58:43 2015 +0100 tools/xenstore: Correct use of va_end() after va_copy() C requires that every use of va_copy() is matched with a va_end() call. This is especially important for x86_64 as va_{start,copy}() may need to allocate memory to generate a va_list containing parameters which were previously in registers. Signed-off-by: Andrew Cooper Acked-by: Wei Liu --- tools/xenstore/talloc.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/xenstore/talloc.c b/tools/xenstore/talloc.c index 54dbd02..d7edcf3 100644 --- a/tools/xenstore/talloc.c +++ b/tools/xenstore/talloc.c @@ -1101,13 +1101,16 @@ char *talloc_vasprintf(const void *t, const char *fmt, va_list ap) /* this call looks strange, but it makes it work on older solaris boxes */ if ((len = vsnprintf(&c, 1, fmt, ap2)) < 0) { + va_end(ap2); return NULL; } + va_end(ap2); ret = _talloc(t, len+1); if (ret) { VA_COPY(ap2, ap); vsnprintf(ret, len+1, fmt, ap2); + va_end(ap2); talloc_set_name_const(ret, ret); } @@ -1161,8 +1164,10 @@ static char *talloc_vasprintf_append(char *s, const char *fmt, va_list ap) * the original string. Most current callers of this * function expect it to never return NULL. */ + va_end(ap2); return s; } + va_end(ap2); s = talloc_realloc(NULL, s, char, s_len + len+1); if (!s) return NULL; @@ -1170,6 +1175,7 @@ static char *talloc_vasprintf_append(char *s, const char *fmt, va_list ap) VA_COPY(ap2, ap); vsnprintf(s+s_len, len+1, fmt, ap2); + va_end(ap2); talloc_set_name_const(s, s); return s; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:23:34 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:23:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJoj-0002Aq-WA; Tue, 25 Aug 2015 19:23:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJoi-0002AP-1D for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:23:32 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 83/BE-09570-3B0CCD55; Tue, 25 Aug 2015 19:23:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1440530609!35634391!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22742 invoked from network); 25 Aug 2015 19:23:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:23:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJof-0006WA-Ok for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:23:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJof-00089m-KK for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:23:29 +0000 Date: Tue, 25 Aug 2015 19:23:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: Don't try to update the firmware directory on ARM X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e4a3c7231e1aad4203f352f5f23d76cb5679a534 Author: Julien Grall AuthorDate: Fri Aug 7 18:27:18 2015 +0100 Commit: Ian Campbell CommitDate: Thu Aug 13 10:59:12 2015 +0100 tools: Don't try to update the firmware directory on ARM The firmware directory is not built at all on ARM. Attempting to update it using the target subtree-force-update will fail when try to update seabios. Signed-off-by: Julien Grall Acked-by: Wei Liu Acked-by: Ian Campbell --- tools/Makefile | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index 45cb4b2..2618559 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -305,7 +305,9 @@ endif ifeq ($(CONFIG_QEMU_TRAD),y) $(MAKE) qemu-xen-traditional-dir-force-update endif +ifeq ($(CONFIG_X86),y) $(MAKE) -C firmware subtree-force-update +endif subtree-force-update-all: $(MAKE) qemu-xen-dir-force-update -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:23:34 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:23:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJoj-0002Aq-WA; Tue, 25 Aug 2015 19:23:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJoi-0002AP-1D for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:23:32 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 83/BE-09570-3B0CCD55; Tue, 25 Aug 2015 19:23:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1440530609!35634391!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22742 invoked from network); 25 Aug 2015 19:23:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:23:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJof-0006WA-Ok for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:23:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJof-00089m-KK for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:23:29 +0000 Date: Tue, 25 Aug 2015 19:23:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: Don't try to update the firmware directory on ARM X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e4a3c7231e1aad4203f352f5f23d76cb5679a534 Author: Julien Grall AuthorDate: Fri Aug 7 18:27:18 2015 +0100 Commit: Ian Campbell CommitDate: Thu Aug 13 10:59:12 2015 +0100 tools: Don't try to update the firmware directory on ARM The firmware directory is not built at all on ARM. Attempting to update it using the target subtree-force-update will fail when try to update seabios. Signed-off-by: Julien Grall Acked-by: Wei Liu Acked-by: Ian Campbell --- tools/Makefile | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index 45cb4b2..2618559 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -305,7 +305,9 @@ endif ifeq ($(CONFIG_QEMU_TRAD),y) $(MAKE) qemu-xen-traditional-dir-force-update endif +ifeq ($(CONFIG_X86),y) $(MAKE) -C firmware subtree-force-update +endif subtree-force-update-all: $(MAKE) qemu-xen-dir-force-update -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:23:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:23:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJot-0002CU-2b; Tue, 25 Aug 2015 19:23:43 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJos-0002CI-Aj for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:23:42 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id B3/07-09034-DB0CCD55; Tue, 25 Aug 2015 19:23:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1440530620!30503031!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31441 invoked from network); 25 Aug 2015 19:23:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:23:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJop-0006WM-Ti for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:23:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJop-0008A8-SQ for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:23:39 +0000 Date: Tue, 25 Aug 2015 19:23:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gitignore: Don't ignore *.rej X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7d134b44ac32918744563640cb319f7b3184969d Author: Ian Campbell AuthorDate: Wed Aug 12 10:07:37 2015 +0100 Commit: Ian Campbell CommitDate: Thu Aug 13 11:00:20 2015 +0100 gitignore: Don't ignore *.rej These indicate a patch application went wrong, I want to see them in "git status". This appears to have been imported from .hgignore where it has been since 2005. Signed-off-by: Ian Campbell Acked-by: Jan Beulich Reviewed-by: Konrad Rzeszutek Wilk Acked-by: Ian Jackson Reviewed-by: Daniel Kiper --- .gitignore | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/.gitignore b/.gitignore index bccbd12..dafa3c4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ .hg *.orig -*.rej *~ *.swp *.o -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:23:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:23:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJot-0002CU-2b; Tue, 25 Aug 2015 19:23:43 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJos-0002CI-Aj for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:23:42 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id B3/07-09034-DB0CCD55; Tue, 25 Aug 2015 19:23:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1440530620!30503031!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31441 invoked from network); 25 Aug 2015 19:23:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:23:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJop-0006WM-Ti for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:23:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJop-0008A8-SQ for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:23:39 +0000 Date: Tue, 25 Aug 2015 19:23:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gitignore: Don't ignore *.rej X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7d134b44ac32918744563640cb319f7b3184969d Author: Ian Campbell AuthorDate: Wed Aug 12 10:07:37 2015 +0100 Commit: Ian Campbell CommitDate: Thu Aug 13 11:00:20 2015 +0100 gitignore: Don't ignore *.rej These indicate a patch application went wrong, I want to see them in "git status". This appears to have been imported from .hgignore where it has been since 2005. Signed-off-by: Ian Campbell Acked-by: Jan Beulich Reviewed-by: Konrad Rzeszutek Wilk Acked-by: Ian Jackson Reviewed-by: Daniel Kiper --- .gitignore | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/.gitignore b/.gitignore index bccbd12..dafa3c4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ .hg *.orig -*.rej *~ *.swp *.o -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:23:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:23:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJp4-0002EB-59; Tue, 25 Aug 2015 19:23:54 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJp3-0002E3-DB for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:23:53 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id EB/0F-03763-8C0CCD55; Tue, 25 Aug 2015 19:23:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1440530630!38044931!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20559 invoked from network); 25 Aug 2015 19:23:51 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:23:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJp0-0006Wa-3E for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:23:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJp0-0008AY-2J for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:23:50 +0000 Date: Tue, 25 Aug 2015 19:23:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: libxl: Remove unnecessary trailing \n from log messages. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cb86677d2d1e061bf8d057bf1dd06cbb60210f33 Author: Ian Campbell AuthorDate: Wed Aug 12 14:56:01 2015 +0100 Commit: Ian Campbell CommitDate: Thu Aug 13 11:01:23 2015 +0100 tools: libxl: Remove unnecessary trailing \n from log messages. Both xl's LOG and the various libxl logging mechanisms automatically include a trailing \n. Remove all unnecessary \n's from the logs messages with the following semantic patch. spatch also reindents (I couldn't see how to make it stop). In general it has improved matters but in 1 case it has introduced a long line, this will be fixed in the next patch. Semantic patch, run as spatch --in-place --no-includes --include-headers \ --sp-file libxl-log-nl.spatch \ tools/libxl/libxl*.[ch] tools/libxl/xl*.[ch] ========= // Heavily inspired by https://lkml.org/lkml/2014/9/12/134 virtual patch virtual context virtual org virtual report // First the macros @macro1@ identifier FN =~ "LOG|LOGE|LOGEV"; constant s1 =~ ".*\\n"; constant level; @@ FN(level, s1, ...); @script:python macro2@ s1 << macro1.s1; s2; @@ coccinelle.s2 = s1[:-3]+'"'; @macro3@ identifier macro1.FN; constant macro1.level; expression args; constant macro1.s1; identifier macro2.s2; @@ -FN(level, s1, args); +FN(level, s2, args); @macro4@ identifier macro1.FN; constant macro1.level; constant macro1.s1; identifier macro2.s2; @@ -FN(level, s1); +FN(level, s2); // Now the functions @log1@ identifier FN =~ "LIBXL__LOG(|_ERRNO|_ERRNOVAL)"; constant s1 =~ ".*\\n"; expression ctx; constant level; @@ FN(ctx, level, s1, ...); @script:python log2@ s1 << log1.s1; s2; @@ coccinelle.s2 = s1[:-3]+'"'; @log3@ identifier log1.FN; constant log1.level; expression args; expression log1.ctx; constant log1.s1; identifier log2.s2; @@ -FN(ctx, level, s1, args); +FN(ctx, level, s2, args); @log4@ identifier log1.FN; constant log1.level; expression log1.ctx; constant log1.s1; identifier log2.s2; @@ -FN(ctx, level, s1); +FN(ctx, level, s2); ========= Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- tools/libxl/libxl.c | 43 +++++++++++++++++++++---------------- tools/libxl/libxl_arm.c | 6 ++-- tools/libxl/libxl_create.c | 2 +- tools/libxl/libxl_dm.c | 4 +- tools/libxl/libxl_dom.c | 2 +- tools/libxl/libxl_internal.c | 11 ++++----- tools/libxl/libxl_json.c | 6 ++-- tools/libxl/libxl_linux.c | 4 +- tools/libxl/libxl_qmp.c | 2 +- tools/libxl/libxl_stream_write.c | 2 +- tools/libxl/libxl_x86.c | 2 +- 11 files changed, 44 insertions(+), 40 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 083f099..865e162 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -699,7 +699,7 @@ static int cpupool_info(libxl__gc *gc, if (xcinfo == NULL) { if (exact || errno != ENOENT) - LOGE(ERROR, "failed to get info for cpupool%d\n", poolid); + LOGE(ERROR, "failed to get info for cpupool%d", poolid); return ERROR_FAIL; } @@ -2261,7 +2261,7 @@ int libxl_device_vtpm_getinfo(libxl_ctx *ctx, val = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/uuid", vtpminfo->backend)); if(val == NULL) { - LOG(ERROR, "%s/uuid does not exist!\n", vtpminfo->backend); + LOG(ERROR, "%s/uuid does not exist!", vtpminfo->backend); goto err; } if(libxl_uuid_from_string(&(vtpminfo->uuid), val)) { @@ -2352,8 +2352,8 @@ int libxl__device_from_disk(libxl__gc *gc, uint32_t domid, device->backend_kind = LIBXL__DEVICE_KIND_QDISK; break; default: - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "unrecognized disk backend type: %d\n", - disk->backend); + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, + "unrecognized disk backend type: %d", disk->backend); return ERROR_INVAL; } @@ -2495,7 +2495,7 @@ static void device_disk_add(libxl__egc *egc, uint32_t domid, dev = libxl__blktap_devpath(gc, disk->pdev_path, disk->format); if (!dev) { - LOG(ERROR, "failed to get blktap devpath for %p\n", + LOG(ERROR, "failed to get blktap devpath for %p", disk->pdev_path); rc = ERROR_FAIL; goto out; @@ -2519,7 +2519,9 @@ static void device_disk_add(libxl__egc *egc, uint32_t domid, assert(device->backend_kind == LIBXL__DEVICE_KIND_QDISK); break; default: - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "unrecognized disk backend type: %d\n", disk->backend); + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, + "unrecognized disk backend type: %d", + disk->backend); rc = ERROR_INVAL; goto out; } @@ -4573,7 +4575,9 @@ int libxl_domain_setmaxmem(libxl_ctx *ctx, uint32_t domid, uint32_t max_memkb) mem = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/memory/target", dompath)); if (!mem) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "cannot get memory info from %s/memory/target\n", dompath); + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, + "cannot get memory info from %s/memory/target", + dompath); goto out; } memorykb = strtoul(mem, &endptr, 10); @@ -4583,7 +4587,8 @@ int libxl_domain_setmaxmem(libxl_ctx *ctx, uint32_t domid, uint32_t max_memkb) } if (max_memkb < memorykb) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "memory_static_max must be greater than or or equal to memory_dynamic_max\n"); + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, + "memory_static_max must be greater than or or equal to memory_dynamic_max"); goto out; } rc = xc_domain_setmaxmem(ctx->xch, domid, max_memkb + LIBXL_MAXMEM_CONSTANT); @@ -4722,8 +4727,8 @@ retry_transaction: goto retry_transaction; } else if (!target) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, - "cannot get target memory info from %s/memory/target\n", - dompath); + "cannot get target memory info from %s/memory/target", + dompath); abort_transaction = 1; goto out; } else { @@ -4740,8 +4745,8 @@ retry_transaction: "%s/memory/static-max", dompath)); if (!memmax) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, - "cannot get memory info from %s/memory/static-max\n", - dompath); + "cannot get memory info from %s/memory/static-max", + dompath); abort_transaction = 1; goto out; } @@ -4775,8 +4780,8 @@ retry_transaction: if (!domid && new_target_memkb < LIBXL_MIN_DOM0_MEM) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "new target %d for dom0 is below the minimum threshold\n", - new_target_memkb); + "new target %d for dom0 is below the minimum threshold", + new_target_memkb); abort_transaction = 1; goto out; } @@ -4856,13 +4861,13 @@ static int libxl__get_memory_target(libxl__gc *gc, uint32_t domid, goto out; } else if (!target) { LIBXL__LOG_ERRNO(CTX, LIBXL__LOG_ERROR, - "cannot get target memory info from %s/memory/target\n", - dompath); + "cannot get target memory info from %s/memory/target", + dompath); goto out; } else if (!static_max) { LIBXL__LOG_ERRNO(CTX, LIBXL__LOG_ERROR, - "cannot get target memory info from %s/memory/static-max\n", - dompath); + "cannot get target memory info from %s/memory/static-max", + dompath); goto out; } else { target_memkb = strtoul(target, &endptr, 10); @@ -5654,7 +5659,7 @@ int libxl_sched_credit_params_set(libxl_ctx *ctx, uint32_t poolid, } if (scinfo->ratelimit_us > scinfo->tslice_ms*1000) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "Ratelimit cannot be greater than timeslice\n"); + "Ratelimit cannot be greater than timeslice"); return ERROR_INVAL; } diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c index a310737..0af8010 100644 --- a/tools/libxl/libxl_arm.c +++ b/tools/libxl/libxl_arm.c @@ -72,7 +72,7 @@ int libxl__arch_domain_prepare_config(libxl__gc *gc, xc_config->gic_version = XEN_DOMCTL_CONFIG_GIC_V3; break; default: - LOG(ERROR, "Unknown GIC version %d\n", + LOG(ERROR, "Unknown GIC version %d", d_config->b_info.arch_arm.gic_version); return ERROR_FAIL; } @@ -92,7 +92,7 @@ int libxl__arch_domain_save_config(libxl__gc *gc, d_config->b_info.arch_arm.gic_version = LIBXL_GIC_VERSION_V3; break; default: - LOG(ERROR, "Unexpected gic version %u\n", xc_config->gic_version); + LOG(ERROR, "Unexpected gic version %u", xc_config->gic_version); return ERROR_FAIL; } @@ -566,7 +566,7 @@ static const struct arch_info *get_arch_info(libxl__gc *gc, if (!strcmp(dom->guest_type, info->guest_type)) return info; } - LOG(ERROR, "Unable to find arch FDT info for %s\n", dom->guest_type); + LOG(ERROR, "Unable to find arch FDT info for %s", dom->guest_type); return NULL; } diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 2348ffc..5128160 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1460,7 +1460,7 @@ static void domcreate_attach_dtdev(libxl__egc *egc, LOG(DEBUG, "Assign device \"%s\" to dom%u", dtdev->path, domid); ret = xc_assign_dt_device(CTX->xch, domid, dtdev->path); if (ret < 0) { - LOG(ERROR, "xc_assign_dtdevice failed: %d\n", ret); + LOG(ERROR, "xc_assign_dtdevice failed: %d", ret); goto error_out; } } diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 02c0162..c84085e 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -79,7 +79,7 @@ const char *libxl__domain_device_model(libxl__gc *gc, break; default: LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "invalid device model version %d\n", + "invalid device model version %d", info->device_model_version); dm = NULL; break; @@ -124,7 +124,7 @@ libxl__xc_device_get_rdm(libxl__gc *gc, if (rc) { *nr_entries = 0; *xrdm = NULL; - LOG(ERROR, "Could not get reserved device memory maps.\n"); + LOG(ERROR, "Could not get reserved device memory maps."); } return rc; } diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index e1f11a3..4a061ec 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -50,7 +50,7 @@ int libxl__domain_cpupool(libxl__gc *gc, uint32_t domid) ret = xc_domain_getinfolist(CTX->xch, domid, 1, &info); if (ret != 1) { - LOGE(ERROR, "getinfolist failed %d\n", ret); + LOGE(ERROR, "getinfolist failed %d", ret); return ERROR_FAIL; } if (info.domain != domid) diff --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c index 23fd751..366ea05 100644 --- a/tools/libxl/libxl_internal.c +++ b/tools/libxl/libxl_internal.c @@ -340,19 +340,18 @@ _hidden int libxl__init_recursive_mutex(libxl_ctx *ctx, pthread_mutex_t *lock) int rc = 0; if (pthread_mutexattr_init(&attr) != 0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, - "Failed to init mutex attributes\n"); + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, + "Failed to init mutex attributes"); return ERROR_FAIL; } if (pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE) != 0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, - "Failed to set mutex attributes\n"); + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, + "Failed to set mutex attributes"); rc = ERROR_FAIL; goto out; } if (pthread_mutex_init(lock, &attr) != 0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, - "Failed to init mutex\n"); + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Failed to init mutex"); rc = ERROR_FAIL; goto out; } diff --git a/tools/libxl/libxl_json.c b/tools/libxl/libxl_json.c index 346929a..3b695dd 100644 --- a/tools/libxl/libxl_json.c +++ b/tools/libxl/libxl_json.c @@ -59,8 +59,8 @@ struct libxl__yajl_ctx { const unsigned char *buf = NULL; \ size_t len = 0; \ yajl_gen_get_buf((yajl_ctx)->g, &buf, &len); \ - LIBXL__LOG(libxl__gc_owner((yajl_ctx)->gc), \ - LIBXL__LOG_DEBUG, "response:\n%s", buf); \ + LIBXL__LOG(libxl__gc_owner((yajl_ctx)->gc), LIBXL__LOG_DEBUG, + "response:\n", buf); \ yajl_gen_free((yajl_ctx)->g); \ (yajl_ctx)->g = NULL; \ } while (0) @@ -487,7 +487,7 @@ int libxl__json_object_append_to(libxl__gc *gc, libxl__json_object *obj, break; default: LIBXL__LOG(libxl__gc_owner(gc), LIBXL__LOG_ERROR, - "Try append an object is not a map/array (%i)\n", + "Try append an object is not a map/array (%i)", dst->type); return ERROR_FAIL; } diff --git a/tools/libxl/libxl_linux.c b/tools/libxl/libxl_linux.c index 4fbcba1..be4afc6 100644 --- a/tools/libxl/libxl_linux.c +++ b/tools/libxl/libxl_linux.c @@ -243,7 +243,7 @@ int libxl__get_hotplug_script_info(libxl__gc *gc, libxl__device *dev, switch (dev->backend_kind) { case LIBXL__DEVICE_KIND_VBD: if (num_exec != 0) { - LOG(DEBUG, "num_exec %d, not running hotplug scripts\n", num_exec); + LOG(DEBUG, "num_exec %d, not running hotplug scripts", num_exec); rc = 0; goto out; } @@ -256,7 +256,7 @@ int libxl__get_hotplug_script_info(libxl__gc *gc, libxl__device *dev, */ if ((num_exec > 1) || (libxl_get_stubdom_id(CTX, dev->domid) && num_exec)) { - LOG(DEBUG, "num_exec %d, not running hotplug scripts\n", num_exec); + LOG(DEBUG, "num_exec %d, not running hotplug scripts", num_exec); rc = 0; goto out; } diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c index 965c507..f798de7 100644 --- a/tools/libxl/libxl_qmp.c +++ b/tools/libxl/libxl_qmp.c @@ -489,7 +489,7 @@ static int qmp_next(libxl__gc *gc, libxl__qmp_handler *qmp) if (o) { rc = qmp_handle_response(gc, qmp, o); } else { - LOG(ERROR, "Parse error of : %s\n", s); + LOG(ERROR, "Parse error of : %s", s); return -1; } diff --git a/tools/libxl/libxl_stream_write.c b/tools/libxl/libxl_stream_write.c index 10a9e0f..52a60d7 100644 --- a/tools/libxl/libxl_stream_write.c +++ b/tools/libxl/libxl_stream_write.c @@ -234,7 +234,7 @@ void libxl__stream_write_start(libxl__egc *egc, default: rc = ERROR_FAIL; - LOG(ERROR, "Unknown emulator for HVM domain\n"); + LOG(ERROR, "Unknown emulator for HVM domain"); goto err; } stream->emu_sub_hdr.index = 0; diff --git a/tools/libxl/libxl_x86.c b/tools/libxl/libxl_x86.c index b379e09..896f34c 100644 --- a/tools/libxl/libxl_x86.c +++ b/tools/libxl/libxl_x86.c @@ -494,7 +494,7 @@ int libxl__arch_domain_construct_memmap(libxl__gc *gc, e820_entries++; if (e820_entries >= E820MAX) { - LOG(ERROR, "Ooops! Too many entries in the memory map!\n"); + LOG(ERROR, "Ooops! Too many entries in the memory map!"); rc = ERROR_INVAL; goto out; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:23:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:23:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJp4-0002EB-59; Tue, 25 Aug 2015 19:23:54 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJp3-0002E3-DB for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:23:53 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id EB/0F-03763-8C0CCD55; Tue, 25 Aug 2015 19:23:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1440530630!38044931!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20559 invoked from network); 25 Aug 2015 19:23:51 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:23:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJp0-0006Wa-3E for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:23:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJp0-0008AY-2J for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:23:50 +0000 Date: Tue, 25 Aug 2015 19:23:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: libxl: Remove unnecessary trailing \n from log messages. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cb86677d2d1e061bf8d057bf1dd06cbb60210f33 Author: Ian Campbell AuthorDate: Wed Aug 12 14:56:01 2015 +0100 Commit: Ian Campbell CommitDate: Thu Aug 13 11:01:23 2015 +0100 tools: libxl: Remove unnecessary trailing \n from log messages. Both xl's LOG and the various libxl logging mechanisms automatically include a trailing \n. Remove all unnecessary \n's from the logs messages with the following semantic patch. spatch also reindents (I couldn't see how to make it stop). In general it has improved matters but in 1 case it has introduced a long line, this will be fixed in the next patch. Semantic patch, run as spatch --in-place --no-includes --include-headers \ --sp-file libxl-log-nl.spatch \ tools/libxl/libxl*.[ch] tools/libxl/xl*.[ch] ========= // Heavily inspired by https://lkml.org/lkml/2014/9/12/134 virtual patch virtual context virtual org virtual report // First the macros @macro1@ identifier FN =~ "LOG|LOGE|LOGEV"; constant s1 =~ ".*\\n"; constant level; @@ FN(level, s1, ...); @script:python macro2@ s1 << macro1.s1; s2; @@ coccinelle.s2 = s1[:-3]+'"'; @macro3@ identifier macro1.FN; constant macro1.level; expression args; constant macro1.s1; identifier macro2.s2; @@ -FN(level, s1, args); +FN(level, s2, args); @macro4@ identifier macro1.FN; constant macro1.level; constant macro1.s1; identifier macro2.s2; @@ -FN(level, s1); +FN(level, s2); // Now the functions @log1@ identifier FN =~ "LIBXL__LOG(|_ERRNO|_ERRNOVAL)"; constant s1 =~ ".*\\n"; expression ctx; constant level; @@ FN(ctx, level, s1, ...); @script:python log2@ s1 << log1.s1; s2; @@ coccinelle.s2 = s1[:-3]+'"'; @log3@ identifier log1.FN; constant log1.level; expression args; expression log1.ctx; constant log1.s1; identifier log2.s2; @@ -FN(ctx, level, s1, args); +FN(ctx, level, s2, args); @log4@ identifier log1.FN; constant log1.level; expression log1.ctx; constant log1.s1; identifier log2.s2; @@ -FN(ctx, level, s1); +FN(ctx, level, s2); ========= Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- tools/libxl/libxl.c | 43 +++++++++++++++++++++---------------- tools/libxl/libxl_arm.c | 6 ++-- tools/libxl/libxl_create.c | 2 +- tools/libxl/libxl_dm.c | 4 +- tools/libxl/libxl_dom.c | 2 +- tools/libxl/libxl_internal.c | 11 ++++----- tools/libxl/libxl_json.c | 6 ++-- tools/libxl/libxl_linux.c | 4 +- tools/libxl/libxl_qmp.c | 2 +- tools/libxl/libxl_stream_write.c | 2 +- tools/libxl/libxl_x86.c | 2 +- 11 files changed, 44 insertions(+), 40 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 083f099..865e162 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -699,7 +699,7 @@ static int cpupool_info(libxl__gc *gc, if (xcinfo == NULL) { if (exact || errno != ENOENT) - LOGE(ERROR, "failed to get info for cpupool%d\n", poolid); + LOGE(ERROR, "failed to get info for cpupool%d", poolid); return ERROR_FAIL; } @@ -2261,7 +2261,7 @@ int libxl_device_vtpm_getinfo(libxl_ctx *ctx, val = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/uuid", vtpminfo->backend)); if(val == NULL) { - LOG(ERROR, "%s/uuid does not exist!\n", vtpminfo->backend); + LOG(ERROR, "%s/uuid does not exist!", vtpminfo->backend); goto err; } if(libxl_uuid_from_string(&(vtpminfo->uuid), val)) { @@ -2352,8 +2352,8 @@ int libxl__device_from_disk(libxl__gc *gc, uint32_t domid, device->backend_kind = LIBXL__DEVICE_KIND_QDISK; break; default: - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "unrecognized disk backend type: %d\n", - disk->backend); + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, + "unrecognized disk backend type: %d", disk->backend); return ERROR_INVAL; } @@ -2495,7 +2495,7 @@ static void device_disk_add(libxl__egc *egc, uint32_t domid, dev = libxl__blktap_devpath(gc, disk->pdev_path, disk->format); if (!dev) { - LOG(ERROR, "failed to get blktap devpath for %p\n", + LOG(ERROR, "failed to get blktap devpath for %p", disk->pdev_path); rc = ERROR_FAIL; goto out; @@ -2519,7 +2519,9 @@ static void device_disk_add(libxl__egc *egc, uint32_t domid, assert(device->backend_kind == LIBXL__DEVICE_KIND_QDISK); break; default: - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "unrecognized disk backend type: %d\n", disk->backend); + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, + "unrecognized disk backend type: %d", + disk->backend); rc = ERROR_INVAL; goto out; } @@ -4573,7 +4575,9 @@ int libxl_domain_setmaxmem(libxl_ctx *ctx, uint32_t domid, uint32_t max_memkb) mem = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/memory/target", dompath)); if (!mem) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "cannot get memory info from %s/memory/target\n", dompath); + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, + "cannot get memory info from %s/memory/target", + dompath); goto out; } memorykb = strtoul(mem, &endptr, 10); @@ -4583,7 +4587,8 @@ int libxl_domain_setmaxmem(libxl_ctx *ctx, uint32_t domid, uint32_t max_memkb) } if (max_memkb < memorykb) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "memory_static_max must be greater than or or equal to memory_dynamic_max\n"); + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, + "memory_static_max must be greater than or or equal to memory_dynamic_max"); goto out; } rc = xc_domain_setmaxmem(ctx->xch, domid, max_memkb + LIBXL_MAXMEM_CONSTANT); @@ -4722,8 +4727,8 @@ retry_transaction: goto retry_transaction; } else if (!target) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, - "cannot get target memory info from %s/memory/target\n", - dompath); + "cannot get target memory info from %s/memory/target", + dompath); abort_transaction = 1; goto out; } else { @@ -4740,8 +4745,8 @@ retry_transaction: "%s/memory/static-max", dompath)); if (!memmax) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, - "cannot get memory info from %s/memory/static-max\n", - dompath); + "cannot get memory info from %s/memory/static-max", + dompath); abort_transaction = 1; goto out; } @@ -4775,8 +4780,8 @@ retry_transaction: if (!domid && new_target_memkb < LIBXL_MIN_DOM0_MEM) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "new target %d for dom0 is below the minimum threshold\n", - new_target_memkb); + "new target %d for dom0 is below the minimum threshold", + new_target_memkb); abort_transaction = 1; goto out; } @@ -4856,13 +4861,13 @@ static int libxl__get_memory_target(libxl__gc *gc, uint32_t domid, goto out; } else if (!target) { LIBXL__LOG_ERRNO(CTX, LIBXL__LOG_ERROR, - "cannot get target memory info from %s/memory/target\n", - dompath); + "cannot get target memory info from %s/memory/target", + dompath); goto out; } else if (!static_max) { LIBXL__LOG_ERRNO(CTX, LIBXL__LOG_ERROR, - "cannot get target memory info from %s/memory/static-max\n", - dompath); + "cannot get target memory info from %s/memory/static-max", + dompath); goto out; } else { target_memkb = strtoul(target, &endptr, 10); @@ -5654,7 +5659,7 @@ int libxl_sched_credit_params_set(libxl_ctx *ctx, uint32_t poolid, } if (scinfo->ratelimit_us > scinfo->tslice_ms*1000) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "Ratelimit cannot be greater than timeslice\n"); + "Ratelimit cannot be greater than timeslice"); return ERROR_INVAL; } diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c index a310737..0af8010 100644 --- a/tools/libxl/libxl_arm.c +++ b/tools/libxl/libxl_arm.c @@ -72,7 +72,7 @@ int libxl__arch_domain_prepare_config(libxl__gc *gc, xc_config->gic_version = XEN_DOMCTL_CONFIG_GIC_V3; break; default: - LOG(ERROR, "Unknown GIC version %d\n", + LOG(ERROR, "Unknown GIC version %d", d_config->b_info.arch_arm.gic_version); return ERROR_FAIL; } @@ -92,7 +92,7 @@ int libxl__arch_domain_save_config(libxl__gc *gc, d_config->b_info.arch_arm.gic_version = LIBXL_GIC_VERSION_V3; break; default: - LOG(ERROR, "Unexpected gic version %u\n", xc_config->gic_version); + LOG(ERROR, "Unexpected gic version %u", xc_config->gic_version); return ERROR_FAIL; } @@ -566,7 +566,7 @@ static const struct arch_info *get_arch_info(libxl__gc *gc, if (!strcmp(dom->guest_type, info->guest_type)) return info; } - LOG(ERROR, "Unable to find arch FDT info for %s\n", dom->guest_type); + LOG(ERROR, "Unable to find arch FDT info for %s", dom->guest_type); return NULL; } diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 2348ffc..5128160 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1460,7 +1460,7 @@ static void domcreate_attach_dtdev(libxl__egc *egc, LOG(DEBUG, "Assign device \"%s\" to dom%u", dtdev->path, domid); ret = xc_assign_dt_device(CTX->xch, domid, dtdev->path); if (ret < 0) { - LOG(ERROR, "xc_assign_dtdevice failed: %d\n", ret); + LOG(ERROR, "xc_assign_dtdevice failed: %d", ret); goto error_out; } } diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 02c0162..c84085e 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -79,7 +79,7 @@ const char *libxl__domain_device_model(libxl__gc *gc, break; default: LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "invalid device model version %d\n", + "invalid device model version %d", info->device_model_version); dm = NULL; break; @@ -124,7 +124,7 @@ libxl__xc_device_get_rdm(libxl__gc *gc, if (rc) { *nr_entries = 0; *xrdm = NULL; - LOG(ERROR, "Could not get reserved device memory maps.\n"); + LOG(ERROR, "Could not get reserved device memory maps."); } return rc; } diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index e1f11a3..4a061ec 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -50,7 +50,7 @@ int libxl__domain_cpupool(libxl__gc *gc, uint32_t domid) ret = xc_domain_getinfolist(CTX->xch, domid, 1, &info); if (ret != 1) { - LOGE(ERROR, "getinfolist failed %d\n", ret); + LOGE(ERROR, "getinfolist failed %d", ret); return ERROR_FAIL; } if (info.domain != domid) diff --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c index 23fd751..366ea05 100644 --- a/tools/libxl/libxl_internal.c +++ b/tools/libxl/libxl_internal.c @@ -340,19 +340,18 @@ _hidden int libxl__init_recursive_mutex(libxl_ctx *ctx, pthread_mutex_t *lock) int rc = 0; if (pthread_mutexattr_init(&attr) != 0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, - "Failed to init mutex attributes\n"); + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, + "Failed to init mutex attributes"); return ERROR_FAIL; } if (pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE) != 0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, - "Failed to set mutex attributes\n"); + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, + "Failed to set mutex attributes"); rc = ERROR_FAIL; goto out; } if (pthread_mutex_init(lock, &attr) != 0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, - "Failed to init mutex\n"); + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Failed to init mutex"); rc = ERROR_FAIL; goto out; } diff --git a/tools/libxl/libxl_json.c b/tools/libxl/libxl_json.c index 346929a..3b695dd 100644 --- a/tools/libxl/libxl_json.c +++ b/tools/libxl/libxl_json.c @@ -59,8 +59,8 @@ struct libxl__yajl_ctx { const unsigned char *buf = NULL; \ size_t len = 0; \ yajl_gen_get_buf((yajl_ctx)->g, &buf, &len); \ - LIBXL__LOG(libxl__gc_owner((yajl_ctx)->gc), \ - LIBXL__LOG_DEBUG, "response:\n%s", buf); \ + LIBXL__LOG(libxl__gc_owner((yajl_ctx)->gc), LIBXL__LOG_DEBUG, + "response:\n", buf); \ yajl_gen_free((yajl_ctx)->g); \ (yajl_ctx)->g = NULL; \ } while (0) @@ -487,7 +487,7 @@ int libxl__json_object_append_to(libxl__gc *gc, libxl__json_object *obj, break; default: LIBXL__LOG(libxl__gc_owner(gc), LIBXL__LOG_ERROR, - "Try append an object is not a map/array (%i)\n", + "Try append an object is not a map/array (%i)", dst->type); return ERROR_FAIL; } diff --git a/tools/libxl/libxl_linux.c b/tools/libxl/libxl_linux.c index 4fbcba1..be4afc6 100644 --- a/tools/libxl/libxl_linux.c +++ b/tools/libxl/libxl_linux.c @@ -243,7 +243,7 @@ int libxl__get_hotplug_script_info(libxl__gc *gc, libxl__device *dev, switch (dev->backend_kind) { case LIBXL__DEVICE_KIND_VBD: if (num_exec != 0) { - LOG(DEBUG, "num_exec %d, not running hotplug scripts\n", num_exec); + LOG(DEBUG, "num_exec %d, not running hotplug scripts", num_exec); rc = 0; goto out; } @@ -256,7 +256,7 @@ int libxl__get_hotplug_script_info(libxl__gc *gc, libxl__device *dev, */ if ((num_exec > 1) || (libxl_get_stubdom_id(CTX, dev->domid) && num_exec)) { - LOG(DEBUG, "num_exec %d, not running hotplug scripts\n", num_exec); + LOG(DEBUG, "num_exec %d, not running hotplug scripts", num_exec); rc = 0; goto out; } diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c index 965c507..f798de7 100644 --- a/tools/libxl/libxl_qmp.c +++ b/tools/libxl/libxl_qmp.c @@ -489,7 +489,7 @@ static int qmp_next(libxl__gc *gc, libxl__qmp_handler *qmp) if (o) { rc = qmp_handle_response(gc, qmp, o); } else { - LOG(ERROR, "Parse error of : %s\n", s); + LOG(ERROR, "Parse error of : %s", s); return -1; } diff --git a/tools/libxl/libxl_stream_write.c b/tools/libxl/libxl_stream_write.c index 10a9e0f..52a60d7 100644 --- a/tools/libxl/libxl_stream_write.c +++ b/tools/libxl/libxl_stream_write.c @@ -234,7 +234,7 @@ void libxl__stream_write_start(libxl__egc *egc, default: rc = ERROR_FAIL; - LOG(ERROR, "Unknown emulator for HVM domain\n"); + LOG(ERROR, "Unknown emulator for HVM domain"); goto err; } stream->emu_sub_hdr.index = 0; diff --git a/tools/libxl/libxl_x86.c b/tools/libxl/libxl_x86.c index b379e09..896f34c 100644 --- a/tools/libxl/libxl_x86.c +++ b/tools/libxl/libxl_x86.c @@ -494,7 +494,7 @@ int libxl__arch_domain_construct_memmap(libxl__gc *gc, e820_entries++; if (e820_entries >= E820MAX) { - LOG(ERROR, "Ooops! Too many entries in the memory map!\n"); + LOG(ERROR, "Ooops! Too many entries in the memory map!"); rc = ERROR_INVAL; goto out; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:24:04 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:24:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJpE-0002FY-7l; Tue, 25 Aug 2015 19:24:04 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJpD-0002FK-4R for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:24:03 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 5B/A0-05269-2D0CCD55; Tue, 25 Aug 2015 19:24:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1440530640!33648548!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30985 invoked from network); 25 Aug 2015 19:24:01 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:24:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJpA-0006We-8T for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:24:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJpA-0008Bk-65 for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:24:00 +0000 Date: Tue, 25 Aug 2015 19:24:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: libxl: fixup long line introduced by previous semantic patch X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 23d01fc3768e72e82a40cbe781409856d63d4f5c Author: Ian Campbell AuthorDate: Wed Aug 12 14:56:02 2015 +0100 Commit: Ian Campbell CommitDate: Thu Aug 13 11:01:23 2015 +0100 tools: libxl: fixup long line introduced by previous semantic patch Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- tools/libxl/libxl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 865e162..4f2eb24 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4866,8 +4866,8 @@ static int libxl__get_memory_target(libxl__gc *gc, uint32_t domid, goto out; } else if (!static_max) { LIBXL__LOG_ERRNO(CTX, LIBXL__LOG_ERROR, - "cannot get target memory info from %s/memory/static-max", - dompath); + "cannot get target memory info from %s/memory/static-max", + dompath); goto out; } else { target_memkb = strtoul(target, &endptr, 10); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:24:04 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:24:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJpE-0002FY-7l; Tue, 25 Aug 2015 19:24:04 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJpD-0002FK-4R for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:24:03 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 5B/A0-05269-2D0CCD55; Tue, 25 Aug 2015 19:24:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1440530640!33648548!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30985 invoked from network); 25 Aug 2015 19:24:01 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:24:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJpA-0006We-8T for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:24:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJpA-0008Bk-65 for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:24:00 +0000 Date: Tue, 25 Aug 2015 19:24:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: libxl: fixup long line introduced by previous semantic patch X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 23d01fc3768e72e82a40cbe781409856d63d4f5c Author: Ian Campbell AuthorDate: Wed Aug 12 14:56:02 2015 +0100 Commit: Ian Campbell CommitDate: Thu Aug 13 11:01:23 2015 +0100 tools: libxl: fixup long line introduced by previous semantic patch Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- tools/libxl/libxl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 865e162..4f2eb24 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4866,8 +4866,8 @@ static int libxl__get_memory_target(libxl__gc *gc, uint32_t domid, goto out; } else if (!static_max) { LIBXL__LOG_ERRNO(CTX, LIBXL__LOG_ERROR, - "cannot get target memory info from %s/memory/static-max", - dompath); + "cannot get target memory info from %s/memory/static-max", + dompath); goto out; } else { target_memkb = strtoul(target, &endptr, 10); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:24:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:24:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJpO-0002HO-CK; Tue, 25 Aug 2015 19:24:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJpM-0002H0-Rz for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:24:13 +0000 Content-Length: 5089 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id A1/63-22089-CD0CCD55; Tue, 25 Aug 2015 19:24:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1440530650!30451655!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12184 invoked from network); 25 Aug 2015 19:24:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:24:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJpK-0006XK-Ce for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:24:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJpK-0008CG-Bj for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:24:10 +0000 Date: Tue, 25 Aug 2015 19:24:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fix libxl__build_hvm error handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0707127953022142959==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0707127953022142959== Content-Length: 4758 Content-Transfer-Encoding: quoted-printable commit a97ee1cc4259abba99460aae1abe758920d998b2 Author: Roger Pau Monne AuthorDate: Fri Aug 7 12:17:38 2015 +0200 Commit: Ian Campbell CommitDate: Sun Aug 16 07:47:19 2015 +0100 libxl: fix libxl__build_hvm error handling With the current code in libxl__build_hvm it is possible for the function to fail and still return 0. Signed-off-by: Roger Pau Monn=C3=A9 Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Ian Jackson --- tools/libxl/libxl_dom.c | 39 ++++++++++++++++++++++----------------- 1 files changed, 22 insertions(+), 17 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 4a061ec..c2518a3 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -766,7 +766,7 @@ static int hvm_build_set_params(xc_interface *handle, uint32_t domid, XC_PAGE_SIZE, PROT_READ | PROT_WRITE, HVM_INFO_PFN); if (va_map =3D=3D NULL) - return -1; + return ERROR_FAIL; va_hvm =3D (struct hvm_info_table *)(va_map + HVM_INFO_OFFSET); va_hvm->apic_mode =3D libxl_defbool_val(info->u.hvm.apic); @@ -912,7 +912,7 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid, { libxl_ctx *ctx =3D libxl__gc_owner(gc); struct xc_hvm_build_args args =3D {}; - int ret, rc =3D ERROR_FAIL; + int ret, rc; uint64_t mmio_start, lowmem_end, highmem_end; libxl_domain_build_info *const info =3D &d_config->b_info; @@ -932,7 +932,9 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid, if (max_ram_below_4g < HVM_BELOW_4G_MMIO_START) args.mmio_size =3D info->u.hvm.mmio_hole_memkb << 10; } - if (libxl__domain_firmware(gc, info, &args)) { + + rc =3D libxl__domain_firmware(gc, info, &args); + if (rc !=3D 0) { LOG(ERROR, "initializing domain firmware failed"); goto out; } @@ -963,15 +965,15 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid, if (info->num_vnuma_nodes !=3D 0) { int i; - ret =3D libxl__vnuma_build_vmemrange_hvm(gc, domid, info, state, &args); - if (ret) { - LOGEV(ERROR, ret, "hvm build vmemranges failed"); + rc =3D libxl__vnuma_build_vmemrange_hvm(gc, domid, info, state, &args); + if (rc !=3D 0) { + LOG(ERROR, "hvm build vmemranges failed"); goto out; } - ret =3D libxl__vnuma_config_check(gc, info, state); - if (ret) goto out; - ret =3D set_vnuma_info(gc, domid, info, state); - if (ret) goto out; + rc =3D libxl__vnuma_config_check(gc, info, state); + if (rc !=3D 0) goto out; + rc =3D set_vnuma_info(gc, domid, info, state); + if (rc !=3D 0) goto out; args.nr_vmemranges =3D state->num_vmemranges; args.vmemranges =3D libxl__malloc(gc, sizeof(*args.vmemranges) * @@ -994,31 +996,34 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid, ret =3D xc_hvm_build(ctx->xch, domid, &args); if (ret) { LOGEV(ERROR, ret, "hvm building failed"); + rc =3D ERROR_FAIL; goto out; } - if (libxl__arch_domain_construct_memmap(gc, d_config, domid, &args)) { + rc =3D libxl__arch_domain_construct_memmap(gc, d_config, domid, &args); + if (rc !=3D 0) { LOG(ERROR, "setting domain memory map failed"); goto out; } - ret =3D hvm_build_set_params(ctx->xch, domid, info, state->store_port, + rc =3D hvm_build_set_params(ctx->xch, domid, info, state->store_port, &state->store_mfn, state->console_port, &state->console_mfn, state->store_domid, state->console_domid); - if (ret) { - LOGEV(ERROR, ret, "hvm build set params failed"); + if (rc !=3D 0) { + LOG(ERROR, "hvm build set params failed"); goto out; } - ret =3D hvm_build_set_xs_values(gc, domid, &args); - if (ret) { - LOG(ERROR, "hvm build set xenstore values failed (ret=3D%d)", ret); + rc =3D hvm_build_set_xs_values(gc, domid, &args); + if (rc !=3D 0) { + LOG(ERROR, "hvm build set xenstore values failed"); goto out; } return 0; out: + assert(rc !=3D 0); return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#master --===============0707127953022142959== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============0707127953022142959==-- From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:24:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:24:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJpO-0002HO-CK; Tue, 25 Aug 2015 19:24:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJpM-0002H0-Rz for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:24:13 +0000 Content-Length: 5089 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id A1/63-22089-CD0CCD55; Tue, 25 Aug 2015 19:24:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1440530650!30451655!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12184 invoked from network); 25 Aug 2015 19:24:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:24:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJpK-0006XK-Ce for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:24:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJpK-0008CG-Bj for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:24:10 +0000 Date: Tue, 25 Aug 2015 19:24:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fix libxl__build_hvm error handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0707127953022142959==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0707127953022142959== Content-Length: 4758 Content-Transfer-Encoding: quoted-printable commit a97ee1cc4259abba99460aae1abe758920d998b2 Author: Roger Pau Monne AuthorDate: Fri Aug 7 12:17:38 2015 +0200 Commit: Ian Campbell CommitDate: Sun Aug 16 07:47:19 2015 +0100 libxl: fix libxl__build_hvm error handling With the current code in libxl__build_hvm it is possible for the function to fail and still return 0. Signed-off-by: Roger Pau Monn=C3=A9 Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Ian Jackson --- tools/libxl/libxl_dom.c | 39 ++++++++++++++++++++++----------------- 1 files changed, 22 insertions(+), 17 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 4a061ec..c2518a3 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -766,7 +766,7 @@ static int hvm_build_set_params(xc_interface *handle, uint32_t domid, XC_PAGE_SIZE, PROT_READ | PROT_WRITE, HVM_INFO_PFN); if (va_map =3D=3D NULL) - return -1; + return ERROR_FAIL; va_hvm =3D (struct hvm_info_table *)(va_map + HVM_INFO_OFFSET); va_hvm->apic_mode =3D libxl_defbool_val(info->u.hvm.apic); @@ -912,7 +912,7 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid, { libxl_ctx *ctx =3D libxl__gc_owner(gc); struct xc_hvm_build_args args =3D {}; - int ret, rc =3D ERROR_FAIL; + int ret, rc; uint64_t mmio_start, lowmem_end, highmem_end; libxl_domain_build_info *const info =3D &d_config->b_info; @@ -932,7 +932,9 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid, if (max_ram_below_4g < HVM_BELOW_4G_MMIO_START) args.mmio_size =3D info->u.hvm.mmio_hole_memkb << 10; } - if (libxl__domain_firmware(gc, info, &args)) { + + rc =3D libxl__domain_firmware(gc, info, &args); + if (rc !=3D 0) { LOG(ERROR, "initializing domain firmware failed"); goto out; } @@ -963,15 +965,15 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid, if (info->num_vnuma_nodes !=3D 0) { int i; - ret =3D libxl__vnuma_build_vmemrange_hvm(gc, domid, info, state, &args); - if (ret) { - LOGEV(ERROR, ret, "hvm build vmemranges failed"); + rc =3D libxl__vnuma_build_vmemrange_hvm(gc, domid, info, state, &args); + if (rc !=3D 0) { + LOG(ERROR, "hvm build vmemranges failed"); goto out; } - ret =3D libxl__vnuma_config_check(gc, info, state); - if (ret) goto out; - ret =3D set_vnuma_info(gc, domid, info, state); - if (ret) goto out; + rc =3D libxl__vnuma_config_check(gc, info, state); + if (rc !=3D 0) goto out; + rc =3D set_vnuma_info(gc, domid, info, state); + if (rc !=3D 0) goto out; args.nr_vmemranges =3D state->num_vmemranges; args.vmemranges =3D libxl__malloc(gc, sizeof(*args.vmemranges) * @@ -994,31 +996,34 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid, ret =3D xc_hvm_build(ctx->xch, domid, &args); if (ret) { LOGEV(ERROR, ret, "hvm building failed"); + rc =3D ERROR_FAIL; goto out; } - if (libxl__arch_domain_construct_memmap(gc, d_config, domid, &args)) { + rc =3D libxl__arch_domain_construct_memmap(gc, d_config, domid, &args); + if (rc !=3D 0) { LOG(ERROR, "setting domain memory map failed"); goto out; } - ret =3D hvm_build_set_params(ctx->xch, domid, info, state->store_port, + rc =3D hvm_build_set_params(ctx->xch, domid, info, state->store_port, &state->store_mfn, state->console_port, &state->console_mfn, state->store_domid, state->console_domid); - if (ret) { - LOGEV(ERROR, ret, "hvm build set params failed"); + if (rc !=3D 0) { + LOG(ERROR, "hvm build set params failed"); goto out; } - ret =3D hvm_build_set_xs_values(gc, domid, &args); - if (ret) { - LOG(ERROR, "hvm build set xenstore values failed (ret=3D%d)", ret); + rc =3D hvm_build_set_xs_values(gc, domid, &args); + if (rc !=3D 0) { + LOG(ERROR, "hvm build set xenstore values failed"); goto out; } return 0; out: + assert(rc !=3D 0); return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#master --===============0707127953022142959== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============0707127953022142959==-- From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:24:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:24:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJpZ-0002Jt-2J; Tue, 25 Aug 2015 19:24:25 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJpX-0002Je-HN for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:24:23 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id E2/5B-05427-6E0CCD55; Tue, 25 Aug 2015 19:24:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1440530660!43864645!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1186 invoked from network); 25 Aug 2015 19:24:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:24:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJpU-0006XS-H4 for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:24:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJpU-0008Ci-Fb for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:24:20 +0000 Date: Tue, 25 Aug 2015 19:24:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: close restore file fd when we're done with it X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6a249a118ef215d6eff4c4fec81a69298365a914 Author: Wei Liu AuthorDate: Thu Aug 13 11:09:38 2015 +0100 Commit: Ian Campbell CommitDate: Sun Aug 16 07:48:37 2015 +0100 xl: close restore file fd when we're done with it And log if close fails. Reported-by: Andrew Armenia Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 499a05c..c6b0b68 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2627,6 +2627,7 @@ static uint32_t create_domain(struct domain_create *dom_info) void *config_data = 0; int config_len = 0; int restore_fd = -1; + int restore_fd_to_close = -1; const libxl_asyncprogress_how *autoconnect_console_how; struct save_file_header hdr; @@ -2650,6 +2651,7 @@ static uint32_t create_domain(struct domain_create *dom_info) fprintf(stderr, "Can't open restore file: %s\n", strerror(errno)); return ERROR_INVAL; } + restore_fd_to_close = restore_fd; rc = libxl_fd_set_cloexec(ctx, restore_fd, 1); if (rc) return rc; } @@ -2851,6 +2853,13 @@ start: release_lock(); + if (restore_fd_to_close >= 0) { + if (close(restore_fd_to_close)) + fprintf(stderr, "Failed to close restoring file, fd %d, errno %d\n", + restore_fd_to_close, errno); + restore_fd_to_close = -1; + } + if (!paused) libxl_domain_unpause(ctx, domid); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:24:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:24:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJpZ-0002Jt-2J; Tue, 25 Aug 2015 19:24:25 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJpX-0002Je-HN for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:24:23 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id E2/5B-05427-6E0CCD55; Tue, 25 Aug 2015 19:24:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1440530660!43864645!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1186 invoked from network); 25 Aug 2015 19:24:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:24:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJpU-0006XS-H4 for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:24:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJpU-0008Ci-Fb for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:24:20 +0000 Date: Tue, 25 Aug 2015 19:24:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: close restore file fd when we're done with it X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6a249a118ef215d6eff4c4fec81a69298365a914 Author: Wei Liu AuthorDate: Thu Aug 13 11:09:38 2015 +0100 Commit: Ian Campbell CommitDate: Sun Aug 16 07:48:37 2015 +0100 xl: close restore file fd when we're done with it And log if close fails. Reported-by: Andrew Armenia Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 499a05c..c6b0b68 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2627,6 +2627,7 @@ static uint32_t create_domain(struct domain_create *dom_info) void *config_data = 0; int config_len = 0; int restore_fd = -1; + int restore_fd_to_close = -1; const libxl_asyncprogress_how *autoconnect_console_how; struct save_file_header hdr; @@ -2650,6 +2651,7 @@ static uint32_t create_domain(struct domain_create *dom_info) fprintf(stderr, "Can't open restore file: %s\n", strerror(errno)); return ERROR_INVAL; } + restore_fd_to_close = restore_fd; rc = libxl_fd_set_cloexec(ctx, restore_fd, 1); if (rc) return rc; } @@ -2851,6 +2853,13 @@ start: release_lock(); + if (restore_fd_to_close >= 0) { + if (close(restore_fd_to_close)) + fprintf(stderr, "Failed to close restoring file, fd %d, errno %d\n", + restore_fd_to_close, errno); + restore_fd_to_close = -1; + } + if (!paused) libxl_domain_unpause(ctx, domid); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:24:35 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:24:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJpj-0002Lg-4r; Tue, 25 Aug 2015 19:24:35 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJph-0002LP-7l for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:24:33 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 7A/A1-04752-0F0CCD55; Tue, 25 Aug 2015 19:24:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1440530670!43940249!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24744 invoked from network); 25 Aug 2015 19:24:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:24:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJpe-0006Xi-MZ for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:24:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJpe-0008D4-L9 for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:24:30 +0000 Date: Tue, 25 Aug 2015 19:24:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: allow empty memory nodes in vNUMA X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b56892f5a9165397fcff0b0e45b9ee181cbb52c8 Author: Boris Ostrovsky AuthorDate: Fri Aug 14 12:18:52 2015 -0400 Commit: Ian Campbell CommitDate: Sun Aug 16 07:49:59 2015 +0100 libxc: allow empty memory nodes in vNUMA The test for 'nr_vmemranges < nr_vnodes' in xc_domain_setvnuma() was originally writtten with the idea that number of memory ranges would at least be equal to number of nodes. We may want to specify nodes with no memory, however, and thus this check should be removed. Signed-off-by: Boris Ostrovsky Acked-by: Wei Liu --- tools/libxc/xc_domain.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 2ee26fb..780797f 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -2451,8 +2451,7 @@ int xc_domain_setvnuma(xc_interface *xch, XC_HYPERCALL_BUFFER_BOUNCE_BOTH); errno = EINVAL; - if ( nr_vnodes == 0 || nr_vmemranges == 0 || - nr_vmemranges < nr_vnodes || nr_vcpus == 0 ) + if ( nr_vnodes == 0 || nr_vmemranges == 0 || nr_vcpus == 0 ) return -1; if ( !vdistance || !vcpu_to_vnode || !vmemrange || !vnode_to_pnode ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:24:35 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:24:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJpj-0002Lg-4r; Tue, 25 Aug 2015 19:24:35 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJph-0002LP-7l for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:24:33 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 7A/A1-04752-0F0CCD55; Tue, 25 Aug 2015 19:24:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1440530670!43940249!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24744 invoked from network); 25 Aug 2015 19:24:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:24:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJpe-0006Xi-MZ for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:24:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJpe-0008D4-L9 for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:24:30 +0000 Date: Tue, 25 Aug 2015 19:24:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: allow empty memory nodes in vNUMA X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b56892f5a9165397fcff0b0e45b9ee181cbb52c8 Author: Boris Ostrovsky AuthorDate: Fri Aug 14 12:18:52 2015 -0400 Commit: Ian Campbell CommitDate: Sun Aug 16 07:49:59 2015 +0100 libxc: allow empty memory nodes in vNUMA The test for 'nr_vmemranges < nr_vnodes' in xc_domain_setvnuma() was originally writtten with the idea that number of memory ranges would at least be equal to number of nodes. We may want to specify nodes with no memory, however, and thus this check should be removed. Signed-off-by: Boris Ostrovsky Acked-by: Wei Liu --- tools/libxc/xc_domain.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 2ee26fb..780797f 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -2451,8 +2451,7 @@ int xc_domain_setvnuma(xc_interface *xch, XC_HYPERCALL_BUFFER_BOUNCE_BOTH); errno = EINVAL; - if ( nr_vnodes == 0 || nr_vmemranges == 0 || - nr_vmemranges < nr_vnodes || nr_vcpus == 0 ) + if ( nr_vnodes == 0 || nr_vmemranges == 0 || nr_vcpus == 0 ) return -1; if ( !vdistance || !vcpu_to_vnode || !vmemrange || !vnode_to_pnode ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:24:46 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:24:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJpu-0002OP-7j; Tue, 25 Aug 2015 19:24:46 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJps-0002O3-Fa for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:24:44 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 26/DB-06021-BF0CCD55; Tue, 25 Aug 2015 19:24:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1440530681!35634604!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28794 invoked from network); 25 Aug 2015 19:24:43 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:24:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJpp-0006Xv-CN for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:24:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJpp-0008EB-5O for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:24:41 +0000 Date: Tue, 25 Aug 2015 19:24:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mm: populate_physmap: validate correctly the gfn for direct mapped domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9503ab0e9c6a41a1ee7a70c8ea9313d08ebaa8c5 Author: Julien Grall AuthorDate: Thu Aug 13 14:41:09 2015 +0200 Commit: Jan Beulich CommitDate: Thu Aug 13 14:41:09 2015 +0200 mm: populate_physmap: validate correctly the gfn for direct mapped domain Direct mapped domain has already the memory allocated 1:1, so we are directly using the gfn as mfn to map the RAM in the guest. While we are validating that the page associated to the first mfn belongs to the domain, the subsequent MFN are not validated when the extent_order is > 0. This may result to map memory region (MMIO, RAM) which doesn't belong to the domain. Although, only DOM0 on ARM is using a direct memory mapped. So it doesn't affect any guest (at least on the upstream version) or even x86. Signed-off-by: Julien Grall Reviewed-by: Jan Beulich Release-acked-by: Wei Liu Acked-by: Ian Campbell --- xen/common/memory.c | 32 +++++++++++++++++++------------- 1 files changed, 19 insertions(+), 13 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index 61bb94c..b541f4a1 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -126,22 +126,28 @@ static void populate_physmap(struct memop_args *a) if ( is_domain_direct_mapped(d) ) { mfn = gpfn; - if ( !mfn_valid(mfn) ) - { - gdprintk(XENLOG_INFO, "Invalid mfn %#"PRI_xen_pfn"\n", - mfn); - goto out; - } - page = mfn_to_page(mfn); - if ( !get_page(page, d) ) + for ( j = 0; j < (1U << a->extent_order); j++, mfn++ ) { - gdprintk(XENLOG_INFO, - "mfn %#"PRI_xen_pfn" doesn't belong to the" - " domain\n", mfn); - goto out; + if ( !mfn_valid(mfn) ) + { + gdprintk(XENLOG_INFO, "Invalid mfn %#"PRI_xen_pfn"\n", + mfn); + goto out; + } + + page = mfn_to_page(mfn); + if ( !get_page(page, d) ) + { + gdprintk(XENLOG_INFO, + "mfn %#"PRI_xen_pfn" doesn't belong to the" + " domain\n", mfn); + goto out; + } + put_page(page); } - put_page(page); + + page = mfn_to_page(gpfn); } else page = alloc_domheap_pages(d, a->extent_order, a->memflags); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:24:46 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:24:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJpu-0002OP-7j; Tue, 25 Aug 2015 19:24:46 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJps-0002O3-Fa for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:24:44 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 26/DB-06021-BF0CCD55; Tue, 25 Aug 2015 19:24:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1440530681!35634604!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28794 invoked from network); 25 Aug 2015 19:24:43 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:24:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJpp-0006Xv-CN for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:24:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJpp-0008EB-5O for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:24:41 +0000 Date: Tue, 25 Aug 2015 19:24:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mm: populate_physmap: validate correctly the gfn for direct mapped domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9503ab0e9c6a41a1ee7a70c8ea9313d08ebaa8c5 Author: Julien Grall AuthorDate: Thu Aug 13 14:41:09 2015 +0200 Commit: Jan Beulich CommitDate: Thu Aug 13 14:41:09 2015 +0200 mm: populate_physmap: validate correctly the gfn for direct mapped domain Direct mapped domain has already the memory allocated 1:1, so we are directly using the gfn as mfn to map the RAM in the guest. While we are validating that the page associated to the first mfn belongs to the domain, the subsequent MFN are not validated when the extent_order is > 0. This may result to map memory region (MMIO, RAM) which doesn't belong to the domain. Although, only DOM0 on ARM is using a direct memory mapped. So it doesn't affect any guest (at least on the upstream version) or even x86. Signed-off-by: Julien Grall Reviewed-by: Jan Beulich Release-acked-by: Wei Liu Acked-by: Ian Campbell --- xen/common/memory.c | 32 +++++++++++++++++++------------- 1 files changed, 19 insertions(+), 13 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index 61bb94c..b541f4a1 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -126,22 +126,28 @@ static void populate_physmap(struct memop_args *a) if ( is_domain_direct_mapped(d) ) { mfn = gpfn; - if ( !mfn_valid(mfn) ) - { - gdprintk(XENLOG_INFO, "Invalid mfn %#"PRI_xen_pfn"\n", - mfn); - goto out; - } - page = mfn_to_page(mfn); - if ( !get_page(page, d) ) + for ( j = 0; j < (1U << a->extent_order); j++, mfn++ ) { - gdprintk(XENLOG_INFO, - "mfn %#"PRI_xen_pfn" doesn't belong to the" - " domain\n", mfn); - goto out; + if ( !mfn_valid(mfn) ) + { + gdprintk(XENLOG_INFO, "Invalid mfn %#"PRI_xen_pfn"\n", + mfn); + goto out; + } + + page = mfn_to_page(mfn); + if ( !get_page(page, d) ) + { + gdprintk(XENLOG_INFO, + "mfn %#"PRI_xen_pfn" doesn't belong to the" + " domain\n", mfn); + goto out; + } + put_page(page); } - put_page(page); + + page = mfn_to_page(gpfn); } else page = alloc_domheap_pages(d, a->extent_order, a->memflags); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:25:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:25:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJq8-0002QU-AI; Tue, 25 Aug 2015 19:25:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJq7-0002QM-6Q for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:24:59 +0000 Received: from [85.158.139.211] by server-10.bemta-5.messagelabs.com id 27/71-31788-A01CCD55; Tue, 25 Aug 2015 19:24:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1440530694!30451744!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15352 invoked from network); 25 Aug 2015 19:24:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:24:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJq0-0006Y0-O0 for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:24:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJpz-0008EX-Hk for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:24:51 +0000 Date: Tue, 25 Aug 2015 19:24:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/p2m: clear_identity_p2m_entry() must cope with 'relaxed' RDM mode X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit adc5b2e05ec781db974216857f98a1ac1d74111b Author: Jan Beulich AuthorDate: Thu Aug 13 14:44:21 2015 +0200 Commit: Jan Beulich CommitDate: Thu Aug 13 14:44:21 2015 +0200 x86/p2m: clear_identity_p2m_entry() must cope with 'relaxed' RDM mode Tearing down a 1:1 mapping that was never established isn't really nice (and in fact hits an ASSERT() in p2m_remove_page()). Convert from a wrapper macro to a proper function which then can take care of the situation. Also take the opportunity to remove the 'page_order' parameter of clear_identity_p2m_entry(), to make it match set_identity_p2m_entry(). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Release-acked-by: Wei Liu --- xen/arch/x86/mm/p2m.c | 32 ++++++++++++++++++++++++++++++++ xen/drivers/passthrough/vtd/iommu.c | 2 +- xen/include/asm-x86/p2m.h | 4 +--- 3 files changed, 34 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 7aafacc..8fa918b 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1019,6 +1019,38 @@ int clear_mmio_p2m_entry(struct domain *d, unsigned long gfn, mfn_t mfn) return rc; } +int clear_identity_p2m_entry(struct domain *d, unsigned long gfn) +{ + p2m_type_t p2mt; + p2m_access_t a; + mfn_t mfn; + struct p2m_domain *p2m = p2m_get_hostp2m(d); + int ret; + + if ( !paging_mode_translate(d) ) + return 0; + + gfn_lock(p2m, gfn, 0); + + mfn = p2m->get_entry(p2m, gfn, &p2mt, &a, 0, NULL, NULL); + if ( p2mt == p2m_mmio_direct && mfn_x(mfn) == gfn ) + { + ret = p2m_set_entry(p2m, gfn, _mfn(INVALID_MFN), PAGE_ORDER_4K, + p2m_invalid, p2m->default_access); + gfn_unlock(p2m, gfn, 0); + } + else + { + gfn_unlock(p2m, gfn, 0); + printk(XENLOG_G_WARNING + "non-identity map d%d:%lx not cleared (mapped to %lx)\n", + d->domain_id, gfn, mfn_x(mfn)); + ret = 0; + } + + return ret; +} + /* Returns: 0 for success, -errno for failure */ int set_shared_p2m_entry(struct domain *d, unsigned long gfn, mfn_t mfn) { diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 1dffc40..836aed5 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -1839,7 +1839,7 @@ static int rmrr_identity_mapping(struct domain *d, bool_t map, while ( base_pfn < end_pfn ) { - if ( clear_identity_p2m_entry(d, base_pfn, 0) ) + if ( clear_identity_p2m_entry(d, base_pfn) ) ret = -ENXIO; base_pfn++; } diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index f487178..5e99ac6 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -563,9 +563,7 @@ int clear_mmio_p2m_entry(struct domain *d, unsigned long gfn, mfn_t mfn); /* Set identity addresses in the p2m table (for pass-through) */ int set_identity_p2m_entry(struct domain *d, unsigned long gfn, p2m_access_t p2ma, unsigned int flag); - -#define clear_identity_p2m_entry(d, gfn, page_order) \ - guest_physmap_remove_page(d, gfn, gfn, page_order) +int clear_identity_p2m_entry(struct domain *d, unsigned long gfn); /* Add foreign mapping to the guest's p2m table. */ int p2m_add_foreign(struct domain *tdom, unsigned long fgfn, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:25:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:25:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJq8-0002QU-AI; Tue, 25 Aug 2015 19:25:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJq7-0002QM-6Q for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:24:59 +0000 Received: from [85.158.139.211] by server-10.bemta-5.messagelabs.com id 27/71-31788-A01CCD55; Tue, 25 Aug 2015 19:24:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1440530694!30451744!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15352 invoked from network); 25 Aug 2015 19:24:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:24:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJq0-0006Y0-O0 for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:24:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJpz-0008EX-Hk for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:24:51 +0000 Date: Tue, 25 Aug 2015 19:24:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/p2m: clear_identity_p2m_entry() must cope with 'relaxed' RDM mode X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit adc5b2e05ec781db974216857f98a1ac1d74111b Author: Jan Beulich AuthorDate: Thu Aug 13 14:44:21 2015 +0200 Commit: Jan Beulich CommitDate: Thu Aug 13 14:44:21 2015 +0200 x86/p2m: clear_identity_p2m_entry() must cope with 'relaxed' RDM mode Tearing down a 1:1 mapping that was never established isn't really nice (and in fact hits an ASSERT() in p2m_remove_page()). Convert from a wrapper macro to a proper function which then can take care of the situation. Also take the opportunity to remove the 'page_order' parameter of clear_identity_p2m_entry(), to make it match set_identity_p2m_entry(). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Release-acked-by: Wei Liu --- xen/arch/x86/mm/p2m.c | 32 ++++++++++++++++++++++++++++++++ xen/drivers/passthrough/vtd/iommu.c | 2 +- xen/include/asm-x86/p2m.h | 4 +--- 3 files changed, 34 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 7aafacc..8fa918b 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1019,6 +1019,38 @@ int clear_mmio_p2m_entry(struct domain *d, unsigned long gfn, mfn_t mfn) return rc; } +int clear_identity_p2m_entry(struct domain *d, unsigned long gfn) +{ + p2m_type_t p2mt; + p2m_access_t a; + mfn_t mfn; + struct p2m_domain *p2m = p2m_get_hostp2m(d); + int ret; + + if ( !paging_mode_translate(d) ) + return 0; + + gfn_lock(p2m, gfn, 0); + + mfn = p2m->get_entry(p2m, gfn, &p2mt, &a, 0, NULL, NULL); + if ( p2mt == p2m_mmio_direct && mfn_x(mfn) == gfn ) + { + ret = p2m_set_entry(p2m, gfn, _mfn(INVALID_MFN), PAGE_ORDER_4K, + p2m_invalid, p2m->default_access); + gfn_unlock(p2m, gfn, 0); + } + else + { + gfn_unlock(p2m, gfn, 0); + printk(XENLOG_G_WARNING + "non-identity map d%d:%lx not cleared (mapped to %lx)\n", + d->domain_id, gfn, mfn_x(mfn)); + ret = 0; + } + + return ret; +} + /* Returns: 0 for success, -errno for failure */ int set_shared_p2m_entry(struct domain *d, unsigned long gfn, mfn_t mfn) { diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 1dffc40..836aed5 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -1839,7 +1839,7 @@ static int rmrr_identity_mapping(struct domain *d, bool_t map, while ( base_pfn < end_pfn ) { - if ( clear_identity_p2m_entry(d, base_pfn, 0) ) + if ( clear_identity_p2m_entry(d, base_pfn) ) ret = -ENXIO; base_pfn++; } diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index f487178..5e99ac6 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -563,9 +563,7 @@ int clear_mmio_p2m_entry(struct domain *d, unsigned long gfn, mfn_t mfn); /* Set identity addresses in the p2m table (for pass-through) */ int set_identity_p2m_entry(struct domain *d, unsigned long gfn, p2m_access_t p2ma, unsigned int flag); - -#define clear_identity_p2m_entry(d, gfn, page_order) \ - guest_physmap_remove_page(d, gfn, gfn, page_order) +int clear_identity_p2m_entry(struct domain *d, unsigned long gfn); /* Add foreign mapping to the guest's p2m table. */ int p2m_add_foreign(struct domain *tdom, unsigned long fgfn, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:25:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:25:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJqM-0002SY-D7; Tue, 25 Aug 2015 19:25:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJqK-0002SH-H7 for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:25:12 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id BF/4B-28791-711CCD55; Tue, 25 Aug 2015 19:25:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1440530707!11564278!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6231 invoked from network); 25 Aug 2015 19:25:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:25:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJqD-0006Yb-IB for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:25:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJqB-0008Fb-72 for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:25:03 +0000 Date: Tue, 25 Aug 2015 19:25:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: fix non-onchangeonly CR write events logic X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 421850a06d54dbe48f8e5979d3453428071db4fd Author: Razvan Cojocaru AuthorDate: Thu Aug 13 14:46:25 2015 +0200 Commit: Jan Beulich CommitDate: Thu Aug 13 14:46:25 2015 +0200 x86/hvm: fix non-onchangeonly CR write events logic hvm_event_crX() already returns a bool_t to tell us whether an event will be sent out or not, so the extra check that value != old is not only useless, but also prevents non-onchangeonly events from being sent. Signed-off-by: Razvan Cojocaru Reviewed-by: Andrew Cooper Release-acked-by: Wei Liu --- xen/arch/x86/hvm/hvm.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index c957610..707ad86 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3368,8 +3368,7 @@ int hvm_set_cr0(unsigned long value, bool_t may_defer) } if ( may_defer && unlikely(currad->monitor.write_ctrlreg_enabled & - monitor_ctrlreg_bitmask(VM_EVENT_X86_CR0)) && - value != old_value ) + monitor_ctrlreg_bitmask(VM_EVENT_X86_CR0)) ) { ASSERT(currad->event_write_data != NULL); @@ -3472,8 +3471,7 @@ int hvm_set_cr3(unsigned long value, bool_t may_defer) struct arch_domain *currad = &v->domain->arch; if ( may_defer && unlikely(currad->monitor.write_ctrlreg_enabled & - monitor_ctrlreg_bitmask(VM_EVENT_X86_CR3)) && - value != old ) + monitor_ctrlreg_bitmask(VM_EVENT_X86_CR3)) ) { ASSERT(currad->event_write_data != NULL); @@ -3546,8 +3544,7 @@ int hvm_set_cr4(unsigned long value, bool_t may_defer) } if ( may_defer && unlikely(currad->monitor.write_ctrlreg_enabled & - monitor_ctrlreg_bitmask(VM_EVENT_X86_CR4)) && - value != old_cr ) + monitor_ctrlreg_bitmask(VM_EVENT_X86_CR4)) ) { ASSERT(currad->event_write_data != NULL); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:25:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:25:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJqM-0002SY-D7; Tue, 25 Aug 2015 19:25:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJqK-0002SH-H7 for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:25:12 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id BF/4B-28791-711CCD55; Tue, 25 Aug 2015 19:25:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1440530707!11564278!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6231 invoked from network); 25 Aug 2015 19:25:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:25:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJqD-0006Yb-IB for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:25:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJqB-0008Fb-72 for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:25:03 +0000 Date: Tue, 25 Aug 2015 19:25:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: fix non-onchangeonly CR write events logic X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 421850a06d54dbe48f8e5979d3453428071db4fd Author: Razvan Cojocaru AuthorDate: Thu Aug 13 14:46:25 2015 +0200 Commit: Jan Beulich CommitDate: Thu Aug 13 14:46:25 2015 +0200 x86/hvm: fix non-onchangeonly CR write events logic hvm_event_crX() already returns a bool_t to tell us whether an event will be sent out or not, so the extra check that value != old is not only useless, but also prevents non-onchangeonly events from being sent. Signed-off-by: Razvan Cojocaru Reviewed-by: Andrew Cooper Release-acked-by: Wei Liu --- xen/arch/x86/hvm/hvm.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index c957610..707ad86 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3368,8 +3368,7 @@ int hvm_set_cr0(unsigned long value, bool_t may_defer) } if ( may_defer && unlikely(currad->monitor.write_ctrlreg_enabled & - monitor_ctrlreg_bitmask(VM_EVENT_X86_CR0)) && - value != old_value ) + monitor_ctrlreg_bitmask(VM_EVENT_X86_CR0)) ) { ASSERT(currad->event_write_data != NULL); @@ -3472,8 +3471,7 @@ int hvm_set_cr3(unsigned long value, bool_t may_defer) struct arch_domain *currad = &v->domain->arch; if ( may_defer && unlikely(currad->monitor.write_ctrlreg_enabled & - monitor_ctrlreg_bitmask(VM_EVENT_X86_CR3)) && - value != old ) + monitor_ctrlreg_bitmask(VM_EVENT_X86_CR3)) ) { ASSERT(currad->event_write_data != NULL); @@ -3546,8 +3544,7 @@ int hvm_set_cr4(unsigned long value, bool_t may_defer) } if ( may_defer && unlikely(currad->monitor.write_ctrlreg_enabled & - monitor_ctrlreg_bitmask(VM_EVENT_X86_CR4)) && - value != old_cr ) + monitor_ctrlreg_bitmask(VM_EVENT_X86_CR4)) ) { ASSERT(currad->event_write_data != NULL); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:25:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:25:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJqZ-0002Ua-Fz; Tue, 25 Aug 2015 19:25:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJqX-0002UH-Ib for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:25:25 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id D7/31-01421-421CCD55; Tue, 25 Aug 2015 19:25:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1440530720!38058462!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25938 invoked from network); 25 Aug 2015 19:25:23 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:25:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJqP-0006Yj-N1 for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:25:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJqO-0008Fx-3S for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:25:16 +0000 Date: Tue, 25 Aug 2015 19:25:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] add page_get_owner_and_reference() related ASSERT()s X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d1f1380591e6abe7101228346158e15248cc4cb5 Author: Jan Beulich AuthorDate: Thu Aug 13 14:47:06 2015 +0200 Commit: Jan Beulich CommitDate: Thu Aug 13 14:47:06 2015 +0200 add page_get_owner_and_reference() related ASSERT()s The function shouldn't return NULL after having obtained a reference, or else the caller won't know to drop it. Also its result shouldn't be ignored - if calling code is certain that a page already has a non-zero refcount, it better ASSERT()s so. Finally this as well as get_page() and put_page() are required to be available on all architectures - move the declarations to xen/mm.h. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Acked-by: Ian Campbell Release-acked-by: Wei Liu --- xen/arch/arm/guestcopy.c | 4 +--- xen/arch/arm/mm.c | 6 +++++- xen/arch/x86/mm.c | 6 +++++- xen/common/grant_table.c | 7 ++++++- xen/include/asm-arm/mm.h | 4 ---- xen/include/asm-x86/mm.h | 3 --- xen/include/xen/mm.h | 6 +++++- 7 files changed, 22 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/guestcopy.c b/xen/arch/arm/guestcopy.c index 7dbaeca..ce1c3c3 100644 --- a/xen/arch/arm/guestcopy.c +++ b/xen/arch/arm/guestcopy.c @@ -1,10 +1,8 @@ -#include #include #include +#include #include #include - -#include #include static unsigned long raw_copy_to_guest_helper(void *to, const void *from, diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index ae0f34c..d6f64cc 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -1170,6 +1170,7 @@ long arch_memory_op(int op, XEN_GUEST_HANDLE_PARAM(void) arg) struct domain *page_get_owner_and_reference(struct page_info *page) { unsigned long x, y = page->count_info; + struct domain *owner; do { x = y; @@ -1182,7 +1183,10 @@ struct domain *page_get_owner_and_reference(struct page_info *page) } while ( (y = cmpxchg(&page->count_info, x, x + 1)) != x ); - return page_get_owner(page); + owner = page_get_owner(page); + ASSERT(owner); + + return owner; } void put_page(struct page_info *page) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 4b76587..358eb3a 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -2038,6 +2038,7 @@ void put_page(struct page_info *page) struct domain *page_get_owner_and_reference(struct page_info *page) { unsigned long x, y = page->count_info; + struct domain *owner; do { x = y; @@ -2051,7 +2052,10 @@ struct domain *page_get_owner_and_reference(struct page_info *page) } while ( (y = cmpxchg(&page->count_info, x, x + 1)) != x ); - return page_get_owner(page); + owner = page_get_owner(page); + ASSERT(owner); + + return owner; } diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index f2ed64a..2b449d5 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -2244,7 +2244,12 @@ __acquire_grant_for_copy( { ASSERT(mfn_valid(act->frame)); *page = mfn_to_page(act->frame); - (void)page_get_owner_and_reference(*page); + td = page_get_owner_and_reference(*page); + /* + * act->pin being non-zero should guarantee the page to have a + * non-zero refcount and hence a valid owner. + */ + ASSERT(td); } act->pin += readonly ? GNTPIN_hstr_inc : GNTPIN_hstw_inc; diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index 2e1f21a..a95082e 100644 --- a/xen/include/asm-arm/mm.h +++ b/xen/include/asm-arm/mm.h @@ -275,10 +275,6 @@ static inline void *page_to_virt(const struct page_info *pg) return mfn_to_virt(page_to_mfn(pg)); } -struct domain *page_get_owner_and_reference(struct page_info *page); -void put_page(struct page_info *page); -int get_page(struct page_info *page, struct domain *domain); - struct page_info *get_page_from_gva(struct domain *d, vaddr_t va, unsigned long flags); diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h index 8595c38..67b34c6 100644 --- a/xen/include/asm-x86/mm.h +++ b/xen/include/asm-x86/mm.h @@ -352,9 +352,6 @@ const unsigned long *get_platform_badpages(unsigned int *array_size); int page_lock(struct page_info *page); void page_unlock(struct page_info *page); -struct domain *page_get_owner_and_reference(struct page_info *page); -void put_page(struct page_info *page); -int get_page(struct page_info *page, struct domain *domain); void put_page_type(struct page_info *page); int get_page_type(struct page_info *page, unsigned long type); int put_page_type_preemptible(struct page_info *page); diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index 876d370..5d4b64b 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -45,6 +45,7 @@ #ifndef __XEN_MM_H__ #define __XEN_MM_H__ +#include #include #include #include @@ -77,9 +78,12 @@ TYPE_SAFE(unsigned long, pfn); #undef pfn_t #endif -struct domain; struct page_info; +void put_page(struct page_info *); +int get_page(struct page_info *, struct domain *); +struct domain *__must_check page_get_owner_and_reference(struct page_info *); + /* Boot-time allocator. Turns into generic allocator after bootstrap. */ void init_boot_pages(paddr_t ps, paddr_t pe); unsigned long alloc_boot_pages( -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:25:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:25:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJqZ-0002Ua-Fz; Tue, 25 Aug 2015 19:25:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJqX-0002UH-Ib for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:25:25 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id D7/31-01421-421CCD55; Tue, 25 Aug 2015 19:25:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1440530720!38058462!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25938 invoked from network); 25 Aug 2015 19:25:23 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:25:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJqP-0006Yj-N1 for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:25:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJqO-0008Fx-3S for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:25:16 +0000 Date: Tue, 25 Aug 2015 19:25:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] add page_get_owner_and_reference() related ASSERT()s X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d1f1380591e6abe7101228346158e15248cc4cb5 Author: Jan Beulich AuthorDate: Thu Aug 13 14:47:06 2015 +0200 Commit: Jan Beulich CommitDate: Thu Aug 13 14:47:06 2015 +0200 add page_get_owner_and_reference() related ASSERT()s The function shouldn't return NULL after having obtained a reference, or else the caller won't know to drop it. Also its result shouldn't be ignored - if calling code is certain that a page already has a non-zero refcount, it better ASSERT()s so. Finally this as well as get_page() and put_page() are required to be available on all architectures - move the declarations to xen/mm.h. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Acked-by: Ian Campbell Release-acked-by: Wei Liu --- xen/arch/arm/guestcopy.c | 4 +--- xen/arch/arm/mm.c | 6 +++++- xen/arch/x86/mm.c | 6 +++++- xen/common/grant_table.c | 7 ++++++- xen/include/asm-arm/mm.h | 4 ---- xen/include/asm-x86/mm.h | 3 --- xen/include/xen/mm.h | 6 +++++- 7 files changed, 22 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/guestcopy.c b/xen/arch/arm/guestcopy.c index 7dbaeca..ce1c3c3 100644 --- a/xen/arch/arm/guestcopy.c +++ b/xen/arch/arm/guestcopy.c @@ -1,10 +1,8 @@ -#include #include #include +#include #include #include - -#include #include static unsigned long raw_copy_to_guest_helper(void *to, const void *from, diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index ae0f34c..d6f64cc 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -1170,6 +1170,7 @@ long arch_memory_op(int op, XEN_GUEST_HANDLE_PARAM(void) arg) struct domain *page_get_owner_and_reference(struct page_info *page) { unsigned long x, y = page->count_info; + struct domain *owner; do { x = y; @@ -1182,7 +1183,10 @@ struct domain *page_get_owner_and_reference(struct page_info *page) } while ( (y = cmpxchg(&page->count_info, x, x + 1)) != x ); - return page_get_owner(page); + owner = page_get_owner(page); + ASSERT(owner); + + return owner; } void put_page(struct page_info *page) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 4b76587..358eb3a 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -2038,6 +2038,7 @@ void put_page(struct page_info *page) struct domain *page_get_owner_and_reference(struct page_info *page) { unsigned long x, y = page->count_info; + struct domain *owner; do { x = y; @@ -2051,7 +2052,10 @@ struct domain *page_get_owner_and_reference(struct page_info *page) } while ( (y = cmpxchg(&page->count_info, x, x + 1)) != x ); - return page_get_owner(page); + owner = page_get_owner(page); + ASSERT(owner); + + return owner; } diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index f2ed64a..2b449d5 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -2244,7 +2244,12 @@ __acquire_grant_for_copy( { ASSERT(mfn_valid(act->frame)); *page = mfn_to_page(act->frame); - (void)page_get_owner_and_reference(*page); + td = page_get_owner_and_reference(*page); + /* + * act->pin being non-zero should guarantee the page to have a + * non-zero refcount and hence a valid owner. + */ + ASSERT(td); } act->pin += readonly ? GNTPIN_hstr_inc : GNTPIN_hstw_inc; diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index 2e1f21a..a95082e 100644 --- a/xen/include/asm-arm/mm.h +++ b/xen/include/asm-arm/mm.h @@ -275,10 +275,6 @@ static inline void *page_to_virt(const struct page_info *pg) return mfn_to_virt(page_to_mfn(pg)); } -struct domain *page_get_owner_and_reference(struct page_info *page); -void put_page(struct page_info *page); -int get_page(struct page_info *page, struct domain *domain); - struct page_info *get_page_from_gva(struct domain *d, vaddr_t va, unsigned long flags); diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h index 8595c38..67b34c6 100644 --- a/xen/include/asm-x86/mm.h +++ b/xen/include/asm-x86/mm.h @@ -352,9 +352,6 @@ const unsigned long *get_platform_badpages(unsigned int *array_size); int page_lock(struct page_info *page); void page_unlock(struct page_info *page); -struct domain *page_get_owner_and_reference(struct page_info *page); -void put_page(struct page_info *page); -int get_page(struct page_info *page, struct domain *domain); void put_page_type(struct page_info *page); int get_page_type(struct page_info *page, unsigned long type); int put_page_type_preemptible(struct page_info *page); diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index 876d370..5d4b64b 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -45,6 +45,7 @@ #ifndef __XEN_MM_H__ #define __XEN_MM_H__ +#include #include #include #include @@ -77,9 +78,12 @@ TYPE_SAFE(unsigned long, pfn); #undef pfn_t #endif -struct domain; struct page_info; +void put_page(struct page_info *); +int get_page(struct page_info *, struct domain *); +struct domain *__must_check page_get_owner_and_reference(struct page_info *); + /* Boot-time allocator. Turns into generic allocator after bootstrap. */ void init_boot_pages(paddr_t ps, paddr_t pe); unsigned long alloc_boot_pages( -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:25:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:25:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJqf-0002WR-KT; Tue, 25 Aug 2015 19:25:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJqf-0002W7-84 for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:25:33 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 03/91-05269-C21CCD55; Tue, 25 Aug 2015 19:25:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1440530731!38084340!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15636 invoked from network); 25 Aug 2015 19:25:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:25:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJqc-0006Zu-2X for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:25:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJqa-0008GV-EQ for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:25:28 +0000 Date: Tue, 25 Aug 2015 19:25:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/dmi_scan: only honor end-of-table for 64-bit tables X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b001c41cf2da767127ed5ebb7d906d4a284afad7 Author: Jean Delvare AuthorDate: Thu Aug 13 14:48:40 2015 +0200 Commit: Jan Beulich CommitDate: Thu Aug 13 14:48:40 2015 +0200 x86/dmi_scan: only honor end-of-table for 64-bit tables A 32-bit entry point to a DMI table says how many structures the table contains. The SMBIOS specification explicitly says that end-of-table markers should be ignored if they are not actually at the end of the DMI table. So only honor the end-of-table marker for tables accessed through 64-bit entry points, as they do not specify a structure count. Signed-off-by: Jean Delvare [Linux commit 17cd5bd5391e6e7b363d66335e1bc6760ae969b9] Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Release-acked-by: Wei Liu --- xen/arch/x86/dmi_scan.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/dmi_scan.c b/xen/arch/x86/dmi_scan.c index 269168c..8e07f8d 100644 --- a/xen/arch/x86/dmi_scan.c +++ b/xen/arch/x86/dmi_scan.c @@ -148,10 +148,11 @@ static int __init dmi_table(paddr_t base, u32 len, int num, data = buf; /* - * Stop when we see all the items the table claimed to have - * OR we run off the end of the table (also happens) - */ - + * Stop when we have seen all the items the table claimed to have + * (SMBIOS < 3.0 only) OR we reach an end-of-table marker (SMBIOS + * >= 3.0 only) OR we run off the end of the table (should never + * happen but sometimes does on bogus implementations.) + */ while((num < 0 || i < num) && data-buf+sizeof(struct dmi_header)<=len) { dm=(struct dmi_header *)data; @@ -165,8 +166,16 @@ static int __init dmi_table(paddr_t base, u32 len, int num, data++; if(data-buftype == DMI_ENTRY_END_OF_TABLE) - break; + /* + * 7.45 End-of-Table (Type 127) [SMBIOS reference spec v3.0.0] + * For tables behind a 64-bit entry point, we have no item + * count and no exact table length, so stop on end-of-table + * marker. For tables behind a 32-bit entry point, we have + * seen OEM structures behind the end-of-table marker on + * some systems, so don't trust it. + */ + if (num < 0 && dm->type == DMI_ENTRY_END_OF_TABLE) + break; data+=2; i++; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:25:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:25:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJqf-0002WR-KT; Tue, 25 Aug 2015 19:25:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJqf-0002W7-84 for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:25:33 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 03/91-05269-C21CCD55; Tue, 25 Aug 2015 19:25:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1440530731!38084340!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15636 invoked from network); 25 Aug 2015 19:25:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:25:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJqc-0006Zu-2X for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:25:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJqa-0008GV-EQ for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:25:28 +0000 Date: Tue, 25 Aug 2015 19:25:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/dmi_scan: only honor end-of-table for 64-bit tables X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b001c41cf2da767127ed5ebb7d906d4a284afad7 Author: Jean Delvare AuthorDate: Thu Aug 13 14:48:40 2015 +0200 Commit: Jan Beulich CommitDate: Thu Aug 13 14:48:40 2015 +0200 x86/dmi_scan: only honor end-of-table for 64-bit tables A 32-bit entry point to a DMI table says how many structures the table contains. The SMBIOS specification explicitly says that end-of-table markers should be ignored if they are not actually at the end of the DMI table. So only honor the end-of-table marker for tables accessed through 64-bit entry points, as they do not specify a structure count. Signed-off-by: Jean Delvare [Linux commit 17cd5bd5391e6e7b363d66335e1bc6760ae969b9] Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Release-acked-by: Wei Liu --- xen/arch/x86/dmi_scan.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/dmi_scan.c b/xen/arch/x86/dmi_scan.c index 269168c..8e07f8d 100644 --- a/xen/arch/x86/dmi_scan.c +++ b/xen/arch/x86/dmi_scan.c @@ -148,10 +148,11 @@ static int __init dmi_table(paddr_t base, u32 len, int num, data = buf; /* - * Stop when we see all the items the table claimed to have - * OR we run off the end of the table (also happens) - */ - + * Stop when we have seen all the items the table claimed to have + * (SMBIOS < 3.0 only) OR we reach an end-of-table marker (SMBIOS + * >= 3.0 only) OR we run off the end of the table (should never + * happen but sometimes does on bogus implementations.) + */ while((num < 0 || i < num) && data-buf+sizeof(struct dmi_header)<=len) { dm=(struct dmi_header *)data; @@ -165,8 +166,16 @@ static int __init dmi_table(paddr_t base, u32 len, int num, data++; if(data-buftype == DMI_ENTRY_END_OF_TABLE) - break; + /* + * 7.45 End-of-Table (Type 127) [SMBIOS reference spec v3.0.0] + * For tables behind a 64-bit entry point, we have no item + * count and no exact table length, so stop on end-of-table + * marker. For tables behind a 32-bit entry point, we have + * seen OEM structures behind the end-of-table marker on + * some systems, so don't trust it. + */ + if (num < 0 && dm->type == DMI_ENTRY_END_OF_TABLE) + break; data+=2; i++; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:25:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:25:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJqq-0002YU-NH; Tue, 25 Aug 2015 19:25:44 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJqp-0002Y9-SA for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:25:44 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id F6/3F-05979-631CCD55; Tue, 25 Aug 2015 19:25:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1440530740!38045265!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29175 invoked from network); 25 Aug 2015 19:25:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:25:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJqm-0006a6-PM for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:25:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJqm-0008H5-Ml for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:25:40 +0000 Date: Tue, 25 Aug 2015 19:25:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: honor p2m_ram_ro in hvm_map_guest_frame_rw() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 672101b54269d7a69c2ccaa345ea396dcca63238 Author: Jan Beulich AuthorDate: Fri Aug 14 12:36:26 2015 +0200 Commit: Jan Beulich CommitDate: Fri Aug 14 12:36:26 2015 +0200 x86/HVM: honor p2m_ram_ro in hvm_map_guest_frame_rw() ... and its callers. While all non-nested users are made fully honor the semantics of that type, doing so in the nested case seemed insane (if doable at all, considering VMCS shadowing), and hence there the respective operations are simply made fail. One case not (yet) taken care of is that of a page getting transitioned to this type after a mapping got established. Signed-off-by: Jan Beulich Acked-by: Boris Ostrovsky Reviewed-by: Andrew Cooper Acked-by: Kevin Tian Release-acked-by: Wei Liu --- xen/arch/x86/hvm/hvm.c | 39 +++++++++++++++++++----------- xen/arch/x86/hvm/svm/nestedsvm.c | 16 ++++++++++-- xen/arch/x86/hvm/vmx/vmx.c | 13 ++++++---- xen/arch/x86/hvm/vmx/vvmx.c | 48 ++++++++++++++++++++++++++------------ xen/include/asm-x86/hvm/hvm.h | 3 +- 5 files changed, 81 insertions(+), 38 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 707ad86..615fa89 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3666,8 +3666,8 @@ int hvm_virtual_to_linear_addr( /* On non-NULL return, we leave this function holding an additional * ref on the underlying mfn, if any */ -static void *__hvm_map_guest_frame(unsigned long gfn, bool_t writable, - bool_t permanent) +static void *_hvm_map_guest_frame(unsigned long gfn, bool_t permanent, + bool_t *writable) { void *map; p2m_type_t p2mt; @@ -3690,7 +3690,12 @@ static void *__hvm_map_guest_frame(unsigned long gfn, bool_t writable, } if ( writable ) - paging_mark_dirty(d, page_to_mfn(page)); + { + if ( !p2m_is_discard_write(p2mt) ) + paging_mark_dirty(d, page_to_mfn(page)); + else + *writable = 0; + } if ( !permanent ) return __map_domain_page(page); @@ -3702,14 +3707,16 @@ static void *__hvm_map_guest_frame(unsigned long gfn, bool_t writable, return map; } -void *hvm_map_guest_frame_rw(unsigned long gfn, bool_t permanent) +void *hvm_map_guest_frame_rw(unsigned long gfn, bool_t permanent, + bool_t *writable) { - return __hvm_map_guest_frame(gfn, 1, permanent); + *writable = 1; + return _hvm_map_guest_frame(gfn, permanent, writable); } void *hvm_map_guest_frame_ro(unsigned long gfn, bool_t permanent) { - return __hvm_map_guest_frame(gfn, 0, permanent); + return _hvm_map_guest_frame(gfn, permanent, NULL); } void hvm_unmap_guest_frame(void *p, bool_t permanent) @@ -3729,7 +3736,7 @@ void hvm_unmap_guest_frame(void *p, bool_t permanent) put_page(mfn_to_page(mfn)); } -static void *hvm_map_entry(unsigned long va) +static void *hvm_map_entry(unsigned long va, bool_t *writable) { unsigned long gfn; uint32_t pfec; @@ -3752,7 +3759,7 @@ static void *hvm_map_entry(unsigned long va) if ( (pfec == PFEC_page_paged) || (pfec == PFEC_page_shared) ) goto fail; - v = hvm_map_guest_frame_rw(gfn, 0); + v = hvm_map_guest_frame_rw(gfn, 0, writable); if ( v == NULL ) goto fail; @@ -3774,6 +3781,7 @@ static int hvm_load_segment_selector( struct segment_register desctab, cs, segr; struct desc_struct *pdesc, desc; u8 dpl, rpl, cpl; + bool_t writable; int fault_type = TRAP_invalid_tss; struct cpu_user_regs *regs = guest_cpu_user_regs(); struct vcpu *v = current; @@ -3810,7 +3818,7 @@ static int hvm_load_segment_selector( if ( ((sel & 0xfff8) + 7) > desctab.limit ) goto fail; - pdesc = hvm_map_entry(desctab.base + (sel & 0xfff8)); + pdesc = hvm_map_entry(desctab.base + (sel & 0xfff8), &writable); if ( pdesc == NULL ) goto hvm_map_fail; @@ -3869,6 +3877,7 @@ static int hvm_load_segment_selector( break; } } while ( !(desc.b & 0x100) && /* Ensure Accessed flag is set */ + writable && /* except if we are to discard writes */ (cmpxchg(&pdesc->b, desc.b, desc.b | 0x100) != desc.b) ); /* Force the Accessed flag in our local copy. */ @@ -3906,6 +3915,7 @@ void hvm_task_switch( struct cpu_user_regs *regs = guest_cpu_user_regs(); struct segment_register gdt, tr, prev_tr, segr; struct desc_struct *optss_desc = NULL, *nptss_desc = NULL, tss_desc; + bool_t otd_writable, ntd_writable; unsigned long eflags; int exn_raised, rc; struct { @@ -3932,11 +3942,12 @@ void hvm_task_switch( goto out; } - optss_desc = hvm_map_entry(gdt.base + (prev_tr.sel & 0xfff8)); + optss_desc = hvm_map_entry(gdt.base + (prev_tr.sel & 0xfff8), + &otd_writable); if ( optss_desc == NULL ) goto out; - nptss_desc = hvm_map_entry(gdt.base + (tss_sel & 0xfff8)); + nptss_desc = hvm_map_entry(gdt.base + (tss_sel & 0xfff8), &ntd_writable); if ( nptss_desc == NULL ) goto out; @@ -4068,11 +4079,11 @@ void hvm_task_switch( v->arch.hvm_vcpu.guest_cr[0] |= X86_CR0_TS; hvm_update_guest_cr(v, 0); - if ( (taskswitch_reason == TSW_iret) || - (taskswitch_reason == TSW_jmp) ) + if ( (taskswitch_reason == TSW_iret || + taskswitch_reason == TSW_jmp) && otd_writable ) clear_bit(41, optss_desc); /* clear B flag of old task */ - if ( taskswitch_reason != TSW_iret ) + if ( taskswitch_reason != TSW_iret && ntd_writable ) set_bit(41, nptss_desc); /* set B flag of new task */ if ( errcode >= 0 ) diff --git a/xen/arch/x86/hvm/svm/nestedsvm.c b/xen/arch/x86/hvm/svm/nestedsvm.c index dd927f7..46f2532 100644 --- a/xen/arch/x86/hvm/svm/nestedsvm.c +++ b/xen/arch/x86/hvm/svm/nestedsvm.c @@ -74,10 +74,20 @@ int nestedsvm_vmcb_map(struct vcpu *v, uint64_t vmcbaddr) nv->nv_vvmcxaddr = VMCX_EADDR; } - if (nv->nv_vvmcx == NULL) { - nv->nv_vvmcx = hvm_map_guest_frame_rw(vmcbaddr >> PAGE_SHIFT, 1); - if (nv->nv_vvmcx == NULL) + if ( !nv->nv_vvmcx ) + { + bool_t writable; + void *vvmcx = hvm_map_guest_frame_rw(paddr_to_pfn(vmcbaddr), 1, + &writable); + + if ( !vvmcx ) return 0; + if ( !writable ) + { + hvm_unmap_guest_frame(vvmcx, 1); + return 0; + } + nv->nv_vvmcx = vvmcx; nv->nv_vvmcxaddr = vmcbaddr; } diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index c32d863..999defe 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1853,14 +1853,17 @@ static int vmx_vcpu_emulate_vmfunc(struct cpu_user_regs *regs) static bool_t vmx_vcpu_emulate_ve(struct vcpu *v) { - bool_t rc = 0; - ve_info_t *veinfo = gfn_x(vcpu_altp2m(v).veinfo_gfn) != INVALID_GFN ? - hvm_map_guest_frame_rw(gfn_x(vcpu_altp2m(v).veinfo_gfn), 0) : NULL; + bool_t rc = 0, writable; + unsigned long gfn = gfn_x(vcpu_altp2m(v).veinfo_gfn); + ve_info_t *veinfo; - if ( !veinfo ) + if ( gfn == INVALID_GFN ) return 0; - if ( veinfo->semaphore != 0 ) + veinfo = hvm_map_guest_frame_rw(gfn, 0, &writable); + if ( !veinfo ) + return 0; + if ( !writable || veinfo->semaphore != 0 ) goto out; rc = 1; diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index 34b05be..cb6f9b8 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -1618,10 +1618,23 @@ int nvmx_handle_vmptrld(struct cpu_user_regs *regs) if ( nvcpu->nv_vvmcxaddr == VMCX_EADDR ) { - nvcpu->nv_vvmcx = hvm_map_guest_frame_rw(gpa >> PAGE_SHIFT, 1); - if ( nvcpu->nv_vvmcx ) - nvcpu->nv_vvmcxaddr = gpa; - if ( !nvcpu->nv_vvmcx || + bool_t writable; + void *vvmcx = hvm_map_guest_frame_rw(paddr_to_pfn(gpa), 1, &writable); + + if ( vvmcx ) + { + if ( writable ) + { + nvcpu->nv_vvmcx = vvmcx; + nvcpu->nv_vvmcxaddr = gpa; + } + else + { + hvm_unmap_guest_frame(vvmcx, 1); + vvmcx = NULL; + } + } + if ( !vvmcx || !map_io_bitmap_all(v) || !_map_msr_bitmap(v) ) { @@ -1675,13 +1688,10 @@ int nvmx_handle_vmclear(struct cpu_user_regs *regs) if ( rc != X86EMUL_OKAY ) return rc; + BUILD_BUG_ON(X86EMUL_OKAY != VMSUCCEED); /* rc = VMSUCCEED; */ if ( gpa & 0xfff ) - { - vmreturn(regs, VMFAIL_INVALID); - return X86EMUL_OKAY; - } - - if ( gpa == nvcpu->nv_vvmcxaddr ) + rc = VMFAIL_INVALID; + else if ( gpa == nvcpu->nv_vvmcxaddr ) { if ( cpu_has_vmx_vmcs_shadowing ) nvmx_clear_vmcs_pointer(v, nvcpu->nv_vvmcx); @@ -1692,14 +1702,22 @@ int nvmx_handle_vmclear(struct cpu_user_regs *regs) else { /* Even if this VMCS isn't the current one, we must clear it. */ - vvmcs = hvm_map_guest_frame_rw(gpa >> PAGE_SHIFT, 0); + bool_t writable; + + vvmcs = hvm_map_guest_frame_rw(paddr_to_pfn(gpa), 0, &writable); if ( vvmcs ) - clear_vvmcs_launched(&nvmx->launched_list, - domain_page_map_to_mfn(vvmcs)); - hvm_unmap_guest_frame(vvmcs, 0); + { + if ( writable ) + clear_vvmcs_launched(&nvmx->launched_list, + domain_page_map_to_mfn(vvmcs)); + else + rc = VMFAIL_VALID; + hvm_unmap_guest_frame(vvmcs, 0); + } } - vmreturn(regs, VMSUCCEED); + vmreturn(regs, rc); + return X86EMUL_OKAY; } diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index 3cac64f..68b216c 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -440,7 +440,8 @@ int hvm_virtual_to_linear_addr( unsigned int addr_size, unsigned long *linear_addr); -void *hvm_map_guest_frame_rw(unsigned long gfn, bool_t permanent); +void *hvm_map_guest_frame_rw(unsigned long gfn, bool_t permanent, + bool_t *writable); void *hvm_map_guest_frame_ro(unsigned long gfn, bool_t permanent); void hvm_unmap_guest_frame(void *p, bool_t permanent); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:25:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:25:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJqq-0002YU-NH; Tue, 25 Aug 2015 19:25:44 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJqp-0002Y9-SA for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:25:44 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id F6/3F-05979-631CCD55; Tue, 25 Aug 2015 19:25:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1440530740!38045265!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29175 invoked from network); 25 Aug 2015 19:25:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:25:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJqm-0006a6-PM for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:25:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJqm-0008H5-Ml for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:25:40 +0000 Date: Tue, 25 Aug 2015 19:25:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: honor p2m_ram_ro in hvm_map_guest_frame_rw() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 672101b54269d7a69c2ccaa345ea396dcca63238 Author: Jan Beulich AuthorDate: Fri Aug 14 12:36:26 2015 +0200 Commit: Jan Beulich CommitDate: Fri Aug 14 12:36:26 2015 +0200 x86/HVM: honor p2m_ram_ro in hvm_map_guest_frame_rw() ... and its callers. While all non-nested users are made fully honor the semantics of that type, doing so in the nested case seemed insane (if doable at all, considering VMCS shadowing), and hence there the respective operations are simply made fail. One case not (yet) taken care of is that of a page getting transitioned to this type after a mapping got established. Signed-off-by: Jan Beulich Acked-by: Boris Ostrovsky Reviewed-by: Andrew Cooper Acked-by: Kevin Tian Release-acked-by: Wei Liu --- xen/arch/x86/hvm/hvm.c | 39 +++++++++++++++++++----------- xen/arch/x86/hvm/svm/nestedsvm.c | 16 ++++++++++-- xen/arch/x86/hvm/vmx/vmx.c | 13 ++++++---- xen/arch/x86/hvm/vmx/vvmx.c | 48 ++++++++++++++++++++++++++------------ xen/include/asm-x86/hvm/hvm.h | 3 +- 5 files changed, 81 insertions(+), 38 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 707ad86..615fa89 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3666,8 +3666,8 @@ int hvm_virtual_to_linear_addr( /* On non-NULL return, we leave this function holding an additional * ref on the underlying mfn, if any */ -static void *__hvm_map_guest_frame(unsigned long gfn, bool_t writable, - bool_t permanent) +static void *_hvm_map_guest_frame(unsigned long gfn, bool_t permanent, + bool_t *writable) { void *map; p2m_type_t p2mt; @@ -3690,7 +3690,12 @@ static void *__hvm_map_guest_frame(unsigned long gfn, bool_t writable, } if ( writable ) - paging_mark_dirty(d, page_to_mfn(page)); + { + if ( !p2m_is_discard_write(p2mt) ) + paging_mark_dirty(d, page_to_mfn(page)); + else + *writable = 0; + } if ( !permanent ) return __map_domain_page(page); @@ -3702,14 +3707,16 @@ static void *__hvm_map_guest_frame(unsigned long gfn, bool_t writable, return map; } -void *hvm_map_guest_frame_rw(unsigned long gfn, bool_t permanent) +void *hvm_map_guest_frame_rw(unsigned long gfn, bool_t permanent, + bool_t *writable) { - return __hvm_map_guest_frame(gfn, 1, permanent); + *writable = 1; + return _hvm_map_guest_frame(gfn, permanent, writable); } void *hvm_map_guest_frame_ro(unsigned long gfn, bool_t permanent) { - return __hvm_map_guest_frame(gfn, 0, permanent); + return _hvm_map_guest_frame(gfn, permanent, NULL); } void hvm_unmap_guest_frame(void *p, bool_t permanent) @@ -3729,7 +3736,7 @@ void hvm_unmap_guest_frame(void *p, bool_t permanent) put_page(mfn_to_page(mfn)); } -static void *hvm_map_entry(unsigned long va) +static void *hvm_map_entry(unsigned long va, bool_t *writable) { unsigned long gfn; uint32_t pfec; @@ -3752,7 +3759,7 @@ static void *hvm_map_entry(unsigned long va) if ( (pfec == PFEC_page_paged) || (pfec == PFEC_page_shared) ) goto fail; - v = hvm_map_guest_frame_rw(gfn, 0); + v = hvm_map_guest_frame_rw(gfn, 0, writable); if ( v == NULL ) goto fail; @@ -3774,6 +3781,7 @@ static int hvm_load_segment_selector( struct segment_register desctab, cs, segr; struct desc_struct *pdesc, desc; u8 dpl, rpl, cpl; + bool_t writable; int fault_type = TRAP_invalid_tss; struct cpu_user_regs *regs = guest_cpu_user_regs(); struct vcpu *v = current; @@ -3810,7 +3818,7 @@ static int hvm_load_segment_selector( if ( ((sel & 0xfff8) + 7) > desctab.limit ) goto fail; - pdesc = hvm_map_entry(desctab.base + (sel & 0xfff8)); + pdesc = hvm_map_entry(desctab.base + (sel & 0xfff8), &writable); if ( pdesc == NULL ) goto hvm_map_fail; @@ -3869,6 +3877,7 @@ static int hvm_load_segment_selector( break; } } while ( !(desc.b & 0x100) && /* Ensure Accessed flag is set */ + writable && /* except if we are to discard writes */ (cmpxchg(&pdesc->b, desc.b, desc.b | 0x100) != desc.b) ); /* Force the Accessed flag in our local copy. */ @@ -3906,6 +3915,7 @@ void hvm_task_switch( struct cpu_user_regs *regs = guest_cpu_user_regs(); struct segment_register gdt, tr, prev_tr, segr; struct desc_struct *optss_desc = NULL, *nptss_desc = NULL, tss_desc; + bool_t otd_writable, ntd_writable; unsigned long eflags; int exn_raised, rc; struct { @@ -3932,11 +3942,12 @@ void hvm_task_switch( goto out; } - optss_desc = hvm_map_entry(gdt.base + (prev_tr.sel & 0xfff8)); + optss_desc = hvm_map_entry(gdt.base + (prev_tr.sel & 0xfff8), + &otd_writable); if ( optss_desc == NULL ) goto out; - nptss_desc = hvm_map_entry(gdt.base + (tss_sel & 0xfff8)); + nptss_desc = hvm_map_entry(gdt.base + (tss_sel & 0xfff8), &ntd_writable); if ( nptss_desc == NULL ) goto out; @@ -4068,11 +4079,11 @@ void hvm_task_switch( v->arch.hvm_vcpu.guest_cr[0] |= X86_CR0_TS; hvm_update_guest_cr(v, 0); - if ( (taskswitch_reason == TSW_iret) || - (taskswitch_reason == TSW_jmp) ) + if ( (taskswitch_reason == TSW_iret || + taskswitch_reason == TSW_jmp) && otd_writable ) clear_bit(41, optss_desc); /* clear B flag of old task */ - if ( taskswitch_reason != TSW_iret ) + if ( taskswitch_reason != TSW_iret && ntd_writable ) set_bit(41, nptss_desc); /* set B flag of new task */ if ( errcode >= 0 ) diff --git a/xen/arch/x86/hvm/svm/nestedsvm.c b/xen/arch/x86/hvm/svm/nestedsvm.c index dd927f7..46f2532 100644 --- a/xen/arch/x86/hvm/svm/nestedsvm.c +++ b/xen/arch/x86/hvm/svm/nestedsvm.c @@ -74,10 +74,20 @@ int nestedsvm_vmcb_map(struct vcpu *v, uint64_t vmcbaddr) nv->nv_vvmcxaddr = VMCX_EADDR; } - if (nv->nv_vvmcx == NULL) { - nv->nv_vvmcx = hvm_map_guest_frame_rw(vmcbaddr >> PAGE_SHIFT, 1); - if (nv->nv_vvmcx == NULL) + if ( !nv->nv_vvmcx ) + { + bool_t writable; + void *vvmcx = hvm_map_guest_frame_rw(paddr_to_pfn(vmcbaddr), 1, + &writable); + + if ( !vvmcx ) return 0; + if ( !writable ) + { + hvm_unmap_guest_frame(vvmcx, 1); + return 0; + } + nv->nv_vvmcx = vvmcx; nv->nv_vvmcxaddr = vmcbaddr; } diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index c32d863..999defe 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1853,14 +1853,17 @@ static int vmx_vcpu_emulate_vmfunc(struct cpu_user_regs *regs) static bool_t vmx_vcpu_emulate_ve(struct vcpu *v) { - bool_t rc = 0; - ve_info_t *veinfo = gfn_x(vcpu_altp2m(v).veinfo_gfn) != INVALID_GFN ? - hvm_map_guest_frame_rw(gfn_x(vcpu_altp2m(v).veinfo_gfn), 0) : NULL; + bool_t rc = 0, writable; + unsigned long gfn = gfn_x(vcpu_altp2m(v).veinfo_gfn); + ve_info_t *veinfo; - if ( !veinfo ) + if ( gfn == INVALID_GFN ) return 0; - if ( veinfo->semaphore != 0 ) + veinfo = hvm_map_guest_frame_rw(gfn, 0, &writable); + if ( !veinfo ) + return 0; + if ( !writable || veinfo->semaphore != 0 ) goto out; rc = 1; diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index 34b05be..cb6f9b8 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -1618,10 +1618,23 @@ int nvmx_handle_vmptrld(struct cpu_user_regs *regs) if ( nvcpu->nv_vvmcxaddr == VMCX_EADDR ) { - nvcpu->nv_vvmcx = hvm_map_guest_frame_rw(gpa >> PAGE_SHIFT, 1); - if ( nvcpu->nv_vvmcx ) - nvcpu->nv_vvmcxaddr = gpa; - if ( !nvcpu->nv_vvmcx || + bool_t writable; + void *vvmcx = hvm_map_guest_frame_rw(paddr_to_pfn(gpa), 1, &writable); + + if ( vvmcx ) + { + if ( writable ) + { + nvcpu->nv_vvmcx = vvmcx; + nvcpu->nv_vvmcxaddr = gpa; + } + else + { + hvm_unmap_guest_frame(vvmcx, 1); + vvmcx = NULL; + } + } + if ( !vvmcx || !map_io_bitmap_all(v) || !_map_msr_bitmap(v) ) { @@ -1675,13 +1688,10 @@ int nvmx_handle_vmclear(struct cpu_user_regs *regs) if ( rc != X86EMUL_OKAY ) return rc; + BUILD_BUG_ON(X86EMUL_OKAY != VMSUCCEED); /* rc = VMSUCCEED; */ if ( gpa & 0xfff ) - { - vmreturn(regs, VMFAIL_INVALID); - return X86EMUL_OKAY; - } - - if ( gpa == nvcpu->nv_vvmcxaddr ) + rc = VMFAIL_INVALID; + else if ( gpa == nvcpu->nv_vvmcxaddr ) { if ( cpu_has_vmx_vmcs_shadowing ) nvmx_clear_vmcs_pointer(v, nvcpu->nv_vvmcx); @@ -1692,14 +1702,22 @@ int nvmx_handle_vmclear(struct cpu_user_regs *regs) else { /* Even if this VMCS isn't the current one, we must clear it. */ - vvmcs = hvm_map_guest_frame_rw(gpa >> PAGE_SHIFT, 0); + bool_t writable; + + vvmcs = hvm_map_guest_frame_rw(paddr_to_pfn(gpa), 0, &writable); if ( vvmcs ) - clear_vvmcs_launched(&nvmx->launched_list, - domain_page_map_to_mfn(vvmcs)); - hvm_unmap_guest_frame(vvmcs, 0); + { + if ( writable ) + clear_vvmcs_launched(&nvmx->launched_list, + domain_page_map_to_mfn(vvmcs)); + else + rc = VMFAIL_VALID; + hvm_unmap_guest_frame(vvmcs, 0); + } } - vmreturn(regs, VMSUCCEED); + vmreturn(regs, rc); + return X86EMUL_OKAY; } diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index 3cac64f..68b216c 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -440,7 +440,8 @@ int hvm_virtual_to_linear_addr( unsigned int addr_size, unsigned long *linear_addr); -void *hvm_map_guest_frame_rw(unsigned long gfn, bool_t permanent); +void *hvm_map_guest_frame_rw(unsigned long gfn, bool_t permanent, + bool_t *writable); void *hvm_map_guest_frame_ro(unsigned long gfn, bool_t permanent); void hvm_unmap_guest_frame(void *p, bool_t permanent); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:25:53 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:25:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJqz-0002aO-Pn; Tue, 25 Aug 2015 19:25:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJqz-0002a9-A6 for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:25:53 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 33/F8-23203-041CCD55; Tue, 25 Aug 2015 19:25:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1440530751!38084400!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17060 invoked from network); 25 Aug 2015 19:25:52 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:25:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJqx-0006aE-0s for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:25:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJqw-0008Ha-W6 for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:25:51 +0000 Date: Tue, 25 Aug 2015 19:25:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 743289d0296268fe6bad64531a24d8053afeb062 Merge: b56892f5a9165397fcff0b0e45b9ee181cbb52c8 672101b54269d7a69c2ccaa345ea396dcca63238 Author: Ian Campbell AuthorDate: Sun Aug 16 09:00:30 2015 +0100 Commit: Ian Campbell CommitDate: Sun Aug 16 09:00:30 2015 +0100 Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging xen/arch/arm/guestcopy.c | 4 +-- xen/arch/arm/mm.c | 6 +++- xen/arch/x86/dmi_scan.c | 21 +++++++++++---- xen/arch/x86/hvm/hvm.c | 48 ++++++++++++++++++++-------------- xen/arch/x86/hvm/svm/nestedsvm.c | 16 +++++++++-- xen/arch/x86/hvm/vmx/vmx.c | 13 ++++++--- xen/arch/x86/hvm/vmx/vvmx.c | 48 ++++++++++++++++++++++++----------- xen/arch/x86/mm.c | 6 +++- xen/arch/x86/mm/p2m.c | 32 +++++++++++++++++++++++ xen/common/grant_table.c | 7 ++++- xen/common/memory.c | 32 ++++++++++++++--------- xen/drivers/passthrough/vtd/iommu.c | 2 +- xen/include/asm-arm/mm.h | 4 --- xen/include/asm-x86/hvm/hvm.h | 3 +- xen/include/asm-x86/mm.h | 3 -- xen/include/asm-x86/p2m.h | 4 +-- xen/include/xen/mm.h | 6 +++- 17 files changed, 174 insertions(+), 81 deletions(-) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:25:53 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:25:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJqz-0002aO-Pn; Tue, 25 Aug 2015 19:25:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJqz-0002a9-A6 for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:25:53 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 33/F8-23203-041CCD55; Tue, 25 Aug 2015 19:25:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1440530751!38084400!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17060 invoked from network); 25 Aug 2015 19:25:52 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:25:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJqx-0006aE-0s for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:25:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJqw-0008Ha-W6 for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:25:51 +0000 Date: Tue, 25 Aug 2015 19:25:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 743289d0296268fe6bad64531a24d8053afeb062 Merge: b56892f5a9165397fcff0b0e45b9ee181cbb52c8 672101b54269d7a69c2ccaa345ea396dcca63238 Author: Ian Campbell AuthorDate: Sun Aug 16 09:00:30 2015 +0100 Commit: Ian Campbell CommitDate: Sun Aug 16 09:00:30 2015 +0100 Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging xen/arch/arm/guestcopy.c | 4 +-- xen/arch/arm/mm.c | 6 +++- xen/arch/x86/dmi_scan.c | 21 +++++++++++---- xen/arch/x86/hvm/hvm.c | 48 ++++++++++++++++++++-------------- xen/arch/x86/hvm/svm/nestedsvm.c | 16 +++++++++-- xen/arch/x86/hvm/vmx/vmx.c | 13 ++++++--- xen/arch/x86/hvm/vmx/vvmx.c | 48 ++++++++++++++++++++++++----------- xen/arch/x86/mm.c | 6 +++- xen/arch/x86/mm/p2m.c | 32 +++++++++++++++++++++++ xen/common/grant_table.c | 7 ++++- xen/common/memory.c | 32 ++++++++++++++--------- xen/drivers/passthrough/vtd/iommu.c | 2 +- xen/include/asm-arm/mm.h | 4 --- xen/include/asm-x86/hvm/hvm.h | 3 +- xen/include/asm-x86/mm.h | 3 -- xen/include/asm-x86/p2m.h | 4 +-- xen/include/xen/mm.h | 6 +++- 17 files changed, 174 insertions(+), 81 deletions(-) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:26:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:26:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJr9-0002c3-TY; Tue, 25 Aug 2015 19:26:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJr9-0002bt-CI for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:26:03 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id AA/B5-31069-A41CCD55; Tue, 25 Aug 2015 19:26:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1440530761!35634863!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17781 invoked from network); 25 Aug 2015 19:26:02 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:26:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJr7-0006aM-5s for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:26:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJr7-0008Iu-4K for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:26:01 +0000 Date: Tue, 25 Aug 2015 19:26:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: fix vNUMA vdistance parsing X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 649f0eb7f4b8eb0d5918462e537bc3186f6d52cf Author: Wei Liu AuthorDate: Mon Aug 17 19:56:59 2015 +0100 Commit: Ian Campbell CommitDate: Fri Aug 21 08:45:55 2015 +0100 xl: fix vNUMA vdistance parsing We should parse the output from splitting function, not the original string, otherwise the parsed result is wrong. For example: vnuma = [ [...,"vdistance=10,20",...], [...,"vdistance=20,10",...] ] Before this change, vdistance from node 0 to all nodes (including itself) was 10 and vdistance from node 1 to all nodes was 20. After this change, vdistance from node 0 to itself is 10, to node 1 is 20 and vdistance from node 1 to node 0 is 20, to itself is 10. That's the correct vdistance settings we expect. Signed-off-by: Wei Liu Reviewed-by: Dario Faggioli Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index c6b0b68..44fff82 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1188,7 +1188,7 @@ static void parse_vnuma_config(const XLU_Config *config, len = libxl_string_list_length(&vdist); for (j = 0; j < len; j++) { - val = parse_ulong(value); + val = parse_ulong(vdist[j]); p->distances[j] = val; } libxl_string_list_dispose(&vdist); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:26:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:26:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJr9-0002c3-TY; Tue, 25 Aug 2015 19:26:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJr9-0002bt-CI for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:26:03 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id AA/B5-31069-A41CCD55; Tue, 25 Aug 2015 19:26:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1440530761!35634863!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17781 invoked from network); 25 Aug 2015 19:26:02 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:26:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJr7-0006aM-5s for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:26:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJr7-0008Iu-4K for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:26:01 +0000 Date: Tue, 25 Aug 2015 19:26:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: fix vNUMA vdistance parsing X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 649f0eb7f4b8eb0d5918462e537bc3186f6d52cf Author: Wei Liu AuthorDate: Mon Aug 17 19:56:59 2015 +0100 Commit: Ian Campbell CommitDate: Fri Aug 21 08:45:55 2015 +0100 xl: fix vNUMA vdistance parsing We should parse the output from splitting function, not the original string, otherwise the parsed result is wrong. For example: vnuma = [ [...,"vdistance=10,20",...], [...,"vdistance=20,10",...] ] Before this change, vdistance from node 0 to all nodes (including itself) was 10 and vdistance from node 1 to all nodes was 20. After this change, vdistance from node 0 to itself is 10, to node 1 is 20 and vdistance from node 1 to node 0 is 20, to itself is 10. That's the correct vdistance settings we expect. Signed-off-by: Wei Liu Reviewed-by: Dario Faggioli Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index c6b0b68..44fff82 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1188,7 +1188,7 @@ static void parse_vnuma_config(const XLU_Config *config, len = libxl_string_list_length(&vdist); for (j = 0; j < len; j++) { - val = parse_ulong(value); + val = parse_ulong(vdist[j]); p->distances[j] = val; } libxl_string_list_dispose(&vdist); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:26:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:26:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJrM-0002di-0D; Tue, 25 Aug 2015 19:26:16 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJrL-0002dZ-1L for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:26:15 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 9F/22-28221-651CCD55; Tue, 25 Aug 2015 19:26:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1440530771!43920577!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19992 invoked from network); 25 Aug 2015 19:26:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:26:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJrH-0006aw-Ae for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:26:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJrH-0008JQ-9j for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:26:11 +0000 Date: Tue, 25 Aug 2015 19:26:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: error out if vNUMA specifies more vcpus than pcpus X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 51086e196ee6531f7cb45f23943dc8daf2d1527b Author: Wei Liu AuthorDate: Mon Aug 17 19:57:00 2015 +0100 Commit: Ian Campbell CommitDate: Fri Aug 21 08:45:55 2015 +0100 xl: error out if vNUMA specifies more vcpus than pcpus ... but allow user to override that check by specifying maxvcpus= in xl configuration file. Note that the code is constructed such that the fallout is dealt with after parsing. We can live with that because though it wastes a bit of cpu cycles but it is still functionally correct and I would like to have a clear split between parsing and dealing with fallouts. Signed-off-by: Wei Liu Reviewed-by: Dario Faggioli Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 44fff82..ebbb9a5 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1175,6 +1175,14 @@ static void parse_vnuma_config(const XLU_Config *config, for (j = 0; j < len; j++) { parse_range(cpu_spec_list[j], &s, &e); for (; s <= e; s++) { + /* + * Note that if we try to set a bit beyond + * the size of bitmap, libxl_bitmap_set + * has no effect. The resulted bitmap + * doesn't reflect what user wants. The + * fallout is dealt with later after + * parsing. + */ libxl_bitmap_set(&vcpu_parsed[i], s); max_vcpus++; } @@ -1202,11 +1210,27 @@ static void parse_vnuma_config(const XLU_Config *config, } /* User has specified maxvcpus= */ - if (b_info->max_vcpus != 0 && b_info->max_vcpus != max_vcpus) { - fprintf(stderr, "xl: vnuma vcpus and maxvcpus= mismatch\n"); - exit(1); - } else + if (b_info->max_vcpus != 0) { + if (b_info->max_vcpus != max_vcpus) { + fprintf(stderr, "xl: vnuma vcpus and maxvcpus= mismatch\n"); + exit(1); + } + } else { + int host_cpus = libxl_get_online_cpus(ctx); + + if (host_cpus < 0) { + fprintf(stderr, "Failed to get online cpus\n"); + exit(1); + } + + if (host_cpus < max_vcpus) { + fprintf(stderr, "xl: vnuma specifies more vcpus than pcpus, "\ + "use maxvcpus= to override this check.\n"); + exit(1); + } + b_info->max_vcpus = max_vcpus; + } /* User has specified maxmem= */ if (b_info->max_memkb != LIBXL_MEMKB_DEFAULT && -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:26:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:26:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJrM-0002di-0D; Tue, 25 Aug 2015 19:26:16 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJrL-0002dZ-1L for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:26:15 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 9F/22-28221-651CCD55; Tue, 25 Aug 2015 19:26:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1440530771!43920577!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19992 invoked from network); 25 Aug 2015 19:26:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:26:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJrH-0006aw-Ae for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:26:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJrH-0008JQ-9j for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:26:11 +0000 Date: Tue, 25 Aug 2015 19:26:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: error out if vNUMA specifies more vcpus than pcpus X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 51086e196ee6531f7cb45f23943dc8daf2d1527b Author: Wei Liu AuthorDate: Mon Aug 17 19:57:00 2015 +0100 Commit: Ian Campbell CommitDate: Fri Aug 21 08:45:55 2015 +0100 xl: error out if vNUMA specifies more vcpus than pcpus ... but allow user to override that check by specifying maxvcpus= in xl configuration file. Note that the code is constructed such that the fallout is dealt with after parsing. We can live with that because though it wastes a bit of cpu cycles but it is still functionally correct and I would like to have a clear split between parsing and dealing with fallouts. Signed-off-by: Wei Liu Reviewed-by: Dario Faggioli Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 44fff82..ebbb9a5 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1175,6 +1175,14 @@ static void parse_vnuma_config(const XLU_Config *config, for (j = 0; j < len; j++) { parse_range(cpu_spec_list[j], &s, &e); for (; s <= e; s++) { + /* + * Note that if we try to set a bit beyond + * the size of bitmap, libxl_bitmap_set + * has no effect. The resulted bitmap + * doesn't reflect what user wants. The + * fallout is dealt with later after + * parsing. + */ libxl_bitmap_set(&vcpu_parsed[i], s); max_vcpus++; } @@ -1202,11 +1210,27 @@ static void parse_vnuma_config(const XLU_Config *config, } /* User has specified maxvcpus= */ - if (b_info->max_vcpus != 0 && b_info->max_vcpus != max_vcpus) { - fprintf(stderr, "xl: vnuma vcpus and maxvcpus= mismatch\n"); - exit(1); - } else + if (b_info->max_vcpus != 0) { + if (b_info->max_vcpus != max_vcpus) { + fprintf(stderr, "xl: vnuma vcpus and maxvcpus= mismatch\n"); + exit(1); + } + } else { + int host_cpus = libxl_get_online_cpus(ctx); + + if (host_cpus < 0) { + fprintf(stderr, "Failed to get online cpus\n"); + exit(1); + } + + if (host_cpus < max_vcpus) { + fprintf(stderr, "xl: vnuma specifies more vcpus than pcpus, "\ + "use maxvcpus= to override this check.\n"); + exit(1); + } + b_info->max_vcpus = max_vcpus; + } /* User has specified maxmem= */ if (b_info->max_memkb != LIBXL_MEMKB_DEFAULT && -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:26:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:26:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJrV-0002fk-5K; Tue, 25 Aug 2015 19:26:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJrT-0002fS-Pt for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:26:23 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 16/3B-10678-F51CCD55; Tue, 25 Aug 2015 19:26:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1440530781!35634927!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19639 invoked from network); 25 Aug 2015 19:26:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:26:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJrR-0006b4-G4 for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:26:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJrR-0008Jm-Ef for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:26:21 +0000 Date: Tue, 25 Aug 2015 19:26:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: fix vNUMA memory allocation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7b99717f62caeac08eea224a177cd28f047ac4b5 Author: Wei Liu AuthorDate: Mon Aug 17 19:57:01 2015 +0100 Commit: Ian Campbell CommitDate: Fri Aug 21 08:45:55 2015 +0100 libxc: fix vNUMA memory allocation Only 4KB allocation was using new_memflags. We should use new_memflags in for 2MB and 1GB allocation as well because that variable contains node information. Without this patch, when creating a HVM guest with vNUMA, because the node information was not present in the flags passed to libxc, actual memory allocation didn't comply with what user specified. With this patch the behaviour is correct. Reported-by: Boris Ostrovsky Tested-by: Boris Ostrovsky Signed-off-by: Wei Liu Reviewed-by: Dario Faggioli Acked-by: Ian Campbell --- tools/libxc/xc_hvm_build_x86.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_hvm_build_x86.c b/tools/libxc/xc_hvm_build_x86.c index ec11f15..ea250dd 100644 --- a/tools/libxc/xc_hvm_build_x86.c +++ b/tools/libxc/xc_hvm_build_x86.c @@ -486,7 +486,8 @@ static int setup_guest(xc_interface *xch, done = xc_domain_populate_physmap(xch, dom, nr_extents, SUPERPAGE_1GB_SHIFT, - memflags, sp_extents); + new_memflags, + sp_extents); if ( done > 0 ) { @@ -526,7 +527,8 @@ static int setup_guest(xc_interface *xch, done = xc_domain_populate_physmap(xch, dom, nr_extents, SUPERPAGE_2MB_SHIFT, - memflags, sp_extents); + new_memflags, + sp_extents); if ( done > 0 ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Aug 25 19:26:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Aug 2015 19:26:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJrV-0002fk-5K; Tue, 25 Aug 2015 19:26:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJrT-0002fS-Pt for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:26:23 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 16/3B-10678-F51CCD55; Tue, 25 Aug 2015 19:26:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1440530781!35634927!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19639 invoked from network); 25 Aug 2015 19:26:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 25 Aug 2015 19:26:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZUJrR-0006b4-G4 for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:26:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZUJrR-0008Jm-Ef for xen-changelog@lists.xensource.com; Tue, 25 Aug 2015 19:26:21 +0000 Date: Tue, 25 Aug 2015 19:26:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: fix vNUMA memory allocation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7b99717f62caeac08eea224a177cd28f047ac4b5 Author: Wei Liu AuthorDate: Mon Aug 17 19:57:01 2015 +0100 Commit: Ian Campbell CommitDate: Fri Aug 21 08:45:55 2015 +0100 libxc: fix vNUMA memory allocation Only 4KB allocation was using new_memflags. We should use new_memflags in for 2MB and 1GB allocation as well because that variable contains node information. Without this patch, when creating a HVM guest with vNUMA, because the node information was not present in the flags passed to libxc, actual memory allocation didn't comply with what user specified. With this patch the behaviour is correct. Reported-by: Boris Ostrovsky Tested-by: Boris Ostrovsky Signed-off-by: Wei Liu Reviewed-by: Dario Faggioli Acked-by: Ian Campbell --- tools/libxc/xc_hvm_build_x86.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_hvm_build_x86.c b/tools/libxc/xc_hvm_build_x86.c index ec11f15..ea250dd 100644 --- a/tools/libxc/xc_hvm_build_x86.c +++ b/tools/libxc/xc_hvm_build_x86.c @@ -486,7 +486,8 @@ static int setup_guest(xc_interface *xch, done = xc_domain_populate_physmap(xch, dom, nr_extents, SUPERPAGE_1GB_SHIFT, - memflags, sp_extents); + new_memflags, + sp_extents); if ( done > 0 ) { @@ -526,7 +527,8 @@ static int setup_guest(xc_interface *xch, done = xc_domain_populate_physmap(xch, dom, nr_extents, SUPERPAGE_2MB_SHIFT, - memflags, sp_extents); + new_memflags, + sp_extents); if ( done > 0 ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 28 15:33:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 28 Aug 2015 15:33:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZVLeN-0005j4-44; Fri, 28 Aug 2015 15:33:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZVLeM-0005ix-AY for xen-changelog@lists.xensource.com; Fri, 28 Aug 2015 15:33:06 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 99/C8-16965-13F70E55; Fri, 28 Aug 2015 15:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1440775983!39155874!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12331 invoked from network); 28 Aug 2015 15:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 28 Aug 2015 15:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZVLeJ-0005ry-KJ for xen-changelog@lists.xensource.com; Fri, 28 Aug 2015 15:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZVLeI-0003no-Ml for xen-changelog@lists.xensource.com; Fri, 28 Aug 2015 15:33:02 +0000 Date: Fri, 28 Aug 2015 15:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] HVM: atomically access pointers in bufioreq handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5cdde31eacdd288359746019ad05cac8ed5d9f70 Author: Ian Jackson AuthorDate: Fri Aug 28 15:53:40 2015 +0100 Commit: Ian Jackson CommitDate: Fri Aug 28 15:53:40 2015 +0100 HVM: atomically access pointers in bufioreq handling The number of slots per page being 511 (i.e. not a power of two) means that the (32-bit) read and write indexes going beyond 2^32 will likely disturb operation. The hypervisor side gets I/O req server creation extended so we can indicate that we're using suitable atomic accesses where needed, allowing it to atomically canonicalize both pointers when both have gone through at least one cycle. The Xen side counterpart (which is not a functional prereq to this change, albeit the intention is for Xen to assume default servers always use suitable atomic accesses) went in already (commit b7007bc6f9). Signed-off-by: Jan Beulich Acked-by: Ian Jackson --- v2: Adjust description. --- i386-dm/helper2.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/i386-dm/helper2.c b/i386-dm/helper2.c index 63a938b..ede3105 100644 --- a/i386-dm/helper2.c +++ b/i386-dm/helper2.c @@ -493,10 +493,19 @@ static int __handle_buffered_iopage(CPUState *env) memset(&req, 0x00, sizeof(req)); - while (buffered_io_page->read_pointer != - buffered_io_page->write_pointer) { - buf_req = &buffered_io_page->buf_ioreq[ - buffered_io_page->read_pointer % IOREQ_BUFFER_SLOT_NUM]; + for (;;) { + uint32_t rdptr = buffered_io_page->read_pointer, wrptr; + + xen_rmb(); + wrptr = buffered_io_page->write_pointer; + xen_rmb(); + if (rdptr != buffered_io_page->read_pointer) { + continue; + } + if (rdptr == wrptr) { + break; + } + buf_req = &buffered_io_page->buf_ioreq[rdptr % IOREQ_BUFFER_SLOT_NUM]; req.size = 1UL << buf_req->size; req.count = 1; req.addr = buf_req->addr; @@ -508,15 +517,14 @@ static int __handle_buffered_iopage(CPUState *env) req.data_is_ptr = 0; qw = (req.size == 8); if (qw) { - buf_req = &buffered_io_page->buf_ioreq[ - (buffered_io_page->read_pointer+1) % IOREQ_BUFFER_SLOT_NUM]; + buf_req = &buffered_io_page->buf_ioreq[(rdptr + 1) % + IOREQ_BUFFER_SLOT_NUM]; req.data |= ((uint64_t)buf_req->data) << 32; } __handle_ioreq(env, &req); - xen_mb(); - buffered_io_page->read_pointer += qw ? 2 : 1; + __sync_fetch_and_add(&buffered_io_page->read_pointer, qw + 1); } return req.count; -- generated by git-patchbot for /home/xen/git/qemu-xen-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Aug 28 15:33:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 28 Aug 2015 15:33:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZVLeN-0005j4-44; Fri, 28 Aug 2015 15:33:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZVLeM-0005ix-AY for xen-changelog@lists.xensource.com; Fri, 28 Aug 2015 15:33:06 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 99/C8-16965-13F70E55; Fri, 28 Aug 2015 15:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1440775983!39155874!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12331 invoked from network); 28 Aug 2015 15:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 28 Aug 2015 15:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZVLeJ-0005ry-KJ for xen-changelog@lists.xensource.com; Fri, 28 Aug 2015 15:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZVLeI-0003no-Ml for xen-changelog@lists.xensource.com; Fri, 28 Aug 2015 15:33:02 +0000 Date: Fri, 28 Aug 2015 15:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] HVM: atomically access pointers in bufioreq handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5cdde31eacdd288359746019ad05cac8ed5d9f70 Author: Ian Jackson AuthorDate: Fri Aug 28 15:53:40 2015 +0100 Commit: Ian Jackson CommitDate: Fri Aug 28 15:53:40 2015 +0100 HVM: atomically access pointers in bufioreq handling The number of slots per page being 511 (i.e. not a power of two) means that the (32-bit) read and write indexes going beyond 2^32 will likely disturb operation. The hypervisor side gets I/O req server creation extended so we can indicate that we're using suitable atomic accesses where needed, allowing it to atomically canonicalize both pointers when both have gone through at least one cycle. The Xen side counterpart (which is not a functional prereq to this change, albeit the intention is for Xen to assume default servers always use suitable atomic accesses) went in already (commit b7007bc6f9). Signed-off-by: Jan Beulich Acked-by: Ian Jackson --- v2: Adjust description. --- i386-dm/helper2.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/i386-dm/helper2.c b/i386-dm/helper2.c index 63a938b..ede3105 100644 --- a/i386-dm/helper2.c +++ b/i386-dm/helper2.c @@ -493,10 +493,19 @@ static int __handle_buffered_iopage(CPUState *env) memset(&req, 0x00, sizeof(req)); - while (buffered_io_page->read_pointer != - buffered_io_page->write_pointer) { - buf_req = &buffered_io_page->buf_ioreq[ - buffered_io_page->read_pointer % IOREQ_BUFFER_SLOT_NUM]; + for (;;) { + uint32_t rdptr = buffered_io_page->read_pointer, wrptr; + + xen_rmb(); + wrptr = buffered_io_page->write_pointer; + xen_rmb(); + if (rdptr != buffered_io_page->read_pointer) { + continue; + } + if (rdptr == wrptr) { + break; + } + buf_req = &buffered_io_page->buf_ioreq[rdptr % IOREQ_BUFFER_SLOT_NUM]; req.size = 1UL << buf_req->size; req.count = 1; req.addr = buf_req->addr; @@ -508,15 +517,14 @@ static int __handle_buffered_iopage(CPUState *env) req.data_is_ptr = 0; qw = (req.size == 8); if (qw) { - buf_req = &buffered_io_page->buf_ioreq[ - (buffered_io_page->read_pointer+1) % IOREQ_BUFFER_SLOT_NUM]; + buf_req = &buffered_io_page->buf_ioreq[(rdptr + 1) % + IOREQ_BUFFER_SLOT_NUM]; req.data |= ((uint64_t)buf_req->data) << 32; } __handle_ioreq(env, &req); - xen_mb(); - buffered_io_page->read_pointer += qw ? 2 : 1; + __sync_fetch_and_add(&buffered_io_page->read_pointer, qw + 1); } return req.count; -- generated by git-patchbot for /home/xen/git/qemu-xen-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog