From xen-changelog-bounces@lists.xen.org Sat Jun 02 03:11:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Jun 2012 03: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 1SaekG-0007Vo-Do; Sat, 02 Jun 2012 03:11:16 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekF-0007V7-E0 for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:15 +0000 Received: from [85.158.143.99:40206] by server-2.bemta-4.messagelabs.com id 4D/EF-11595-25489CF4; Sat, 02 Jun 2012 03:11:14 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-216.messagelabs.com!1338606672!25684025!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5101 invoked from network); 2 Jun 2012 03:11:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 2 Jun 2012 03:11:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekB-0000JZ-Ok for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SaekB-0003Tp-Ne for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:11 +0000 Message-Id: Date: Sat, 02 Jun 2012 03:11:11 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: implement event injection 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 # HG changeset patch # User Stefano Stabellini # Date 1338542435 -3600 # Node ID 3585dd50af3bb623fecca6ba5febbf328a87d811 # Parent 4406628d77edb1a7040ee9574debcdb013b2c003 arm: implement event injection Implement vcpu_mark_events_pending using the vgic to inject PPI 31, that we reserve for Xen usage. In the future the interrupt used for event injection might be dynamic and could be written into the device tree. Otherwise it could be an SGI choosen by the guest and passed to Xen through an hypercall. Considering that: - it is easy to determine if an event notification interrupt has already been EOI'd by the guest just looking at the evtchn_upcall_pending bit in the shared_info page; - we can safely assume that there is at most one event notification interrupt pending at any time in any set of LR registers because we never inject more than a single event notification interrupt in one vcpu (see vcpu_mark_events_pending); we can avoid requesting maintenance interrupts for VGIC_IRQ_EVTCHN_CALLBACK, provided that we check for event notification interrupts that need to be cleared in the following places: - maintenance interrupt entry; - gic_set_guest_irq; that is every time we are about to write to an LR. Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 4406628d77ed -r 3585dd50af3b xen/arch/arm/domain.c --- a/xen/arch/arm/domain.c Fri Jun 01 10:20:35 2012 +0100 +++ b/xen/arch/arm/domain.c Fri Jun 01 10:20:35 2012 +0100 @@ -232,6 +232,17 @@ void arch_dump_vcpu_info(struct vcpu *v) { } +void vcpu_mark_events_pending(struct vcpu *v) +{ + int already_pending = test_and_set_bit( + 0, (unsigned long *)&vcpu_info(v, evtchn_upcall_pending)); + + if ( already_pending ) + return; + + vgic_vcpu_inject_irq(v, VGIC_IRQ_EVTCHN_CALLBACK, 1); +} + /* * Local variables: * mode: C diff -r 4406628d77ed -r 3585dd50af3b xen/arch/arm/dummy.S --- a/xen/arch/arm/dummy.S Fri Jun 01 10:20:35 2012 +0100 +++ b/xen/arch/arm/dummy.S Fri Jun 01 10:20:35 2012 +0100 @@ -27,7 +27,6 @@ DUMMY(arch_vcpu_reset); DUMMY(free_vcpu_guest_context); DUMMY(sync_vcpu_execstate); NOP(update_vcpu_system_time); -DUMMY(vcpu_mark_events_pending); DUMMY(vcpu_show_execution_state); /* Page Reference & Type Maintenance */ diff -r 4406628d77ed -r 3585dd50af3b xen/arch/arm/gic.c --- a/xen/arch/arm/gic.c Fri Jun 01 10:20:35 2012 +0100 +++ b/xen/arch/arm/gic.c Fri Jun 01 10:20:35 2012 +0100 @@ -37,6 +37,7 @@ + (GIC_CR_OFFSET & 0xfff))) #define GICH ((volatile uint32_t *) (FIXMAP_ADDR(FIXMAP_GICH) \ + (GIC_HR_OFFSET & 0xfff))) +static void events_maintenance(struct vcpu *v); /* Global state */ static struct { @@ -46,6 +47,7 @@ static struct { unsigned int lines; unsigned int cpus; spinlock_t lock; + uint64_t event_mask; uint64_t lr_mask; /* lr_pending is used to queue IRQs (struct pending_irq) that the * vgic tried to inject in the guest (calling gic_set_guest_irq) but @@ -293,6 +295,7 @@ int __init gic_init(void) gic_hyp_init(); gic.lr_mask = 0ULL; + gic.event_mask = 0ULL; INIT_LIST_HEAD(&gic.lr_pending); spin_unlock(&gic.lock); @@ -392,9 +395,15 @@ int __init setup_irq(unsigned int irq, s static inline void gic_set_lr(int lr, unsigned int virtual_irq, unsigned int state, unsigned int priority) { + int maintenance_int = GICH_LR_MAINTENANCE_IRQ; + BUG_ON(lr > nr_lrs); + + if (virtual_irq == VGIC_IRQ_EVTCHN_CALLBACK && nr_lrs > 1) + maintenance_int = 0; + GICH[GICH_LR + lr] = state | - GICH_LR_MAINTENANCE_IRQ | + maintenance_int | ((priority >> 3) << GICH_LR_PRIORITY_SHIFT) | ((virtual_irq & GICH_LR_VIRTUAL_MASK) << GICH_LR_VIRTUAL_SHIFT); } @@ -405,6 +414,8 @@ void gic_set_guest_irq(unsigned int virt int i; struct pending_irq *iter, *n; + events_maintenance(current); + spin_lock(&gic.lock); if ( list_empty(&gic.lr_pending) ) @@ -412,6 +423,8 @@ void gic_set_guest_irq(unsigned int virt i = find_first_zero_bit(&gic.lr_mask, nr_lrs); if (i < nr_lrs) { set_bit(i, &gic.lr_mask); + if ( virtual_irq == VGIC_IRQ_EVTCHN_CALLBACK ) + set_bit(i, &gic.event_mask); gic_set_lr(i, virtual_irq, state, priority); goto out; } @@ -515,12 +528,35 @@ void gicv_setup(struct domain *d) GIC_BASE_ADDRESS + GIC_VR_OFFSET); } +static void events_maintenance(struct vcpu *v) +{ + int i = 0; + int already_pending = test_bit(0, + (unsigned long *)&vcpu_info(v, evtchn_upcall_pending)); + + if (!already_pending && gic.event_mask != 0) { + spin_lock(&gic.lock); + while ((i = find_next_bit((const long unsigned int *) &gic.event_mask, + sizeof(uint64_t), i)) < sizeof(uint64_t)) { + + GICH[GICH_LR + i] = 0; + clear_bit(i, &gic.lr_mask); + clear_bit(i, &gic.event_mask); + + i++; + } + spin_unlock(&gic.lock); + } +} + static void maintenance_interrupt(int irq, void *dev_id, struct cpu_user_regs *regs) { int i = 0, virq; uint32_t lr; uint64_t eisr = GICH[GICH_EISR0] | (((uint64_t) GICH[GICH_EISR1]) << 32); + events_maintenance(current); + while ((i = find_next_bit((const long unsigned int *) &eisr, sizeof(eisr), i)) < sizeof(eisr)) { struct pending_irq *p; @@ -536,6 +572,8 @@ static void maintenance_interrupt(int ir gic_set_lr(i, p->irq, GICH_LR_PENDING, p->priority); list_del_init(&p->lr_queue); set_bit(i, &gic.lr_mask); + if ( p->irq == VGIC_IRQ_EVTCHN_CALLBACK ) + set_bit(i, &gic.event_mask); } else { gic_inject_irq_stop(); } diff -r 4406628d77ed -r 3585dd50af3b xen/arch/arm/gic.h --- a/xen/arch/arm/gic.h Fri Jun 01 10:20:35 2012 +0100 +++ b/xen/arch/arm/gic.h Fri Jun 01 10:20:35 2012 +0100 @@ -121,6 +121,9 @@ #define GICH_LR_CPUID_SHIFT 9 #define GICH_VTR_NRLRGS 0x3f +/* XXX: write this into the DT */ +#define VGIC_IRQ_EVTCHN_CALLBACK 31 + extern int domain_vgic_init(struct domain *d); extern int vcpu_vgic_init(struct vcpu *v); extern void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq,int virtual); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 02 03:11:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Jun 2012 03: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 1SaekG-0007Vt-Gk; Sat, 02 Jun 2012 03:11:16 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekF-0007VB-KL for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:15 +0000 Received: from [85.158.143.99:40210] by server-1.bemta-4.messagelabs.com id EB/DD-27869-25489CF4; Sat, 02 Jun 2012 03:11:14 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-216.messagelabs.com!1338606672!25729308!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32446 invoked from network); 2 Jun 2012 03:11:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 2 Jun 2012 03:11:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekC-0000Jc-Ag for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SaekC-0003U4-8l for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:12 +0000 Message-Id: Date: Sat, 02 Jun 2012 03:11:11 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: More interrupt setup at start-of-day for secondary CPUs 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 # HG changeset patch # User Tim Deegan # Date 1338542436 -3600 # Node ID 99641bdf1a6783e309133230ed141042c322e51e # Parent 3585dd50af3bb623fecca6ba5febbf328a87d811 arm: More interrupt setup at start-of-day for secondary CPUs Signed-off-by: Tim Deegan Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 3585dd50af3b -r 99641bdf1a67 xen/arch/arm/smpboot.c --- a/xen/arch/arm/smpboot.c Fri Jun 01 10:20:35 2012 +0100 +++ b/xen/arch/arm/smpboot.c Fri Jun 01 10:20:36 2012 +0100 @@ -107,6 +107,8 @@ void __cpuinit start_secondary(unsigned mmu_init_secondary_cpu(); gic_init_secondary_cpu(); + init_timer_interrupt(); + gic_route_irqs(); set_current(idle_vcpu[cpuid]); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 02 03:11:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Jun 2012 03: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 1SaekE-0007Ut-6H; Sat, 02 Jun 2012 03:11:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekD-0007UW-56 for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:13 +0000 Received: from [85.158.138.51:48323] by server-6.bemta-3.messagelabs.com id 7C/72-23455-05489CF4; Sat, 02 Jun 2012 03:11:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-174.messagelabs.com!1338606669!26397883!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=2.0 required=7.0 tests=SUBJECT_RANDOMQ X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29010 invoked from network); 2 Jun 2012 03:11:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 2 Jun 2012 03:11:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Saek9-0000JJ-Eu for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Saek9-0003Sa-0J for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:09 +0000 Message-Id: Date: Sat, 02 Jun 2012 03:11:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: support fewer LR registers than virtual irqs 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 # HG changeset patch # User Stefano Stabellini # Date 1338542431 -3600 # Node ID ded5cb662d6ed8d14417c37c0565d2683dbde92d # Parent d7318231cfe3498947bf75f09d6675407d7b4e76 arm: support fewer LR registers than virtual irqs If the vgic needs to inject a virtual irq into the guest, but no free LR registers are available, add the irq to a list and return. Whenever an LR register becomes available we add the queued irq to it and remove it from the list. We use the gic lock to protect the list and the bitmask. Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r d7318231cfe3 -r ded5cb662d6e xen/arch/arm/gic.c --- a/xen/arch/arm/gic.c Thu May 31 10:18:52 2012 +0200 +++ b/xen/arch/arm/gic.c Fri Jun 01 10:20:31 2012 +0100 @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -45,6 +46,14 @@ static struct { unsigned int lines; unsigned int cpus; spinlock_t lock; + uint64_t lr_mask; + /* lr_pending is used to queue IRQs (struct pending_irq) that the + * vgic tried to inject in the guest (calling gic_set_guest_irq) but + * no LRs were available at the time. + * As soon as an LR is freed we remove the first IRQ from this + * list and write it to the LR register. + * lr_pending is a subset of vgic.inflight_irqs. */ + struct list_head lr_pending; } gic; irq_desc_t irq_desc[NR_IRQS]; @@ -283,6 +292,9 @@ int __init gic_init(void) gic_cpu_init(); gic_hyp_init(); + gic.lr_mask = 0ULL; + INIT_LIST_HEAD(&gic.lr_pending); + spin_unlock(&gic.lock); return gic.cpus; @@ -377,14 +389,48 @@ int __init setup_irq(unsigned int irq, s return rc; } +static inline void gic_set_lr(int lr, unsigned int virtual_irq, + unsigned int state, unsigned int priority) +{ + BUG_ON(lr > nr_lrs); + GICH[GICH_LR + lr] = state | + GICH_LR_MAINTENANCE_IRQ | + ((priority >> 3) << GICH_LR_PRIORITY_SHIFT) | + ((virtual_irq & GICH_LR_VIRTUAL_MASK) << GICH_LR_VIRTUAL_SHIFT); +} + void gic_set_guest_irq(unsigned int virtual_irq, unsigned int state, unsigned int priority) { - BUG_ON(virtual_irq > nr_lrs); - GICH[GICH_LR + virtual_irq] = state | - GICH_LR_MAINTENANCE_IRQ | - ((priority >> 3) << GICH_LR_PRIORITY_SHIFT) | - ((virtual_irq & GICH_LR_VIRTUAL_MASK) << GICH_LR_VIRTUAL_SHIFT); + int i; + struct pending_irq *iter, *n; + + spin_lock(&gic.lock); + + if ( list_empty(&gic.lr_pending) ) + { + i = find_first_zero_bit(&gic.lr_mask, nr_lrs); + if (i < nr_lrs) { + set_bit(i, &gic.lr_mask); + gic_set_lr(i, virtual_irq, state, priority); + goto out; + } + } + + n = irq_to_pending(current, virtual_irq); + list_for_each_entry ( iter, &gic.lr_pending, lr_queue ) + { + if ( iter->priority > priority ) + { + list_add_tail(&n->lr_queue, &iter->lr_queue); + goto out; + } + } + list_add_tail(&n->lr_queue, &gic.lr_pending); + +out: + spin_unlock(&gic.lock); + return; } void gic_inject_irq_start(void) @@ -463,30 +509,42 @@ void gicv_setup(struct domain *d) static void maintenance_interrupt(int irq, void *dev_id, struct cpu_user_regs *regs) { - int i, virq; + int i = 0, virq; uint32_t lr; uint64_t eisr = GICH[GICH_EISR0] | (((uint64_t) GICH[GICH_EISR1]) << 32); - for ( i = 0; i < 64; i++ ) { - if ( eisr & ((uint64_t)1 << i) ) { - struct pending_irq *p; + while ((i = find_next_bit((const long unsigned int *) &eisr, + sizeof(eisr), i)) < sizeof(eisr)) { + struct pending_irq *p; - lr = GICH[GICH_LR + i]; - virq = lr & GICH_LR_VIRTUAL_MASK; - GICH[GICH_LR + i] = 0; + spin_lock(&gic.lock); + lr = GICH[GICH_LR + i]; + virq = lr & GICH_LR_VIRTUAL_MASK; + GICH[GICH_LR + i] = 0; + clear_bit(i, &gic.lr_mask); - spin_lock(¤t->arch.vgic.lock); - p = irq_to_pending(current, virq); - if ( p->desc != NULL ) { - p->desc->status &= ~IRQ_INPROGRESS; - GICC[GICC_DIR] = virq; - } + if ( !list_empty(&gic.lr_pending) ) { + p = list_entry(gic.lr_pending.next, typeof(*p), lr_queue); + gic_set_lr(i, p->irq, GICH_LR_PENDING, p->priority); + list_del_init(&p->lr_queue); + set_bit(i, &gic.lr_mask); + } else { gic_inject_irq_stop(); - list_del(&p->inflight); - INIT_LIST_HEAD(&p->inflight); - cpu_raise_softirq(current->processor, VGIC_SOFTIRQ); - spin_unlock(¤t->arch.vgic.lock); } + spin_unlock(&gic.lock); + + spin_lock(¤t->arch.vgic.lock); + p = irq_to_pending(current, virq); + if ( p->desc != NULL ) { + p->desc->status &= ~IRQ_INPROGRESS; + GICC[GICC_DIR] = virq; + } + list_del(&p->inflight); + INIT_LIST_HEAD(&p->inflight); + cpu_raise_softirq(current->processor, VGIC_SOFTIRQ); + spin_unlock(¤t->arch.vgic.lock); + + i++; } } diff -r d7318231cfe3 -r ded5cb662d6e xen/include/asm-arm/domain.h --- a/xen/include/asm-arm/domain.h Thu May 31 10:18:52 2012 +0200 +++ b/xen/include/asm-arm/domain.h Fri Jun 01 10:20:31 2012 +0100 @@ -23,6 +23,9 @@ struct pending_irq /* inflight is used to append instances of pending_irq to * vgic.inflight_irqs */ struct list_head inflight; + /* lr_queue is used to append instances of pending_irq to + * gic.lr_pending */ + struct list_head lr_queue; }; struct arch_domain @@ -75,6 +78,13 @@ struct arch_vcpu struct { struct vgic_irq_rank private_irqs; + /* This list is ordered by IRQ priority and it is used to keep + * track of the IRQs that the VGIC injected into the guest. + * Depending on the availability of LR registers, the IRQs might + * actually be in an LR, and therefore injected into the guest, + * or queued in gic.lr_pending. + * As soon as an IRQ is EOI'd by the guest and removed from the + * corresponding LR it is also removed from this list. */ struct list_head inflight_irqs; spinlock_t lock; } vgic; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 02 03:11:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Jun 2012 03: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 1SaekG-0007Vo-Do; Sat, 02 Jun 2012 03:11:16 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekF-0007V7-E0 for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:15 +0000 Received: from [85.158.143.99:40206] by server-2.bemta-4.messagelabs.com id 4D/EF-11595-25489CF4; Sat, 02 Jun 2012 03:11:14 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-216.messagelabs.com!1338606672!25684025!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5101 invoked from network); 2 Jun 2012 03:11:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 2 Jun 2012 03:11:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekB-0000JZ-Ok for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SaekB-0003Tp-Ne for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:11 +0000 Message-Id: Date: Sat, 02 Jun 2012 03:11:11 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: implement event injection 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 # HG changeset patch # User Stefano Stabellini # Date 1338542435 -3600 # Node ID 3585dd50af3bb623fecca6ba5febbf328a87d811 # Parent 4406628d77edb1a7040ee9574debcdb013b2c003 arm: implement event injection Implement vcpu_mark_events_pending using the vgic to inject PPI 31, that we reserve for Xen usage. In the future the interrupt used for event injection might be dynamic and could be written into the device tree. Otherwise it could be an SGI choosen by the guest and passed to Xen through an hypercall. Considering that: - it is easy to determine if an event notification interrupt has already been EOI'd by the guest just looking at the evtchn_upcall_pending bit in the shared_info page; - we can safely assume that there is at most one event notification interrupt pending at any time in any set of LR registers because we never inject more than a single event notification interrupt in one vcpu (see vcpu_mark_events_pending); we can avoid requesting maintenance interrupts for VGIC_IRQ_EVTCHN_CALLBACK, provided that we check for event notification interrupts that need to be cleared in the following places: - maintenance interrupt entry; - gic_set_guest_irq; that is every time we are about to write to an LR. Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 4406628d77ed -r 3585dd50af3b xen/arch/arm/domain.c --- a/xen/arch/arm/domain.c Fri Jun 01 10:20:35 2012 +0100 +++ b/xen/arch/arm/domain.c Fri Jun 01 10:20:35 2012 +0100 @@ -232,6 +232,17 @@ void arch_dump_vcpu_info(struct vcpu *v) { } +void vcpu_mark_events_pending(struct vcpu *v) +{ + int already_pending = test_and_set_bit( + 0, (unsigned long *)&vcpu_info(v, evtchn_upcall_pending)); + + if ( already_pending ) + return; + + vgic_vcpu_inject_irq(v, VGIC_IRQ_EVTCHN_CALLBACK, 1); +} + /* * Local variables: * mode: C diff -r 4406628d77ed -r 3585dd50af3b xen/arch/arm/dummy.S --- a/xen/arch/arm/dummy.S Fri Jun 01 10:20:35 2012 +0100 +++ b/xen/arch/arm/dummy.S Fri Jun 01 10:20:35 2012 +0100 @@ -27,7 +27,6 @@ DUMMY(arch_vcpu_reset); DUMMY(free_vcpu_guest_context); DUMMY(sync_vcpu_execstate); NOP(update_vcpu_system_time); -DUMMY(vcpu_mark_events_pending); DUMMY(vcpu_show_execution_state); /* Page Reference & Type Maintenance */ diff -r 4406628d77ed -r 3585dd50af3b xen/arch/arm/gic.c --- a/xen/arch/arm/gic.c Fri Jun 01 10:20:35 2012 +0100 +++ b/xen/arch/arm/gic.c Fri Jun 01 10:20:35 2012 +0100 @@ -37,6 +37,7 @@ + (GIC_CR_OFFSET & 0xfff))) #define GICH ((volatile uint32_t *) (FIXMAP_ADDR(FIXMAP_GICH) \ + (GIC_HR_OFFSET & 0xfff))) +static void events_maintenance(struct vcpu *v); /* Global state */ static struct { @@ -46,6 +47,7 @@ static struct { unsigned int lines; unsigned int cpus; spinlock_t lock; + uint64_t event_mask; uint64_t lr_mask; /* lr_pending is used to queue IRQs (struct pending_irq) that the * vgic tried to inject in the guest (calling gic_set_guest_irq) but @@ -293,6 +295,7 @@ int __init gic_init(void) gic_hyp_init(); gic.lr_mask = 0ULL; + gic.event_mask = 0ULL; INIT_LIST_HEAD(&gic.lr_pending); spin_unlock(&gic.lock); @@ -392,9 +395,15 @@ int __init setup_irq(unsigned int irq, s static inline void gic_set_lr(int lr, unsigned int virtual_irq, unsigned int state, unsigned int priority) { + int maintenance_int = GICH_LR_MAINTENANCE_IRQ; + BUG_ON(lr > nr_lrs); + + if (virtual_irq == VGIC_IRQ_EVTCHN_CALLBACK && nr_lrs > 1) + maintenance_int = 0; + GICH[GICH_LR + lr] = state | - GICH_LR_MAINTENANCE_IRQ | + maintenance_int | ((priority >> 3) << GICH_LR_PRIORITY_SHIFT) | ((virtual_irq & GICH_LR_VIRTUAL_MASK) << GICH_LR_VIRTUAL_SHIFT); } @@ -405,6 +414,8 @@ void gic_set_guest_irq(unsigned int virt int i; struct pending_irq *iter, *n; + events_maintenance(current); + spin_lock(&gic.lock); if ( list_empty(&gic.lr_pending) ) @@ -412,6 +423,8 @@ void gic_set_guest_irq(unsigned int virt i = find_first_zero_bit(&gic.lr_mask, nr_lrs); if (i < nr_lrs) { set_bit(i, &gic.lr_mask); + if ( virtual_irq == VGIC_IRQ_EVTCHN_CALLBACK ) + set_bit(i, &gic.event_mask); gic_set_lr(i, virtual_irq, state, priority); goto out; } @@ -515,12 +528,35 @@ void gicv_setup(struct domain *d) GIC_BASE_ADDRESS + GIC_VR_OFFSET); } +static void events_maintenance(struct vcpu *v) +{ + int i = 0; + int already_pending = test_bit(0, + (unsigned long *)&vcpu_info(v, evtchn_upcall_pending)); + + if (!already_pending && gic.event_mask != 0) { + spin_lock(&gic.lock); + while ((i = find_next_bit((const long unsigned int *) &gic.event_mask, + sizeof(uint64_t), i)) < sizeof(uint64_t)) { + + GICH[GICH_LR + i] = 0; + clear_bit(i, &gic.lr_mask); + clear_bit(i, &gic.event_mask); + + i++; + } + spin_unlock(&gic.lock); + } +} + static void maintenance_interrupt(int irq, void *dev_id, struct cpu_user_regs *regs) { int i = 0, virq; uint32_t lr; uint64_t eisr = GICH[GICH_EISR0] | (((uint64_t) GICH[GICH_EISR1]) << 32); + events_maintenance(current); + while ((i = find_next_bit((const long unsigned int *) &eisr, sizeof(eisr), i)) < sizeof(eisr)) { struct pending_irq *p; @@ -536,6 +572,8 @@ static void maintenance_interrupt(int ir gic_set_lr(i, p->irq, GICH_LR_PENDING, p->priority); list_del_init(&p->lr_queue); set_bit(i, &gic.lr_mask); + if ( p->irq == VGIC_IRQ_EVTCHN_CALLBACK ) + set_bit(i, &gic.event_mask); } else { gic_inject_irq_stop(); } diff -r 4406628d77ed -r 3585dd50af3b xen/arch/arm/gic.h --- a/xen/arch/arm/gic.h Fri Jun 01 10:20:35 2012 +0100 +++ b/xen/arch/arm/gic.h Fri Jun 01 10:20:35 2012 +0100 @@ -121,6 +121,9 @@ #define GICH_LR_CPUID_SHIFT 9 #define GICH_VTR_NRLRGS 0x3f +/* XXX: write this into the DT */ +#define VGIC_IRQ_EVTCHN_CALLBACK 31 + extern int domain_vgic_init(struct domain *d); extern int vcpu_vgic_init(struct vcpu *v); extern void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq,int virtual); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 02 03:11:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Jun 2012 03: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 1SaekG-0007W2-JG; Sat, 02 Jun 2012 03:11:16 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekF-0007VN-Uc for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:16 +0000 Received: from [193.109.254.147:20063] by server-12.bemta-14.messagelabs.com id 78/8D-12643-35489CF4; Sat, 02 Jun 2012 03:11:15 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-27.messagelabs.com!1338606673!11586628!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8500 invoked from network); 2 Jun 2012 03:11:14 -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; 2 Jun 2012 03:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekD-0000Ji-JH for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SaekD-0003UZ-Aj for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:13 +0000 Message-Id: Date: Sat, 02 Jun 2012 03:11:12 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: avoid memory write in switch to Hyp 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 # HG changeset patch # User Tim Deegan # Date 1338542438 -3600 # Node ID b2d9f2411d711d8177acf1af0fbe9f0c9115c7ef # Parent b2649ecbe06f5624ca42066ea9d506eed1562d55 arm: avoid memory write in switch to Hyp mode Assemble the new CPSR in registers instead. It's slightly cleaner, And makes it possible to have a read-only text section. Signed-off-by: Tim Deegan Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r b2649ecbe06f -r b2d9f2411d71 xen/arch/arm/mode_switch.S --- a/xen/arch/arm/mode_switch.S Fri Jun 01 10:20:37 2012 +0100 +++ b/xen/arch/arm/mode_switch.S Fri Jun 01 10:20:38 2012 +0100 @@ -66,11 +66,7 @@ enter_hyp_mode: mcr CP32(r0, FCSEIDR) mcr CP32(r0, CONTEXTIDR) /* FIXME: ought to reset some other NS control regs here */ - adr r1, 1f /* Store return address */ - str r3, [r1] /* where we can use it for RFE */ - isb /* Ensure we see the stored address */ - rfeia r1 /* Enter Hyp mode */ - -1: .word 0 /* PC to enter Hyp mode at */ - .word 0x000001da /* CPSR: LE, Abort/IRQ/FIQ off, Hyp */ - + mrs r0, cpsr /* Copy the CPSR */ + add r0, r0, #0x4 /* 0x16 (Monitor) -> 0x1a (Hyp) */ + msr spsr_cxsf, r0 /* into the SPSR */ + movs pc, r3 /* Exception-return into Hyp mode */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 02 03:11:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Jun 2012 03: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 1SaekF-0007VI-BU; Sat, 02 Jun 2012 03:11:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekE-0007Ul-Cw for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:14 +0000 Received: from [85.158.138.51:48381] by server-9.bemta-3.messagelabs.com id 47/AA-21565-15489CF4; Sat, 02 Jun 2012 03:11:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-174.messagelabs.com!1338606671!24093803!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15939 invoked from network); 2 Jun 2012 03:11:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 2 Jun 2012 03:11:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekB-0000JW-E6 for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SaekB-0003Ta-6D for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:11 +0000 Message-Id: Date: Sat, 02 Jun 2012 03:11:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: remove VGIC_SOFTIRQ 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 # HG changeset patch # User Stefano Stabellini # Date 1338542435 -3600 # Node ID 4406628d77edb1a7040ee9574debcdb013b2c003 # Parent ebf41e3d1ee3041a96d84e2a6f7576171179772b arm: remove VGIC_SOFTIRQ Instead of using a softirq to check whether we need to set the VI bit in the HCR (IRQ injection in the guest), always check the lr_mask on leave_hypervisor_tail. Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r ebf41e3d1ee3 -r 4406628d77ed xen/arch/arm/gic.c --- a/xen/arch/arm/gic.c Fri Jun 01 10:20:34 2012 +0100 +++ b/xen/arch/arm/gic.c Fri Jun 01 10:20:35 2012 +0100 @@ -433,7 +433,7 @@ out: return; } -void gic_inject_irq_start(void) +static void gic_inject_irq_start(void) { uint32_t hcr; hcr = READ_CP32(HCR); @@ -441,7 +441,7 @@ void gic_inject_irq_start(void) isb(); } -void gic_inject_irq_stop(void) +static void gic_inject_irq_stop(void) { uint32_t hcr; hcr = READ_CP32(HCR); @@ -451,6 +451,14 @@ void gic_inject_irq_stop(void) } } +void gic_inject(void) +{ + if (!gic.lr_mask) + gic_inject_irq_stop(); + else + gic_inject_irq_start(); +} + int gic_route_irq_to_guest(struct domain *d, unsigned int irq, const char * devname) { @@ -540,7 +548,6 @@ static void maintenance_interrupt(int ir GICC[GICC_DIR] = virq; } list_del_init(&p->inflight); - cpu_raise_softirq(current->processor, VGIC_SOFTIRQ); spin_unlock(¤t->arch.vgic.lock); i++; diff -r ebf41e3d1ee3 -r 4406628d77ed xen/arch/arm/gic.h --- a/xen/arch/arm/gic.h Fri Jun 01 10:20:34 2012 +0100 +++ b/xen/arch/arm/gic.h Fri Jun 01 10:20:35 2012 +0100 @@ -128,11 +128,11 @@ extern struct pending_irq *irq_to_pendin extern void gic_route_irqs(void); +extern void gic_inject(void); + extern void __cpuinit init_maintenance_interrupt(void); extern void gic_set_guest_irq(unsigned int irq, unsigned int state, unsigned int priority); -extern void gic_inject_irq_start(void); -extern void gic_inject_irq_stop(void); extern int gic_route_irq_to_guest(struct domain *d, unsigned int irq, const char * devname); diff -r ebf41e3d1ee3 -r 4406628d77ed xen/arch/arm/traps.c --- a/xen/arch/arm/traps.c Fri Jun 01 10:20:34 2012 +0100 +++ b/xen/arch/arm/traps.c Fri Jun 01 10:20:35 2012 +0100 @@ -608,8 +608,10 @@ asmlinkage void leave_hypervisor_tail(vo while (1) { local_irq_disable(); - if (!softirq_pending(smp_processor_id())) + if (!softirq_pending(smp_processor_id())) { + gic_inject(); return; + } local_irq_enable(); do_softirq(); } diff -r ebf41e3d1ee3 -r 4406628d77ed xen/arch/arm/vgic.c --- a/xen/arch/arm/vgic.c Fri Jun 01 10:20:34 2012 +0100 +++ b/xen/arch/arm/vgic.c Fri Jun 01 10:20:35 2012 +0100 @@ -577,23 +577,8 @@ void vgic_vcpu_inject_irq(struct vcpu *v list_add_tail(&n->inflight, &v->arch.vgic.inflight_irqs); spin_unlock(&v->arch.vgic.lock); /* we have a new higher priority irq, inject it into the guest */ - cpu_raise_softirq(v->processor, VGIC_SOFTIRQ); } -static void vgic_softirq(void) -{ - if (list_empty(¤t->arch.vgic.inflight_irqs)) - return; - - gic_inject_irq_start(); -} - -static int __init init_vgic_softirq(void) -{ - open_softirq(VGIC_SOFTIRQ, vgic_softirq); - return 0; -} -__initcall(init_vgic_softirq); /* * Local variables: * mode: C diff -r ebf41e3d1ee3 -r 4406628d77ed xen/include/asm-arm/softirq.h --- a/xen/include/asm-arm/softirq.h Fri Jun 01 10:20:34 2012 +0100 +++ b/xen/include/asm-arm/softirq.h Fri Jun 01 10:20:35 2012 +0100 @@ -1,8 +1,7 @@ #ifndef __ASM_SOFTIRQ_H__ #define __ASM_SOFTIRQ_H__ -#define VGIC_SOFTIRQ (NR_COMMON_SOFTIRQS + 0) -#define NR_ARCH_SOFTIRQS 1 +#define NR_ARCH_SOFTIRQS 0 #endif /* __ASM_SOFTIRQ_H__ */ /* _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 02 03:11:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Jun 2012 03: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 1SaekJ-0007XS-3V; Sat, 02 Jun 2012 03:11:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekH-0007WK-PJ for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:17 +0000 Received: from [193.109.254.147:20119] by server-1.bemta-14.messagelabs.com id 10/FB-07411-45489CF4; Sat, 02 Jun 2012 03:11:16 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-27.messagelabs.com!1338606675!7312698!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18271 invoked from network); 2 Jun 2012 03:11:16 -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; 2 Jun 2012 03:11:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekF-0000Js-1z for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SaekE-0003VI-TT for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:14 +0000 Message-Id: Date: Sat, 02 Jun 2012 03:11:14 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: Enable VFP at boot 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 # HG changeset patch # User Tim Deegan # Date 1338542440 -3600 # Node ID 137b02968b406c19124819d00cba46a990834b52 # Parent 8b7e5f6b1f7f84fd9aa170dc43ac88dad5e8e446 arm: Enable VFP at boot Signed-off-by: Tim Deegan Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 8b7e5f6b1f7f -r 137b02968b40 xen/arch/arm/Rules.mk --- a/xen/arch/arm/Rules.mk Fri Jun 01 10:20:39 2012 +0100 +++ b/xen/arch/arm/Rules.mk Fri Jun 01 10:20:40 2012 +0100 @@ -24,7 +24,7 @@ ifneq ($(call cc-option,$(CC),-fvisibili CFLAGS += -DGCC_HAS_VISIBILITY_ATTRIBUTE endif -CFLAGS += -march=armv7-a -mcpu=cortex-a15 +CFLAGS += -march=armv7-a -mcpu=cortex-a15 -mfpu=vfpv3 -mfloat-abi=softfp # Require GCC v3.4+ (to avoid issues with alignment constraints in Xen headers) check-$(gcc) = $(call cc-ver-check,CC,0x030400,"Xen requires at least gcc-3.4") diff -r 8b7e5f6b1f7f -r 137b02968b40 xen/arch/arm/setup.c --- a/xen/arch/arm/setup.c Fri Jun 01 10:20:39 2012 +0100 +++ b/xen/arch/arm/setup.c Fri Jun 01 10:20:40 2012 +0100 @@ -36,6 +36,7 @@ #include #include #include +#include #include "gic.h" static __attribute_used__ void init_done(void) @@ -192,6 +193,8 @@ void __init start_xen(unsigned long boot processor_id(); + enable_vfp(); + softirq_init(); tasklet_subsys_init(); diff -r 8b7e5f6b1f7f -r 137b02968b40 xen/arch/arm/smpboot.c --- a/xen/arch/arm/smpboot.c Fri Jun 01 10:20:39 2012 +0100 +++ b/xen/arch/arm/smpboot.c Fri Jun 01 10:20:40 2012 +0100 @@ -26,6 +26,7 @@ #include #include #include +#include #include "gic.h" cpumask_t cpu_online_map; @@ -106,6 +107,8 @@ void __cpuinit start_secondary(unsigned WRITE_CP32((uint32_t) hyp_traps_vector, HVBAR); mmu_init_secondary_cpu(); + enable_vfp(); + gic_init_secondary_cpu(); init_timer_interrupt(); gic_route_irqs(); diff -r 8b7e5f6b1f7f -r 137b02968b40 xen/include/asm-arm/vfp.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xen/include/asm-arm/vfp.h Fri Jun 01 10:20:40 2012 +0100 @@ -0,0 +1,35 @@ +#ifndef __ARM_VFP_H_ +#define __ARM_VFP_H_ + +#include + +#define FPEXC_EN (1u << 30) + +/* Save and restore FP state. + * Ought to be using the new vmrs/vmsr names, but older binutils has a + * bug where it only allows them to target fpscr (and not, say, fpexc). */ +#define READ_FP(reg) ({ \ + uint32_t val; \ + asm volatile ("fmrx %0, fp" #reg : "=r" (val)); \ + val; }) + +#define WRITE_FP(reg, val) do { \ + asm volatile ("fmxr fp" #reg ", %0" : : "r" (val)); \ +} while (0) + + +/* Start-of-day: Turn on VFP */ +static inline void enable_vfp(void) +{ + WRITE_FP(exc, READ_FP(exc) | FPEXC_EN); +} + +#endif +/* + * Local variables: + * mode: C + * c-set-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 02 03:11:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Jun 2012 03: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 1SaekH-0007Wh-Sv; Sat, 02 Jun 2012 03:11:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekG-0007Va-Ew for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:16 +0000 Received: from [85.158.138.51:48439] by server-10.bemta-3.messagelabs.com id FF/34-12071-35489CF4; Sat, 02 Jun 2012 03:11:15 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-174.messagelabs.com!1338606673!24093805!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16025 invoked from network); 2 Jun 2012 03:11:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 2 Jun 2012 03:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekC-0000Jf-Rt for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SaekC-0003UK-QL for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:12 +0000 Message-Id: Date: Sat, 02 Jun 2012 03:11:12 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: Move hyp-mode entry code out of line. 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 # HG changeset patch # User Tim Deegan # Date 1338542437 -3600 # Node ID b2649ecbe06f5624ca42066ea9d506eed1562d55 # Parent 99641bdf1a6783e309133230ed141042c322e51e arm: Move hyp-mode entry code out of line. This code is grottier than the rest of the start-of-day code and very specific to the software model we're developing on. Segregate it accordingly, by putting it in its own file. Signed-off-by: Tim Deegan Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 99641bdf1a67 -r b2649ecbe06f xen/arch/arm/Makefile --- a/xen/arch/arm/Makefile Fri Jun 01 10:20:36 2012 +0100 +++ b/xen/arch/arm/Makefile Fri Jun 01 10:20:37 2012 +0100 @@ -12,6 +12,7 @@ obj-y += io.o obj-y += irq.o obj-y += kernel.o obj-y += mm.o +obj-y += mode_switch.o obj-y += p2m.o obj-y += percpu.o obj-y += guestcopy.o diff -r 99641bdf1a67 -r b2649ecbe06f xen/arch/arm/head.S --- a/xen/arch/arm/head.S Fri Jun 01 10:20:36 2012 +0100 +++ b/xen/arch/arm/head.S Fri Jun 01 10:20:37 2012 +0100 @@ -122,50 +122,9 @@ 1: 1: /* OK, we're in Secure state. */ PRINT("- Started in Secure state -\r\n- Entering Hyp mode -\r\n") - - /* Dance into Hyp mode */ - cpsid aif, #0x16 /* Enter Monitor mode */ - mrc CP32(r0, SCR) - orr r0, r0, #0x100 /* Set HCE */ - orr r0, r0, #0xb1 /* Set SCD, AW, FW and NS */ - bic r0, r0, #0xe /* Clear EA, FIQ and IRQ */ - mcr CP32(r0, SCR) - /* Ugly: the system timer's frequency register is only - * programmable in Secure state. Since we don't know where its - * memory-mapped control registers live, we can't find out the - * right frequency. Use the VE model's default frequency here. */ - ldr r0, =0x5f5e100 /* 100 MHz */ - mcr CP32(r0, CNTFRQ) - ldr r0, =0x40c00 /* SMP, c11, c10 in non-secure mode */ - mcr CP32(r0, NSACR) - /* Continuing ugliness: Set up the GIC so NS state owns interrupts */ - mov r0, #GIC_BASE_ADDRESS - add r0, r0, #GIC_DR_OFFSET - mov r1, #0 - str r1, [r0] /* Disable delivery in the distributor */ - add r0, r0, #0x80 /* GICD_IGROUP0 */ - mov r2, #0xffffffff /* All interrupts to group 1 */ - str r2, [r0] - str r2, [r0, #4] - str r2, [r0, #8] - /* Must drop priority mask below 0x80 before entering NS state */ - mov r0, #GIC_BASE_ADDRESS - add r0, r0, #GIC_CR_OFFSET - ldr r1, =0xff - str r1, [r0, #0x4] /* -> GICC_PMR */ - /* Reset a few config registers */ - mov r0, #0 - mcr CP32(r0, FCSEIDR) - mcr CP32(r0, CONTEXTIDR) - /* FIXME: ought to reset some other NS control regs here */ - adr r1, 1f - adr r0, hyp /* Store paddr (hyp entry point) */ - str r0, [r1] /* where we can use it for RFE */ - isb /* Ensure we see the stored target address */ - rfeia r1 /* Enter Hyp mode */ - -1: .word 0 /* PC to enter Hyp mode at */ - .word 0x000001da /* CPSR: LE, Abort/IRQ/FIQ off, Hyp */ + ldr r0, =enter_hyp_mode /* VA of function */ + adr lr, hyp /* Set return address for call */ + add pc, r0, r10 /* Call PA of function */ hyp: PRINT("- Setting up control registers -\r\n") diff -r 99641bdf1a67 -r b2649ecbe06f xen/arch/arm/mode_switch.S --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xen/arch/arm/mode_switch.S Fri Jun 01 10:20:37 2012 +0100 @@ -0,0 +1,76 @@ +/* + * xen/arch/arm/mode_switch.S + * + * Start-of day code to take a CPU from Secure mode to Hyp mode. + * + * Tim Deegan + * Copyright (c) 2011-2012 Citrix Systems. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include +#include + +/* Get up a CPU into Hyp mode. Clobbers r0-r3. + * + * This code is specific to the VE model, and not intended to be used + * on production systems. As such it's a bit hackier than the main + * boot code in head.S. In future it will be replaced by better + * integration with the bootloader/firmware so that Xen always starts + * in Hyp mode. */ + +.globl enter_hyp_mode +enter_hyp_mode: + mov r3, lr /* Put return address in non-banked reg */ + cpsid aif, #0x16 /* Enter Monitor mode */ + mrc CP32(r0, SCR) + orr r0, r0, #0x100 /* Set HCE */ + orr r0, r0, #0xb1 /* Set SCD, AW, FW and NS */ + bic r0, r0, #0xe /* Clear EA, FIQ and IRQ */ + mcr CP32(r0, SCR) + /* Ugly: the system timer's frequency register is only + * programmable in Secure state. Since we don't know where its + * memory-mapped control registers live, we can't find out the + * right frequency. Use the VE model's default frequency here. */ + ldr r0, =0x5f5e100 /* 100 MHz */ + mcr CP32(r0, CNTFRQ) + ldr r0, =0x40c00 /* SMP, c11, c10 in non-secure mode */ + mcr CP32(r0, NSACR) + /* Continuing ugliness: Set up the GIC so NS state owns interrupts */ + mov r0, #GIC_BASE_ADDRESS + add r0, r0, #GIC_DR_OFFSET + mov r1, #0 + str r1, [r0] /* Disable delivery in the distributor */ + add r0, r0, #0x80 /* GICD_IGROUP0 */ + mov r2, #0xffffffff /* All interrupts to group 1 */ + str r2, [r0] + str r2, [r0, #4] + str r2, [r0, #8] + /* Must drop priority mask below 0x80 before entering NS state */ + mov r0, #GIC_BASE_ADDRESS + add r0, r0, #GIC_CR_OFFSET + ldr r1, =0xff + str r1, [r0, #0x4] /* -> GICC_PMR */ + /* Reset a few config registers */ + mov r0, #0 + mcr CP32(r0, FCSEIDR) + mcr CP32(r0, CONTEXTIDR) + /* FIXME: ought to reset some other NS control regs here */ + adr r1, 1f /* Store return address */ + str r3, [r1] /* where we can use it for RFE */ + isb /* Ensure we see the stored address */ + rfeia r1 /* Enter Hyp mode */ + +1: .word 0 /* PC to enter Hyp mode at */ + .word 0x000001da /* CPSR: LE, Abort/IRQ/FIQ off, Hyp */ + _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 02 03:11:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Jun 2012 03: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 1SaekH-0007WU-O6; Sat, 02 Jun 2012 03:11:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekF-0007VC-TX for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:16 +0000 Received: from [85.158.139.83:50087] by server-4.bemta-5.messagelabs.com id F1/AF-05858-25489CF4; Sat, 02 Jun 2012 03:11:14 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-182.messagelabs.com!1338606672!17840631!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26380 invoked from network); 2 Jun 2012 03:11:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 2 Jun 2012 03:11:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekB-0000JP-68 for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SaekA-0003T4-2q for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:10 +0000 Message-Id: Date: Sat, 02 Jun 2012 03:11:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: shared_info page allocation and mapping 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 # HG changeset patch # User Stefano Stabellini # Date 1338542433 -3600 # Node ID dde175688d5f0b53779fb96987138a477c62e887 # Parent 3fd1f4d540947c766e8cfef696879fdc55cde4e5 arm: shared_info page allocation and mapping Allocate the shared_info page at domain creation. Implement arch_memory_op, only for XENMEM_add_to_physmap with space == XENMAPSPACE_shared_info, so that the guest can map the shared_info page. Signed-off-by: Stefano Stabellini Signed-off-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 3fd1f4d54094 -r dde175688d5f xen/arch/arm/domain.c --- a/xen/arch/arm/domain.c Fri Jun 01 10:20:32 2012 +0100 +++ b/xen/arch/arm/domain.c Fri Jun 01 10:20:33 2012 +0100 @@ -192,6 +192,17 @@ int arch_domain_create(struct domain *d, if ( (rc = p2m_init(d)) != 0 ) goto fail; + if ( !is_idle_domain(d) ) + { + rc = -ENOMEM; + if ( (d->shared_info = alloc_xenheap_pages(0, 0)) == NULL ) + goto fail; + + clear_page(d->shared_info); + share_xen_page_with_guest( + virt_to_page(d->shared_info), d, XENSHARE_writable); + } + d->max_vcpus = 8; if ( (rc = domain_vgic_init(d)) != 0 ) diff -r 3fd1f4d54094 -r dde175688d5f xen/arch/arm/mm.c --- a/xen/arch/arm/mm.c Fri Jun 01 10:20:32 2012 +0100 +++ b/xen/arch/arm/mm.c Fri Jun 01 10:20:33 2012 +0100 @@ -25,8 +25,11 @@ #include #include #include +#include #include #include +#include +#include struct domain *dom_xen, *dom_io; @@ -376,17 +379,104 @@ void arch_dump_shared_mem_info(void) { } -long arch_memory_op(int op, XEN_GUEST_HANDLE(void) arg) -{ - return -ENOSYS; -} - int donate_page(struct domain *d, struct page_info *page, unsigned int memflags) { ASSERT(0); return -ENOSYS; } +void share_xen_page_with_guest(struct page_info *page, + struct domain *d, int readonly) +{ + if ( page_get_owner(page) == d ) + return; + + spin_lock(&d->page_alloc_lock); + + /* The incremented type count pins as writable or read-only. */ + page->u.inuse.type_info = (readonly ? PGT_none : PGT_writable_page); + page->u.inuse.type_info |= PGT_validated | 1; + + page_set_owner(page, d); + wmb(); /* install valid domain ptr before updating refcnt. */ + ASSERT((page->count_info & ~PGC_xen_heap) == 0); + + /* Only add to the allocation list if the domain isn't dying. */ + if ( !d->is_dying ) + { + page->count_info |= PGC_allocated | 1; + if ( unlikely(d->xenheap_pages++ == 0) ) + get_knownalive_domain(d); + page_list_add_tail(page, &d->xenpage_list); + } + + spin_unlock(&d->page_alloc_lock); +} + +static int xenmem_add_to_physmap_once( + struct domain *d, + const struct xen_add_to_physmap *xatp) +{ + unsigned long mfn = 0; + int rc; + + switch ( xatp->space ) + { + case XENMAPSPACE_shared_info: + if ( xatp->idx == 0 ) + mfn = virt_to_mfn(d->shared_info); + break; + default: + return -ENOSYS; + } + + domain_lock(d); + + /* Map at new location. */ + rc = guest_physmap_add_page(d, xatp->gpfn, mfn, 0); + + domain_unlock(d); + + return rc; +} + +static int xenmem_add_to_physmap(struct domain *d, + struct xen_add_to_physmap *xatp) +{ + return xenmem_add_to_physmap_once(d, xatp); +} + +long arch_memory_op(int op, XEN_GUEST_HANDLE(void) arg) +{ + int rc; + + switch ( op ) + { + case XENMEM_add_to_physmap: + { + struct xen_add_to_physmap xatp; + struct domain *d; + + if ( copy_from_guest(&xatp, arg, 1) ) + return -EFAULT; + + rc = rcu_lock_target_domain_by_id(xatp.domid, &d); + if ( rc != 0 ) + return rc; + + rc = xenmem_add_to_physmap(d, &xatp); + + rcu_unlock_domain(d); + + return rc; + } + + default: + return -ENOSYS; + } + + return 0; +} /* * Local variables: * mode: C diff -r 3fd1f4d54094 -r dde175688d5f xen/arch/arm/p2m.c --- a/xen/arch/arm/p2m.c Fri Jun 01 10:20:32 2012 +0100 +++ b/xen/arch/arm/p2m.c Fri Jun 01 10:20:33 2012 +0100 @@ -118,7 +118,12 @@ static int create_p2m_entries(struct dom } /* else: third already valid */ - BUG_ON(third[third_table_offset(addr)].p2m.valid); + if ( third[third_table_offset(addr)].p2m.valid ) + { + /* p2m entry already present */ + free_domheap_page( + mfn_to_page(third[third_table_offset(addr)].p2m.base)); + } /* Allocate a new RAM page and attach */ if (alloc) @@ -172,6 +177,23 @@ int map_mmio_regions(struct domain *d, return create_p2m_entries(d, 0, start_gaddr, end_gaddr, maddr); } +int guest_physmap_add_page(struct domain *d, + unsigned long gpfn, + unsigned long mfn, + unsigned int page_order) +{ + return create_p2m_entries(d, 0, gpfn << PAGE_SHIFT, + (gpfn + (1<arch.p2m; diff -r 3fd1f4d54094 -r dde175688d5f xen/include/asm-arm/config.h --- a/xen/include/asm-arm/config.h Fri Jun 01 10:20:32 2012 +0100 +++ b/xen/include/asm-arm/config.h Fri Jun 01 10:20:33 2012 +0100 @@ -7,6 +7,8 @@ #ifndef __ARM_CONFIG_H__ #define __ARM_CONFIG_H__ +#define CONFIG_PAGING_ASSISTANCE 1 + #define CONFIG_PAGING_LEVELS 3 #define CONFIG_ARM 1 diff -r 3fd1f4d54094 -r dde175688d5f xen/include/asm-arm/mm.h --- a/xen/include/asm-arm/mm.h Fri Jun 01 10:20:32 2012 +0100 +++ b/xen/include/asm-arm/mm.h Fri Jun 01 10:20:33 2012 +0100 @@ -78,6 +78,10 @@ struct page_info #define _PGT_pinned PG_shift(5) #define PGT_pinned PG_mask(1, 5) + /* Has this page been validated for use as its current type? */ +#define _PGT_validated PG_shift(6) +#define PGT_validated PG_mask(1, 6) + /* Count of uses of this frame as its current type. */ #define PGT_count_width PG_shift(9) #define PGT_count_mask ((1UL< Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Jun 2012 03: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 1SaekG-0007W2-JG; Sat, 02 Jun 2012 03:11:16 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekF-0007VN-Uc for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:16 +0000 Received: from [193.109.254.147:20063] by server-12.bemta-14.messagelabs.com id 78/8D-12643-35489CF4; Sat, 02 Jun 2012 03:11:15 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-27.messagelabs.com!1338606673!11586628!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8500 invoked from network); 2 Jun 2012 03:11:14 -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; 2 Jun 2012 03:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekD-0000Ji-JH for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SaekD-0003UZ-Aj for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:13 +0000 Message-Id: Date: Sat, 02 Jun 2012 03:11:12 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: avoid memory write in switch to Hyp 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 # HG changeset patch # User Tim Deegan # Date 1338542438 -3600 # Node ID b2d9f2411d711d8177acf1af0fbe9f0c9115c7ef # Parent b2649ecbe06f5624ca42066ea9d506eed1562d55 arm: avoid memory write in switch to Hyp mode Assemble the new CPSR in registers instead. It's slightly cleaner, And makes it possible to have a read-only text section. Signed-off-by: Tim Deegan Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r b2649ecbe06f -r b2d9f2411d71 xen/arch/arm/mode_switch.S --- a/xen/arch/arm/mode_switch.S Fri Jun 01 10:20:37 2012 +0100 +++ b/xen/arch/arm/mode_switch.S Fri Jun 01 10:20:38 2012 +0100 @@ -66,11 +66,7 @@ enter_hyp_mode: mcr CP32(r0, FCSEIDR) mcr CP32(r0, CONTEXTIDR) /* FIXME: ought to reset some other NS control regs here */ - adr r1, 1f /* Store return address */ - str r3, [r1] /* where we can use it for RFE */ - isb /* Ensure we see the stored address */ - rfeia r1 /* Enter Hyp mode */ - -1: .word 0 /* PC to enter Hyp mode at */ - .word 0x000001da /* CPSR: LE, Abort/IRQ/FIQ off, Hyp */ - + mrs r0, cpsr /* Copy the CPSR */ + add r0, r0, #0x4 /* 0x16 (Monitor) -> 0x1a (Hyp) */ + msr spsr_cxsf, r0 /* into the SPSR */ + movs pc, r3 /* Exception-return into Hyp mode */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 02 03:11:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Jun 2012 03: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 1SaekE-0007Ut-6H; Sat, 02 Jun 2012 03:11:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekD-0007UW-56 for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:13 +0000 Received: from [85.158.138.51:48323] by server-6.bemta-3.messagelabs.com id 7C/72-23455-05489CF4; Sat, 02 Jun 2012 03:11:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-174.messagelabs.com!1338606669!26397883!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=2.0 required=7.0 tests=SUBJECT_RANDOMQ X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29010 invoked from network); 2 Jun 2012 03:11:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 2 Jun 2012 03:11:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Saek9-0000JJ-Eu for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Saek9-0003Sa-0J for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:09 +0000 Message-Id: Date: Sat, 02 Jun 2012 03:11:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: support fewer LR registers than virtual irqs 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 # HG changeset patch # User Stefano Stabellini # Date 1338542431 -3600 # Node ID ded5cb662d6ed8d14417c37c0565d2683dbde92d # Parent d7318231cfe3498947bf75f09d6675407d7b4e76 arm: support fewer LR registers than virtual irqs If the vgic needs to inject a virtual irq into the guest, but no free LR registers are available, add the irq to a list and return. Whenever an LR register becomes available we add the queued irq to it and remove it from the list. We use the gic lock to protect the list and the bitmask. Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r d7318231cfe3 -r ded5cb662d6e xen/arch/arm/gic.c --- a/xen/arch/arm/gic.c Thu May 31 10:18:52 2012 +0200 +++ b/xen/arch/arm/gic.c Fri Jun 01 10:20:31 2012 +0100 @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -45,6 +46,14 @@ static struct { unsigned int lines; unsigned int cpus; spinlock_t lock; + uint64_t lr_mask; + /* lr_pending is used to queue IRQs (struct pending_irq) that the + * vgic tried to inject in the guest (calling gic_set_guest_irq) but + * no LRs were available at the time. + * As soon as an LR is freed we remove the first IRQ from this + * list and write it to the LR register. + * lr_pending is a subset of vgic.inflight_irqs. */ + struct list_head lr_pending; } gic; irq_desc_t irq_desc[NR_IRQS]; @@ -283,6 +292,9 @@ int __init gic_init(void) gic_cpu_init(); gic_hyp_init(); + gic.lr_mask = 0ULL; + INIT_LIST_HEAD(&gic.lr_pending); + spin_unlock(&gic.lock); return gic.cpus; @@ -377,14 +389,48 @@ int __init setup_irq(unsigned int irq, s return rc; } +static inline void gic_set_lr(int lr, unsigned int virtual_irq, + unsigned int state, unsigned int priority) +{ + BUG_ON(lr > nr_lrs); + GICH[GICH_LR + lr] = state | + GICH_LR_MAINTENANCE_IRQ | + ((priority >> 3) << GICH_LR_PRIORITY_SHIFT) | + ((virtual_irq & GICH_LR_VIRTUAL_MASK) << GICH_LR_VIRTUAL_SHIFT); +} + void gic_set_guest_irq(unsigned int virtual_irq, unsigned int state, unsigned int priority) { - BUG_ON(virtual_irq > nr_lrs); - GICH[GICH_LR + virtual_irq] = state | - GICH_LR_MAINTENANCE_IRQ | - ((priority >> 3) << GICH_LR_PRIORITY_SHIFT) | - ((virtual_irq & GICH_LR_VIRTUAL_MASK) << GICH_LR_VIRTUAL_SHIFT); + int i; + struct pending_irq *iter, *n; + + spin_lock(&gic.lock); + + if ( list_empty(&gic.lr_pending) ) + { + i = find_first_zero_bit(&gic.lr_mask, nr_lrs); + if (i < nr_lrs) { + set_bit(i, &gic.lr_mask); + gic_set_lr(i, virtual_irq, state, priority); + goto out; + } + } + + n = irq_to_pending(current, virtual_irq); + list_for_each_entry ( iter, &gic.lr_pending, lr_queue ) + { + if ( iter->priority > priority ) + { + list_add_tail(&n->lr_queue, &iter->lr_queue); + goto out; + } + } + list_add_tail(&n->lr_queue, &gic.lr_pending); + +out: + spin_unlock(&gic.lock); + return; } void gic_inject_irq_start(void) @@ -463,30 +509,42 @@ void gicv_setup(struct domain *d) static void maintenance_interrupt(int irq, void *dev_id, struct cpu_user_regs *regs) { - int i, virq; + int i = 0, virq; uint32_t lr; uint64_t eisr = GICH[GICH_EISR0] | (((uint64_t) GICH[GICH_EISR1]) << 32); - for ( i = 0; i < 64; i++ ) { - if ( eisr & ((uint64_t)1 << i) ) { - struct pending_irq *p; + while ((i = find_next_bit((const long unsigned int *) &eisr, + sizeof(eisr), i)) < sizeof(eisr)) { + struct pending_irq *p; - lr = GICH[GICH_LR + i]; - virq = lr & GICH_LR_VIRTUAL_MASK; - GICH[GICH_LR + i] = 0; + spin_lock(&gic.lock); + lr = GICH[GICH_LR + i]; + virq = lr & GICH_LR_VIRTUAL_MASK; + GICH[GICH_LR + i] = 0; + clear_bit(i, &gic.lr_mask); - spin_lock(¤t->arch.vgic.lock); - p = irq_to_pending(current, virq); - if ( p->desc != NULL ) { - p->desc->status &= ~IRQ_INPROGRESS; - GICC[GICC_DIR] = virq; - } + if ( !list_empty(&gic.lr_pending) ) { + p = list_entry(gic.lr_pending.next, typeof(*p), lr_queue); + gic_set_lr(i, p->irq, GICH_LR_PENDING, p->priority); + list_del_init(&p->lr_queue); + set_bit(i, &gic.lr_mask); + } else { gic_inject_irq_stop(); - list_del(&p->inflight); - INIT_LIST_HEAD(&p->inflight); - cpu_raise_softirq(current->processor, VGIC_SOFTIRQ); - spin_unlock(¤t->arch.vgic.lock); } + spin_unlock(&gic.lock); + + spin_lock(¤t->arch.vgic.lock); + p = irq_to_pending(current, virq); + if ( p->desc != NULL ) { + p->desc->status &= ~IRQ_INPROGRESS; + GICC[GICC_DIR] = virq; + } + list_del(&p->inflight); + INIT_LIST_HEAD(&p->inflight); + cpu_raise_softirq(current->processor, VGIC_SOFTIRQ); + spin_unlock(¤t->arch.vgic.lock); + + i++; } } diff -r d7318231cfe3 -r ded5cb662d6e xen/include/asm-arm/domain.h --- a/xen/include/asm-arm/domain.h Thu May 31 10:18:52 2012 +0200 +++ b/xen/include/asm-arm/domain.h Fri Jun 01 10:20:31 2012 +0100 @@ -23,6 +23,9 @@ struct pending_irq /* inflight is used to append instances of pending_irq to * vgic.inflight_irqs */ struct list_head inflight; + /* lr_queue is used to append instances of pending_irq to + * gic.lr_pending */ + struct list_head lr_queue; }; struct arch_domain @@ -75,6 +78,13 @@ struct arch_vcpu struct { struct vgic_irq_rank private_irqs; + /* This list is ordered by IRQ priority and it is used to keep + * track of the IRQs that the VGIC injected into the guest. + * Depending on the availability of LR registers, the IRQs might + * actually be in an LR, and therefore injected into the guest, + * or queued in gic.lr_pending. + * As soon as an IRQ is EOI'd by the guest and removed from the + * corresponding LR it is also removed from this list. */ struct list_head inflight_irqs; spinlock_t lock; } vgic; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 02 03:11:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Jun 2012 03: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 1SaekG-0007Vt-Gk; Sat, 02 Jun 2012 03:11:16 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekF-0007VB-KL for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:15 +0000 Received: from [85.158.143.99:40210] by server-1.bemta-4.messagelabs.com id EB/DD-27869-25489CF4; Sat, 02 Jun 2012 03:11:14 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-216.messagelabs.com!1338606672!25729308!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32446 invoked from network); 2 Jun 2012 03:11:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 2 Jun 2012 03:11:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekC-0000Jc-Ag for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SaekC-0003U4-8l for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:12 +0000 Message-Id: Date: Sat, 02 Jun 2012 03:11:11 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: More interrupt setup at start-of-day for secondary CPUs 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 # HG changeset patch # User Tim Deegan # Date 1338542436 -3600 # Node ID 99641bdf1a6783e309133230ed141042c322e51e # Parent 3585dd50af3bb623fecca6ba5febbf328a87d811 arm: More interrupt setup at start-of-day for secondary CPUs Signed-off-by: Tim Deegan Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 3585dd50af3b -r 99641bdf1a67 xen/arch/arm/smpboot.c --- a/xen/arch/arm/smpboot.c Fri Jun 01 10:20:35 2012 +0100 +++ b/xen/arch/arm/smpboot.c Fri Jun 01 10:20:36 2012 +0100 @@ -107,6 +107,8 @@ void __cpuinit start_secondary(unsigned mmu_init_secondary_cpu(); gic_init_secondary_cpu(); + init_timer_interrupt(); + gic_route_irqs(); set_current(idle_vcpu[cpuid]); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 02 03:11:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Jun 2012 03: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 1SaekJ-0007XS-3V; Sat, 02 Jun 2012 03:11:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekH-0007WK-PJ for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:17 +0000 Received: from [193.109.254.147:20119] by server-1.bemta-14.messagelabs.com id 10/FB-07411-45489CF4; Sat, 02 Jun 2012 03:11:16 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-27.messagelabs.com!1338606675!7312698!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18271 invoked from network); 2 Jun 2012 03:11:16 -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; 2 Jun 2012 03:11:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekF-0000Js-1z for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SaekE-0003VI-TT for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:14 +0000 Message-Id: Date: Sat, 02 Jun 2012 03:11:14 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: Enable VFP at boot 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 # HG changeset patch # User Tim Deegan # Date 1338542440 -3600 # Node ID 137b02968b406c19124819d00cba46a990834b52 # Parent 8b7e5f6b1f7f84fd9aa170dc43ac88dad5e8e446 arm: Enable VFP at boot Signed-off-by: Tim Deegan Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 8b7e5f6b1f7f -r 137b02968b40 xen/arch/arm/Rules.mk --- a/xen/arch/arm/Rules.mk Fri Jun 01 10:20:39 2012 +0100 +++ b/xen/arch/arm/Rules.mk Fri Jun 01 10:20:40 2012 +0100 @@ -24,7 +24,7 @@ ifneq ($(call cc-option,$(CC),-fvisibili CFLAGS += -DGCC_HAS_VISIBILITY_ATTRIBUTE endif -CFLAGS += -march=armv7-a -mcpu=cortex-a15 +CFLAGS += -march=armv7-a -mcpu=cortex-a15 -mfpu=vfpv3 -mfloat-abi=softfp # Require GCC v3.4+ (to avoid issues with alignment constraints in Xen headers) check-$(gcc) = $(call cc-ver-check,CC,0x030400,"Xen requires at least gcc-3.4") diff -r 8b7e5f6b1f7f -r 137b02968b40 xen/arch/arm/setup.c --- a/xen/arch/arm/setup.c Fri Jun 01 10:20:39 2012 +0100 +++ b/xen/arch/arm/setup.c Fri Jun 01 10:20:40 2012 +0100 @@ -36,6 +36,7 @@ #include #include #include +#include #include "gic.h" static __attribute_used__ void init_done(void) @@ -192,6 +193,8 @@ void __init start_xen(unsigned long boot processor_id(); + enable_vfp(); + softirq_init(); tasklet_subsys_init(); diff -r 8b7e5f6b1f7f -r 137b02968b40 xen/arch/arm/smpboot.c --- a/xen/arch/arm/smpboot.c Fri Jun 01 10:20:39 2012 +0100 +++ b/xen/arch/arm/smpboot.c Fri Jun 01 10:20:40 2012 +0100 @@ -26,6 +26,7 @@ #include #include #include +#include #include "gic.h" cpumask_t cpu_online_map; @@ -106,6 +107,8 @@ void __cpuinit start_secondary(unsigned WRITE_CP32((uint32_t) hyp_traps_vector, HVBAR); mmu_init_secondary_cpu(); + enable_vfp(); + gic_init_secondary_cpu(); init_timer_interrupt(); gic_route_irqs(); diff -r 8b7e5f6b1f7f -r 137b02968b40 xen/include/asm-arm/vfp.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xen/include/asm-arm/vfp.h Fri Jun 01 10:20:40 2012 +0100 @@ -0,0 +1,35 @@ +#ifndef __ARM_VFP_H_ +#define __ARM_VFP_H_ + +#include + +#define FPEXC_EN (1u << 30) + +/* Save and restore FP state. + * Ought to be using the new vmrs/vmsr names, but older binutils has a + * bug where it only allows them to target fpscr (and not, say, fpexc). */ +#define READ_FP(reg) ({ \ + uint32_t val; \ + asm volatile ("fmrx %0, fp" #reg : "=r" (val)); \ + val; }) + +#define WRITE_FP(reg, val) do { \ + asm volatile ("fmxr fp" #reg ", %0" : : "r" (val)); \ +} while (0) + + +/* Start-of-day: Turn on VFP */ +static inline void enable_vfp(void) +{ + WRITE_FP(exc, READ_FP(exc) | FPEXC_EN); +} + +#endif +/* + * Local variables: + * mode: C + * c-set-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 02 03:11:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Jun 2012 03: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 1SaekF-0007VD-8j; Sat, 02 Jun 2012 03:11:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekE-0007Uk-3U for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:14 +0000 Received: from [85.158.138.51:48360] by server-12.bemta-3.messagelabs.com id 19/35-29860-15489CF4; Sat, 02 Jun 2012 03:11:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-174.messagelabs.com!1338606671!24093802!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15922 invoked from network); 2 Jun 2012 03:11:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 2 Jun 2012 03:11:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekB-0000JQ-2c for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SaekA-0003TJ-JF for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:10 +0000 Message-Id: Date: Sat, 02 Jun 2012 03:11:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: implement flush_tlb_all_local and flush_tlb_local 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 # HG changeset patch # User Stefano Stabellini # Date 1338542434 -3600 # Node ID ebf41e3d1ee3041a96d84e2a6f7576171179772b # Parent dde175688d5f0b53779fb96987138a477c62e887 arm: implement flush_tlb_all_local and flush_tlb_local Call flush_tlb_all_local from create_p2m_entries after removing a page from the p2m. Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r dde175688d5f -r ebf41e3d1ee3 xen/arch/arm/p2m.c --- a/xen/arch/arm/p2m.c Fri Jun 01 10:20:33 2012 +0100 +++ b/xen/arch/arm/p2m.c Fri Jun 01 10:20:34 2012 +0100 @@ -3,6 +3,7 @@ #include #include #include +#include void p2m_load_VTTBR(struct domain *d) { @@ -123,6 +124,7 @@ static int create_p2m_entries(struct dom /* p2m entry already present */ free_domheap_page( mfn_to_page(third[third_table_offset(addr)].p2m.base)); + flush_tlb_all_local(); } /* Allocate a new RAM page and attach */ diff -r dde175688d5f -r ebf41e3d1ee3 xen/include/asm-arm/flushtlb.h --- a/xen/include/asm-arm/flushtlb.h Fri Jun 01 10:20:33 2012 +0100 +++ b/xen/include/asm-arm/flushtlb.h Fri Jun 01 10:20:34 2012 +0100 @@ -14,8 +14,27 @@ do { #define tlbflush_current_time() (0) -/* Flush local TLBs */ -void flush_tlb_local(void); +/* Flush local TLBs, current VMID only */ +static inline void flush_tlb_local(void) +{ + dsb(); + + WRITE_CP32((uint32_t) 0, TLBIALLIS); + + dsb(); + isb(); +} + +/* Flush local TLBs, all VMIDs, non-hypervisor mode */ +static inline void flush_tlb_all_local(void) +{ + dsb(); + + WRITE_CP32((uint32_t) 0, TLBIALLNSNHIS); + + dsb(); + isb(); +} /* Flush specified CPUs' TLBs */ void flush_tlb_mask(const cpumask_t *mask); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 02 03:11:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Jun 2012 03: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 1SaekH-0007Wb-QN; Sat, 02 Jun 2012 03:11:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekG-0007VB-DI for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:16 +0000 Received: from [85.158.143.35:24515] by server-1.bemta-4.messagelabs.com id FC/DD-27869-45489CF4; Sat, 02 Jun 2012 03:11:16 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-21.messagelabs.com!1338606674!17211337!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15908 invoked from network); 2 Jun 2012 03:11:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 2 Jun 2012 03:11:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekD-0000Jl-Ti for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SaekD-0003Uo-S5 for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:13 +0000 Message-Id: Date: Sat, 02 Jun 2012 03:11:13 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: missing __init annotation 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 # HG changeset patch # User Tim Deegan # Date 1338542439 -3600 # Node ID 10bb1cc00ab66e794831e0553d9045197be1d327 # Parent b2d9f2411d711d8177acf1af0fbe9f0c9115c7ef arm: missing __init annotation Signed-off-by: Tim Deegan Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r b2d9f2411d71 -r 10bb1cc00ab6 xen/arch/arm/setup.c --- a/xen/arch/arm/setup.c Fri Jun 01 10:20:38 2012 +0100 +++ b/xen/arch/arm/setup.c Fri Jun 01 10:20:39 2012 +0100 @@ -51,7 +51,7 @@ static void __init init_idle_domain(void /* TODO: setup_idle_pagetable(); */ } -static void processor_id(void) +static void __init processor_id(void) { printk("Processor Features: %08x %08x\n", READ_CP32(ID_PFR0), READ_CP32(ID_PFR0)); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 02 03:11:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Jun 2012 03: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 1SaekF-0007VD-8j; Sat, 02 Jun 2012 03:11:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekE-0007Uk-3U for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:14 +0000 Received: from [85.158.138.51:48360] by server-12.bemta-3.messagelabs.com id 19/35-29860-15489CF4; Sat, 02 Jun 2012 03:11:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-174.messagelabs.com!1338606671!24093802!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15922 invoked from network); 2 Jun 2012 03:11:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 2 Jun 2012 03:11:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekB-0000JQ-2c for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SaekA-0003TJ-JF for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:10 +0000 Message-Id: Date: Sat, 02 Jun 2012 03:11:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: implement flush_tlb_all_local and flush_tlb_local 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 # HG changeset patch # User Stefano Stabellini # Date 1338542434 -3600 # Node ID ebf41e3d1ee3041a96d84e2a6f7576171179772b # Parent dde175688d5f0b53779fb96987138a477c62e887 arm: implement flush_tlb_all_local and flush_tlb_local Call flush_tlb_all_local from create_p2m_entries after removing a page from the p2m. Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r dde175688d5f -r ebf41e3d1ee3 xen/arch/arm/p2m.c --- a/xen/arch/arm/p2m.c Fri Jun 01 10:20:33 2012 +0100 +++ b/xen/arch/arm/p2m.c Fri Jun 01 10:20:34 2012 +0100 @@ -3,6 +3,7 @@ #include #include #include +#include void p2m_load_VTTBR(struct domain *d) { @@ -123,6 +124,7 @@ static int create_p2m_entries(struct dom /* p2m entry already present */ free_domheap_page( mfn_to_page(third[third_table_offset(addr)].p2m.base)); + flush_tlb_all_local(); } /* Allocate a new RAM page and attach */ diff -r dde175688d5f -r ebf41e3d1ee3 xen/include/asm-arm/flushtlb.h --- a/xen/include/asm-arm/flushtlb.h Fri Jun 01 10:20:33 2012 +0100 +++ b/xen/include/asm-arm/flushtlb.h Fri Jun 01 10:20:34 2012 +0100 @@ -14,8 +14,27 @@ do { #define tlbflush_current_time() (0) -/* Flush local TLBs */ -void flush_tlb_local(void); +/* Flush local TLBs, current VMID only */ +static inline void flush_tlb_local(void) +{ + dsb(); + + WRITE_CP32((uint32_t) 0, TLBIALLIS); + + dsb(); + isb(); +} + +/* Flush local TLBs, all VMIDs, non-hypervisor mode */ +static inline void flush_tlb_all_local(void) +{ + dsb(); + + WRITE_CP32((uint32_t) 0, TLBIALLNSNHIS); + + dsb(); + isb(); +} /* Flush specified CPUs' TLBs */ void flush_tlb_mask(const cpumask_t *mask); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 02 03:11:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Jun 2012 03: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 1SaekH-0007WU-O6; Sat, 02 Jun 2012 03:11:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekF-0007VC-TX for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:16 +0000 Received: from [85.158.139.83:50087] by server-4.bemta-5.messagelabs.com id F1/AF-05858-25489CF4; Sat, 02 Jun 2012 03:11:14 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-182.messagelabs.com!1338606672!17840631!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26380 invoked from network); 2 Jun 2012 03:11:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 2 Jun 2012 03:11:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekB-0000JP-68 for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SaekA-0003T4-2q for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:10 +0000 Message-Id: Date: Sat, 02 Jun 2012 03:11:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: shared_info page allocation and mapping 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 # HG changeset patch # User Stefano Stabellini # Date 1338542433 -3600 # Node ID dde175688d5f0b53779fb96987138a477c62e887 # Parent 3fd1f4d540947c766e8cfef696879fdc55cde4e5 arm: shared_info page allocation and mapping Allocate the shared_info page at domain creation. Implement arch_memory_op, only for XENMEM_add_to_physmap with space == XENMAPSPACE_shared_info, so that the guest can map the shared_info page. Signed-off-by: Stefano Stabellini Signed-off-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 3fd1f4d54094 -r dde175688d5f xen/arch/arm/domain.c --- a/xen/arch/arm/domain.c Fri Jun 01 10:20:32 2012 +0100 +++ b/xen/arch/arm/domain.c Fri Jun 01 10:20:33 2012 +0100 @@ -192,6 +192,17 @@ int arch_domain_create(struct domain *d, if ( (rc = p2m_init(d)) != 0 ) goto fail; + if ( !is_idle_domain(d) ) + { + rc = -ENOMEM; + if ( (d->shared_info = alloc_xenheap_pages(0, 0)) == NULL ) + goto fail; + + clear_page(d->shared_info); + share_xen_page_with_guest( + virt_to_page(d->shared_info), d, XENSHARE_writable); + } + d->max_vcpus = 8; if ( (rc = domain_vgic_init(d)) != 0 ) diff -r 3fd1f4d54094 -r dde175688d5f xen/arch/arm/mm.c --- a/xen/arch/arm/mm.c Fri Jun 01 10:20:32 2012 +0100 +++ b/xen/arch/arm/mm.c Fri Jun 01 10:20:33 2012 +0100 @@ -25,8 +25,11 @@ #include #include #include +#include #include #include +#include +#include struct domain *dom_xen, *dom_io; @@ -376,17 +379,104 @@ void arch_dump_shared_mem_info(void) { } -long arch_memory_op(int op, XEN_GUEST_HANDLE(void) arg) -{ - return -ENOSYS; -} - int donate_page(struct domain *d, struct page_info *page, unsigned int memflags) { ASSERT(0); return -ENOSYS; } +void share_xen_page_with_guest(struct page_info *page, + struct domain *d, int readonly) +{ + if ( page_get_owner(page) == d ) + return; + + spin_lock(&d->page_alloc_lock); + + /* The incremented type count pins as writable or read-only. */ + page->u.inuse.type_info = (readonly ? PGT_none : PGT_writable_page); + page->u.inuse.type_info |= PGT_validated | 1; + + page_set_owner(page, d); + wmb(); /* install valid domain ptr before updating refcnt. */ + ASSERT((page->count_info & ~PGC_xen_heap) == 0); + + /* Only add to the allocation list if the domain isn't dying. */ + if ( !d->is_dying ) + { + page->count_info |= PGC_allocated | 1; + if ( unlikely(d->xenheap_pages++ == 0) ) + get_knownalive_domain(d); + page_list_add_tail(page, &d->xenpage_list); + } + + spin_unlock(&d->page_alloc_lock); +} + +static int xenmem_add_to_physmap_once( + struct domain *d, + const struct xen_add_to_physmap *xatp) +{ + unsigned long mfn = 0; + int rc; + + switch ( xatp->space ) + { + case XENMAPSPACE_shared_info: + if ( xatp->idx == 0 ) + mfn = virt_to_mfn(d->shared_info); + break; + default: + return -ENOSYS; + } + + domain_lock(d); + + /* Map at new location. */ + rc = guest_physmap_add_page(d, xatp->gpfn, mfn, 0); + + domain_unlock(d); + + return rc; +} + +static int xenmem_add_to_physmap(struct domain *d, + struct xen_add_to_physmap *xatp) +{ + return xenmem_add_to_physmap_once(d, xatp); +} + +long arch_memory_op(int op, XEN_GUEST_HANDLE(void) arg) +{ + int rc; + + switch ( op ) + { + case XENMEM_add_to_physmap: + { + struct xen_add_to_physmap xatp; + struct domain *d; + + if ( copy_from_guest(&xatp, arg, 1) ) + return -EFAULT; + + rc = rcu_lock_target_domain_by_id(xatp.domid, &d); + if ( rc != 0 ) + return rc; + + rc = xenmem_add_to_physmap(d, &xatp); + + rcu_unlock_domain(d); + + return rc; + } + + default: + return -ENOSYS; + } + + return 0; +} /* * Local variables: * mode: C diff -r 3fd1f4d54094 -r dde175688d5f xen/arch/arm/p2m.c --- a/xen/arch/arm/p2m.c Fri Jun 01 10:20:32 2012 +0100 +++ b/xen/arch/arm/p2m.c Fri Jun 01 10:20:33 2012 +0100 @@ -118,7 +118,12 @@ static int create_p2m_entries(struct dom } /* else: third already valid */ - BUG_ON(third[third_table_offset(addr)].p2m.valid); + if ( third[third_table_offset(addr)].p2m.valid ) + { + /* p2m entry already present */ + free_domheap_page( + mfn_to_page(third[third_table_offset(addr)].p2m.base)); + } /* Allocate a new RAM page and attach */ if (alloc) @@ -172,6 +177,23 @@ int map_mmio_regions(struct domain *d, return create_p2m_entries(d, 0, start_gaddr, end_gaddr, maddr); } +int guest_physmap_add_page(struct domain *d, + unsigned long gpfn, + unsigned long mfn, + unsigned int page_order) +{ + return create_p2m_entries(d, 0, gpfn << PAGE_SHIFT, + (gpfn + (1<arch.p2m; diff -r 3fd1f4d54094 -r dde175688d5f xen/include/asm-arm/config.h --- a/xen/include/asm-arm/config.h Fri Jun 01 10:20:32 2012 +0100 +++ b/xen/include/asm-arm/config.h Fri Jun 01 10:20:33 2012 +0100 @@ -7,6 +7,8 @@ #ifndef __ARM_CONFIG_H__ #define __ARM_CONFIG_H__ +#define CONFIG_PAGING_ASSISTANCE 1 + #define CONFIG_PAGING_LEVELS 3 #define CONFIG_ARM 1 diff -r 3fd1f4d54094 -r dde175688d5f xen/include/asm-arm/mm.h --- a/xen/include/asm-arm/mm.h Fri Jun 01 10:20:32 2012 +0100 +++ b/xen/include/asm-arm/mm.h Fri Jun 01 10:20:33 2012 +0100 @@ -78,6 +78,10 @@ struct page_info #define _PGT_pinned PG_shift(5) #define PGT_pinned PG_mask(1, 5) + /* Has this page been validated for use as its current type? */ +#define _PGT_validated PG_shift(6) +#define PGT_validated PG_mask(1, 6) + /* Count of uses of this frame as its current type. */ #define PGT_count_width PG_shift(9) #define PGT_count_mask ((1UL< Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Jun 2012 03: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 1SaekH-0007Wn-VA; Sat, 02 Jun 2012 03:11:17 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekG-0007Vm-Oq for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:16 +0000 Received: from [193.109.254.147:48382] by server-8.bemta-14.messagelabs.com id 6D/02-04215-45489CF4; Sat, 02 Jun 2012 03:11:16 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-27.messagelabs.com!1338606674!4547769!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18418 invoked from network); 2 Jun 2012 03:11:15 -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; 2 Jun 2012 03:11:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekE-0000Jo-EF for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SaekE-0003V3-Ch for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:14 +0000 Message-Id: Date: Sat, 02 Jun 2012 03:11:13 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: allow ourselves access to all coprocessors in non-secure 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 # HG changeset patch # User Tim Deegan # Date 1338542439 -3600 # Node ID 8b7e5f6b1f7f84fd9aa170dc43ac88dad5e8e446 # Parent 10bb1cc00ab66e794831e0553d9045197be1d327 arm: allow ourselves access to all coprocessors in non-secure mode We'll need it to be able to use the VFP extensions, for example. Signed-off-by: Tim Deegan Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 10bb1cc00ab6 -r 8b7e5f6b1f7f xen/arch/arm/mode_switch.S --- a/xen/arch/arm/mode_switch.S Fri Jun 01 10:20:39 2012 +0100 +++ b/xen/arch/arm/mode_switch.S Fri Jun 01 10:20:39 2012 +0100 @@ -65,7 +65,10 @@ enter_hyp_mode: mov r0, #0 mcr CP32(r0, FCSEIDR) mcr CP32(r0, CONTEXTIDR) - /* FIXME: ought to reset some other NS control regs here */ + /* Allow non-secure access to coprocessors, FIQs, VFP and NEON */ + ldr r1, =0x3fff /* 14 CP bits set, all others clear */ + mcr CP32(r1, NSACR) + mrs r0, cpsr /* Copy the CPSR */ add r0, r0, #0x4 /* 0x16 (Monitor) -> 0x1a (Hyp) */ msr spsr_cxsf, r0 /* into the SPSR */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 02 03:11:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Jun 2012 03: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 1SaekF-0007VI-BU; Sat, 02 Jun 2012 03:11:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekE-0007Ul-Cw for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:14 +0000 Received: from [85.158.138.51:48381] by server-9.bemta-3.messagelabs.com id 47/AA-21565-15489CF4; Sat, 02 Jun 2012 03:11:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-174.messagelabs.com!1338606671!24093803!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15939 invoked from network); 2 Jun 2012 03:11:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 2 Jun 2012 03:11:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekB-0000JW-E6 for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SaekB-0003Ta-6D for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:11 +0000 Message-Id: Date: Sat, 02 Jun 2012 03:11:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: remove VGIC_SOFTIRQ 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 # HG changeset patch # User Stefano Stabellini # Date 1338542435 -3600 # Node ID 4406628d77edb1a7040ee9574debcdb013b2c003 # Parent ebf41e3d1ee3041a96d84e2a6f7576171179772b arm: remove VGIC_SOFTIRQ Instead of using a softirq to check whether we need to set the VI bit in the HCR (IRQ injection in the guest), always check the lr_mask on leave_hypervisor_tail. Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r ebf41e3d1ee3 -r 4406628d77ed xen/arch/arm/gic.c --- a/xen/arch/arm/gic.c Fri Jun 01 10:20:34 2012 +0100 +++ b/xen/arch/arm/gic.c Fri Jun 01 10:20:35 2012 +0100 @@ -433,7 +433,7 @@ out: return; } -void gic_inject_irq_start(void) +static void gic_inject_irq_start(void) { uint32_t hcr; hcr = READ_CP32(HCR); @@ -441,7 +441,7 @@ void gic_inject_irq_start(void) isb(); } -void gic_inject_irq_stop(void) +static void gic_inject_irq_stop(void) { uint32_t hcr; hcr = READ_CP32(HCR); @@ -451,6 +451,14 @@ void gic_inject_irq_stop(void) } } +void gic_inject(void) +{ + if (!gic.lr_mask) + gic_inject_irq_stop(); + else + gic_inject_irq_start(); +} + int gic_route_irq_to_guest(struct domain *d, unsigned int irq, const char * devname) { @@ -540,7 +548,6 @@ static void maintenance_interrupt(int ir GICC[GICC_DIR] = virq; } list_del_init(&p->inflight); - cpu_raise_softirq(current->processor, VGIC_SOFTIRQ); spin_unlock(¤t->arch.vgic.lock); i++; diff -r ebf41e3d1ee3 -r 4406628d77ed xen/arch/arm/gic.h --- a/xen/arch/arm/gic.h Fri Jun 01 10:20:34 2012 +0100 +++ b/xen/arch/arm/gic.h Fri Jun 01 10:20:35 2012 +0100 @@ -128,11 +128,11 @@ extern struct pending_irq *irq_to_pendin extern void gic_route_irqs(void); +extern void gic_inject(void); + extern void __cpuinit init_maintenance_interrupt(void); extern void gic_set_guest_irq(unsigned int irq, unsigned int state, unsigned int priority); -extern void gic_inject_irq_start(void); -extern void gic_inject_irq_stop(void); extern int gic_route_irq_to_guest(struct domain *d, unsigned int irq, const char * devname); diff -r ebf41e3d1ee3 -r 4406628d77ed xen/arch/arm/traps.c --- a/xen/arch/arm/traps.c Fri Jun 01 10:20:34 2012 +0100 +++ b/xen/arch/arm/traps.c Fri Jun 01 10:20:35 2012 +0100 @@ -608,8 +608,10 @@ asmlinkage void leave_hypervisor_tail(vo while (1) { local_irq_disable(); - if (!softirq_pending(smp_processor_id())) + if (!softirq_pending(smp_processor_id())) { + gic_inject(); return; + } local_irq_enable(); do_softirq(); } diff -r ebf41e3d1ee3 -r 4406628d77ed xen/arch/arm/vgic.c --- a/xen/arch/arm/vgic.c Fri Jun 01 10:20:34 2012 +0100 +++ b/xen/arch/arm/vgic.c Fri Jun 01 10:20:35 2012 +0100 @@ -577,23 +577,8 @@ void vgic_vcpu_inject_irq(struct vcpu *v list_add_tail(&n->inflight, &v->arch.vgic.inflight_irqs); spin_unlock(&v->arch.vgic.lock); /* we have a new higher priority irq, inject it into the guest */ - cpu_raise_softirq(v->processor, VGIC_SOFTIRQ); } -static void vgic_softirq(void) -{ - if (list_empty(¤t->arch.vgic.inflight_irqs)) - return; - - gic_inject_irq_start(); -} - -static int __init init_vgic_softirq(void) -{ - open_softirq(VGIC_SOFTIRQ, vgic_softirq); - return 0; -} -__initcall(init_vgic_softirq); /* * Local variables: * mode: C diff -r ebf41e3d1ee3 -r 4406628d77ed xen/include/asm-arm/softirq.h --- a/xen/include/asm-arm/softirq.h Fri Jun 01 10:20:34 2012 +0100 +++ b/xen/include/asm-arm/softirq.h Fri Jun 01 10:20:35 2012 +0100 @@ -1,8 +1,7 @@ #ifndef __ASM_SOFTIRQ_H__ #define __ASM_SOFTIRQ_H__ -#define VGIC_SOFTIRQ (NR_COMMON_SOFTIRQS + 0) -#define NR_ARCH_SOFTIRQS 1 +#define NR_ARCH_SOFTIRQS 0 #endif /* __ASM_SOFTIRQ_H__ */ /* _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 02 03:11:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Jun 2012 03: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 1SaekH-0007Wb-QN; Sat, 02 Jun 2012 03:11:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekG-0007VB-DI for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:16 +0000 Received: from [85.158.143.35:24515] by server-1.bemta-4.messagelabs.com id FC/DD-27869-45489CF4; Sat, 02 Jun 2012 03:11:16 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-21.messagelabs.com!1338606674!17211337!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15908 invoked from network); 2 Jun 2012 03:11:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 2 Jun 2012 03:11:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekD-0000Jl-Ti for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SaekD-0003Uo-S5 for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:13 +0000 Message-Id: Date: Sat, 02 Jun 2012 03:11:13 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: missing __init annotation 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 # HG changeset patch # User Tim Deegan # Date 1338542439 -3600 # Node ID 10bb1cc00ab66e794831e0553d9045197be1d327 # Parent b2d9f2411d711d8177acf1af0fbe9f0c9115c7ef arm: missing __init annotation Signed-off-by: Tim Deegan Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r b2d9f2411d71 -r 10bb1cc00ab6 xen/arch/arm/setup.c --- a/xen/arch/arm/setup.c Fri Jun 01 10:20:38 2012 +0100 +++ b/xen/arch/arm/setup.c Fri Jun 01 10:20:39 2012 +0100 @@ -51,7 +51,7 @@ static void __init init_idle_domain(void /* TODO: setup_idle_pagetable(); */ } -static void processor_id(void) +static void __init processor_id(void) { printk("Processor Features: %08x %08x\n", READ_CP32(ID_PFR0), READ_CP32(ID_PFR0)); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 02 03:11:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Jun 2012 03: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 1SaekH-0007Wn-VA; Sat, 02 Jun 2012 03:11:17 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekG-0007Vm-Oq for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:16 +0000 Received: from [193.109.254.147:48382] by server-8.bemta-14.messagelabs.com id 6D/02-04215-45489CF4; Sat, 02 Jun 2012 03:11:16 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-27.messagelabs.com!1338606674!4547769!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18418 invoked from network); 2 Jun 2012 03:11:15 -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; 2 Jun 2012 03:11:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekE-0000Jo-EF for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SaekE-0003V3-Ch for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:14 +0000 Message-Id: Date: Sat, 02 Jun 2012 03:11:13 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: allow ourselves access to all coprocessors in non-secure 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 # HG changeset patch # User Tim Deegan # Date 1338542439 -3600 # Node ID 8b7e5f6b1f7f84fd9aa170dc43ac88dad5e8e446 # Parent 10bb1cc00ab66e794831e0553d9045197be1d327 arm: allow ourselves access to all coprocessors in non-secure mode We'll need it to be able to use the VFP extensions, for example. Signed-off-by: Tim Deegan Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 10bb1cc00ab6 -r 8b7e5f6b1f7f xen/arch/arm/mode_switch.S --- a/xen/arch/arm/mode_switch.S Fri Jun 01 10:20:39 2012 +0100 +++ b/xen/arch/arm/mode_switch.S Fri Jun 01 10:20:39 2012 +0100 @@ -65,7 +65,10 @@ enter_hyp_mode: mov r0, #0 mcr CP32(r0, FCSEIDR) mcr CP32(r0, CONTEXTIDR) - /* FIXME: ought to reset some other NS control regs here */ + /* Allow non-secure access to coprocessors, FIQs, VFP and NEON */ + ldr r1, =0x3fff /* 14 CP bits set, all others clear */ + mcr CP32(r1, NSACR) + mrs r0, cpsr /* Copy the CPSR */ add r0, r0, #0x4 /* 0x16 (Monitor) -> 0x1a (Hyp) */ msr spsr_cxsf, r0 /* into the SPSR */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 02 03:11:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Jun 2012 03: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 1SaekH-0007Wh-Sv; Sat, 02 Jun 2012 03:11:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekG-0007Va-Ew for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:16 +0000 Received: from [85.158.138.51:48439] by server-10.bemta-3.messagelabs.com id FF/34-12071-35489CF4; Sat, 02 Jun 2012 03:11:15 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-174.messagelabs.com!1338606673!24093805!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16025 invoked from network); 2 Jun 2012 03:11:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 2 Jun 2012 03:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekC-0000Jf-Rt for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SaekC-0003UK-QL for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:12 +0000 Message-Id: Date: Sat, 02 Jun 2012 03:11:12 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: Move hyp-mode entry code out of line. 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 # HG changeset patch # User Tim Deegan # Date 1338542437 -3600 # Node ID b2649ecbe06f5624ca42066ea9d506eed1562d55 # Parent 99641bdf1a6783e309133230ed141042c322e51e arm: Move hyp-mode entry code out of line. This code is grottier than the rest of the start-of-day code and very specific to the software model we're developing on. Segregate it accordingly, by putting it in its own file. Signed-off-by: Tim Deegan Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 99641bdf1a67 -r b2649ecbe06f xen/arch/arm/Makefile --- a/xen/arch/arm/Makefile Fri Jun 01 10:20:36 2012 +0100 +++ b/xen/arch/arm/Makefile Fri Jun 01 10:20:37 2012 +0100 @@ -12,6 +12,7 @@ obj-y += io.o obj-y += irq.o obj-y += kernel.o obj-y += mm.o +obj-y += mode_switch.o obj-y += p2m.o obj-y += percpu.o obj-y += guestcopy.o diff -r 99641bdf1a67 -r b2649ecbe06f xen/arch/arm/head.S --- a/xen/arch/arm/head.S Fri Jun 01 10:20:36 2012 +0100 +++ b/xen/arch/arm/head.S Fri Jun 01 10:20:37 2012 +0100 @@ -122,50 +122,9 @@ 1: 1: /* OK, we're in Secure state. */ PRINT("- Started in Secure state -\r\n- Entering Hyp mode -\r\n") - - /* Dance into Hyp mode */ - cpsid aif, #0x16 /* Enter Monitor mode */ - mrc CP32(r0, SCR) - orr r0, r0, #0x100 /* Set HCE */ - orr r0, r0, #0xb1 /* Set SCD, AW, FW and NS */ - bic r0, r0, #0xe /* Clear EA, FIQ and IRQ */ - mcr CP32(r0, SCR) - /* Ugly: the system timer's frequency register is only - * programmable in Secure state. Since we don't know where its - * memory-mapped control registers live, we can't find out the - * right frequency. Use the VE model's default frequency here. */ - ldr r0, =0x5f5e100 /* 100 MHz */ - mcr CP32(r0, CNTFRQ) - ldr r0, =0x40c00 /* SMP, c11, c10 in non-secure mode */ - mcr CP32(r0, NSACR) - /* Continuing ugliness: Set up the GIC so NS state owns interrupts */ - mov r0, #GIC_BASE_ADDRESS - add r0, r0, #GIC_DR_OFFSET - mov r1, #0 - str r1, [r0] /* Disable delivery in the distributor */ - add r0, r0, #0x80 /* GICD_IGROUP0 */ - mov r2, #0xffffffff /* All interrupts to group 1 */ - str r2, [r0] - str r2, [r0, #4] - str r2, [r0, #8] - /* Must drop priority mask below 0x80 before entering NS state */ - mov r0, #GIC_BASE_ADDRESS - add r0, r0, #GIC_CR_OFFSET - ldr r1, =0xff - str r1, [r0, #0x4] /* -> GICC_PMR */ - /* Reset a few config registers */ - mov r0, #0 - mcr CP32(r0, FCSEIDR) - mcr CP32(r0, CONTEXTIDR) - /* FIXME: ought to reset some other NS control regs here */ - adr r1, 1f - adr r0, hyp /* Store paddr (hyp entry point) */ - str r0, [r1] /* where we can use it for RFE */ - isb /* Ensure we see the stored target address */ - rfeia r1 /* Enter Hyp mode */ - -1: .word 0 /* PC to enter Hyp mode at */ - .word 0x000001da /* CPSR: LE, Abort/IRQ/FIQ off, Hyp */ + ldr r0, =enter_hyp_mode /* VA of function */ + adr lr, hyp /* Set return address for call */ + add pc, r0, r10 /* Call PA of function */ hyp: PRINT("- Setting up control registers -\r\n") diff -r 99641bdf1a67 -r b2649ecbe06f xen/arch/arm/mode_switch.S --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xen/arch/arm/mode_switch.S Fri Jun 01 10:20:37 2012 +0100 @@ -0,0 +1,76 @@ +/* + * xen/arch/arm/mode_switch.S + * + * Start-of day code to take a CPU from Secure mode to Hyp mode. + * + * Tim Deegan + * Copyright (c) 2011-2012 Citrix Systems. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include +#include + +/* Get up a CPU into Hyp mode. Clobbers r0-r3. + * + * This code is specific to the VE model, and not intended to be used + * on production systems. As such it's a bit hackier than the main + * boot code in head.S. In future it will be replaced by better + * integration with the bootloader/firmware so that Xen always starts + * in Hyp mode. */ + +.globl enter_hyp_mode +enter_hyp_mode: + mov r3, lr /* Put return address in non-banked reg */ + cpsid aif, #0x16 /* Enter Monitor mode */ + mrc CP32(r0, SCR) + orr r0, r0, #0x100 /* Set HCE */ + orr r0, r0, #0xb1 /* Set SCD, AW, FW and NS */ + bic r0, r0, #0xe /* Clear EA, FIQ and IRQ */ + mcr CP32(r0, SCR) + /* Ugly: the system timer's frequency register is only + * programmable in Secure state. Since we don't know where its + * memory-mapped control registers live, we can't find out the + * right frequency. Use the VE model's default frequency here. */ + ldr r0, =0x5f5e100 /* 100 MHz */ + mcr CP32(r0, CNTFRQ) + ldr r0, =0x40c00 /* SMP, c11, c10 in non-secure mode */ + mcr CP32(r0, NSACR) + /* Continuing ugliness: Set up the GIC so NS state owns interrupts */ + mov r0, #GIC_BASE_ADDRESS + add r0, r0, #GIC_DR_OFFSET + mov r1, #0 + str r1, [r0] /* Disable delivery in the distributor */ + add r0, r0, #0x80 /* GICD_IGROUP0 */ + mov r2, #0xffffffff /* All interrupts to group 1 */ + str r2, [r0] + str r2, [r0, #4] + str r2, [r0, #8] + /* Must drop priority mask below 0x80 before entering NS state */ + mov r0, #GIC_BASE_ADDRESS + add r0, r0, #GIC_CR_OFFSET + ldr r1, =0xff + str r1, [r0, #0x4] /* -> GICC_PMR */ + /* Reset a few config registers */ + mov r0, #0 + mcr CP32(r0, FCSEIDR) + mcr CP32(r0, CONTEXTIDR) + /* FIXME: ought to reset some other NS control regs here */ + adr r1, 1f /* Store return address */ + str r3, [r1] /* where we can use it for RFE */ + isb /* Ensure we see the stored address */ + rfeia r1 /* Enter Hyp mode */ + +1: .word 0 /* PC to enter Hyp mode at */ + .word 0x000001da /* CPSR: LE, Abort/IRQ/FIQ off, Hyp */ + _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 02 03:11:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Jun 2012 03:11: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 1SaekE-0007Un-3n; Sat, 02 Jun 2012 03:11:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekC-0007UV-TZ for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:13 +0000 Received: from [85.158.138.51:48306] by server-2.bemta-3.messagelabs.com id 21/B6-17140-05489CF4; Sat, 02 Jun 2012 03:11:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-174.messagelabs.com!1338606670!27578216!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6220 invoked from network); 2 Jun 2012 03:11:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 2 Jun 2012 03:11:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Saek9-0000JM-Q1 for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Saek9-0003Sp-IL for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:09 +0000 Message-Id: Date: Sat, 02 Jun 2012 03:11:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: replace list_del and INIT_LIST_HEAD with list_del_init 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 # HG changeset patch # User Stefano Stabellini # Date 1338542432 -3600 # Node ID 3fd1f4d540947c766e8cfef696879fdc55cde4e5 # Parent ded5cb662d6ed8d14417c37c0565d2683dbde92d arm: replace list_del and INIT_LIST_HEAD with list_del_init Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r ded5cb662d6e -r 3fd1f4d54094 xen/arch/arm/gic.c --- a/xen/arch/arm/gic.c Fri Jun 01 10:20:31 2012 +0100 +++ b/xen/arch/arm/gic.c Fri Jun 01 10:20:32 2012 +0100 @@ -539,8 +539,7 @@ static void maintenance_interrupt(int ir p->desc->status &= ~IRQ_INPROGRESS; GICC[GICC_DIR] = virq; } - list_del(&p->inflight); - INIT_LIST_HEAD(&p->inflight); + list_del_init(&p->inflight); cpu_raise_softirq(current->processor, VGIC_SOFTIRQ); spin_unlock(¤t->arch.vgic.lock); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 02 03:11:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Jun 2012 03:11: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 1SaekK-0007YS-6H; Sat, 02 Jun 2012 03:11:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekI-0007VB-MZ for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:18 +0000 Received: from [85.158.143.35:24589] by server-1.bemta-4.messagelabs.com id 0E/DD-27869-65489CF4; Sat, 02 Jun 2012 03:11:18 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-21.messagelabs.com!1338606676!18531088!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6041 invoked from network); 2 Jun 2012 03:11:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 2 Jun 2012 03:11:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekG-0000Jz-3h for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SaekG-0003WV-2d for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:16 +0000 Message-Id: Date: Sat, 02 Jun 2012 03:11:15 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: rename libxl_sched_params to libxl_domain_sched_params 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 # HG changeset patch # User Ian Campbell # Date 1338548779 -3600 # Node ID 648508ee27a22b724b8d2d636550af2c25a9a38a # Parent 7d15860d75abcb1e81982edaa1d0c2aacb4ef70c libxl: rename libxl_sched_params to libxl_domain_sched_params Remove credit scheduler global options from the struct, they were never used anyway. Signed-off-by: Ian Campbell Acked-by: George Dunlap Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 7d15860d75ab -r 648508ee27a2 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Fri Jun 01 12:06:18 2012 +0100 +++ b/tools/libxl/libxl_dom.c Fri Jun 01 12:06:19 2012 +0100 @@ -42,7 +42,8 @@ libxl_domain_type libxl__domain_type(lib return LIBXL_DOMAIN_TYPE_PV; } -int libxl__sched_set_params(libxl__gc *gc, uint32_t domid, libxl_sched_params *scparams) +int libxl__sched_set_params(libxl__gc *gc, uint32_t domid, + libxl_domain_sched_params *scparams) { libxl_ctx *ctx = libxl__gc_owner(gc); libxl_scheduler sched; diff -r 7d15860d75ab -r 648508ee27a2 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri Jun 01 12:06:18 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri Jun 01 12:06:19 2012 +0100 @@ -742,7 +742,8 @@ _hidden libxl_domain_type libxl__domain_ _hidden int libxl__domain_shutdown_reason(libxl__gc *gc, uint32_t domid); _hidden int libxl__domain_cpupool(libxl__gc *gc, uint32_t domid); _hidden libxl_scheduler libxl__domain_scheduler(libxl__gc *gc, uint32_t domid); -_hidden int libxl__sched_set_params(libxl__gc *gc, uint32_t domid, libxl_sched_params *scparams); +_hidden int libxl__sched_set_params(libxl__gc *gc, uint32_t domid, + libxl_domain_sched_params *scparams); #define LIBXL__DOMAIN_IS_TYPE(gc, domid, type) \ libxl__domain_type((gc), (domid)) == LIBXL_DOMAIN_TYPE_##type typedef struct { diff -r 7d15860d75ab -r 648508ee27a2 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Fri Jun 01 12:06:18 2012 +0100 +++ b/tools/libxl/libxl_types.idl Fri Jun 01 12:06:19 2012 +0100 @@ -224,11 +224,9 @@ libxl_domain_create_info = Struct("domai MemKB = UInt(64, init_val = "LIBXL_MEMKB_DEFAULT") -libxl_sched_params = Struct("sched_params",[ +libxl_domain_sched_params = Struct("domain_sched_params",[ ("weight", integer), ("cap", integer), - ("tslice_ms", integer), - ("ratelimit_us", integer), ("period", integer), ("slice", integer), ("latency", integer), @@ -263,7 +261,7 @@ libxl_domain_build_info = Struct("domain # extra parameters pass directly to qemu for HVM guest, NULL terminated ("extra_hvm", libxl_string_list), # parameters for all type of scheduler - ("sched_params", libxl_sched_params), + ("sched_params", libxl_domain_sched_params), ("u", KeyedUnion(None, libxl_domain_type, "type", [("hvm", Struct(None, [("firmware", string), diff -r 7d15860d75ab -r 648508ee27a2 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri Jun 01 12:06:18 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Fri Jun 01 12:06:19 2012 +0100 @@ -635,10 +635,6 @@ static void parse_config_data(const char b_info->sched_params.weight = l; if (!xlu_cfg_get_long (config, "cap", &l, 0)) b_info->sched_params.cap = l; - if (!xlu_cfg_get_long (config, "tslice_ms", &l, 0)) - b_info->sched_params.tslice_ms = l; - if (!xlu_cfg_get_long (config, "ratelimit_us", &l, 0)) - b_info->sched_params.ratelimit_us = l; if (!xlu_cfg_get_long (config, "period", &l, 0)) b_info->sched_params.period = l; if (!xlu_cfg_get_long (config, "slice", &l, 0)) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 02 03:11:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Jun 2012 03:11: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 1SaekK-0007YS-6H; Sat, 02 Jun 2012 03:11:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekI-0007VB-MZ for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:18 +0000 Received: from [85.158.143.35:24589] by server-1.bemta-4.messagelabs.com id 0E/DD-27869-65489CF4; Sat, 02 Jun 2012 03:11:18 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-21.messagelabs.com!1338606676!18531088!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6041 invoked from network); 2 Jun 2012 03:11:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 2 Jun 2012 03:11:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekG-0000Jz-3h for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SaekG-0003WV-2d for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:16 +0000 Message-Id: Date: Sat, 02 Jun 2012 03:11:15 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: rename libxl_sched_params to libxl_domain_sched_params 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 # HG changeset patch # User Ian Campbell # Date 1338548779 -3600 # Node ID 648508ee27a22b724b8d2d636550af2c25a9a38a # Parent 7d15860d75abcb1e81982edaa1d0c2aacb4ef70c libxl: rename libxl_sched_params to libxl_domain_sched_params Remove credit scheduler global options from the struct, they were never used anyway. Signed-off-by: Ian Campbell Acked-by: George Dunlap Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 7d15860d75ab -r 648508ee27a2 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Fri Jun 01 12:06:18 2012 +0100 +++ b/tools/libxl/libxl_dom.c Fri Jun 01 12:06:19 2012 +0100 @@ -42,7 +42,8 @@ libxl_domain_type libxl__domain_type(lib return LIBXL_DOMAIN_TYPE_PV; } -int libxl__sched_set_params(libxl__gc *gc, uint32_t domid, libxl_sched_params *scparams) +int libxl__sched_set_params(libxl__gc *gc, uint32_t domid, + libxl_domain_sched_params *scparams) { libxl_ctx *ctx = libxl__gc_owner(gc); libxl_scheduler sched; diff -r 7d15860d75ab -r 648508ee27a2 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri Jun 01 12:06:18 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri Jun 01 12:06:19 2012 +0100 @@ -742,7 +742,8 @@ _hidden libxl_domain_type libxl__domain_ _hidden int libxl__domain_shutdown_reason(libxl__gc *gc, uint32_t domid); _hidden int libxl__domain_cpupool(libxl__gc *gc, uint32_t domid); _hidden libxl_scheduler libxl__domain_scheduler(libxl__gc *gc, uint32_t domid); -_hidden int libxl__sched_set_params(libxl__gc *gc, uint32_t domid, libxl_sched_params *scparams); +_hidden int libxl__sched_set_params(libxl__gc *gc, uint32_t domid, + libxl_domain_sched_params *scparams); #define LIBXL__DOMAIN_IS_TYPE(gc, domid, type) \ libxl__domain_type((gc), (domid)) == LIBXL_DOMAIN_TYPE_##type typedef struct { diff -r 7d15860d75ab -r 648508ee27a2 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Fri Jun 01 12:06:18 2012 +0100 +++ b/tools/libxl/libxl_types.idl Fri Jun 01 12:06:19 2012 +0100 @@ -224,11 +224,9 @@ libxl_domain_create_info = Struct("domai MemKB = UInt(64, init_val = "LIBXL_MEMKB_DEFAULT") -libxl_sched_params = Struct("sched_params",[ +libxl_domain_sched_params = Struct("domain_sched_params",[ ("weight", integer), ("cap", integer), - ("tslice_ms", integer), - ("ratelimit_us", integer), ("period", integer), ("slice", integer), ("latency", integer), @@ -263,7 +261,7 @@ libxl_domain_build_info = Struct("domain # extra parameters pass directly to qemu for HVM guest, NULL terminated ("extra_hvm", libxl_string_list), # parameters for all type of scheduler - ("sched_params", libxl_sched_params), + ("sched_params", libxl_domain_sched_params), ("u", KeyedUnion(None, libxl_domain_type, "type", [("hvm", Struct(None, [("firmware", string), diff -r 7d15860d75ab -r 648508ee27a2 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri Jun 01 12:06:18 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Fri Jun 01 12:06:19 2012 +0100 @@ -635,10 +635,6 @@ static void parse_config_data(const char b_info->sched_params.weight = l; if (!xlu_cfg_get_long (config, "cap", &l, 0)) b_info->sched_params.cap = l; - if (!xlu_cfg_get_long (config, "tslice_ms", &l, 0)) - b_info->sched_params.tslice_ms = l; - if (!xlu_cfg_get_long (config, "ratelimit_us", &l, 0)) - b_info->sched_params.ratelimit_us = l; if (!xlu_cfg_get_long (config, "period", &l, 0)) b_info->sched_params.period = l; if (!xlu_cfg_get_long (config, "slice", &l, 0)) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 02 03:11:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Jun 2012 03:11: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 1SaekE-0007Un-3n; Sat, 02 Jun 2012 03:11:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekC-0007UV-TZ for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:13 +0000 Received: from [85.158.138.51:48306] by server-2.bemta-3.messagelabs.com id 21/B6-17140-05489CF4; Sat, 02 Jun 2012 03:11:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-174.messagelabs.com!1338606670!27578216!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6220 invoked from network); 2 Jun 2012 03:11:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 2 Jun 2012 03:11:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Saek9-0000JM-Q1 for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Saek9-0003Sp-IL for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:09 +0000 Message-Id: Date: Sat, 02 Jun 2012 03:11:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] arm: replace list_del and INIT_LIST_HEAD with list_del_init 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 # HG changeset patch # User Stefano Stabellini # Date 1338542432 -3600 # Node ID 3fd1f4d540947c766e8cfef696879fdc55cde4e5 # Parent ded5cb662d6ed8d14417c37c0565d2683dbde92d arm: replace list_del and INIT_LIST_HEAD with list_del_init Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r ded5cb662d6e -r 3fd1f4d54094 xen/arch/arm/gic.c --- a/xen/arch/arm/gic.c Fri Jun 01 10:20:31 2012 +0100 +++ b/xen/arch/arm/gic.c Fri Jun 01 10:20:32 2012 +0100 @@ -539,8 +539,7 @@ static void maintenance_interrupt(int ir p->desc->status &= ~IRQ_INPROGRESS; GICC[GICC_DIR] = virq; } - list_del(&p->inflight); - INIT_LIST_HEAD(&p->inflight); + list_del_init(&p->inflight); cpu_raise_softirq(current->processor, VGIC_SOFTIRQ); spin_unlock(¤t->arch.vgic.lock); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 02 03:11:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Jun 2012 03:11: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 1SaekM-0007bP-EQ; Sat, 02 Jun 2012 03:11:22 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekJ-0007V7-KX for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:19 +0000 Received: from [85.158.143.35:24625] by server-2.bemta-4.messagelabs.com id 01/FF-11595-75489CF4; Sat, 02 Jun 2012 03:11:19 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-21.messagelabs.com!1338606677!15924062!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11483 invoked from network); 2 Jun 2012 03:11:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 2 Jun 2012 03:11:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekH-0000K5-7t for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SaekH-0003X1-6o for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:17 +0000 Message-Id: Date: Sat, 02 Jun 2012 03:11:16 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: move libxl__sched_set_params into libxl.c 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 # HG changeset patch # User Ian Campbell # Date 1338548780 -3600 # Node ID 4f743faf755977697ad0060f888a93753dc40f54 # Parent 53a905c9bb9a784e205c29a39f76153399e27ee0 libxl: move libxl__sched_set_params into libxl.c All the other sched functions are here and I'm just about to make those static functions as I make libxl__sched_set_params the public function. Signed-off-by: Ian Campbell Acked-by: George Dunlap Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 53a905c9bb9a -r 4f743faf7559 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri Jun 01 12:06:20 2012 +0100 +++ b/tools/libxl/libxl.c Fri Jun 01 12:06:20 2012 +0100 @@ -3549,6 +3549,33 @@ int libxl_sched_sedf_domain_set(libxl_ct return 0; } +int libxl__sched_set_params(libxl__gc *gc, uint32_t domid, + libxl_domain_sched_params *scparams) +{ + libxl_scheduler sched = scparams->sched; + int ret; + + if (sched == LIBXL_SCHEDULER_UNKNOWN) + sched = libxl__domain_scheduler(gc, domid); + + switch (sched) { + case LIBXL_SCHEDULER_SEDF: + ret=libxl_sched_sedf_domain_set(CTX, domid, scparams); + break; + case LIBXL_SCHEDULER_CREDIT: + ret=libxl_sched_credit_domain_set(CTX, domid, scparams); + break; + case LIBXL_SCHEDULER_CREDIT2: + ret=libxl_sched_credit2_domain_set(CTX, domid, scparams); + break; + default: + LOG(ERROR, "Unknown scheduler"); + ret=ERROR_INVAL; + break; + } + return ret; +} + int libxl_send_trigger(libxl_ctx *ctx, uint32_t domid, libxl_trigger trigger, uint32_t vcpuid) { diff -r 53a905c9bb9a -r 4f743faf7559 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Fri Jun 01 12:06:20 2012 +0100 +++ b/tools/libxl/libxl_dom.c Fri Jun 01 12:06:20 2012 +0100 @@ -42,33 +42,6 @@ libxl_domain_type libxl__domain_type(lib return LIBXL_DOMAIN_TYPE_PV; } -int libxl__sched_set_params(libxl__gc *gc, uint32_t domid, - libxl_domain_sched_params *scparams) -{ - libxl_scheduler sched = scparams->sched; - int ret; - - if (sched == LIBXL_SCHEDULER_UNKNOWN) - sched = libxl__domain_scheduler(gc, domid); - - switch (sched) { - case LIBXL_SCHEDULER_SEDF: - ret=libxl_sched_sedf_domain_set(CTX, domid, scparams); - break; - case LIBXL_SCHEDULER_CREDIT: - ret=libxl_sched_credit_domain_set(CTX, domid, scparams); - break; - case LIBXL_SCHEDULER_CREDIT2: - ret=libxl_sched_credit2_domain_set(CTX, domid, scparams); - break; - default: - LOG(ERROR, "Unknown scheduler"); - ret=ERROR_INVAL; - break; - } - return ret; -} - int libxl__domain_shutdown_reason(libxl__gc *gc, uint32_t domid) { libxl_ctx *ctx = libxl__gc_owner(gc); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 02 03:11:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Jun 2012 03:11: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 1SaekM-0007bP-EQ; Sat, 02 Jun 2012 03:11:22 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekJ-0007V7-KX for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:19 +0000 Received: from [85.158.143.35:24625] by server-2.bemta-4.messagelabs.com id 01/FF-11595-75489CF4; Sat, 02 Jun 2012 03:11:19 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-21.messagelabs.com!1338606677!15924062!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11483 invoked from network); 2 Jun 2012 03:11:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 2 Jun 2012 03:11:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekH-0000K5-7t for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SaekH-0003X1-6o for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:17 +0000 Message-Id: Date: Sat, 02 Jun 2012 03:11:16 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: move libxl__sched_set_params into libxl.c 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 # HG changeset patch # User Ian Campbell # Date 1338548780 -3600 # Node ID 4f743faf755977697ad0060f888a93753dc40f54 # Parent 53a905c9bb9a784e205c29a39f76153399e27ee0 libxl: move libxl__sched_set_params into libxl.c All the other sched functions are here and I'm just about to make those static functions as I make libxl__sched_set_params the public function. Signed-off-by: Ian Campbell Acked-by: George Dunlap Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 53a905c9bb9a -r 4f743faf7559 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri Jun 01 12:06:20 2012 +0100 +++ b/tools/libxl/libxl.c Fri Jun 01 12:06:20 2012 +0100 @@ -3549,6 +3549,33 @@ int libxl_sched_sedf_domain_set(libxl_ct return 0; } +int libxl__sched_set_params(libxl__gc *gc, uint32_t domid, + libxl_domain_sched_params *scparams) +{ + libxl_scheduler sched = scparams->sched; + int ret; + + if (sched == LIBXL_SCHEDULER_UNKNOWN) + sched = libxl__domain_scheduler(gc, domid); + + switch (sched) { + case LIBXL_SCHEDULER_SEDF: + ret=libxl_sched_sedf_domain_set(CTX, domid, scparams); + break; + case LIBXL_SCHEDULER_CREDIT: + ret=libxl_sched_credit_domain_set(CTX, domid, scparams); + break; + case LIBXL_SCHEDULER_CREDIT2: + ret=libxl_sched_credit2_domain_set(CTX, domid, scparams); + break; + default: + LOG(ERROR, "Unknown scheduler"); + ret=ERROR_INVAL; + break; + } + return ret; +} + int libxl_send_trigger(libxl_ctx *ctx, uint32_t domid, libxl_trigger trigger, uint32_t vcpuid) { diff -r 53a905c9bb9a -r 4f743faf7559 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Fri Jun 01 12:06:20 2012 +0100 +++ b/tools/libxl/libxl_dom.c Fri Jun 01 12:06:20 2012 +0100 @@ -42,33 +42,6 @@ libxl_domain_type libxl__domain_type(lib return LIBXL_DOMAIN_TYPE_PV; } -int libxl__sched_set_params(libxl__gc *gc, uint32_t domid, - libxl_domain_sched_params *scparams) -{ - libxl_scheduler sched = scparams->sched; - int ret; - - if (sched == LIBXL_SCHEDULER_UNKNOWN) - sched = libxl__domain_scheduler(gc, domid); - - switch (sched) { - case LIBXL_SCHEDULER_SEDF: - ret=libxl_sched_sedf_domain_set(CTX, domid, scparams); - break; - case LIBXL_SCHEDULER_CREDIT: - ret=libxl_sched_credit_domain_set(CTX, domid, scparams); - break; - case LIBXL_SCHEDULER_CREDIT2: - ret=libxl_sched_credit2_domain_set(CTX, domid, scparams); - break; - default: - LOG(ERROR, "Unknown scheduler"); - ret=ERROR_INVAL; - break; - } - return ret; -} - int libxl__domain_shutdown_reason(libxl__gc *gc, uint32_t domid) { libxl_ctx *ctx = libxl__gc_owner(gc); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 02 03:11:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Jun 2012 03:11: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 1SaekL-0007ao-Av; Sat, 02 Jun 2012 03:11:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekJ-0007XF-6w for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:19 +0000 Received: from [85.158.143.99:26059] by server-3.bemta-4.messagelabs.com id 99/6F-04252-65489CF4; Sat, 02 Jun 2012 03:11:18 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-216.messagelabs.com!1338606675!21229070!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15783 invoked from network); 2 Jun 2012 03:11:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 2 Jun 2012 03:11:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekF-0000Jw-II for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SaekF-0003WG-Gr for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:15 +0000 Message-Id: Date: Sat, 02 Jun 2012 03:11:14 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: add internal function to get a domain's scheduler 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 # HG changeset patch # User Ian Campbell # Date 1338548778 -3600 # Node ID 7d15860d75abcb1e81982edaa1d0c2aacb4ef70c # Parent 137b02968b406c19124819d00cba46a990834b52 libxl: add internal function to get a domain's scheduler This takes into account cpupools. Add a helper to get the info for a single cpu pool, refactor libxl_list_cpupool t use this. While there fix the leaks due to not disposing the partial list on realloc failure in that function. Fix the failure of sched_domain_output to free the poolinfo list. Signed-off-by: Ian Campbell Acked-by: George Dunlap Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 137b02968b40 -r 7d15860d75ab tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri Jun 01 10:20:40 2012 +0100 +++ b/tools/libxl/libxl.c Fri Jun 01 12:06:18 2012 +0100 @@ -552,41 +552,70 @@ int libxl_domain_info(libxl_ctx *ctx, li return 0; } +static int cpupool_info(libxl__gc *gc, + libxl_cpupoolinfo *info, + uint32_t poolid, + bool exact /* exactly poolid or >= poolid */) +{ + xc_cpupoolinfo_t *xcinfo; + int rc = ERROR_FAIL; + + xcinfo = xc_cpupool_getinfo(CTX->xch, poolid); + if (xcinfo == NULL) + return ERROR_FAIL; + + if (exact && xcinfo->cpupool_id != poolid) + goto out; + + info->poolid = xcinfo->cpupool_id; + info->sched = xcinfo->sched_id; + info->n_dom = xcinfo->n_dom; + if (libxl_cpumap_alloc(CTX, &info->cpumap)) + goto out; + memcpy(info->cpumap.map, xcinfo->cpumap, info->cpumap.size); + + rc = 0; +out: + xc_cpupool_infofree(CTX->xch, xcinfo); + return rc; +} + +int libxl_cpupool_info(libxl_ctx *ctx, + libxl_cpupoolinfo *info, uint32_t poolid) +{ + GC_INIT(ctx); + int rc = cpupool_info(gc, info, poolid, true); + GC_FREE; + return rc; +} + libxl_cpupoolinfo * libxl_list_cpupool(libxl_ctx *ctx, int *nb_pool) { - libxl_cpupoolinfo *ptr, *tmp; + GC_INIT(ctx); + libxl_cpupoolinfo info, *ptr, *tmp; int i; - xc_cpupoolinfo_t *info; uint32_t poolid; ptr = NULL; poolid = 0; for (i = 0;; i++) { - info = xc_cpupool_getinfo(ctx->xch, poolid); - if (info == NULL) + if (cpupool_info(gc, &info, poolid, false)) break; tmp = realloc(ptr, (i + 1) * sizeof(libxl_cpupoolinfo)); if (!tmp) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "allocating cpupool info"); - free(ptr); - xc_cpupool_infofree(ctx->xch, info); - return NULL; + libxl_cpupoolinfo_list_free(ptr, i); + goto out; } ptr = tmp; - ptr[i].poolid = info->cpupool_id; - ptr[i].sched = info->sched_id; - ptr[i].n_dom = info->n_dom; - if (libxl_cpumap_alloc(ctx, &ptr[i].cpumap)) { - xc_cpupool_infofree(ctx->xch, info); - break; - } - memcpy(ptr[i].cpumap.map, info->cpumap, ptr[i].cpumap.size); - poolid = info->cpupool_id + 1; - xc_cpupool_infofree(ctx->xch, info); + ptr[i] = info; + poolid = info.poolid + 1; } *nb_pool = i; +out: + GC_FREE; return ptr; } @@ -4031,14 +4060,10 @@ int libxl_cpupool_cpuremove_node(libxl_c } } - for (cpu = 0; cpu < nr_cpus; cpu++) - libxl_cputopology_dispose(&topology[cpu]); - free(topology); + libxl_cputopology_list_free(topology, nr_cpus); out: - for (p = 0; p < n_pools; p++) { - libxl_cpupoolinfo_dispose(poolinfo + p); - } + libxl_cpupoolinfo_list_free(poolinfo, n_pools); return ret; } diff -r 137b02968b40 -r 7d15860d75ab tools/libxl/libxl.h --- a/tools/libxl/libxl.h Fri Jun 01 10:20:40 2012 +0100 +++ b/tools/libxl/libxl.h Fri Jun 01 12:06:18 2012 +0100 @@ -576,6 +576,7 @@ int libxl_domain_info(libxl_ctx*, libxl_ libxl_dominfo * libxl_list_domain(libxl_ctx*, int *nb_domain); void libxl_dominfo_list_free(libxl_dominfo *list, int nr); libxl_cpupoolinfo * libxl_list_cpupool(libxl_ctx*, int *nb_pool); +void libxl_cpupoolinfo_list_free(libxl_cpupoolinfo *list, int nr); libxl_vminfo * libxl_list_vm(libxl_ctx *ctx, int *nb_vm); void libxl_vminfo_list_free(libxl_vminfo *list, int nr); @@ -822,6 +823,7 @@ int libxl_cpupool_cpuadd_node(libxl_ctx int libxl_cpupool_cpuremove(libxl_ctx *ctx, uint32_t poolid, int cpu); int libxl_cpupool_cpuremove_node(libxl_ctx *ctx, uint32_t poolid, int node, int *cpus); int libxl_cpupool_movedomain(libxl_ctx *ctx, uint32_t poolid, uint32_t domid); +int libxl_cpupool_info(libxl_ctx *ctx, libxl_cpupoolinfo *info, uint32_t poolid); int libxl_domid_valid_guest(uint32_t domid); diff -r 137b02968b40 -r 7d15860d75ab tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Fri Jun 01 10:20:40 2012 +0100 +++ b/tools/libxl/libxl_dom.c Fri Jun 01 12:06:18 2012 +0100 @@ -93,6 +93,41 @@ int libxl__domain_shutdown_reason(libxl_ return (info.flags >> XEN_DOMINF_shutdownshift) & XEN_DOMINF_shutdownmask; } +int libxl__domain_cpupool(libxl__gc *gc, uint32_t domid) +{ + xc_domaininfo_t info; + int ret; + + ret = xc_domain_getinfolist(CTX->xch, domid, 1, &info); + if (ret != 1) + return ERROR_FAIL; + if (info.domain != domid) + return ERROR_FAIL; + + return info.cpupool; +} + +libxl_scheduler libxl__domain_scheduler(libxl__gc *gc, uint32_t domid) +{ + uint32_t cpupool = libxl__domain_cpupool(gc, domid); + libxl_cpupoolinfo poolinfo; + libxl_scheduler sched = LIBXL_SCHEDULER_UNKNOWN; + int rc; + + if (cpupool < 0) + return sched; + + rc = libxl_cpupool_info(CTX, &poolinfo, cpupool); + if (rc < 0) + goto out; + + sched = poolinfo.sched; + +out: + libxl_cpupoolinfo_dispose(&poolinfo); + return sched; +} + int libxl__build_pre(libxl__gc *gc, uint32_t domid, libxl_domain_build_info *info, libxl__domain_build_state *state) { diff -r 137b02968b40 -r 7d15860d75ab tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri Jun 01 10:20:40 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri Jun 01 12:06:18 2012 +0100 @@ -740,6 +740,8 @@ _hidden int libxl__file_reference_unmap( /* from xl_dom */ _hidden libxl_domain_type libxl__domain_type(libxl__gc *gc, uint32_t domid); _hidden int libxl__domain_shutdown_reason(libxl__gc *gc, uint32_t domid); +_hidden int libxl__domain_cpupool(libxl__gc *gc, uint32_t domid); +_hidden libxl_scheduler libxl__domain_scheduler(libxl__gc *gc, uint32_t domid); _hidden int libxl__sched_set_params(libxl__gc *gc, uint32_t domid, libxl_sched_params *scparams); #define LIBXL__DOMAIN_IS_TYPE(gc, domid, type) \ libxl__domain_type((gc), (domid)) == LIBXL_DOMAIN_TYPE_##type diff -r 137b02968b40 -r 7d15860d75ab tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Fri Jun 01 10:20:40 2012 +0100 +++ b/tools/libxl/libxl_types.idl Fri Jun 01 12:06:18 2012 +0100 @@ -107,7 +107,9 @@ libxl_bios_type = Enumeration("bios_type ]) # Consistent with values defined in domctl.h +# Except unknown which we have made up libxl_scheduler = Enumeration("scheduler", [ + (0, "unknown"), (4, "sedf"), (5, "credit"), (6, "credit2"), diff -r 137b02968b40 -r 7d15860d75ab tools/libxl/libxl_utils.c --- a/tools/libxl/libxl_utils.c Fri Jun 01 10:20:40 2012 +0100 +++ b/tools/libxl/libxl_utils.c Fri Jun 01 12:06:18 2012 +0100 @@ -133,9 +133,8 @@ int libxl_name_to_cpupoolid(libxl_ctx *c } free(poolname); } - libxl_cpupoolinfo_dispose(poolinfo + i); } - free(poolinfo); + libxl_cpupoolinfo_list_free(poolinfo, nb_pools); return ret; } @@ -688,6 +687,14 @@ void libxl_vminfo_list_free(libxl_vminfo free(list); } +void libxl_cpupoolinfo_list_free(libxl_cpupoolinfo *list, int nr) +{ + int i; + for (i = 0; i < nr; i++) + libxl_cpupoolinfo_dispose(&list[i]); + free(list); +} + int libxl_domid_valid_guest(uint32_t domid) { /* returns 1 if the value _could_ be a valid guest domid, 0 otherwise diff -r 137b02968b40 -r 7d15860d75ab tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri Jun 01 10:20:40 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Fri Jun 01 12:06:18 2012 +0100 @@ -4610,11 +4610,8 @@ static int sched_domain_output(libxl_sch break; } } - if (poolinfo) { - for (p = 0; p < n_pools; p++) { - libxl_cpupoolinfo_dispose(poolinfo + p); - } - } + if (poolinfo) + libxl_cpupoolinfo_list_free(poolinfo, n_pools); return 0; } @@ -6122,8 +6119,9 @@ int main_cpupoollist(int argc, char **ar printf("\n"); } } - libxl_cpupoolinfo_dispose(poolinfo + p); - } + } + + libxl_cpupoolinfo_list_free(poolinfo, n_pools); return ret; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 02 03:11:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Jun 2012 03:11: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 1SaekL-0007ao-Av; Sat, 02 Jun 2012 03:11:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekJ-0007XF-6w for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:19 +0000 Received: from [85.158.143.99:26059] by server-3.bemta-4.messagelabs.com id 99/6F-04252-65489CF4; Sat, 02 Jun 2012 03:11:18 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-216.messagelabs.com!1338606675!21229070!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15783 invoked from network); 2 Jun 2012 03:11:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 2 Jun 2012 03:11:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekF-0000Jw-II for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SaekF-0003WG-Gr for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:15 +0000 Message-Id: Date: Sat, 02 Jun 2012 03:11:14 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: add internal function to get a domain's scheduler 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 # HG changeset patch # User Ian Campbell # Date 1338548778 -3600 # Node ID 7d15860d75abcb1e81982edaa1d0c2aacb4ef70c # Parent 137b02968b406c19124819d00cba46a990834b52 libxl: add internal function to get a domain's scheduler This takes into account cpupools. Add a helper to get the info for a single cpu pool, refactor libxl_list_cpupool t use this. While there fix the leaks due to not disposing the partial list on realloc failure in that function. Fix the failure of sched_domain_output to free the poolinfo list. Signed-off-by: Ian Campbell Acked-by: George Dunlap Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 137b02968b40 -r 7d15860d75ab tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri Jun 01 10:20:40 2012 +0100 +++ b/tools/libxl/libxl.c Fri Jun 01 12:06:18 2012 +0100 @@ -552,41 +552,70 @@ int libxl_domain_info(libxl_ctx *ctx, li return 0; } +static int cpupool_info(libxl__gc *gc, + libxl_cpupoolinfo *info, + uint32_t poolid, + bool exact /* exactly poolid or >= poolid */) +{ + xc_cpupoolinfo_t *xcinfo; + int rc = ERROR_FAIL; + + xcinfo = xc_cpupool_getinfo(CTX->xch, poolid); + if (xcinfo == NULL) + return ERROR_FAIL; + + if (exact && xcinfo->cpupool_id != poolid) + goto out; + + info->poolid = xcinfo->cpupool_id; + info->sched = xcinfo->sched_id; + info->n_dom = xcinfo->n_dom; + if (libxl_cpumap_alloc(CTX, &info->cpumap)) + goto out; + memcpy(info->cpumap.map, xcinfo->cpumap, info->cpumap.size); + + rc = 0; +out: + xc_cpupool_infofree(CTX->xch, xcinfo); + return rc; +} + +int libxl_cpupool_info(libxl_ctx *ctx, + libxl_cpupoolinfo *info, uint32_t poolid) +{ + GC_INIT(ctx); + int rc = cpupool_info(gc, info, poolid, true); + GC_FREE; + return rc; +} + libxl_cpupoolinfo * libxl_list_cpupool(libxl_ctx *ctx, int *nb_pool) { - libxl_cpupoolinfo *ptr, *tmp; + GC_INIT(ctx); + libxl_cpupoolinfo info, *ptr, *tmp; int i; - xc_cpupoolinfo_t *info; uint32_t poolid; ptr = NULL; poolid = 0; for (i = 0;; i++) { - info = xc_cpupool_getinfo(ctx->xch, poolid); - if (info == NULL) + if (cpupool_info(gc, &info, poolid, false)) break; tmp = realloc(ptr, (i + 1) * sizeof(libxl_cpupoolinfo)); if (!tmp) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "allocating cpupool info"); - free(ptr); - xc_cpupool_infofree(ctx->xch, info); - return NULL; + libxl_cpupoolinfo_list_free(ptr, i); + goto out; } ptr = tmp; - ptr[i].poolid = info->cpupool_id; - ptr[i].sched = info->sched_id; - ptr[i].n_dom = info->n_dom; - if (libxl_cpumap_alloc(ctx, &ptr[i].cpumap)) { - xc_cpupool_infofree(ctx->xch, info); - break; - } - memcpy(ptr[i].cpumap.map, info->cpumap, ptr[i].cpumap.size); - poolid = info->cpupool_id + 1; - xc_cpupool_infofree(ctx->xch, info); + ptr[i] = info; + poolid = info.poolid + 1; } *nb_pool = i; +out: + GC_FREE; return ptr; } @@ -4031,14 +4060,10 @@ int libxl_cpupool_cpuremove_node(libxl_c } } - for (cpu = 0; cpu < nr_cpus; cpu++) - libxl_cputopology_dispose(&topology[cpu]); - free(topology); + libxl_cputopology_list_free(topology, nr_cpus); out: - for (p = 0; p < n_pools; p++) { - libxl_cpupoolinfo_dispose(poolinfo + p); - } + libxl_cpupoolinfo_list_free(poolinfo, n_pools); return ret; } diff -r 137b02968b40 -r 7d15860d75ab tools/libxl/libxl.h --- a/tools/libxl/libxl.h Fri Jun 01 10:20:40 2012 +0100 +++ b/tools/libxl/libxl.h Fri Jun 01 12:06:18 2012 +0100 @@ -576,6 +576,7 @@ int libxl_domain_info(libxl_ctx*, libxl_ libxl_dominfo * libxl_list_domain(libxl_ctx*, int *nb_domain); void libxl_dominfo_list_free(libxl_dominfo *list, int nr); libxl_cpupoolinfo * libxl_list_cpupool(libxl_ctx*, int *nb_pool); +void libxl_cpupoolinfo_list_free(libxl_cpupoolinfo *list, int nr); libxl_vminfo * libxl_list_vm(libxl_ctx *ctx, int *nb_vm); void libxl_vminfo_list_free(libxl_vminfo *list, int nr); @@ -822,6 +823,7 @@ int libxl_cpupool_cpuadd_node(libxl_ctx int libxl_cpupool_cpuremove(libxl_ctx *ctx, uint32_t poolid, int cpu); int libxl_cpupool_cpuremove_node(libxl_ctx *ctx, uint32_t poolid, int node, int *cpus); int libxl_cpupool_movedomain(libxl_ctx *ctx, uint32_t poolid, uint32_t domid); +int libxl_cpupool_info(libxl_ctx *ctx, libxl_cpupoolinfo *info, uint32_t poolid); int libxl_domid_valid_guest(uint32_t domid); diff -r 137b02968b40 -r 7d15860d75ab tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Fri Jun 01 10:20:40 2012 +0100 +++ b/tools/libxl/libxl_dom.c Fri Jun 01 12:06:18 2012 +0100 @@ -93,6 +93,41 @@ int libxl__domain_shutdown_reason(libxl_ return (info.flags >> XEN_DOMINF_shutdownshift) & XEN_DOMINF_shutdownmask; } +int libxl__domain_cpupool(libxl__gc *gc, uint32_t domid) +{ + xc_domaininfo_t info; + int ret; + + ret = xc_domain_getinfolist(CTX->xch, domid, 1, &info); + if (ret != 1) + return ERROR_FAIL; + if (info.domain != domid) + return ERROR_FAIL; + + return info.cpupool; +} + +libxl_scheduler libxl__domain_scheduler(libxl__gc *gc, uint32_t domid) +{ + uint32_t cpupool = libxl__domain_cpupool(gc, domid); + libxl_cpupoolinfo poolinfo; + libxl_scheduler sched = LIBXL_SCHEDULER_UNKNOWN; + int rc; + + if (cpupool < 0) + return sched; + + rc = libxl_cpupool_info(CTX, &poolinfo, cpupool); + if (rc < 0) + goto out; + + sched = poolinfo.sched; + +out: + libxl_cpupoolinfo_dispose(&poolinfo); + return sched; +} + int libxl__build_pre(libxl__gc *gc, uint32_t domid, libxl_domain_build_info *info, libxl__domain_build_state *state) { diff -r 137b02968b40 -r 7d15860d75ab tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Fri Jun 01 10:20:40 2012 +0100 +++ b/tools/libxl/libxl_internal.h Fri Jun 01 12:06:18 2012 +0100 @@ -740,6 +740,8 @@ _hidden int libxl__file_reference_unmap( /* from xl_dom */ _hidden libxl_domain_type libxl__domain_type(libxl__gc *gc, uint32_t domid); _hidden int libxl__domain_shutdown_reason(libxl__gc *gc, uint32_t domid); +_hidden int libxl__domain_cpupool(libxl__gc *gc, uint32_t domid); +_hidden libxl_scheduler libxl__domain_scheduler(libxl__gc *gc, uint32_t domid); _hidden int libxl__sched_set_params(libxl__gc *gc, uint32_t domid, libxl_sched_params *scparams); #define LIBXL__DOMAIN_IS_TYPE(gc, domid, type) \ libxl__domain_type((gc), (domid)) == LIBXL_DOMAIN_TYPE_##type diff -r 137b02968b40 -r 7d15860d75ab tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Fri Jun 01 10:20:40 2012 +0100 +++ b/tools/libxl/libxl_types.idl Fri Jun 01 12:06:18 2012 +0100 @@ -107,7 +107,9 @@ libxl_bios_type = Enumeration("bios_type ]) # Consistent with values defined in domctl.h +# Except unknown which we have made up libxl_scheduler = Enumeration("scheduler", [ + (0, "unknown"), (4, "sedf"), (5, "credit"), (6, "credit2"), diff -r 137b02968b40 -r 7d15860d75ab tools/libxl/libxl_utils.c --- a/tools/libxl/libxl_utils.c Fri Jun 01 10:20:40 2012 +0100 +++ b/tools/libxl/libxl_utils.c Fri Jun 01 12:06:18 2012 +0100 @@ -133,9 +133,8 @@ int libxl_name_to_cpupoolid(libxl_ctx *c } free(poolname); } - libxl_cpupoolinfo_dispose(poolinfo + i); } - free(poolinfo); + libxl_cpupoolinfo_list_free(poolinfo, nb_pools); return ret; } @@ -688,6 +687,14 @@ void libxl_vminfo_list_free(libxl_vminfo free(list); } +void libxl_cpupoolinfo_list_free(libxl_cpupoolinfo *list, int nr) +{ + int i; + for (i = 0; i < nr; i++) + libxl_cpupoolinfo_dispose(&list[i]); + free(list); +} + int libxl_domid_valid_guest(uint32_t domid) { /* returns 1 if the value _could_ be a valid guest domid, 0 otherwise diff -r 137b02968b40 -r 7d15860d75ab tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri Jun 01 10:20:40 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Fri Jun 01 12:06:18 2012 +0100 @@ -4610,11 +4610,8 @@ static int sched_domain_output(libxl_sch break; } } - if (poolinfo) { - for (p = 0; p < n_pools; p++) { - libxl_cpupoolinfo_dispose(poolinfo + p); - } - } + if (poolinfo) + libxl_cpupoolinfo_list_free(poolinfo, n_pools); return 0; } @@ -6122,8 +6119,9 @@ int main_cpupoollist(int argc, char **ar printf("\n"); } } - libxl_cpupoolinfo_dispose(poolinfo + p); - } + } + + libxl_cpupoolinfo_list_free(poolinfo, n_pools); return ret; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 02 03:11:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Jun 2012 03:11:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekN-0007dO-UW; Sat, 02 Jun 2012 03:11:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekL-0007ZD-3S for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:21 +0000 Received: from [85.158.138.51:38689] by server-4.bemta-3.messagelabs.com id 2E/38-32504-85489CF4; Sat, 02 Jun 2012 03:11:20 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-174.messagelabs.com!1338606677!30430013!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=1.1 required=7.0 tests=BODY_RANDOM_LONG,DIET_1 X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29736 invoked from network); 2 Jun 2012 03:11:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 2 Jun 2012 03:11:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekG-0000K2-PR for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SaekG-0003Wk-Ky for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:16 +0000 Message-Id: Date: Sat, 02 Jun 2012 03:11:16 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: make it possible to explicitly specify default sched params 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 # HG changeset patch # User Ian Campbell # Date 1338548780 -3600 # Node ID 53a905c9bb9a784e205c29a39f76153399e27ee0 # Parent 648508ee27a22b724b8d2d636550af2c25a9a38a libxl: make it possible to explicitly specify default sched params To do so we define a discriminating value which is never a valid real value for each parameter. While there: - removed libxl_sched_*_domain in favour of libxl_domain_sched_params. - use this new functionality for the various xl commands which set sched parameters, which saves an explicit read-modify-write in xl. - removed call of xc_domain_getinfolist from a few functions which weren't actually using the result (looks like a cut and paste error) - fix xl which was setting period for a variety of different config keys. Signed-off-by: Ian Campbell Acked-by: George Dunlap Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 648508ee27a2 -r 53a905c9bb9a tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri Jun 01 12:06:19 2012 +0100 +++ b/tools/libxl/libxl.c Fri Jun 01 12:06:20 2012 +0100 @@ -3296,19 +3296,19 @@ libxl_scheduler libxl_get_scheduler(libx } int libxl_sched_credit_domain_get(libxl_ctx *ctx, uint32_t domid, - libxl_sched_credit_domain *scinfo) + libxl_domain_sched_params *scinfo) { struct xen_domctl_sched_credit sdom; int rc; - libxl_sched_credit_domain_init(scinfo); - rc = xc_sched_credit_domain_get(ctx->xch, domid, &sdom); if (rc != 0) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "getting domain sched credit"); return ERROR_FAIL; } + libxl_domain_sched_params_init(scinfo); + scinfo->sched = LIBXL_SCHEDULER_CREDIT; scinfo->weight = sdom.weight; scinfo->cap = sdom.cap; @@ -3316,7 +3316,7 @@ int libxl_sched_credit_domain_get(libxl_ } int libxl_sched_credit_domain_set(libxl_ctx *ctx, uint32_t domid, - libxl_sched_credit_domain *scinfo) + libxl_domain_sched_params *scinfo) { struct xen_domctl_sched_credit sdom; xc_domaininfo_t domaininfo; @@ -3330,22 +3330,33 @@ int libxl_sched_credit_domain_set(libxl_ if (rc != 1 || domaininfo.domain != domid) return ERROR_INVAL; - - if (scinfo->weight < 1 || scinfo->weight > 65535) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "Cpu weight out of range, valid values are within range from 1 to 65535"); - return ERROR_INVAL; + rc = xc_sched_credit_domain_get(ctx->xch, domid, &sdom); + if (rc != 0) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "getting domain sched credit"); + return ERROR_FAIL; } - if (scinfo->cap < 0 || scinfo->cap > (domaininfo.max_vcpu_id + 1) * 100) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "Cpu cap out of range, valid range is from 0 to %d for specified number of vcpus", - ((domaininfo.max_vcpu_id + 1) * 100)); - return ERROR_INVAL; + if (scinfo->weight != LIBXL_DOMAIN_SCHED_PARAM_WEIGHT_DEFAULT) { + if (scinfo->weight < 1 || scinfo->weight > 65535) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, + "Cpu weight out of range, " + "valid values are within range from 1 to 65535"); + return ERROR_INVAL; + } + sdom.weight = scinfo->weight; } - sdom.weight = scinfo->weight; - sdom.cap = scinfo->cap; + if (scinfo->cap != LIBXL_DOMAIN_SCHED_PARAM_CAP_DEFAULT) { + if (scinfo->cap < 0 + || scinfo->cap > (domaininfo.max_vcpu_id + 1) * 100) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, + "Cpu cap out of range, " + "valid range is from 0 to %d for specified number of vcpus", + ((domaininfo.max_vcpu_id + 1) * 100)); + return ERROR_INVAL; + } + sdom.cap = scinfo->cap; + } rc = xc_sched_credit_domain_set(ctx->xch, domid, &sdom); if ( rc < 0 ) { @@ -3418,13 +3429,11 @@ int libxl_sched_credit_params_set(libxl_ } int libxl_sched_credit2_domain_get(libxl_ctx *ctx, uint32_t domid, - libxl_sched_credit2_domain *scinfo) + libxl_domain_sched_params *scinfo) { struct xen_domctl_sched_credit2 sdom; int rc; - libxl_sched_credit2_domain_init(scinfo); - rc = xc_sched_credit2_domain_get(ctx->xch, domid, &sdom); if (rc != 0) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, @@ -3432,36 +3441,37 @@ int libxl_sched_credit2_domain_get(libxl return ERROR_FAIL; } + libxl_domain_sched_params_init(scinfo); + scinfo->sched = LIBXL_SCHEDULER_CREDIT2; scinfo->weight = sdom.weight; return 0; } int libxl_sched_credit2_domain_set(libxl_ctx *ctx, uint32_t domid, - libxl_sched_credit2_domain *scinfo) + libxl_domain_sched_params *scinfo) { struct xen_domctl_sched_credit2 sdom; - xc_domaininfo_t domaininfo; int rc; - rc = xc_domain_getinfolist(ctx->xch, domid, 1, &domaininfo); - if (rc < 0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "getting domain info list"); + rc = xc_sched_credit2_domain_get(ctx->xch, domid, &sdom); + if (rc != 0) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, + "getting domain sched credit2"); return ERROR_FAIL; } - if (rc != 1 || domaininfo.domain != domid) - return ERROR_INVAL; - - - if (scinfo->weight < 1 || scinfo->weight > 65535) { - LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, - "Cpu weight out of range, valid values are within range from " - "1 to 65535"); - return ERROR_INVAL; + + if (scinfo->weight != LIBXL_DOMAIN_SCHED_PARAM_WEIGHT_DEFAULT) { + if (scinfo->weight < 1 || scinfo->weight > 65535) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, + "Cpu weight out of range, " + "valid values are within range from " + "1 to 65535"); + return ERROR_INVAL; + } + sdom.weight = scinfo->weight; } - sdom.weight = scinfo->weight; - rc = xc_sched_credit2_domain_set(ctx->xch, domid, &sdom); if ( rc < 0 ) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, @@ -3473,7 +3483,7 @@ int libxl_sched_credit2_domain_set(libxl } int libxl_sched_sedf_domain_get(libxl_ctx *ctx, uint32_t domid, - libxl_sched_sedf_domain *scinfo) + libxl_domain_sched_params *scinfo) { uint64_t period; uint64_t slice; @@ -3482,8 +3492,6 @@ int libxl_sched_sedf_domain_get(libxl_ct uint16_t weight; int rc; - libxl_sched_sedf_domain_init(scinfo); - rc = xc_sedf_domain_get(ctx->xch, domid, &period, &slice, &latency, &extratime, &weight); if (rc != 0) { @@ -3491,6 +3499,8 @@ int libxl_sched_sedf_domain_get(libxl_ct return ERROR_FAIL; } + libxl_domain_sched_params_init(scinfo); + scinfo->sched = LIBXL_SCHEDULER_SEDF; scinfo->period = period / 1000000; scinfo->slice = slice / 1000000; scinfo->latency = latency / 1000000; @@ -3501,24 +3511,37 @@ int libxl_sched_sedf_domain_get(libxl_ct } int libxl_sched_sedf_domain_set(libxl_ctx *ctx, uint32_t domid, - libxl_sched_sedf_domain *scinfo) + libxl_domain_sched_params *scinfo) { - xc_domaininfo_t domaininfo; - int rc; - - rc = xc_domain_getinfolist(ctx->xch, domid, 1, &domaininfo); - if (rc < 0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "getting domain info list"); + uint64_t period; + uint64_t slice; + uint64_t latency; + uint16_t extratime; + uint16_t weight; + + int ret; + + ret = xc_sedf_domain_get(ctx->xch, domid, &period, &slice, &latency, + &extratime, &weight); + if (ret != 0) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "getting domain sched sedf"); return ERROR_FAIL; } - if (rc != 1 || domaininfo.domain != domid) - return ERROR_INVAL; - - - rc = xc_sedf_domain_set(ctx->xch, domid, scinfo->period * 1000000, - scinfo->slice * 1000000, scinfo->latency * 1000000, - scinfo->extratime, scinfo->weight); - if ( rc < 0 ) { + + if (scinfo->period != LIBXL_DOMAIN_SCHED_PARAM_PERIOD_DEFAULT) + period = scinfo->period * 1000000; + if (scinfo->slice != LIBXL_DOMAIN_SCHED_PARAM_SLICE_DEFAULT) + slice = scinfo->slice * 1000000; + if (scinfo->latency != LIBXL_DOMAIN_SCHED_PARAM_LATENCY_DEFAULT) + latency = scinfo->latency * 1000000; + if (scinfo->extratime != LIBXL_DOMAIN_SCHED_PARAM_EXTRATIME_DEFAULT) + extratime = scinfo->extratime; + if (scinfo->weight != LIBXL_DOMAIN_SCHED_PARAM_WEIGHT_DEFAULT) + weight = scinfo->weight; + + ret = xc_sedf_domain_set(ctx->xch, domid, period, slice, latency, + extratime, weight); + if ( ret < 0 ) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "setting domain sched sedf"); return ERROR_FAIL; } diff -r 648508ee27a2 -r 53a905c9bb9a tools/libxl/libxl.h --- a/tools/libxl/libxl.h Fri Jun 01 12:06:19 2012 +0100 +++ b/tools/libxl/libxl.h Fri Jun 01 12:06:20 2012 +0100 @@ -768,23 +768,33 @@ int libxl_set_vcpuonline(libxl_ctx *ctx, libxl_scheduler libxl_get_scheduler(libxl_ctx *ctx); - -int libxl_sched_credit_domain_get(libxl_ctx *ctx, uint32_t domid, - libxl_sched_credit_domain *scinfo); -int libxl_sched_credit_domain_set(libxl_ctx *ctx, uint32_t domid, - libxl_sched_credit_domain *scinfo); +/* Per-scheduler parameters */ int libxl_sched_credit_params_get(libxl_ctx *ctx, uint32_t poolid, libxl_sched_credit_params *scinfo); int libxl_sched_credit_params_set(libxl_ctx *ctx, uint32_t poolid, libxl_sched_credit_params *scinfo); + +/* Scheduler Per-domain parameters */ + +#define LIBXL_DOMAIN_SCHED_PARAM_WEIGHT_DEFAULT -1 +#define LIBXL_DOMAIN_SCHED_PARAM_CAP_DEFAULT -1 +#define LIBXL_DOMAIN_SCHED_PARAM_PERIOD_DEFAULT -1 +#define LIBXL_DOMAIN_SCHED_PARAM_SLICE_DEFAULT -1 +#define LIBXL_DOMAIN_SCHED_PARAM_LATENCY_DEFAULT -1 +#define LIBXL_DOMAIN_SCHED_PARAM_EXTRATIME_DEFAULT -1 + +int libxl_sched_credit_domain_get(libxl_ctx *ctx, uint32_t domid, + libxl_domain_sched_params *scinfo); +int libxl_sched_credit_domain_set(libxl_ctx *ctx, uint32_t domid, + libxl_domain_sched_params *scinfo); int libxl_sched_credit2_domain_get(libxl_ctx *ctx, uint32_t domid, - libxl_sched_credit2_domain *scinfo); + libxl_domain_sched_params *scinfo); int libxl_sched_credit2_domain_set(libxl_ctx *ctx, uint32_t domid, - libxl_sched_credit2_domain *scinfo); + libxl_domain_sched_params *scinfo); int libxl_sched_sedf_domain_get(libxl_ctx *ctx, uint32_t domid, - libxl_sched_sedf_domain *scinfo); + libxl_domain_sched_params *scinfo); int libxl_sched_sedf_domain_set(libxl_ctx *ctx, uint32_t domid, - libxl_sched_sedf_domain *scinfo); + libxl_domain_sched_params *scinfo); int libxl_send_trigger(libxl_ctx *ctx, uint32_t domid, libxl_trigger trigger, uint32_t vcpuid); int libxl_send_sysrq(libxl_ctx *ctx, uint32_t domid, char sysrq); diff -r 648508ee27a2 -r 53a905c9bb9a tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Fri Jun 01 12:06:19 2012 +0100 +++ b/tools/libxl/libxl_dom.c Fri Jun 01 12:06:20 2012 +0100 @@ -45,34 +45,26 @@ libxl_domain_type libxl__domain_type(lib int libxl__sched_set_params(libxl__gc *gc, uint32_t domid, libxl_domain_sched_params *scparams) { - libxl_ctx *ctx = libxl__gc_owner(gc); - libxl_scheduler sched; - libxl_sched_sedf_domain sedf_info; - libxl_sched_credit_domain credit_info; - libxl_sched_credit2_domain credit2_info; + libxl_scheduler sched = scparams->sched; int ret; - sched = libxl_get_scheduler (ctx); + if (sched == LIBXL_SCHEDULER_UNKNOWN) + sched = libxl__domain_scheduler(gc, domid); + switch (sched) { case LIBXL_SCHEDULER_SEDF: - sedf_info.period = scparams->period; - sedf_info.slice = scparams->slice; - sedf_info.latency = scparams->latency; - sedf_info.extratime = scparams->extratime; - sedf_info.weight = scparams->weight; - ret=libxl_sched_sedf_domain_set(ctx, domid, &sedf_info); - break; + ret=libxl_sched_sedf_domain_set(CTX, domid, scparams); + break; case LIBXL_SCHEDULER_CREDIT: - credit_info.weight = scparams->weight; - credit_info.cap = scparams->cap; - ret=libxl_sched_credit_domain_set(ctx, domid, &credit_info); - break; + ret=libxl_sched_credit_domain_set(CTX, domid, scparams); + break; case LIBXL_SCHEDULER_CREDIT2: - credit2_info.weight = scparams->weight; - ret=libxl_sched_credit2_domain_set(ctx, domid, &credit2_info); - break; + ret=libxl_sched_credit2_domain_set(CTX, domid, scparams); + break; default: - ret=-1; + LOG(ERROR, "Unknown scheduler"); + ret=ERROR_INVAL; + break; } return ret; } diff -r 648508ee27a2 -r 53a905c9bb9a tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Fri Jun 01 12:06:19 2012 +0100 +++ b/tools/libxl/libxl_types.idl Fri Jun 01 12:06:20 2012 +0100 @@ -225,12 +225,13 @@ libxl_domain_create_info = Struct("domai MemKB = UInt(64, init_val = "LIBXL_MEMKB_DEFAULT") libxl_domain_sched_params = Struct("domain_sched_params",[ - ("weight", integer), - ("cap", integer), - ("period", integer), - ("slice", integer), - ("latency", integer), - ("extratime", integer), + ("sched", libxl_scheduler), + ("weight", integer, {'init_val': 'LIBXL_DOMAIN_SCHED_PARAM_WEIGHT_DEFAULT'}), + ("cap", integer, {'init_val': 'LIBXL_DOMAIN_SCHED_PARAM_CAP_DEFAULT'}), + ("period", integer, {'init_val': 'LIBXL_DOMAIN_SCHED_PARAM_PERIOD_DEFAULT'}), + ("slice", integer, {'init_val': 'LIBXL_DOMAIN_SCHED_PARAM_SLICE_DEFAULT'}), + ("latency", integer, {'init_val': 'LIBXL_DOMAIN_SCHED_PARAM_LATENCY_DEFAULT'}), + ("extratime", integer, {'init_val': 'LIBXL_DOMAIN_SCHED_PARAM_EXTRATIME_DEFAULT'}), ], dir=DIR_IN) libxl_domain_build_info = Struct("domain_build_info",[ @@ -426,28 +427,11 @@ libxl_cputopology = Struct("cputopology" ("node", uint32), ], dir=DIR_OUT) -libxl_sched_credit_domain = Struct("sched_credit_domain", [ - ("weight", integer), - ("cap", integer), - ]) - libxl_sched_credit_params = Struct("sched_credit_params", [ ("tslice_ms", integer), ("ratelimit_us", integer), ], dispose_fn=None) -libxl_sched_credit2_domain = Struct("sched_credit2_domain", [ - ("weight", integer), - ]) - -libxl_sched_sedf_domain = Struct("sched_sedf_domain", [ - ("period", integer), - ("slice", integer), - ("latency", integer), - ("extratime", integer), - ("weight", integer), - ]) - libxl_domain_remus_info = Struct("domain_remus_info",[ ("interval", integer), ("blackhole", bool), diff -r 648508ee27a2 -r 53a905c9bb9a tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri Jun 01 12:06:19 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Fri Jun 01 12:06:20 2012 +0100 @@ -630,7 +630,8 @@ static void parse_config_data(const char if (blkdev_start) b_info->blkdev_start = strdup(blkdev_start); - /* the following is the actual config parsing with overriding values in the structures */ + /* the following is the actual config parsing with overriding + * values in the structures */ if (!xlu_cfg_get_long (config, "cpu_weight", &l, 0)) b_info->sched_params.weight = l; if (!xlu_cfg_get_long (config, "cap", &l, 0)) @@ -638,11 +639,11 @@ static void parse_config_data(const char if (!xlu_cfg_get_long (config, "period", &l, 0)) b_info->sched_params.period = l; if (!xlu_cfg_get_long (config, "slice", &l, 0)) - b_info->sched_params.period = l; + b_info->sched_params.slice = l; if (!xlu_cfg_get_long (config, "latency", &l, 0)) - b_info->sched_params.period = l; + b_info->sched_params.latency = l; if (!xlu_cfg_get_long (config, "extratime", &l, 0)) - b_info->sched_params.period = l; + b_info->sched_params.extratime = l; if (!xlu_cfg_get_long (config, "vcpus", &l, 0)) { b_info->max_vcpus = l; @@ -4362,7 +4363,7 @@ int main_sharing(int argc, char **argv) return 0; } -static int sched_credit_domain_get(int domid, libxl_sched_credit_domain *scinfo) +static int sched_credit_domain_get(int domid, libxl_domain_sched_params *scinfo) { int rc; @@ -4373,7 +4374,7 @@ static int sched_credit_domain_get(int d return rc; } -static int sched_credit_domain_set(int domid, libxl_sched_credit_domain *scinfo) +static int sched_credit_domain_set(int domid, libxl_domain_sched_params *scinfo) { int rc; @@ -4409,7 +4410,7 @@ static int sched_credit_params_get(int p static int sched_credit_domain_output(int domid) { char *domname; - libxl_sched_credit_domain scinfo; + libxl_domain_sched_params scinfo; int rc; if (domid < 0) { @@ -4426,7 +4427,7 @@ static int sched_credit_domain_output(in scinfo.weight, scinfo.cap); free(domname); - libxl_sched_credit_domain_dispose(&scinfo); + libxl_domain_sched_params_dispose(&scinfo); return 0; } @@ -4452,7 +4453,7 @@ static int sched_credit_pool_output(uint } static int sched_credit2_domain_get( - int domid, libxl_sched_credit2_domain *scinfo) + int domid, libxl_domain_sched_params *scinfo) { int rc; @@ -4464,7 +4465,7 @@ static int sched_credit2_domain_get( } static int sched_credit2_domain_set( - int domid, libxl_sched_credit2_domain *scinfo) + int domid, libxl_domain_sched_params *scinfo) { int rc; @@ -4479,7 +4480,7 @@ static int sched_credit2_domain_output( int domid) { char *domname; - libxl_sched_credit2_domain scinfo; + libxl_domain_sched_params scinfo; int rc; if (domid < 0) { @@ -4495,12 +4496,12 @@ static int sched_credit2_domain_output( domid, scinfo.weight); free(domname); - libxl_sched_credit2_domain_dispose(&scinfo); + libxl_domain_sched_params_dispose(&scinfo); return 0; } static int sched_sedf_domain_get( - int domid, libxl_sched_sedf_domain *scinfo) + int domid, libxl_domain_sched_params *scinfo) { int rc; @@ -4512,7 +4513,7 @@ static int sched_sedf_domain_get( } static int sched_sedf_domain_set( - int domid, libxl_sched_sedf_domain *scinfo) + int domid, libxl_domain_sched_params *scinfo) { int rc; @@ -4526,7 +4527,7 @@ static int sched_sedf_domain_output( int domid) { char *domname; - libxl_sched_sedf_domain scinfo; + libxl_domain_sched_params scinfo; int rc; if (domid < 0) { @@ -4547,7 +4548,7 @@ static int sched_sedf_domain_output( scinfo.extratime, scinfo.weight); free(domname); - libxl_sched_sedf_domain_dispose(&scinfo); + libxl_domain_sched_params_dispose(&scinfo); return 0; } @@ -4624,7 +4625,6 @@ static int sched_domain_output(libxl_sch */ int main_sched_credit(int argc, char **argv) { - libxl_sched_credit_domain scinfo; const char *dom = NULL; const char *cpupool = NULL; int weight = 256, cap = 0, opt_w = 0, opt_c = 0; @@ -4699,7 +4699,7 @@ int main_sched_credit(int argc, char **a } if (opt_s) { - libxl_sched_credit_params scparam; + libxl_sched_credit_params scparam; uint32_t poolid = 0; if (cpupool) { @@ -4735,20 +4735,19 @@ int main_sched_credit(int argc, char **a } else { find_domain(dom); - rc = sched_credit_domain_get(domid, &scinfo); - if (rc) - return -rc; - if (!opt_w && !opt_c) { /* output credit scheduler info */ sched_credit_domain_output(-1); return -sched_credit_domain_output(domid); } else { /* set credit scheduler paramaters */ + libxl_domain_sched_params scinfo; + libxl_domain_sched_params_init(&scinfo); + scinfo.sched = LIBXL_SCHEDULER_CREDIT; if (opt_w) scinfo.weight = weight; if (opt_c) scinfo.cap = cap; rc = sched_credit_domain_set(domid, &scinfo); - libxl_sched_credit_domain_dispose(&scinfo); + libxl_domain_sched_params_dispose(&scinfo); if (rc) return -rc; } @@ -4759,7 +4758,6 @@ int main_sched_credit(int argc, char **a int main_sched_credit2(int argc, char **argv) { - libxl_sched_credit2_domain scinfo; const char *dom = NULL; const char *cpupool = NULL; int weight = 256, opt_w = 0; @@ -4814,18 +4812,17 @@ int main_sched_credit2(int argc, char ** } else { find_domain(dom); - rc = sched_credit2_domain_get(domid, &scinfo); - if (rc) - return -rc; - if (!opt_w) { /* output credit2 scheduler info */ sched_credit2_domain_output(-1); return -sched_credit2_domain_output(domid); } else { /* set credit2 scheduler paramaters */ + libxl_domain_sched_params scinfo; + libxl_domain_sched_params_init(&scinfo); + scinfo.sched = LIBXL_SCHEDULER_CREDIT2; if (opt_w) scinfo.weight = weight; rc = sched_credit2_domain_set(domid, &scinfo); - libxl_sched_credit2_domain_dispose(&scinfo); + libxl_domain_sched_params_dispose(&scinfo); if (rc) return -rc; } @@ -4836,7 +4833,6 @@ int main_sched_credit2(int argc, char ** int main_sched_sedf(int argc, char **argv) { - libxl_sched_sedf_domain scinfo; const char *dom = NULL; const char *cpupool = NULL; int period = 0, opt_p = 0; @@ -4919,15 +4915,15 @@ int main_sched_sedf(int argc, char **arg } else { find_domain(dom); - rc = sched_sedf_domain_get(domid, &scinfo); - if (rc) - return -rc; - if (!opt_p && !opt_s && !opt_l && !opt_e && !opt_w) { /* output sedf scheduler info */ sched_sedf_domain_output(-1); return -sched_sedf_domain_output(domid); } else { /* set sedf scheduler paramaters */ + libxl_domain_sched_params scinfo; + libxl_domain_sched_params_init(&scinfo); + scinfo.sched = LIBXL_SCHEDULER_SEDF; + if (opt_p) { scinfo.period = period; scinfo.weight = 0; @@ -4946,7 +4942,7 @@ int main_sched_sedf(int argc, char **arg scinfo.slice = 0; } rc = sched_sedf_domain_set(domid, &scinfo); - libxl_sched_sedf_domain_dispose(&scinfo); + libxl_domain_sched_params_dispose(&scinfo); if (rc) return -rc; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 02 03:11:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Jun 2012 03:11:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekN-0007dO-UW; Sat, 02 Jun 2012 03:11:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekL-0007ZD-3S for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:21 +0000 Received: from [85.158.138.51:38689] by server-4.bemta-3.messagelabs.com id 2E/38-32504-85489CF4; Sat, 02 Jun 2012 03:11:20 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-174.messagelabs.com!1338606677!30430013!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=1.1 required=7.0 tests=BODY_RANDOM_LONG,DIET_1 X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29736 invoked from network); 2 Jun 2012 03:11:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 2 Jun 2012 03:11:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekG-0000K2-PR for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SaekG-0003Wk-Ky for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:16 +0000 Message-Id: Date: Sat, 02 Jun 2012 03:11:16 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: make it possible to explicitly specify default sched params 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 # HG changeset patch # User Ian Campbell # Date 1338548780 -3600 # Node ID 53a905c9bb9a784e205c29a39f76153399e27ee0 # Parent 648508ee27a22b724b8d2d636550af2c25a9a38a libxl: make it possible to explicitly specify default sched params To do so we define a discriminating value which is never a valid real value for each parameter. While there: - removed libxl_sched_*_domain in favour of libxl_domain_sched_params. - use this new functionality for the various xl commands which set sched parameters, which saves an explicit read-modify-write in xl. - removed call of xc_domain_getinfolist from a few functions which weren't actually using the result (looks like a cut and paste error) - fix xl which was setting period for a variety of different config keys. Signed-off-by: Ian Campbell Acked-by: George Dunlap Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 648508ee27a2 -r 53a905c9bb9a tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri Jun 01 12:06:19 2012 +0100 +++ b/tools/libxl/libxl.c Fri Jun 01 12:06:20 2012 +0100 @@ -3296,19 +3296,19 @@ libxl_scheduler libxl_get_scheduler(libx } int libxl_sched_credit_domain_get(libxl_ctx *ctx, uint32_t domid, - libxl_sched_credit_domain *scinfo) + libxl_domain_sched_params *scinfo) { struct xen_domctl_sched_credit sdom; int rc; - libxl_sched_credit_domain_init(scinfo); - rc = xc_sched_credit_domain_get(ctx->xch, domid, &sdom); if (rc != 0) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "getting domain sched credit"); return ERROR_FAIL; } + libxl_domain_sched_params_init(scinfo); + scinfo->sched = LIBXL_SCHEDULER_CREDIT; scinfo->weight = sdom.weight; scinfo->cap = sdom.cap; @@ -3316,7 +3316,7 @@ int libxl_sched_credit_domain_get(libxl_ } int libxl_sched_credit_domain_set(libxl_ctx *ctx, uint32_t domid, - libxl_sched_credit_domain *scinfo) + libxl_domain_sched_params *scinfo) { struct xen_domctl_sched_credit sdom; xc_domaininfo_t domaininfo; @@ -3330,22 +3330,33 @@ int libxl_sched_credit_domain_set(libxl_ if (rc != 1 || domaininfo.domain != domid) return ERROR_INVAL; - - if (scinfo->weight < 1 || scinfo->weight > 65535) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "Cpu weight out of range, valid values are within range from 1 to 65535"); - return ERROR_INVAL; + rc = xc_sched_credit_domain_get(ctx->xch, domid, &sdom); + if (rc != 0) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "getting domain sched credit"); + return ERROR_FAIL; } - if (scinfo->cap < 0 || scinfo->cap > (domaininfo.max_vcpu_id + 1) * 100) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "Cpu cap out of range, valid range is from 0 to %d for specified number of vcpus", - ((domaininfo.max_vcpu_id + 1) * 100)); - return ERROR_INVAL; + if (scinfo->weight != LIBXL_DOMAIN_SCHED_PARAM_WEIGHT_DEFAULT) { + if (scinfo->weight < 1 || scinfo->weight > 65535) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, + "Cpu weight out of range, " + "valid values are within range from 1 to 65535"); + return ERROR_INVAL; + } + sdom.weight = scinfo->weight; } - sdom.weight = scinfo->weight; - sdom.cap = scinfo->cap; + if (scinfo->cap != LIBXL_DOMAIN_SCHED_PARAM_CAP_DEFAULT) { + if (scinfo->cap < 0 + || scinfo->cap > (domaininfo.max_vcpu_id + 1) * 100) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, + "Cpu cap out of range, " + "valid range is from 0 to %d for specified number of vcpus", + ((domaininfo.max_vcpu_id + 1) * 100)); + return ERROR_INVAL; + } + sdom.cap = scinfo->cap; + } rc = xc_sched_credit_domain_set(ctx->xch, domid, &sdom); if ( rc < 0 ) { @@ -3418,13 +3429,11 @@ int libxl_sched_credit_params_set(libxl_ } int libxl_sched_credit2_domain_get(libxl_ctx *ctx, uint32_t domid, - libxl_sched_credit2_domain *scinfo) + libxl_domain_sched_params *scinfo) { struct xen_domctl_sched_credit2 sdom; int rc; - libxl_sched_credit2_domain_init(scinfo); - rc = xc_sched_credit2_domain_get(ctx->xch, domid, &sdom); if (rc != 0) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, @@ -3432,36 +3441,37 @@ int libxl_sched_credit2_domain_get(libxl return ERROR_FAIL; } + libxl_domain_sched_params_init(scinfo); + scinfo->sched = LIBXL_SCHEDULER_CREDIT2; scinfo->weight = sdom.weight; return 0; } int libxl_sched_credit2_domain_set(libxl_ctx *ctx, uint32_t domid, - libxl_sched_credit2_domain *scinfo) + libxl_domain_sched_params *scinfo) { struct xen_domctl_sched_credit2 sdom; - xc_domaininfo_t domaininfo; int rc; - rc = xc_domain_getinfolist(ctx->xch, domid, 1, &domaininfo); - if (rc < 0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "getting domain info list"); + rc = xc_sched_credit2_domain_get(ctx->xch, domid, &sdom); + if (rc != 0) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, + "getting domain sched credit2"); return ERROR_FAIL; } - if (rc != 1 || domaininfo.domain != domid) - return ERROR_INVAL; - - - if (scinfo->weight < 1 || scinfo->weight > 65535) { - LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, - "Cpu weight out of range, valid values are within range from " - "1 to 65535"); - return ERROR_INVAL; + + if (scinfo->weight != LIBXL_DOMAIN_SCHED_PARAM_WEIGHT_DEFAULT) { + if (scinfo->weight < 1 || scinfo->weight > 65535) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, + "Cpu weight out of range, " + "valid values are within range from " + "1 to 65535"); + return ERROR_INVAL; + } + sdom.weight = scinfo->weight; } - sdom.weight = scinfo->weight; - rc = xc_sched_credit2_domain_set(ctx->xch, domid, &sdom); if ( rc < 0 ) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, @@ -3473,7 +3483,7 @@ int libxl_sched_credit2_domain_set(libxl } int libxl_sched_sedf_domain_get(libxl_ctx *ctx, uint32_t domid, - libxl_sched_sedf_domain *scinfo) + libxl_domain_sched_params *scinfo) { uint64_t period; uint64_t slice; @@ -3482,8 +3492,6 @@ int libxl_sched_sedf_domain_get(libxl_ct uint16_t weight; int rc; - libxl_sched_sedf_domain_init(scinfo); - rc = xc_sedf_domain_get(ctx->xch, domid, &period, &slice, &latency, &extratime, &weight); if (rc != 0) { @@ -3491,6 +3499,8 @@ int libxl_sched_sedf_domain_get(libxl_ct return ERROR_FAIL; } + libxl_domain_sched_params_init(scinfo); + scinfo->sched = LIBXL_SCHEDULER_SEDF; scinfo->period = period / 1000000; scinfo->slice = slice / 1000000; scinfo->latency = latency / 1000000; @@ -3501,24 +3511,37 @@ int libxl_sched_sedf_domain_get(libxl_ct } int libxl_sched_sedf_domain_set(libxl_ctx *ctx, uint32_t domid, - libxl_sched_sedf_domain *scinfo) + libxl_domain_sched_params *scinfo) { - xc_domaininfo_t domaininfo; - int rc; - - rc = xc_domain_getinfolist(ctx->xch, domid, 1, &domaininfo); - if (rc < 0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "getting domain info list"); + uint64_t period; + uint64_t slice; + uint64_t latency; + uint16_t extratime; + uint16_t weight; + + int ret; + + ret = xc_sedf_domain_get(ctx->xch, domid, &period, &slice, &latency, + &extratime, &weight); + if (ret != 0) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "getting domain sched sedf"); return ERROR_FAIL; } - if (rc != 1 || domaininfo.domain != domid) - return ERROR_INVAL; - - - rc = xc_sedf_domain_set(ctx->xch, domid, scinfo->period * 1000000, - scinfo->slice * 1000000, scinfo->latency * 1000000, - scinfo->extratime, scinfo->weight); - if ( rc < 0 ) { + + if (scinfo->period != LIBXL_DOMAIN_SCHED_PARAM_PERIOD_DEFAULT) + period = scinfo->period * 1000000; + if (scinfo->slice != LIBXL_DOMAIN_SCHED_PARAM_SLICE_DEFAULT) + slice = scinfo->slice * 1000000; + if (scinfo->latency != LIBXL_DOMAIN_SCHED_PARAM_LATENCY_DEFAULT) + latency = scinfo->latency * 1000000; + if (scinfo->extratime != LIBXL_DOMAIN_SCHED_PARAM_EXTRATIME_DEFAULT) + extratime = scinfo->extratime; + if (scinfo->weight != LIBXL_DOMAIN_SCHED_PARAM_WEIGHT_DEFAULT) + weight = scinfo->weight; + + ret = xc_sedf_domain_set(ctx->xch, domid, period, slice, latency, + extratime, weight); + if ( ret < 0 ) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "setting domain sched sedf"); return ERROR_FAIL; } diff -r 648508ee27a2 -r 53a905c9bb9a tools/libxl/libxl.h --- a/tools/libxl/libxl.h Fri Jun 01 12:06:19 2012 +0100 +++ b/tools/libxl/libxl.h Fri Jun 01 12:06:20 2012 +0100 @@ -768,23 +768,33 @@ int libxl_set_vcpuonline(libxl_ctx *ctx, libxl_scheduler libxl_get_scheduler(libxl_ctx *ctx); - -int libxl_sched_credit_domain_get(libxl_ctx *ctx, uint32_t domid, - libxl_sched_credit_domain *scinfo); -int libxl_sched_credit_domain_set(libxl_ctx *ctx, uint32_t domid, - libxl_sched_credit_domain *scinfo); +/* Per-scheduler parameters */ int libxl_sched_credit_params_get(libxl_ctx *ctx, uint32_t poolid, libxl_sched_credit_params *scinfo); int libxl_sched_credit_params_set(libxl_ctx *ctx, uint32_t poolid, libxl_sched_credit_params *scinfo); + +/* Scheduler Per-domain parameters */ + +#define LIBXL_DOMAIN_SCHED_PARAM_WEIGHT_DEFAULT -1 +#define LIBXL_DOMAIN_SCHED_PARAM_CAP_DEFAULT -1 +#define LIBXL_DOMAIN_SCHED_PARAM_PERIOD_DEFAULT -1 +#define LIBXL_DOMAIN_SCHED_PARAM_SLICE_DEFAULT -1 +#define LIBXL_DOMAIN_SCHED_PARAM_LATENCY_DEFAULT -1 +#define LIBXL_DOMAIN_SCHED_PARAM_EXTRATIME_DEFAULT -1 + +int libxl_sched_credit_domain_get(libxl_ctx *ctx, uint32_t domid, + libxl_domain_sched_params *scinfo); +int libxl_sched_credit_domain_set(libxl_ctx *ctx, uint32_t domid, + libxl_domain_sched_params *scinfo); int libxl_sched_credit2_domain_get(libxl_ctx *ctx, uint32_t domid, - libxl_sched_credit2_domain *scinfo); + libxl_domain_sched_params *scinfo); int libxl_sched_credit2_domain_set(libxl_ctx *ctx, uint32_t domid, - libxl_sched_credit2_domain *scinfo); + libxl_domain_sched_params *scinfo); int libxl_sched_sedf_domain_get(libxl_ctx *ctx, uint32_t domid, - libxl_sched_sedf_domain *scinfo); + libxl_domain_sched_params *scinfo); int libxl_sched_sedf_domain_set(libxl_ctx *ctx, uint32_t domid, - libxl_sched_sedf_domain *scinfo); + libxl_domain_sched_params *scinfo); int libxl_send_trigger(libxl_ctx *ctx, uint32_t domid, libxl_trigger trigger, uint32_t vcpuid); int libxl_send_sysrq(libxl_ctx *ctx, uint32_t domid, char sysrq); diff -r 648508ee27a2 -r 53a905c9bb9a tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Fri Jun 01 12:06:19 2012 +0100 +++ b/tools/libxl/libxl_dom.c Fri Jun 01 12:06:20 2012 +0100 @@ -45,34 +45,26 @@ libxl_domain_type libxl__domain_type(lib int libxl__sched_set_params(libxl__gc *gc, uint32_t domid, libxl_domain_sched_params *scparams) { - libxl_ctx *ctx = libxl__gc_owner(gc); - libxl_scheduler sched; - libxl_sched_sedf_domain sedf_info; - libxl_sched_credit_domain credit_info; - libxl_sched_credit2_domain credit2_info; + libxl_scheduler sched = scparams->sched; int ret; - sched = libxl_get_scheduler (ctx); + if (sched == LIBXL_SCHEDULER_UNKNOWN) + sched = libxl__domain_scheduler(gc, domid); + switch (sched) { case LIBXL_SCHEDULER_SEDF: - sedf_info.period = scparams->period; - sedf_info.slice = scparams->slice; - sedf_info.latency = scparams->latency; - sedf_info.extratime = scparams->extratime; - sedf_info.weight = scparams->weight; - ret=libxl_sched_sedf_domain_set(ctx, domid, &sedf_info); - break; + ret=libxl_sched_sedf_domain_set(CTX, domid, scparams); + break; case LIBXL_SCHEDULER_CREDIT: - credit_info.weight = scparams->weight; - credit_info.cap = scparams->cap; - ret=libxl_sched_credit_domain_set(ctx, domid, &credit_info); - break; + ret=libxl_sched_credit_domain_set(CTX, domid, scparams); + break; case LIBXL_SCHEDULER_CREDIT2: - credit2_info.weight = scparams->weight; - ret=libxl_sched_credit2_domain_set(ctx, domid, &credit2_info); - break; + ret=libxl_sched_credit2_domain_set(CTX, domid, scparams); + break; default: - ret=-1; + LOG(ERROR, "Unknown scheduler"); + ret=ERROR_INVAL; + break; } return ret; } diff -r 648508ee27a2 -r 53a905c9bb9a tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Fri Jun 01 12:06:19 2012 +0100 +++ b/tools/libxl/libxl_types.idl Fri Jun 01 12:06:20 2012 +0100 @@ -225,12 +225,13 @@ libxl_domain_create_info = Struct("domai MemKB = UInt(64, init_val = "LIBXL_MEMKB_DEFAULT") libxl_domain_sched_params = Struct("domain_sched_params",[ - ("weight", integer), - ("cap", integer), - ("period", integer), - ("slice", integer), - ("latency", integer), - ("extratime", integer), + ("sched", libxl_scheduler), + ("weight", integer, {'init_val': 'LIBXL_DOMAIN_SCHED_PARAM_WEIGHT_DEFAULT'}), + ("cap", integer, {'init_val': 'LIBXL_DOMAIN_SCHED_PARAM_CAP_DEFAULT'}), + ("period", integer, {'init_val': 'LIBXL_DOMAIN_SCHED_PARAM_PERIOD_DEFAULT'}), + ("slice", integer, {'init_val': 'LIBXL_DOMAIN_SCHED_PARAM_SLICE_DEFAULT'}), + ("latency", integer, {'init_val': 'LIBXL_DOMAIN_SCHED_PARAM_LATENCY_DEFAULT'}), + ("extratime", integer, {'init_val': 'LIBXL_DOMAIN_SCHED_PARAM_EXTRATIME_DEFAULT'}), ], dir=DIR_IN) libxl_domain_build_info = Struct("domain_build_info",[ @@ -426,28 +427,11 @@ libxl_cputopology = Struct("cputopology" ("node", uint32), ], dir=DIR_OUT) -libxl_sched_credit_domain = Struct("sched_credit_domain", [ - ("weight", integer), - ("cap", integer), - ]) - libxl_sched_credit_params = Struct("sched_credit_params", [ ("tslice_ms", integer), ("ratelimit_us", integer), ], dispose_fn=None) -libxl_sched_credit2_domain = Struct("sched_credit2_domain", [ - ("weight", integer), - ]) - -libxl_sched_sedf_domain = Struct("sched_sedf_domain", [ - ("period", integer), - ("slice", integer), - ("latency", integer), - ("extratime", integer), - ("weight", integer), - ]) - libxl_domain_remus_info = Struct("domain_remus_info",[ ("interval", integer), ("blackhole", bool), diff -r 648508ee27a2 -r 53a905c9bb9a tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri Jun 01 12:06:19 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Fri Jun 01 12:06:20 2012 +0100 @@ -630,7 +630,8 @@ static void parse_config_data(const char if (blkdev_start) b_info->blkdev_start = strdup(blkdev_start); - /* the following is the actual config parsing with overriding values in the structures */ + /* the following is the actual config parsing with overriding + * values in the structures */ if (!xlu_cfg_get_long (config, "cpu_weight", &l, 0)) b_info->sched_params.weight = l; if (!xlu_cfg_get_long (config, "cap", &l, 0)) @@ -638,11 +639,11 @@ static void parse_config_data(const char if (!xlu_cfg_get_long (config, "period", &l, 0)) b_info->sched_params.period = l; if (!xlu_cfg_get_long (config, "slice", &l, 0)) - b_info->sched_params.period = l; + b_info->sched_params.slice = l; if (!xlu_cfg_get_long (config, "latency", &l, 0)) - b_info->sched_params.period = l; + b_info->sched_params.latency = l; if (!xlu_cfg_get_long (config, "extratime", &l, 0)) - b_info->sched_params.period = l; + b_info->sched_params.extratime = l; if (!xlu_cfg_get_long (config, "vcpus", &l, 0)) { b_info->max_vcpus = l; @@ -4362,7 +4363,7 @@ int main_sharing(int argc, char **argv) return 0; } -static int sched_credit_domain_get(int domid, libxl_sched_credit_domain *scinfo) +static int sched_credit_domain_get(int domid, libxl_domain_sched_params *scinfo) { int rc; @@ -4373,7 +4374,7 @@ static int sched_credit_domain_get(int d return rc; } -static int sched_credit_domain_set(int domid, libxl_sched_credit_domain *scinfo) +static int sched_credit_domain_set(int domid, libxl_domain_sched_params *scinfo) { int rc; @@ -4409,7 +4410,7 @@ static int sched_credit_params_get(int p static int sched_credit_domain_output(int domid) { char *domname; - libxl_sched_credit_domain scinfo; + libxl_domain_sched_params scinfo; int rc; if (domid < 0) { @@ -4426,7 +4427,7 @@ static int sched_credit_domain_output(in scinfo.weight, scinfo.cap); free(domname); - libxl_sched_credit_domain_dispose(&scinfo); + libxl_domain_sched_params_dispose(&scinfo); return 0; } @@ -4452,7 +4453,7 @@ static int sched_credit_pool_output(uint } static int sched_credit2_domain_get( - int domid, libxl_sched_credit2_domain *scinfo) + int domid, libxl_domain_sched_params *scinfo) { int rc; @@ -4464,7 +4465,7 @@ static int sched_credit2_domain_get( } static int sched_credit2_domain_set( - int domid, libxl_sched_credit2_domain *scinfo) + int domid, libxl_domain_sched_params *scinfo) { int rc; @@ -4479,7 +4480,7 @@ static int sched_credit2_domain_output( int domid) { char *domname; - libxl_sched_credit2_domain scinfo; + libxl_domain_sched_params scinfo; int rc; if (domid < 0) { @@ -4495,12 +4496,12 @@ static int sched_credit2_domain_output( domid, scinfo.weight); free(domname); - libxl_sched_credit2_domain_dispose(&scinfo); + libxl_domain_sched_params_dispose(&scinfo); return 0; } static int sched_sedf_domain_get( - int domid, libxl_sched_sedf_domain *scinfo) + int domid, libxl_domain_sched_params *scinfo) { int rc; @@ -4512,7 +4513,7 @@ static int sched_sedf_domain_get( } static int sched_sedf_domain_set( - int domid, libxl_sched_sedf_domain *scinfo) + int domid, libxl_domain_sched_params *scinfo) { int rc; @@ -4526,7 +4527,7 @@ static int sched_sedf_domain_output( int domid) { char *domname; - libxl_sched_sedf_domain scinfo; + libxl_domain_sched_params scinfo; int rc; if (domid < 0) { @@ -4547,7 +4548,7 @@ static int sched_sedf_domain_output( scinfo.extratime, scinfo.weight); free(domname); - libxl_sched_sedf_domain_dispose(&scinfo); + libxl_domain_sched_params_dispose(&scinfo); return 0; } @@ -4624,7 +4625,6 @@ static int sched_domain_output(libxl_sch */ int main_sched_credit(int argc, char **argv) { - libxl_sched_credit_domain scinfo; const char *dom = NULL; const char *cpupool = NULL; int weight = 256, cap = 0, opt_w = 0, opt_c = 0; @@ -4699,7 +4699,7 @@ int main_sched_credit(int argc, char **a } if (opt_s) { - libxl_sched_credit_params scparam; + libxl_sched_credit_params scparam; uint32_t poolid = 0; if (cpupool) { @@ -4735,20 +4735,19 @@ int main_sched_credit(int argc, char **a } else { find_domain(dom); - rc = sched_credit_domain_get(domid, &scinfo); - if (rc) - return -rc; - if (!opt_w && !opt_c) { /* output credit scheduler info */ sched_credit_domain_output(-1); return -sched_credit_domain_output(domid); } else { /* set credit scheduler paramaters */ + libxl_domain_sched_params scinfo; + libxl_domain_sched_params_init(&scinfo); + scinfo.sched = LIBXL_SCHEDULER_CREDIT; if (opt_w) scinfo.weight = weight; if (opt_c) scinfo.cap = cap; rc = sched_credit_domain_set(domid, &scinfo); - libxl_sched_credit_domain_dispose(&scinfo); + libxl_domain_sched_params_dispose(&scinfo); if (rc) return -rc; } @@ -4759,7 +4758,6 @@ int main_sched_credit(int argc, char **a int main_sched_credit2(int argc, char **argv) { - libxl_sched_credit2_domain scinfo; const char *dom = NULL; const char *cpupool = NULL; int weight = 256, opt_w = 0; @@ -4814,18 +4812,17 @@ int main_sched_credit2(int argc, char ** } else { find_domain(dom); - rc = sched_credit2_domain_get(domid, &scinfo); - if (rc) - return -rc; - if (!opt_w) { /* output credit2 scheduler info */ sched_credit2_domain_output(-1); return -sched_credit2_domain_output(domid); } else { /* set credit2 scheduler paramaters */ + libxl_domain_sched_params scinfo; + libxl_domain_sched_params_init(&scinfo); + scinfo.sched = LIBXL_SCHEDULER_CREDIT2; if (opt_w) scinfo.weight = weight; rc = sched_credit2_domain_set(domid, &scinfo); - libxl_sched_credit2_domain_dispose(&scinfo); + libxl_domain_sched_params_dispose(&scinfo); if (rc) return -rc; } @@ -4836,7 +4833,6 @@ int main_sched_credit2(int argc, char ** int main_sched_sedf(int argc, char **argv) { - libxl_sched_sedf_domain scinfo; const char *dom = NULL; const char *cpupool = NULL; int period = 0, opt_p = 0; @@ -4919,15 +4915,15 @@ int main_sched_sedf(int argc, char **arg } else { find_domain(dom); - rc = sched_sedf_domain_get(domid, &scinfo); - if (rc) - return -rc; - if (!opt_p && !opt_s && !opt_l && !opt_e && !opt_w) { /* output sedf scheduler info */ sched_sedf_domain_output(-1); return -sched_sedf_domain_output(domid); } else { /* set sedf scheduler paramaters */ + libxl_domain_sched_params scinfo; + libxl_domain_sched_params_init(&scinfo); + scinfo.sched = LIBXL_SCHEDULER_SEDF; + if (opt_p) { scinfo.period = period; scinfo.weight = 0; @@ -4946,7 +4942,7 @@ int main_sched_sedf(int argc, char **arg scinfo.slice = 0; } rc = sched_sedf_domain_set(domid, &scinfo); - libxl_sched_sedf_domain_dispose(&scinfo); + libxl_domain_sched_params_dispose(&scinfo); if (rc) return -rc; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 02 03:11:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Jun 2012 03:11:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekO-0007dW-0r; Sat, 02 Jun 2012 03:11:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekL-0007V7-H6 for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:21 +0000 Received: from [85.158.143.35:24702] by server-2.bemta-4.messagelabs.com id 23/FF-11595-95489CF4; Sat, 02 Jun 2012 03:11:21 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-21.messagelabs.com!1338606678!13211386!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.6 required=7.0 tests=DIET_1 X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15968 invoked from network); 2 Jun 2012 03:11:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 2 Jun 2012 03:11:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekH-0000K8-Tl for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SaekH-0003XH-PT for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:17 +0000 Message-Id: Date: Sat, 02 Jun 2012 03:11:17 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: expose a single get/setter for domain scheduler parameters 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 # HG changeset patch # User Ian Campbell # Date 1338548781 -3600 # Node ID 68d46c5ea0a3769a9ed398f8cd7542db1a346dc3 # Parent 4f743faf755977697ad0060f888a93753dc40f54 libxl: expose a single get/setter for domain scheduler parameters This is consistent with having a single struct for all parameters. Effectively renames and exports libxl__sched_set_params as libxl_domain_sched_params_set. libxl_domain_sched_params_get is new. Improve const correctness of the setters while I'm here. Use shorter LOG macros when touching a line anyway. Signed-off-by: Ian Campbell Acked-by: George Dunlap Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 4f743faf7559 -r 68d46c5ea0a3 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri Jun 01 12:06:20 2012 +0100 +++ b/tools/libxl/libxl.c Fri Jun 01 12:06:21 2012 +0100 @@ -3295,15 +3295,15 @@ libxl_scheduler libxl_get_scheduler(libx return sched; } -int libxl_sched_credit_domain_get(libxl_ctx *ctx, uint32_t domid, - libxl_domain_sched_params *scinfo) +static int sched_credit_domain_get(libxl__gc *gc, uint32_t domid, + libxl_domain_sched_params *scinfo) { struct xen_domctl_sched_credit sdom; int rc; - rc = xc_sched_credit_domain_get(ctx->xch, domid, &sdom); + rc = xc_sched_credit_domain_get(CTX->xch, domid, &sdom); if (rc != 0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "getting domain sched credit"); + LOGE(ERROR, "getting domain sched credit"); return ERROR_FAIL; } @@ -3315,32 +3315,31 @@ int libxl_sched_credit_domain_get(libxl_ return 0; } -int libxl_sched_credit_domain_set(libxl_ctx *ctx, uint32_t domid, - libxl_domain_sched_params *scinfo) +static int sched_credit_domain_set(libxl__gc *gc, uint32_t domid, + const libxl_domain_sched_params *scinfo) { struct xen_domctl_sched_credit sdom; xc_domaininfo_t domaininfo; int rc; - rc = xc_domain_getinfolist(ctx->xch, domid, 1, &domaininfo); + rc = xc_domain_getinfolist(CTX->xch, domid, 1, &domaininfo); if (rc < 0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "getting domain info list"); + LOGE(ERROR, "getting domain info list"); return ERROR_FAIL; } if (rc != 1 || domaininfo.domain != domid) return ERROR_INVAL; - rc = xc_sched_credit_domain_get(ctx->xch, domid, &sdom); + rc = xc_sched_credit_domain_get(CTX->xch, domid, &sdom); if (rc != 0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "getting domain sched credit"); + LOGE(ERROR, "getting domain sched credit"); return ERROR_FAIL; } if (scinfo->weight != LIBXL_DOMAIN_SCHED_PARAM_WEIGHT_DEFAULT) { if (scinfo->weight < 1 || scinfo->weight > 65535) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "Cpu weight out of range, " - "valid values are within range from 1 to 65535"); + LOG(ERROR, "Cpu weight out of range, " + "valid values are within range from 1 to 65535"); return ERROR_INVAL; } sdom.weight = scinfo->weight; @@ -3349,18 +3348,17 @@ int libxl_sched_credit_domain_set(libxl_ if (scinfo->cap != LIBXL_DOMAIN_SCHED_PARAM_CAP_DEFAULT) { if (scinfo->cap < 0 || scinfo->cap > (domaininfo.max_vcpu_id + 1) * 100) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "Cpu cap out of range, " + LOG(ERROR, "Cpu cap out of range, " "valid range is from 0 to %d for specified number of vcpus", - ((domaininfo.max_vcpu_id + 1) * 100)); + ((domaininfo.max_vcpu_id + 1) * 100)); return ERROR_INVAL; } sdom.cap = scinfo->cap; } - rc = xc_sched_credit_domain_set(ctx->xch, domid, &sdom); + rc = xc_sched_credit_domain_set(CTX->xch, domid, &sdom); if ( rc < 0 ) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "setting domain sched credit"); + LOGE(ERROR, "setting domain sched credit"); return ERROR_FAIL; } @@ -3428,16 +3426,15 @@ int libxl_sched_credit_params_set(libxl_ return 0; } -int libxl_sched_credit2_domain_get(libxl_ctx *ctx, uint32_t domid, - libxl_domain_sched_params *scinfo) +static int sched_credit2_domain_get(libxl__gc *gc, uint32_t domid, + libxl_domain_sched_params *scinfo) { struct xen_domctl_sched_credit2 sdom; int rc; - rc = xc_sched_credit2_domain_get(ctx->xch, domid, &sdom); + rc = xc_sched_credit2_domain_get(CTX->xch, domid, &sdom); if (rc != 0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, - "getting domain sched credit2"); + LOGE(ERROR, "getting domain sched credit2"); return ERROR_FAIL; } @@ -3448,42 +3445,38 @@ int libxl_sched_credit2_domain_get(libxl return 0; } -int libxl_sched_credit2_domain_set(libxl_ctx *ctx, uint32_t domid, - libxl_domain_sched_params *scinfo) +static int sched_credit2_domain_set(libxl__gc *gc, uint32_t domid, + const libxl_domain_sched_params *scinfo) { struct xen_domctl_sched_credit2 sdom; int rc; - rc = xc_sched_credit2_domain_get(ctx->xch, domid, &sdom); + rc = xc_sched_credit2_domain_get(CTX->xch, domid, &sdom); if (rc != 0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, - "getting domain sched credit2"); + LOGE(ERROR, "getting domain sched credit2"); return ERROR_FAIL; } if (scinfo->weight != LIBXL_DOMAIN_SCHED_PARAM_WEIGHT_DEFAULT) { if (scinfo->weight < 1 || scinfo->weight > 65535) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "Cpu weight out of range, " - "valid values are within range from " - "1 to 65535"); + LOG(ERROR, "Cpu weight out of range, " + "valid values are within range from 1 to 65535"); return ERROR_INVAL; } sdom.weight = scinfo->weight; } - rc = xc_sched_credit2_domain_set(ctx->xch, domid, &sdom); + rc = xc_sched_credit2_domain_set(CTX->xch, domid, &sdom); if ( rc < 0 ) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, - "setting domain sched credit2"); + LOGE(ERROR, "setting domain sched credit2"); return ERROR_FAIL; } return 0; } -int libxl_sched_sedf_domain_get(libxl_ctx *ctx, uint32_t domid, - libxl_domain_sched_params *scinfo) +static int sched_sedf_domain_get(libxl__gc *gc, uint32_t domid, + libxl_domain_sched_params *scinfo) { uint64_t period; uint64_t slice; @@ -3492,10 +3485,10 @@ int libxl_sched_sedf_domain_get(libxl_ct uint16_t weight; int rc; - rc = xc_sedf_domain_get(ctx->xch, domid, &period, &slice, &latency, + rc = xc_sedf_domain_get(CTX->xch, domid, &period, &slice, &latency, &extratime, &weight); if (rc != 0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "getting domain sched sedf"); + LOGE(ERROR, "getting domain sched sedf"); return ERROR_FAIL; } @@ -3510,8 +3503,8 @@ int libxl_sched_sedf_domain_get(libxl_ct return 0; } -int libxl_sched_sedf_domain_set(libxl_ctx *ctx, uint32_t domid, - libxl_domain_sched_params *scinfo) +static int sched_sedf_domain_set(libxl__gc *gc, uint32_t domid, + const libxl_domain_sched_params *scinfo) { uint64_t period; uint64_t slice; @@ -3521,10 +3514,10 @@ int libxl_sched_sedf_domain_set(libxl_ct int ret; - ret = xc_sedf_domain_get(ctx->xch, domid, &period, &slice, &latency, + ret = xc_sedf_domain_get(CTX->xch, domid, &period, &slice, &latency, &extratime, &weight); if (ret != 0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "getting domain sched sedf"); + LOGE(ERROR, "getting domain sched sedf"); return ERROR_FAIL; } @@ -3539,20 +3532,21 @@ int libxl_sched_sedf_domain_set(libxl_ct if (scinfo->weight != LIBXL_DOMAIN_SCHED_PARAM_WEIGHT_DEFAULT) weight = scinfo->weight; - ret = xc_sedf_domain_set(ctx->xch, domid, period, slice, latency, + ret = xc_sedf_domain_set(CTX->xch, domid, period, slice, latency, extratime, weight); if ( ret < 0 ) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "setting domain sched sedf"); + LOGE(ERROR, "setting domain sched sedf"); return ERROR_FAIL; } return 0; } -int libxl__sched_set_params(libxl__gc *gc, uint32_t domid, - libxl_domain_sched_params *scparams) +int libxl_domain_sched_params_set(libxl_ctx *ctx, uint32_t domid, + const libxl_domain_sched_params *scinfo) { - libxl_scheduler sched = scparams->sched; + GC_INIT(ctx); + libxl_scheduler sched = scinfo->sched; int ret; if (sched == LIBXL_SCHEDULER_UNKNOWN) @@ -3560,19 +3554,51 @@ int libxl__sched_set_params(libxl__gc *g switch (sched) { case LIBXL_SCHEDULER_SEDF: - ret=libxl_sched_sedf_domain_set(CTX, domid, scparams); + ret=sched_sedf_domain_set(gc, domid, scinfo); break; case LIBXL_SCHEDULER_CREDIT: - ret=libxl_sched_credit_domain_set(CTX, domid, scparams); + ret=sched_credit_domain_set(gc, domid, scinfo); break; case LIBXL_SCHEDULER_CREDIT2: - ret=libxl_sched_credit2_domain_set(CTX, domid, scparams); + ret=sched_credit2_domain_set(gc, domid, scinfo); break; default: LOG(ERROR, "Unknown scheduler"); ret=ERROR_INVAL; break; } + + GC_FREE; + return ret; +} + +int libxl_domain_sched_params_get(libxl_ctx *ctx, uint32_t domid, + libxl_domain_sched_params *scinfo) +{ + GC_INIT(ctx); + int ret; + + libxl_domain_sched_params_init(scinfo); + + scinfo->sched = libxl__domain_scheduler(gc, domid); + + switch (scinfo->sched) { + case LIBXL_SCHEDULER_SEDF: + ret=sched_sedf_domain_get(gc, domid, scinfo); + break; + case LIBXL_SCHEDULER_CREDIT: + ret=sched_credit_domain_get(gc, domid, scinfo); + break; + case LIBXL_SCHEDULER_CREDIT2: + ret=sched_credit2_domain_get(gc, domid, scinfo); + break; + default: + LOG(ERROR, "Unknown scheduler"); + ret=ERROR_INVAL; + break; + } + + GC_FREE; return ret; } diff -r 4f743faf7559 -r 68d46c5ea0a3 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Fri Jun 01 12:06:20 2012 +0100 +++ b/tools/libxl/libxl.h Fri Jun 01 12:06:21 2012 +0100 @@ -783,18 +783,11 @@ int libxl_sched_credit_params_set(libxl_ #define LIBXL_DOMAIN_SCHED_PARAM_LATENCY_DEFAULT -1 #define LIBXL_DOMAIN_SCHED_PARAM_EXTRATIME_DEFAULT -1 -int libxl_sched_credit_domain_get(libxl_ctx *ctx, uint32_t domid, - libxl_domain_sched_params *scinfo); -int libxl_sched_credit_domain_set(libxl_ctx *ctx, uint32_t domid, - libxl_domain_sched_params *scinfo); -int libxl_sched_credit2_domain_get(libxl_ctx *ctx, uint32_t domid, - libxl_domain_sched_params *scinfo); -int libxl_sched_credit2_domain_set(libxl_ctx *ctx, uint32_t domid, - libxl_domain_sched_params *scinfo); -int libxl_sched_sedf_domain_get(libxl_ctx *ctx, uint32_t domid, - libxl_domain_sched_params *scinfo); -int libxl_sched_sedf_domain_set(libxl_ctx *ctx, uint32_t domid, - libxl_domain_sched_params *scinfo); +int libxl_domain_sched_params_get(libxl_ctx *ctx, uint32_t domid, + libxl_domain_sched_params *params); +int libxl_domain_sched_params_set(libxl_ctx *ctx, uint32_t domid, + const libxl_domain_sched_params *params); + int libxl_send_trigger(libxl_ctx *ctx, uint32_t domid, libxl_trigger trigger, uint32_t vcpuid); int libxl_send_sysrq(libxl_ctx *ctx, uint32_t domid, char sysrq); diff -r 4f743faf7559 -r 68d46c5ea0a3 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Fri Jun 01 12:06:20 2012 +0100 +++ b/tools/libxl/libxl_dom.c Fri Jun 01 12:06:21 2012 +0100 @@ -174,7 +174,7 @@ int libxl__build_post(libxl__gc *gc, uin char **ents, **hvm_ents; int i; - libxl__sched_set_params (gc, domid, &(info->sched_params)); + libxl_domain_sched_params_set(CTX, domid, &info->sched_params); libxl_cpuid_apply_policy(ctx, domid); if (info->cpuid != NULL) diff -r 4f743faf7559 -r 68d46c5ea0a3 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri Jun 01 12:06:20 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Fri Jun 01 12:06:21 2012 +0100 @@ -4363,24 +4363,33 @@ int main_sharing(int argc, char **argv) return 0; } -static int sched_credit_domain_get(int domid, libxl_domain_sched_params *scinfo) +static int sched_domain_get(libxl_scheduler sched, int domid, + libxl_domain_sched_params *scinfo) { int rc; - rc = libxl_sched_credit_domain_get(ctx, domid, scinfo); - if (rc) - fprintf(stderr, "libxl_sched_credit_domain_get failed.\n"); - - return rc; -} - -static int sched_credit_domain_set(int domid, libxl_domain_sched_params *scinfo) + rc = libxl_domain_sched_params_get(ctx, domid, scinfo); + if (rc) { + fprintf(stderr, "libxl_domain_sched_params_get failed.\n"); + return rc; + } + if (scinfo->sched != sched) { + fprintf(stderr, "libxl_domain_sched_params_get returned %s not %s.\n", + libxl_scheduler_to_string(scinfo->sched), + libxl_scheduler_to_string(sched)); + return ERROR_INVAL; + } + + return 0; +} + +static int sched_domain_set(int domid, const libxl_domain_sched_params *scinfo) { int rc; - rc = libxl_sched_credit_domain_set(ctx, domid, scinfo); + rc = libxl_domain_sched_params_set(ctx, domid, scinfo); if (rc) - fprintf(stderr, "libxl_sched_credit_domain_set failed.\n"); + fprintf(stderr, "libxl_domain_sched_params_set failed.\n"); return rc; } @@ -4417,7 +4426,7 @@ static int sched_credit_domain_output(in printf("%-33s %4s %6s %4s\n", "Name", "ID", "Weight", "Cap"); return 0; } - rc = sched_credit_domain_get(domid, &scinfo); + rc = sched_domain_get(LIBXL_SCHEDULER_CREDIT, domid, &scinfo); if (rc) return rc; domname = libxl_domid_to_name(ctx, domid); @@ -4452,30 +4461,6 @@ static int sched_credit_pool_output(uint return 0; } -static int sched_credit2_domain_get( - int domid, libxl_domain_sched_params *scinfo) -{ - int rc; - - rc = libxl_sched_credit2_domain_get(ctx, domid, scinfo); - if (rc) - fprintf(stderr, "libxl_sched_credit2_domain_get failed.\n"); - - return rc; -} - -static int sched_credit2_domain_set( - int domid, libxl_domain_sched_params *scinfo) -{ - int rc; - - rc = libxl_sched_credit2_domain_set(ctx, domid, scinfo); - if (rc) - fprintf(stderr, "libxl_sched_credit2_domain_set failed.\n"); - - return rc; -} - static int sched_credit2_domain_output( int domid) { @@ -4487,7 +4472,7 @@ static int sched_credit2_domain_output( printf("%-33s %4s %6s\n", "Name", "ID", "Weight"); return 0; } - rc = sched_credit2_domain_get(domid, &scinfo); + rc = sched_domain_get(LIBXL_SCHEDULER_CREDIT2, domid, &scinfo); if (rc) return rc; domname = libxl_domid_to_name(ctx, domid); @@ -4500,29 +4485,6 @@ static int sched_credit2_domain_output( return 0; } -static int sched_sedf_domain_get( - int domid, libxl_domain_sched_params *scinfo) -{ - int rc; - - rc = libxl_sched_sedf_domain_get(ctx, domid, scinfo); - if (rc) - fprintf(stderr, "libxl_sched_sedf_domain_get failed.\n"); - - return rc; -} - -static int sched_sedf_domain_set( - int domid, libxl_domain_sched_params *scinfo) -{ - int rc; - - rc = libxl_sched_sedf_domain_set(ctx, domid, scinfo); - if (rc) - fprintf(stderr, "libxl_sched_sedf_domain_set failed.\n"); - return rc; -} - static int sched_sedf_domain_output( int domid) { @@ -4535,7 +4497,7 @@ static int sched_sedf_domain_output( "Slice", "Latency", "Extra", "Weight"); return 0; } - rc = sched_sedf_domain_get(domid, &scinfo); + rc = sched_domain_get(LIBXL_SCHEDULER_SEDF, domid, &scinfo); if (rc) return rc; domname = libxl_domid_to_name(ctx, domid); @@ -4746,7 +4708,7 @@ int main_sched_credit(int argc, char **a scinfo.weight = weight; if (opt_c) scinfo.cap = cap; - rc = sched_credit_domain_set(domid, &scinfo); + rc = sched_domain_set(domid, &scinfo); libxl_domain_sched_params_dispose(&scinfo); if (rc) return -rc; @@ -4821,7 +4783,7 @@ int main_sched_credit2(int argc, char ** scinfo.sched = LIBXL_SCHEDULER_CREDIT2; if (opt_w) scinfo.weight = weight; - rc = sched_credit2_domain_set(domid, &scinfo); + rc = sched_domain_set(domid, &scinfo); libxl_domain_sched_params_dispose(&scinfo); if (rc) return -rc; @@ -4941,7 +4903,7 @@ int main_sched_sedf(int argc, char **arg scinfo.period = 0; scinfo.slice = 0; } - rc = sched_sedf_domain_set(domid, &scinfo); + rc = sched_domain_set(domid, &scinfo); libxl_domain_sched_params_dispose(&scinfo); if (rc) return -rc; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 02 03:11:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Jun 2012 03:11:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekO-0007dW-0r; Sat, 02 Jun 2012 03:11:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekL-0007V7-H6 for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:21 +0000 Received: from [85.158.143.35:24702] by server-2.bemta-4.messagelabs.com id 23/FF-11595-95489CF4; Sat, 02 Jun 2012 03:11:21 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-21.messagelabs.com!1338606678!13211386!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.6 required=7.0 tests=DIET_1 X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15968 invoked from network); 2 Jun 2012 03:11:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 2 Jun 2012 03:11:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekH-0000K8-Tl for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SaekH-0003XH-PT for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:17 +0000 Message-Id: Date: Sat, 02 Jun 2012 03:11:17 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: expose a single get/setter for domain scheduler parameters 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 # HG changeset patch # User Ian Campbell # Date 1338548781 -3600 # Node ID 68d46c5ea0a3769a9ed398f8cd7542db1a346dc3 # Parent 4f743faf755977697ad0060f888a93753dc40f54 libxl: expose a single get/setter for domain scheduler parameters This is consistent with having a single struct for all parameters. Effectively renames and exports libxl__sched_set_params as libxl_domain_sched_params_set. libxl_domain_sched_params_get is new. Improve const correctness of the setters while I'm here. Use shorter LOG macros when touching a line anyway. Signed-off-by: Ian Campbell Acked-by: George Dunlap Acked-by: Ian Jackson Committed-by: Ian Campbell --- diff -r 4f743faf7559 -r 68d46c5ea0a3 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Fri Jun 01 12:06:20 2012 +0100 +++ b/tools/libxl/libxl.c Fri Jun 01 12:06:21 2012 +0100 @@ -3295,15 +3295,15 @@ libxl_scheduler libxl_get_scheduler(libx return sched; } -int libxl_sched_credit_domain_get(libxl_ctx *ctx, uint32_t domid, - libxl_domain_sched_params *scinfo) +static int sched_credit_domain_get(libxl__gc *gc, uint32_t domid, + libxl_domain_sched_params *scinfo) { struct xen_domctl_sched_credit sdom; int rc; - rc = xc_sched_credit_domain_get(ctx->xch, domid, &sdom); + rc = xc_sched_credit_domain_get(CTX->xch, domid, &sdom); if (rc != 0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "getting domain sched credit"); + LOGE(ERROR, "getting domain sched credit"); return ERROR_FAIL; } @@ -3315,32 +3315,31 @@ int libxl_sched_credit_domain_get(libxl_ return 0; } -int libxl_sched_credit_domain_set(libxl_ctx *ctx, uint32_t domid, - libxl_domain_sched_params *scinfo) +static int sched_credit_domain_set(libxl__gc *gc, uint32_t domid, + const libxl_domain_sched_params *scinfo) { struct xen_domctl_sched_credit sdom; xc_domaininfo_t domaininfo; int rc; - rc = xc_domain_getinfolist(ctx->xch, domid, 1, &domaininfo); + rc = xc_domain_getinfolist(CTX->xch, domid, 1, &domaininfo); if (rc < 0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "getting domain info list"); + LOGE(ERROR, "getting domain info list"); return ERROR_FAIL; } if (rc != 1 || domaininfo.domain != domid) return ERROR_INVAL; - rc = xc_sched_credit_domain_get(ctx->xch, domid, &sdom); + rc = xc_sched_credit_domain_get(CTX->xch, domid, &sdom); if (rc != 0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "getting domain sched credit"); + LOGE(ERROR, "getting domain sched credit"); return ERROR_FAIL; } if (scinfo->weight != LIBXL_DOMAIN_SCHED_PARAM_WEIGHT_DEFAULT) { if (scinfo->weight < 1 || scinfo->weight > 65535) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "Cpu weight out of range, " - "valid values are within range from 1 to 65535"); + LOG(ERROR, "Cpu weight out of range, " + "valid values are within range from 1 to 65535"); return ERROR_INVAL; } sdom.weight = scinfo->weight; @@ -3349,18 +3348,17 @@ int libxl_sched_credit_domain_set(libxl_ if (scinfo->cap != LIBXL_DOMAIN_SCHED_PARAM_CAP_DEFAULT) { if (scinfo->cap < 0 || scinfo->cap > (domaininfo.max_vcpu_id + 1) * 100) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "Cpu cap out of range, " + LOG(ERROR, "Cpu cap out of range, " "valid range is from 0 to %d for specified number of vcpus", - ((domaininfo.max_vcpu_id + 1) * 100)); + ((domaininfo.max_vcpu_id + 1) * 100)); return ERROR_INVAL; } sdom.cap = scinfo->cap; } - rc = xc_sched_credit_domain_set(ctx->xch, domid, &sdom); + rc = xc_sched_credit_domain_set(CTX->xch, domid, &sdom); if ( rc < 0 ) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "setting domain sched credit"); + LOGE(ERROR, "setting domain sched credit"); return ERROR_FAIL; } @@ -3428,16 +3426,15 @@ int libxl_sched_credit_params_set(libxl_ return 0; } -int libxl_sched_credit2_domain_get(libxl_ctx *ctx, uint32_t domid, - libxl_domain_sched_params *scinfo) +static int sched_credit2_domain_get(libxl__gc *gc, uint32_t domid, + libxl_domain_sched_params *scinfo) { struct xen_domctl_sched_credit2 sdom; int rc; - rc = xc_sched_credit2_domain_get(ctx->xch, domid, &sdom); + rc = xc_sched_credit2_domain_get(CTX->xch, domid, &sdom); if (rc != 0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, - "getting domain sched credit2"); + LOGE(ERROR, "getting domain sched credit2"); return ERROR_FAIL; } @@ -3448,42 +3445,38 @@ int libxl_sched_credit2_domain_get(libxl return 0; } -int libxl_sched_credit2_domain_set(libxl_ctx *ctx, uint32_t domid, - libxl_domain_sched_params *scinfo) +static int sched_credit2_domain_set(libxl__gc *gc, uint32_t domid, + const libxl_domain_sched_params *scinfo) { struct xen_domctl_sched_credit2 sdom; int rc; - rc = xc_sched_credit2_domain_get(ctx->xch, domid, &sdom); + rc = xc_sched_credit2_domain_get(CTX->xch, domid, &sdom); if (rc != 0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, - "getting domain sched credit2"); + LOGE(ERROR, "getting domain sched credit2"); return ERROR_FAIL; } if (scinfo->weight != LIBXL_DOMAIN_SCHED_PARAM_WEIGHT_DEFAULT) { if (scinfo->weight < 1 || scinfo->weight > 65535) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "Cpu weight out of range, " - "valid values are within range from " - "1 to 65535"); + LOG(ERROR, "Cpu weight out of range, " + "valid values are within range from 1 to 65535"); return ERROR_INVAL; } sdom.weight = scinfo->weight; } - rc = xc_sched_credit2_domain_set(ctx->xch, domid, &sdom); + rc = xc_sched_credit2_domain_set(CTX->xch, domid, &sdom); if ( rc < 0 ) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, - "setting domain sched credit2"); + LOGE(ERROR, "setting domain sched credit2"); return ERROR_FAIL; } return 0; } -int libxl_sched_sedf_domain_get(libxl_ctx *ctx, uint32_t domid, - libxl_domain_sched_params *scinfo) +static int sched_sedf_domain_get(libxl__gc *gc, uint32_t domid, + libxl_domain_sched_params *scinfo) { uint64_t period; uint64_t slice; @@ -3492,10 +3485,10 @@ int libxl_sched_sedf_domain_get(libxl_ct uint16_t weight; int rc; - rc = xc_sedf_domain_get(ctx->xch, domid, &period, &slice, &latency, + rc = xc_sedf_domain_get(CTX->xch, domid, &period, &slice, &latency, &extratime, &weight); if (rc != 0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "getting domain sched sedf"); + LOGE(ERROR, "getting domain sched sedf"); return ERROR_FAIL; } @@ -3510,8 +3503,8 @@ int libxl_sched_sedf_domain_get(libxl_ct return 0; } -int libxl_sched_sedf_domain_set(libxl_ctx *ctx, uint32_t domid, - libxl_domain_sched_params *scinfo) +static int sched_sedf_domain_set(libxl__gc *gc, uint32_t domid, + const libxl_domain_sched_params *scinfo) { uint64_t period; uint64_t slice; @@ -3521,10 +3514,10 @@ int libxl_sched_sedf_domain_set(libxl_ct int ret; - ret = xc_sedf_domain_get(ctx->xch, domid, &period, &slice, &latency, + ret = xc_sedf_domain_get(CTX->xch, domid, &period, &slice, &latency, &extratime, &weight); if (ret != 0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "getting domain sched sedf"); + LOGE(ERROR, "getting domain sched sedf"); return ERROR_FAIL; } @@ -3539,20 +3532,21 @@ int libxl_sched_sedf_domain_set(libxl_ct if (scinfo->weight != LIBXL_DOMAIN_SCHED_PARAM_WEIGHT_DEFAULT) weight = scinfo->weight; - ret = xc_sedf_domain_set(ctx->xch, domid, period, slice, latency, + ret = xc_sedf_domain_set(CTX->xch, domid, period, slice, latency, extratime, weight); if ( ret < 0 ) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "setting domain sched sedf"); + LOGE(ERROR, "setting domain sched sedf"); return ERROR_FAIL; } return 0; } -int libxl__sched_set_params(libxl__gc *gc, uint32_t domid, - libxl_domain_sched_params *scparams) +int libxl_domain_sched_params_set(libxl_ctx *ctx, uint32_t domid, + const libxl_domain_sched_params *scinfo) { - libxl_scheduler sched = scparams->sched; + GC_INIT(ctx); + libxl_scheduler sched = scinfo->sched; int ret; if (sched == LIBXL_SCHEDULER_UNKNOWN) @@ -3560,19 +3554,51 @@ int libxl__sched_set_params(libxl__gc *g switch (sched) { case LIBXL_SCHEDULER_SEDF: - ret=libxl_sched_sedf_domain_set(CTX, domid, scparams); + ret=sched_sedf_domain_set(gc, domid, scinfo); break; case LIBXL_SCHEDULER_CREDIT: - ret=libxl_sched_credit_domain_set(CTX, domid, scparams); + ret=sched_credit_domain_set(gc, domid, scinfo); break; case LIBXL_SCHEDULER_CREDIT2: - ret=libxl_sched_credit2_domain_set(CTX, domid, scparams); + ret=sched_credit2_domain_set(gc, domid, scinfo); break; default: LOG(ERROR, "Unknown scheduler"); ret=ERROR_INVAL; break; } + + GC_FREE; + return ret; +} + +int libxl_domain_sched_params_get(libxl_ctx *ctx, uint32_t domid, + libxl_domain_sched_params *scinfo) +{ + GC_INIT(ctx); + int ret; + + libxl_domain_sched_params_init(scinfo); + + scinfo->sched = libxl__domain_scheduler(gc, domid); + + switch (scinfo->sched) { + case LIBXL_SCHEDULER_SEDF: + ret=sched_sedf_domain_get(gc, domid, scinfo); + break; + case LIBXL_SCHEDULER_CREDIT: + ret=sched_credit_domain_get(gc, domid, scinfo); + break; + case LIBXL_SCHEDULER_CREDIT2: + ret=sched_credit2_domain_get(gc, domid, scinfo); + break; + default: + LOG(ERROR, "Unknown scheduler"); + ret=ERROR_INVAL; + break; + } + + GC_FREE; return ret; } diff -r 4f743faf7559 -r 68d46c5ea0a3 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Fri Jun 01 12:06:20 2012 +0100 +++ b/tools/libxl/libxl.h Fri Jun 01 12:06:21 2012 +0100 @@ -783,18 +783,11 @@ int libxl_sched_credit_params_set(libxl_ #define LIBXL_DOMAIN_SCHED_PARAM_LATENCY_DEFAULT -1 #define LIBXL_DOMAIN_SCHED_PARAM_EXTRATIME_DEFAULT -1 -int libxl_sched_credit_domain_get(libxl_ctx *ctx, uint32_t domid, - libxl_domain_sched_params *scinfo); -int libxl_sched_credit_domain_set(libxl_ctx *ctx, uint32_t domid, - libxl_domain_sched_params *scinfo); -int libxl_sched_credit2_domain_get(libxl_ctx *ctx, uint32_t domid, - libxl_domain_sched_params *scinfo); -int libxl_sched_credit2_domain_set(libxl_ctx *ctx, uint32_t domid, - libxl_domain_sched_params *scinfo); -int libxl_sched_sedf_domain_get(libxl_ctx *ctx, uint32_t domid, - libxl_domain_sched_params *scinfo); -int libxl_sched_sedf_domain_set(libxl_ctx *ctx, uint32_t domid, - libxl_domain_sched_params *scinfo); +int libxl_domain_sched_params_get(libxl_ctx *ctx, uint32_t domid, + libxl_domain_sched_params *params); +int libxl_domain_sched_params_set(libxl_ctx *ctx, uint32_t domid, + const libxl_domain_sched_params *params); + int libxl_send_trigger(libxl_ctx *ctx, uint32_t domid, libxl_trigger trigger, uint32_t vcpuid); int libxl_send_sysrq(libxl_ctx *ctx, uint32_t domid, char sysrq); diff -r 4f743faf7559 -r 68d46c5ea0a3 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Fri Jun 01 12:06:20 2012 +0100 +++ b/tools/libxl/libxl_dom.c Fri Jun 01 12:06:21 2012 +0100 @@ -174,7 +174,7 @@ int libxl__build_post(libxl__gc *gc, uin char **ents, **hvm_ents; int i; - libxl__sched_set_params (gc, domid, &(info->sched_params)); + libxl_domain_sched_params_set(CTX, domid, &info->sched_params); libxl_cpuid_apply_policy(ctx, domid); if (info->cpuid != NULL) diff -r 4f743faf7559 -r 68d46c5ea0a3 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Fri Jun 01 12:06:20 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Fri Jun 01 12:06:21 2012 +0100 @@ -4363,24 +4363,33 @@ int main_sharing(int argc, char **argv) return 0; } -static int sched_credit_domain_get(int domid, libxl_domain_sched_params *scinfo) +static int sched_domain_get(libxl_scheduler sched, int domid, + libxl_domain_sched_params *scinfo) { int rc; - rc = libxl_sched_credit_domain_get(ctx, domid, scinfo); - if (rc) - fprintf(stderr, "libxl_sched_credit_domain_get failed.\n"); - - return rc; -} - -static int sched_credit_domain_set(int domid, libxl_domain_sched_params *scinfo) + rc = libxl_domain_sched_params_get(ctx, domid, scinfo); + if (rc) { + fprintf(stderr, "libxl_domain_sched_params_get failed.\n"); + return rc; + } + if (scinfo->sched != sched) { + fprintf(stderr, "libxl_domain_sched_params_get returned %s not %s.\n", + libxl_scheduler_to_string(scinfo->sched), + libxl_scheduler_to_string(sched)); + return ERROR_INVAL; + } + + return 0; +} + +static int sched_domain_set(int domid, const libxl_domain_sched_params *scinfo) { int rc; - rc = libxl_sched_credit_domain_set(ctx, domid, scinfo); + rc = libxl_domain_sched_params_set(ctx, domid, scinfo); if (rc) - fprintf(stderr, "libxl_sched_credit_domain_set failed.\n"); + fprintf(stderr, "libxl_domain_sched_params_set failed.\n"); return rc; } @@ -4417,7 +4426,7 @@ static int sched_credit_domain_output(in printf("%-33s %4s %6s %4s\n", "Name", "ID", "Weight", "Cap"); return 0; } - rc = sched_credit_domain_get(domid, &scinfo); + rc = sched_domain_get(LIBXL_SCHEDULER_CREDIT, domid, &scinfo); if (rc) return rc; domname = libxl_domid_to_name(ctx, domid); @@ -4452,30 +4461,6 @@ static int sched_credit_pool_output(uint return 0; } -static int sched_credit2_domain_get( - int domid, libxl_domain_sched_params *scinfo) -{ - int rc; - - rc = libxl_sched_credit2_domain_get(ctx, domid, scinfo); - if (rc) - fprintf(stderr, "libxl_sched_credit2_domain_get failed.\n"); - - return rc; -} - -static int sched_credit2_domain_set( - int domid, libxl_domain_sched_params *scinfo) -{ - int rc; - - rc = libxl_sched_credit2_domain_set(ctx, domid, scinfo); - if (rc) - fprintf(stderr, "libxl_sched_credit2_domain_set failed.\n"); - - return rc; -} - static int sched_credit2_domain_output( int domid) { @@ -4487,7 +4472,7 @@ static int sched_credit2_domain_output( printf("%-33s %4s %6s\n", "Name", "ID", "Weight"); return 0; } - rc = sched_credit2_domain_get(domid, &scinfo); + rc = sched_domain_get(LIBXL_SCHEDULER_CREDIT2, domid, &scinfo); if (rc) return rc; domname = libxl_domid_to_name(ctx, domid); @@ -4500,29 +4485,6 @@ static int sched_credit2_domain_output( return 0; } -static int sched_sedf_domain_get( - int domid, libxl_domain_sched_params *scinfo) -{ - int rc; - - rc = libxl_sched_sedf_domain_get(ctx, domid, scinfo); - if (rc) - fprintf(stderr, "libxl_sched_sedf_domain_get failed.\n"); - - return rc; -} - -static int sched_sedf_domain_set( - int domid, libxl_domain_sched_params *scinfo) -{ - int rc; - - rc = libxl_sched_sedf_domain_set(ctx, domid, scinfo); - if (rc) - fprintf(stderr, "libxl_sched_sedf_domain_set failed.\n"); - return rc; -} - static int sched_sedf_domain_output( int domid) { @@ -4535,7 +4497,7 @@ static int sched_sedf_domain_output( "Slice", "Latency", "Extra", "Weight"); return 0; } - rc = sched_sedf_domain_get(domid, &scinfo); + rc = sched_domain_get(LIBXL_SCHEDULER_SEDF, domid, &scinfo); if (rc) return rc; domname = libxl_domid_to_name(ctx, domid); @@ -4746,7 +4708,7 @@ int main_sched_credit(int argc, char **a scinfo.weight = weight; if (opt_c) scinfo.cap = cap; - rc = sched_credit_domain_set(domid, &scinfo); + rc = sched_domain_set(domid, &scinfo); libxl_domain_sched_params_dispose(&scinfo); if (rc) return -rc; @@ -4821,7 +4783,7 @@ int main_sched_credit2(int argc, char ** scinfo.sched = LIBXL_SCHEDULER_CREDIT2; if (opt_w) scinfo.weight = weight; - rc = sched_credit2_domain_set(domid, &scinfo); + rc = sched_domain_set(domid, &scinfo); libxl_domain_sched_params_dispose(&scinfo); if (rc) return -rc; @@ -4941,7 +4903,7 @@ int main_sched_sedf(int argc, char **arg scinfo.period = 0; scinfo.slice = 0; } - rc = sched_sedf_domain_set(domid, &scinfo); + rc = sched_domain_set(domid, &scinfo); libxl_domain_sched_params_dispose(&scinfo); if (rc) return -rc; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 02 03:11:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Jun 2012 03:11:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekN-0007d7-OT; Sat, 02 Jun 2012 03:11:23 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekL-0007VB-BV for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:21 +0000 Received: from [85.158.143.99:40388] by server-1.bemta-4.messagelabs.com id 71/ED-27869-95489CF4; Sat, 02 Jun 2012 03:11:21 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-216.messagelabs.com!1338606679!25729314!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32494 invoked from network); 2 Jun 2012 03:11:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 2 Jun 2012 03:11:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekI-0000KB-LG for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SaekI-0003XX-9Z for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:18 +0000 Message-Id: Date: Sat, 02 Jun 2012 03:11:17 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: fix typos in libxl_cpuid_parse_config 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 # HG changeset patch # User Olaf Hering # Date 1338548782 -3600 # Node ID 3b4346d6002e9ffcd4a9f50b031bd2a77b16b1dd # Parent 68d46c5ea0a3769a9ed398f8cd7542db1a346dc3 libxl: fix typos in libxl_cpuid_parse_config Fix typo in comment. Fix cpuid_flags array init, use correct number of arguments for empty array entry. Signed-off-by: Olaf Hering Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 68d46c5ea0a3 -r 3b4346d6002e tools/libxl/libxl_cpuid.c --- a/tools/libxl/libxl_cpuid.c Fri Jun 01 12:06:21 2012 +0100 +++ b/tools/libxl/libxl_cpuid.c Fri Jun 01 12:06:22 2012 +0100 @@ -185,7 +185,7 @@ int libxl_cpuid_parse_config(libxl_cpuid {"svm_decode", 0x8000000a, NA, CPUID_REG_EDX, 7, 1}, {"svm_pausefilt",0x8000000a, NA, CPUID_REG_EDX, 10, 1}, - {NULL, 0, CPUID_REG_INV, 0, 0} + {NULL, 0, NA, CPUID_REG_INV, 0, 0} }; #undef NA char *sep, *val, *endptr; @@ -216,7 +216,7 @@ int libxl_cpuid_parse_config(libxl_cpuid num = strtoull(val, &endptr, 0); flags[flag->length] = 0; if (endptr != val) { - /* is this was a valid number, write the binary form into the string */ + /* if this was a valid number, write the binary form into the string */ for (i = 0; i < flag->length; i++) { flags[flag->length - 1 - i] = "01"[!!(num & (1 << i))]; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 02 03:11:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Jun 2012 03:11:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekN-0007d7-OT; Sat, 02 Jun 2012 03:11:23 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekL-0007VB-BV for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:21 +0000 Received: from [85.158.143.99:40388] by server-1.bemta-4.messagelabs.com id 71/ED-27869-95489CF4; Sat, 02 Jun 2012 03:11:21 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-216.messagelabs.com!1338606679!25729314!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32494 invoked from network); 2 Jun 2012 03:11:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 2 Jun 2012 03:11:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekI-0000KB-LG for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SaekI-0003XX-9Z for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:18 +0000 Message-Id: Date: Sat, 02 Jun 2012 03:11:17 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: fix typos in libxl_cpuid_parse_config 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 # HG changeset patch # User Olaf Hering # Date 1338548782 -3600 # Node ID 3b4346d6002e9ffcd4a9f50b031bd2a77b16b1dd # Parent 68d46c5ea0a3769a9ed398f8cd7542db1a346dc3 libxl: fix typos in libxl_cpuid_parse_config Fix typo in comment. Fix cpuid_flags array init, use correct number of arguments for empty array entry. Signed-off-by: Olaf Hering Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 68d46c5ea0a3 -r 3b4346d6002e tools/libxl/libxl_cpuid.c --- a/tools/libxl/libxl_cpuid.c Fri Jun 01 12:06:21 2012 +0100 +++ b/tools/libxl/libxl_cpuid.c Fri Jun 01 12:06:22 2012 +0100 @@ -185,7 +185,7 @@ int libxl_cpuid_parse_config(libxl_cpuid {"svm_decode", 0x8000000a, NA, CPUID_REG_EDX, 7, 1}, {"svm_pausefilt",0x8000000a, NA, CPUID_REG_EDX, 10, 1}, - {NULL, 0, CPUID_REG_INV, 0, 0} + {NULL, 0, NA, CPUID_REG_INV, 0, 0} }; #undef NA char *sep, *val, *endptr; @@ -216,7 +216,7 @@ int libxl_cpuid_parse_config(libxl_cpuid num = strtoull(val, &endptr, 0); flags[flag->length] = 0; if (endptr != val) { - /* is this was a valid number, write the binary form into the string */ + /* if this was a valid number, write the binary form into the string */ for (i = 0; i < flag->length; i++) { flags[flag->length - 1 - i] = "01"[!!(num & (1 << i))]; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 02 03:11:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Jun 2012 03:11:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekN-0007dG-R5; Sat, 02 Jun 2012 03:11:23 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekL-0007XF-FD for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:21 +0000 Received: from [85.158.143.35:24699] by server-3.bemta-4.messagelabs.com id 2E/6F-04252-95489CF4; Sat, 02 Jun 2012 03:11:21 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-21.messagelabs.com!1338606679!16183174!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18043 invoked from network); 2 Jun 2012 03:11:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 2 Jun 2012 03:11:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekJ-0000KE-6a for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SaekJ-0003Xn-4L for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:19 +0000 Message-Id: Date: Sat, 02 Jun 2012 03:11:18 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: fix Makefile race bug relating to _paths.h 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 # HG changeset patch # User Ian Jackson # Date 1338570123 -3600 # Node ID 1e2ce970f0f29af4184d975c4f161f11938070cf # Parent 3b4346d6002e9ffcd4a9f50b031bd2a77b16b1dd libxl: fix Makefile race bug relating to _paths.h _paths.h needs to be in AUTOINCS. That arranges for it to be an explicit dependency of all object files. This is necessary so that it is made before any compilation is attempted. Making it a dependency of xl.h (as in 25426:e53a1d3c212c) is harmless, but not sufficient because that only takes effect if there is already an autogenerated .d file naming xl.h as a dependency of relevant object files. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 3b4346d6002e -r 1e2ce970f0f2 tools/libxl/Makefile --- a/tools/libxl/Makefile Fri Jun 01 12:06:22 2012 +0100 +++ b/tools/libxl/Makefile Fri Jun 01 18:02:03 2012 +0100 @@ -72,7 +72,7 @@ LIBXL_OBJS += _libxl_types.o libxl_flask $(LIBXL_OBJS): CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore) $(CFLAGS_libblktapctl) -include $(XEN_ROOT)/tools/config.h -AUTOINCS= libxlu_cfg_y.h libxlu_cfg_l.h _libxl_list.h +AUTOINCS= libxlu_cfg_y.h libxlu_cfg_l.h _libxl_list.h _paths.h AUTOSRCS= libxlu_cfg_y.c libxlu_cfg_l.c LIBXLU_OBJS = libxlu_cfg_y.o libxlu_cfg_l.o libxlu_cfg.o \ libxlu_disk_l.o libxlu_disk.o libxlu_vif.o libxlu_pci.o _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 02 03:11:24 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Jun 2012 03:11:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekN-0007dG-R5; Sat, 02 Jun 2012 03:11:23 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekL-0007XF-FD for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:21 +0000 Received: from [85.158.143.35:24699] by server-3.bemta-4.messagelabs.com id 2E/6F-04252-95489CF4; Sat, 02 Jun 2012 03:11:21 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-21.messagelabs.com!1338606679!16183174!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18043 invoked from network); 2 Jun 2012 03:11:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 2 Jun 2012 03:11:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SaekJ-0000KE-6a for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SaekJ-0003Xn-4L for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 03:11:19 +0000 Message-Id: Date: Sat, 02 Jun 2012 03:11:18 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: fix Makefile race bug relating to _paths.h 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 # HG changeset patch # User Ian Jackson # Date 1338570123 -3600 # Node ID 1e2ce970f0f29af4184d975c4f161f11938070cf # Parent 3b4346d6002e9ffcd4a9f50b031bd2a77b16b1dd libxl: fix Makefile race bug relating to _paths.h _paths.h needs to be in AUTOINCS. That arranges for it to be an explicit dependency of all object files. This is necessary so that it is made before any compilation is attempted. Making it a dependency of xl.h (as in 25426:e53a1d3c212c) is harmless, but not sufficient because that only takes effect if there is already an autogenerated .d file naming xl.h as a dependency of relevant object files. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- diff -r 3b4346d6002e -r 1e2ce970f0f2 tools/libxl/Makefile --- a/tools/libxl/Makefile Fri Jun 01 12:06:22 2012 +0100 +++ b/tools/libxl/Makefile Fri Jun 01 18:02:03 2012 +0100 @@ -72,7 +72,7 @@ LIBXL_OBJS += _libxl_types.o libxl_flask $(LIBXL_OBJS): CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore) $(CFLAGS_libblktapctl) -include $(XEN_ROOT)/tools/config.h -AUTOINCS= libxlu_cfg_y.h libxlu_cfg_l.h _libxl_list.h +AUTOINCS= libxlu_cfg_y.h libxlu_cfg_l.h _libxl_list.h _paths.h AUTOSRCS= libxlu_cfg_y.c libxlu_cfg_l.c LIBXLU_OBJS = libxlu_cfg_y.o libxlu_cfg_l.o libxlu_cfg.o \ libxlu_disk_l.o libxlu_disk.o libxlu_vif.o libxlu_pci.o _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 02 14:11:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Jun 2012 14:11: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 1Sap2x-0001PC-VC; Sat, 02 Jun 2012 14:11:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Sap2v-0001P5-Vh for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 14:11:14 +0000 Received: from [85.158.143.99:13262] by server-2.bemta-4.messagelabs.com id E3/38-11595-10F1ACF4; Sat, 02 Jun 2012 14:11:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-216.messagelabs.com!1338646270!30491139!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27859 invoked from network); 2 Jun 2012 14:11:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 2 Jun 2012 14:11:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Sap2r-0007yk-5g for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 14:11:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Sap2q-0001LT-FT for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 14:11:08 +0000 Message-Id: Date: Sat, 02 Jun 2012 14:11:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] ocaml: fix build after 25446:648508ee27a2, 25449:68d46c5ea0a3 et al. 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 # HG changeset patch # User Ian Campbell # Date 1338622785 -3600 # Node ID 6bea63e6c780de6303361e5f190d6925996cd2a2 # Parent 1e2ce970f0f29af4184d975c4f161f11938070cf ocaml: fix build after 25446:648508ee27a2, 25449:68d46c5ea0a3 et al. These renamed a type and the associated functions and the ocaml bindings were not updated to suit. This also highlighted that libxl_domain_sched_params should not be DIR_IN since it is also use as an output struct. Signed-off-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 1e2ce970f0f2 -r 6bea63e6c780 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Fri Jun 01 18:02:03 2012 +0100 +++ b/tools/libxl/libxl_types.idl Sat Jun 02 08:39:45 2012 +0100 @@ -232,7 +232,7 @@ libxl_domain_sched_params = Struct("doma ("slice", integer, {'init_val': 'LIBXL_DOMAIN_SCHED_PARAM_SLICE_DEFAULT'}), ("latency", integer, {'init_val': 'LIBXL_DOMAIN_SCHED_PARAM_LATENCY_DEFAULT'}), ("extratime", integer, {'init_val': 'LIBXL_DOMAIN_SCHED_PARAM_EXTRATIME_DEFAULT'}), - ], dir=DIR_IN) + ]) libxl_domain_build_info = Struct("domain_build_info",[ ("max_vcpus", integer), diff -r 1e2ce970f0f2 -r 6bea63e6c780 tools/ocaml/libs/xl/genwrap.py --- a/tools/ocaml/libs/xl/genwrap.py Fri Jun 01 18:02:03 2012 +0100 +++ b/tools/ocaml/libs/xl/genwrap.py Sat Jun 02 08:39:45 2012 +0100 @@ -32,8 +32,9 @@ functions = { # ( name , [type1,type2,.. ], "cputopology": [ ("get", ["unit", "t array"]), ], - "sched_credit": [ ("domain_get", ["domid", "t"]), - ("domain_set", ["domid", "t", "unit"]), + "domain_sched_params": + [ ("get", ["domid", "t"]), + ("set", ["domid", "t", "unit"]), ], } def stub_fn_name(ty, name): diff -r 1e2ce970f0f2 -r 6bea63e6c780 tools/ocaml/libs/xl/xenlight_stubs.c --- a/tools/ocaml/libs/xl/xenlight_stubs.c Fri Jun 01 18:02:03 2012 +0100 +++ b/tools/ocaml/libs/xl/xenlight_stubs.c Sat Jun 02 08:39:45 2012 +0100 @@ -496,37 +496,37 @@ value stub_xl_cputopology_get(value unit CAMLreturn(topology); } -value stub_xl_sched_credit_domain_get(value domid) +value stub_xl_domain_sched_params_get(value domid) { CAMLparam1(domid); CAMLlocal1(scinfo); - libxl_sched_credit_domain c_scinfo; + libxl_domain_sched_params c_scinfo; int ret; INIT_STRUCT(); INIT_CTX(); - ret = libxl_sched_credit_domain_get(ctx, Int_val(domid), &c_scinfo); + ret = libxl_domain_sched_params_get(ctx, Int_val(domid), &c_scinfo); if (ret != 0) - failwith_xl("sched_credit_domain_get", &lg); + failwith_xl("domain_sched_params_get", &lg); FREE_CTX(); - scinfo = Val_sched_credit_domain(&gc, &lg, &c_scinfo); + scinfo = Val_domain_sched_params(&gc, &lg, &c_scinfo); CAMLreturn(scinfo); } -value stub_xl_sched_credit_domain_set(value domid, value scinfo) +value stub_xl_domain_sched_params_set(value domid, value scinfo) { CAMLparam2(domid, scinfo); - libxl_sched_credit_domain c_scinfo; + libxl_domain_sched_params c_scinfo; int ret; INIT_STRUCT(); - sched_credit_domain_val(&gc, &lg, &c_scinfo, scinfo); + domain_sched_params_val(&gc, &lg, &c_scinfo, scinfo); INIT_CTX(); - ret = libxl_sched_credit_domain_set(ctx, Int_val(domid), &c_scinfo); + ret = libxl_domain_sched_params_set(ctx, Int_val(domid), &c_scinfo); if (ret != 0) - failwith_xl("sched_credit_domain_set", &lg); + failwith_xl("domain_sched_params_set", &lg); FREE_CTX(); CAMLreturn(Val_unit); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Jun 02 14:11:22 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 02 Jun 2012 14:11: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 1Sap2x-0001PC-VC; Sat, 02 Jun 2012 14:11:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Sap2v-0001P5-Vh for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 14:11:14 +0000 Received: from [85.158.143.99:13262] by server-2.bemta-4.messagelabs.com id E3/38-11595-10F1ACF4; Sat, 02 Jun 2012 14:11:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-216.messagelabs.com!1338646270!30491139!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27859 invoked from network); 2 Jun 2012 14:11:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 2 Jun 2012 14:11:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Sap2r-0007yk-5g for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 14:11:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Sap2q-0001LT-FT for xen-changelog@lists.xensource.com; Sat, 02 Jun 2012 14:11:08 +0000 Message-Id: Date: Sat, 02 Jun 2012 14:11:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] ocaml: fix build after 25446:648508ee27a2, 25449:68d46c5ea0a3 et al. 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 # HG changeset patch # User Ian Campbell # Date 1338622785 -3600 # Node ID 6bea63e6c780de6303361e5f190d6925996cd2a2 # Parent 1e2ce970f0f29af4184d975c4f161f11938070cf ocaml: fix build after 25446:648508ee27a2, 25449:68d46c5ea0a3 et al. These renamed a type and the associated functions and the ocaml bindings were not updated to suit. This also highlighted that libxl_domain_sched_params should not be DIR_IN since it is also use as an output struct. Signed-off-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 1e2ce970f0f2 -r 6bea63e6c780 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Fri Jun 01 18:02:03 2012 +0100 +++ b/tools/libxl/libxl_types.idl Sat Jun 02 08:39:45 2012 +0100 @@ -232,7 +232,7 @@ libxl_domain_sched_params = Struct("doma ("slice", integer, {'init_val': 'LIBXL_DOMAIN_SCHED_PARAM_SLICE_DEFAULT'}), ("latency", integer, {'init_val': 'LIBXL_DOMAIN_SCHED_PARAM_LATENCY_DEFAULT'}), ("extratime", integer, {'init_val': 'LIBXL_DOMAIN_SCHED_PARAM_EXTRATIME_DEFAULT'}), - ], dir=DIR_IN) + ]) libxl_domain_build_info = Struct("domain_build_info",[ ("max_vcpus", integer), diff -r 1e2ce970f0f2 -r 6bea63e6c780 tools/ocaml/libs/xl/genwrap.py --- a/tools/ocaml/libs/xl/genwrap.py Fri Jun 01 18:02:03 2012 +0100 +++ b/tools/ocaml/libs/xl/genwrap.py Sat Jun 02 08:39:45 2012 +0100 @@ -32,8 +32,9 @@ functions = { # ( name , [type1,type2,.. ], "cputopology": [ ("get", ["unit", "t array"]), ], - "sched_credit": [ ("domain_get", ["domid", "t"]), - ("domain_set", ["domid", "t", "unit"]), + "domain_sched_params": + [ ("get", ["domid", "t"]), + ("set", ["domid", "t", "unit"]), ], } def stub_fn_name(ty, name): diff -r 1e2ce970f0f2 -r 6bea63e6c780 tools/ocaml/libs/xl/xenlight_stubs.c --- a/tools/ocaml/libs/xl/xenlight_stubs.c Fri Jun 01 18:02:03 2012 +0100 +++ b/tools/ocaml/libs/xl/xenlight_stubs.c Sat Jun 02 08:39:45 2012 +0100 @@ -496,37 +496,37 @@ value stub_xl_cputopology_get(value unit CAMLreturn(topology); } -value stub_xl_sched_credit_domain_get(value domid) +value stub_xl_domain_sched_params_get(value domid) { CAMLparam1(domid); CAMLlocal1(scinfo); - libxl_sched_credit_domain c_scinfo; + libxl_domain_sched_params c_scinfo; int ret; INIT_STRUCT(); INIT_CTX(); - ret = libxl_sched_credit_domain_get(ctx, Int_val(domid), &c_scinfo); + ret = libxl_domain_sched_params_get(ctx, Int_val(domid), &c_scinfo); if (ret != 0) - failwith_xl("sched_credit_domain_get", &lg); + failwith_xl("domain_sched_params_get", &lg); FREE_CTX(); - scinfo = Val_sched_credit_domain(&gc, &lg, &c_scinfo); + scinfo = Val_domain_sched_params(&gc, &lg, &c_scinfo); CAMLreturn(scinfo); } -value stub_xl_sched_credit_domain_set(value domid, value scinfo) +value stub_xl_domain_sched_params_set(value domid, value scinfo) { CAMLparam2(domid, scinfo); - libxl_sched_credit_domain c_scinfo; + libxl_domain_sched_params c_scinfo; int ret; INIT_STRUCT(); - sched_credit_domain_val(&gc, &lg, &c_scinfo, scinfo); + domain_sched_params_val(&gc, &lg, &c_scinfo, scinfo); INIT_CTX(); - ret = libxl_sched_credit_domain_set(ctx, Int_val(domid), &c_scinfo); + ret = libxl_domain_sched_params_set(ctx, Int_val(domid), &c_scinfo); if (ret != 0) - failwith_xl("sched_credit_domain_set", &lg); + failwith_xl("domain_sched_params_set", &lg); FREE_CTX(); CAMLreturn(Val_unit); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jun 04 09:11:16 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Jun 2012 09:11: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 1SbTJd-00016t-C1; Mon, 04 Jun 2012 09:11:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SbTJb-00016o-OH for xen-changelog@lists.xensource.com; Mon, 04 Jun 2012 09:11:08 +0000 Received: from [85.158.139.83:9698] by server-5.bemta-5.messagelabs.com id 11/7A-04481-AAB7CCF4; Mon, 04 Jun 2012 09:11:06 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-182.messagelabs.com!1338801064!31350348!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22844 invoked from network); 4 Jun 2012 09:11:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jun 2012 09:11:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SbTJY-00067n-15 for xen-changelog@lists.xensource.com; Mon, 04 Jun 2012 09:11:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SbTJX-0001Ud-Be for xen-changelog@lists.xensource.com; Mon, 04 Jun 2012 09:11:03 +0000 Message-Id: Date: Mon, 04 Jun 2012 09:11:02 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] update to latest interface version 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 # HG changeset patch # User Jan Beulich # Date 1338799085 -7200 # Node ID 07b22ab8d245b2485ae524de8c5888e327445175 # Parent 90a9c811f4c0bac5a16a9c038deb7d8ce5438723 update to latest interface version Signed-off-by: Jan Beulich --- diff -r 90a9c811f4c0 -r 07b22ab8d245 arch/i386/kernel/setup-xen.c --- a/arch/i386/kernel/setup-xen.c Fri May 11 17:20:53 2012 +0200 +++ b/arch/i386/kernel/setup-xen.c Mon Jun 04 10:38:05 2012 +0200 @@ -1756,8 +1756,6 @@ void __init setup_arch(char **cmdline_p) * kernel parameter); shrink reservation with the HV */ struct xen_memory_reservation reservation = { - .address_bits = 0, - .extent_order = 0, .domid = DOMID_SELF }; unsigned int difference; diff -r 90a9c811f4c0 -r 07b22ab8d245 arch/i386/mm/hypervisor.c --- a/arch/i386/mm/hypervisor.c Fri May 11 17:20:53 2012 +0200 +++ b/arch/i386/mm/hypervisor.c Mon Jun 04 10:38:05 2012 +0200 @@ -266,7 +266,7 @@ int xen_create_contiguous_region( .out = { .nr_extents = 1, .extent_order = order, - .address_bits = address_bits, + .mem_flags = XENMEMF_address_bits(address_bits), .domid = DOMID_SELF } }; @@ -457,7 +457,7 @@ int xen_limit_pages_to_max_mfn( }, .out = { .extent_order = 0, - .address_bits = address_bits, + .mem_flags = XENMEMF_address_bits(address_bits), .domid = DOMID_SELF } }; diff -r 90a9c811f4c0 -r 07b22ab8d245 arch/x86_64/kernel/setup-xen.c --- a/arch/x86_64/kernel/setup-xen.c Fri May 11 17:20:53 2012 +0200 +++ b/arch/x86_64/kernel/setup-xen.c Mon Jun 04 10:38:05 2012 +0200 @@ -787,8 +787,6 @@ void __init setup_arch(char **cmdline_p) * kernel parameter); shrink reservation with the HV */ struct xen_memory_reservation reservation = { - .address_bits = 0, - .extent_order = 0, .domid = DOMID_SELF }; unsigned int difference; diff -r 90a9c811f4c0 -r 07b22ab8d245 drivers/xen/Kconfig --- a/drivers/xen/Kconfig Fri May 11 17:20:53 2012 +0200 +++ b/drivers/xen/Kconfig Mon Jun 04 10:38:05 2012 +0200 @@ -10,7 +10,7 @@ config XEN if XEN config XEN_INTERFACE_VERSION hex - default 0x00030207 + default 0x00040200 menu "XEN" diff -r 90a9c811f4c0 -r 07b22ab8d245 drivers/xen/balloon/balloon.c --- a/drivers/xen/balloon/balloon.c Fri May 11 17:20:53 2012 +0200 +++ b/drivers/xen/balloon/balloon.c Mon Jun 04 10:38:05 2012 +0200 @@ -244,9 +244,7 @@ static int increase_reservation(unsigned struct page *page; long rc; struct xen_memory_reservation reservation = { - .address_bits = 0, - .extent_order = 0, - .domid = DOMID_SELF + .domid = DOMID_SELF }; if (nr_pages > ARRAY_SIZE(frame_list)) @@ -312,9 +310,7 @@ static int decrease_reservation(unsigned int need_sleep = 0; int ret; struct xen_memory_reservation reservation = { - .address_bits = 0, - .extent_order = 0, - .domid = DOMID_SELF + .domid = DOMID_SELF }; if (nr_pages > ARRAY_SIZE(frame_list)) diff -r 90a9c811f4c0 -r 07b22ab8d245 drivers/xen/blkback/common.h --- a/drivers/xen/blkback/common.h Fri May 11 17:20:53 2012 +0200 +++ b/drivers/xen/blkback/common.h Mon Jun 04 10:38:05 2012 +0200 @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include diff -r 90a9c811f4c0 -r 07b22ab8d245 drivers/xen/blkfront/block.h --- a/drivers/xen/blkfront/block.h Fri May 11 17:20:53 2012 +0200 +++ b/drivers/xen/blkfront/block.h Mon Jun 04 10:38:05 2012 +0200 @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include diff -r 90a9c811f4c0 -r 07b22ab8d245 drivers/xen/blktap/common.h --- a/drivers/xen/blktap/common.h Fri May 11 17:20:53 2012 +0200 +++ b/drivers/xen/blktap/common.h Mon Jun 04 10:38:05 2012 +0200 @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include diff -r 90a9c811f4c0 -r 07b22ab8d245 drivers/xen/blktap2/blktap.h --- a/drivers/xen/blktap2/blktap.h Fri May 11 17:20:53 2012 +0200 +++ b/drivers/xen/blktap2/blktap.h Mon Jun 04 10:38:05 2012 +0200 @@ -6,6 +6,7 @@ #include #include #include +#include #include #include diff -r 90a9c811f4c0 -r 07b22ab8d245 drivers/xen/core/evtchn.c --- a/drivers/xen/core/evtchn.c Fri May 11 17:20:53 2012 +0200 +++ b/drivers/xen/core/evtchn.c Mon Jun 04 10:38:05 2012 +0200 @@ -1065,7 +1065,8 @@ void irq_resume(void) struct physdev_pirq_eoi_gmfn eoi_gmfn; eoi_gmfn.gmfn = virt_to_machine(pirq_needs_eoi) >> PAGE_SHIFT; - if (HYPERVISOR_physdev_op(PHYSDEVOP_pirq_eoi_gmfn, &eoi_gmfn)) + if (HYPERVISOR_physdev_op(PHYSDEVOP_pirq_eoi_gmfn_v1, + &eoi_gmfn)) BUG(); } @@ -1162,7 +1163,7 @@ void __init xen_init_IRQ(void) pirq_needs_eoi = alloc_bootmem_pages(sizeof(unsigned long) * BITS_TO_LONGS(ALIGN(NR_PIRQS, PAGE_SIZE * 8))); eoi_gmfn.gmfn = virt_to_machine(pirq_needs_eoi) >> PAGE_SHIFT; - if (HYPERVISOR_physdev_op(PHYSDEVOP_pirq_eoi_gmfn, &eoi_gmfn) == 0) + if (HYPERVISOR_physdev_op(PHYSDEVOP_pirq_eoi_gmfn_v1, &eoi_gmfn) == 0) pirq_eoi_does_unmask = 1; /* No event channels are 'live' right now. */ diff -r 90a9c811f4c0 -r 07b22ab8d245 drivers/xen/core/gnttab.c --- a/drivers/xen/core/gnttab.c Fri May 11 17:20:53 2012 +0200 +++ b/drivers/xen/core/gnttab.c Mon Jun 04 10:38:05 2012 +0200 @@ -53,7 +53,7 @@ /* External tools reserve first few grant table entries. */ #define NR_RESERVED_ENTRIES 8 #define GNTTAB_LIST_END 0xffffffff -#define ENTRIES_PER_GRANT_FRAME (PAGE_SIZE / sizeof(grant_entry_t)) +#define ENTRIES_PER_GRANT_FRAME (PAGE_SIZE / sizeof(grant_entry_v1_t)) static grant_ref_t **gnttab_list; static unsigned int nr_grant_frames; @@ -62,7 +62,7 @@ static int gnttab_free_count; static grant_ref_t gnttab_free_head; static DEFINE_SPINLOCK(gnttab_list_lock); -static struct grant_entry *shared; +static struct grant_entry_v1 *shared; static struct gnttab_free_callback *gnttab_free_callback_list; diff -r 90a9c811f4c0 -r 07b22ab8d245 drivers/xen/netback/common.h --- a/drivers/xen/netback/common.h Fri May 11 17:20:53 2012 +0200 +++ b/drivers/xen/netback/common.h Mon Jun 04 10:38:05 2012 +0200 @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include diff -r 90a9c811f4c0 -r 07b22ab8d245 drivers/xen/netfront/netfront.c --- a/drivers/xen/netfront/netfront.c Fri May 11 17:20:53 2012 +0200 +++ b/drivers/xen/netfront/netfront.c Mon Jun 04 10:38:05 2012 +0200 @@ -719,7 +719,6 @@ static void network_alloc_rx_buffers(str struct page *page; int i, batch_target, notify; RING_IDX req_prod = np->rx.req_prod_pvt; - struct xen_memory_reservation reservation; grant_ref_t ref; unsigned long pfn; void *vaddr; @@ -824,16 +823,17 @@ no_skb: req->gref = ref; } - if ( nr_flips != 0 ) { + if (nr_flips) { + struct xen_memory_reservation reservation = { + .nr_extents = nr_flips, + .domid = DOMID_SELF, + }; + /* Tell the ballon driver what is going on. */ balloon_update_driver_allowance(i); set_xen_guest_handle(reservation.extent_start, np->rx_pfn_array); - reservation.nr_extents = nr_flips; - reservation.extent_order = 0; - reservation.address_bits = 0; - reservation.domid = DOMID_SELF; if (!xen_feature(XENFEAT_auto_translated_physmap)) { /* After all PTEs have been zapped, flush the TLB. */ diff -r 90a9c811f4c0 -r 07b22ab8d245 drivers/xen/netfront/netfront.h --- a/drivers/xen/netfront/netfront.h Fri May 11 17:20:53 2012 +0200 +++ b/drivers/xen/netfront/netfront.h Mon Jun 04 10:38:05 2012 +0200 @@ -33,6 +33,7 @@ #ifndef NETFRONT_H #define NETFRONT_H +#include #include #include #include diff -r 90a9c811f4c0 -r 07b22ab8d245 drivers/xen/scsiback/common.h --- a/drivers/xen/scsiback/common.h Fri May 11 17:20:53 2012 +0200 +++ b/drivers/xen/scsiback/common.h Mon Jun 04 10:38:05 2012 +0200 @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include diff -r 90a9c811f4c0 -r 07b22ab8d245 drivers/xen/scsifront/common.h --- a/drivers/xen/scsifront/common.h Fri May 11 17:20:53 2012 +0200 +++ b/drivers/xen/scsifront/common.h Mon Jun 04 10:38:05 2012 +0200 @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include diff -r 90a9c811f4c0 -r 07b22ab8d245 drivers/xen/usbback/usbback.h --- a/drivers/xen/usbback/usbback.h Fri May 11 17:20:53 2012 +0200 +++ b/drivers/xen/usbback/usbback.h Mon Jun 04 10:38:05 2012 +0200 @@ -54,6 +54,7 @@ #include #include #include +#include #include #include #include diff -r 90a9c811f4c0 -r 07b22ab8d245 drivers/xen/usbfront/usbfront.h --- a/drivers/xen/usbfront/usbfront.h Fri May 11 17:20:53 2012 +0200 +++ b/drivers/xen/usbfront/usbfront.h Mon Jun 04 10:38:05 2012 +0200 @@ -52,6 +52,7 @@ #include #include #include +#include #include #include #include diff -r 90a9c811f4c0 -r 07b22ab8d245 include/xen/barrier.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/include/xen/barrier.h Mon Jun 04 10:38:05 2012 +0200 @@ -0,0 +1,10 @@ +#ifndef __XEN_BARRIER_H__ +#define __XEN_BARRIER_H__ + +#include + +#define xen_mb() mb() +#define xen_rmb() rmb() +#define xen_wmb() wmb() + +#endif /* __XEN_BARRIER_H__ */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jun 04 09:11:16 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Jun 2012 09:11: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 1SbTJd-00016t-C1; Mon, 04 Jun 2012 09:11:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SbTJb-00016o-OH for xen-changelog@lists.xensource.com; Mon, 04 Jun 2012 09:11:08 +0000 Received: from [85.158.139.83:9698] by server-5.bemta-5.messagelabs.com id 11/7A-04481-AAB7CCF4; Mon, 04 Jun 2012 09:11:06 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-182.messagelabs.com!1338801064!31350348!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22844 invoked from network); 4 Jun 2012 09:11:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jun 2012 09:11:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SbTJY-00067n-15 for xen-changelog@lists.xensource.com; Mon, 04 Jun 2012 09:11:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SbTJX-0001Ud-Be for xen-changelog@lists.xensource.com; Mon, 04 Jun 2012 09:11:03 +0000 Message-Id: Date: Mon, 04 Jun 2012 09:11:02 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] update to latest interface version 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 # HG changeset patch # User Jan Beulich # Date 1338799085 -7200 # Node ID 07b22ab8d245b2485ae524de8c5888e327445175 # Parent 90a9c811f4c0bac5a16a9c038deb7d8ce5438723 update to latest interface version Signed-off-by: Jan Beulich --- diff -r 90a9c811f4c0 -r 07b22ab8d245 arch/i386/kernel/setup-xen.c --- a/arch/i386/kernel/setup-xen.c Fri May 11 17:20:53 2012 +0200 +++ b/arch/i386/kernel/setup-xen.c Mon Jun 04 10:38:05 2012 +0200 @@ -1756,8 +1756,6 @@ void __init setup_arch(char **cmdline_p) * kernel parameter); shrink reservation with the HV */ struct xen_memory_reservation reservation = { - .address_bits = 0, - .extent_order = 0, .domid = DOMID_SELF }; unsigned int difference; diff -r 90a9c811f4c0 -r 07b22ab8d245 arch/i386/mm/hypervisor.c --- a/arch/i386/mm/hypervisor.c Fri May 11 17:20:53 2012 +0200 +++ b/arch/i386/mm/hypervisor.c Mon Jun 04 10:38:05 2012 +0200 @@ -266,7 +266,7 @@ int xen_create_contiguous_region( .out = { .nr_extents = 1, .extent_order = order, - .address_bits = address_bits, + .mem_flags = XENMEMF_address_bits(address_bits), .domid = DOMID_SELF } }; @@ -457,7 +457,7 @@ int xen_limit_pages_to_max_mfn( }, .out = { .extent_order = 0, - .address_bits = address_bits, + .mem_flags = XENMEMF_address_bits(address_bits), .domid = DOMID_SELF } }; diff -r 90a9c811f4c0 -r 07b22ab8d245 arch/x86_64/kernel/setup-xen.c --- a/arch/x86_64/kernel/setup-xen.c Fri May 11 17:20:53 2012 +0200 +++ b/arch/x86_64/kernel/setup-xen.c Mon Jun 04 10:38:05 2012 +0200 @@ -787,8 +787,6 @@ void __init setup_arch(char **cmdline_p) * kernel parameter); shrink reservation with the HV */ struct xen_memory_reservation reservation = { - .address_bits = 0, - .extent_order = 0, .domid = DOMID_SELF }; unsigned int difference; diff -r 90a9c811f4c0 -r 07b22ab8d245 drivers/xen/Kconfig --- a/drivers/xen/Kconfig Fri May 11 17:20:53 2012 +0200 +++ b/drivers/xen/Kconfig Mon Jun 04 10:38:05 2012 +0200 @@ -10,7 +10,7 @@ config XEN if XEN config XEN_INTERFACE_VERSION hex - default 0x00030207 + default 0x00040200 menu "XEN" diff -r 90a9c811f4c0 -r 07b22ab8d245 drivers/xen/balloon/balloon.c --- a/drivers/xen/balloon/balloon.c Fri May 11 17:20:53 2012 +0200 +++ b/drivers/xen/balloon/balloon.c Mon Jun 04 10:38:05 2012 +0200 @@ -244,9 +244,7 @@ static int increase_reservation(unsigned struct page *page; long rc; struct xen_memory_reservation reservation = { - .address_bits = 0, - .extent_order = 0, - .domid = DOMID_SELF + .domid = DOMID_SELF }; if (nr_pages > ARRAY_SIZE(frame_list)) @@ -312,9 +310,7 @@ static int decrease_reservation(unsigned int need_sleep = 0; int ret; struct xen_memory_reservation reservation = { - .address_bits = 0, - .extent_order = 0, - .domid = DOMID_SELF + .domid = DOMID_SELF }; if (nr_pages > ARRAY_SIZE(frame_list)) diff -r 90a9c811f4c0 -r 07b22ab8d245 drivers/xen/blkback/common.h --- a/drivers/xen/blkback/common.h Fri May 11 17:20:53 2012 +0200 +++ b/drivers/xen/blkback/common.h Mon Jun 04 10:38:05 2012 +0200 @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include diff -r 90a9c811f4c0 -r 07b22ab8d245 drivers/xen/blkfront/block.h --- a/drivers/xen/blkfront/block.h Fri May 11 17:20:53 2012 +0200 +++ b/drivers/xen/blkfront/block.h Mon Jun 04 10:38:05 2012 +0200 @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include diff -r 90a9c811f4c0 -r 07b22ab8d245 drivers/xen/blktap/common.h --- a/drivers/xen/blktap/common.h Fri May 11 17:20:53 2012 +0200 +++ b/drivers/xen/blktap/common.h Mon Jun 04 10:38:05 2012 +0200 @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include diff -r 90a9c811f4c0 -r 07b22ab8d245 drivers/xen/blktap2/blktap.h --- a/drivers/xen/blktap2/blktap.h Fri May 11 17:20:53 2012 +0200 +++ b/drivers/xen/blktap2/blktap.h Mon Jun 04 10:38:05 2012 +0200 @@ -6,6 +6,7 @@ #include #include #include +#include #include #include diff -r 90a9c811f4c0 -r 07b22ab8d245 drivers/xen/core/evtchn.c --- a/drivers/xen/core/evtchn.c Fri May 11 17:20:53 2012 +0200 +++ b/drivers/xen/core/evtchn.c Mon Jun 04 10:38:05 2012 +0200 @@ -1065,7 +1065,8 @@ void irq_resume(void) struct physdev_pirq_eoi_gmfn eoi_gmfn; eoi_gmfn.gmfn = virt_to_machine(pirq_needs_eoi) >> PAGE_SHIFT; - if (HYPERVISOR_physdev_op(PHYSDEVOP_pirq_eoi_gmfn, &eoi_gmfn)) + if (HYPERVISOR_physdev_op(PHYSDEVOP_pirq_eoi_gmfn_v1, + &eoi_gmfn)) BUG(); } @@ -1162,7 +1163,7 @@ void __init xen_init_IRQ(void) pirq_needs_eoi = alloc_bootmem_pages(sizeof(unsigned long) * BITS_TO_LONGS(ALIGN(NR_PIRQS, PAGE_SIZE * 8))); eoi_gmfn.gmfn = virt_to_machine(pirq_needs_eoi) >> PAGE_SHIFT; - if (HYPERVISOR_physdev_op(PHYSDEVOP_pirq_eoi_gmfn, &eoi_gmfn) == 0) + if (HYPERVISOR_physdev_op(PHYSDEVOP_pirq_eoi_gmfn_v1, &eoi_gmfn) == 0) pirq_eoi_does_unmask = 1; /* No event channels are 'live' right now. */ diff -r 90a9c811f4c0 -r 07b22ab8d245 drivers/xen/core/gnttab.c --- a/drivers/xen/core/gnttab.c Fri May 11 17:20:53 2012 +0200 +++ b/drivers/xen/core/gnttab.c Mon Jun 04 10:38:05 2012 +0200 @@ -53,7 +53,7 @@ /* External tools reserve first few grant table entries. */ #define NR_RESERVED_ENTRIES 8 #define GNTTAB_LIST_END 0xffffffff -#define ENTRIES_PER_GRANT_FRAME (PAGE_SIZE / sizeof(grant_entry_t)) +#define ENTRIES_PER_GRANT_FRAME (PAGE_SIZE / sizeof(grant_entry_v1_t)) static grant_ref_t **gnttab_list; static unsigned int nr_grant_frames; @@ -62,7 +62,7 @@ static int gnttab_free_count; static grant_ref_t gnttab_free_head; static DEFINE_SPINLOCK(gnttab_list_lock); -static struct grant_entry *shared; +static struct grant_entry_v1 *shared; static struct gnttab_free_callback *gnttab_free_callback_list; diff -r 90a9c811f4c0 -r 07b22ab8d245 drivers/xen/netback/common.h --- a/drivers/xen/netback/common.h Fri May 11 17:20:53 2012 +0200 +++ b/drivers/xen/netback/common.h Mon Jun 04 10:38:05 2012 +0200 @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include diff -r 90a9c811f4c0 -r 07b22ab8d245 drivers/xen/netfront/netfront.c --- a/drivers/xen/netfront/netfront.c Fri May 11 17:20:53 2012 +0200 +++ b/drivers/xen/netfront/netfront.c Mon Jun 04 10:38:05 2012 +0200 @@ -719,7 +719,6 @@ static void network_alloc_rx_buffers(str struct page *page; int i, batch_target, notify; RING_IDX req_prod = np->rx.req_prod_pvt; - struct xen_memory_reservation reservation; grant_ref_t ref; unsigned long pfn; void *vaddr; @@ -824,16 +823,17 @@ no_skb: req->gref = ref; } - if ( nr_flips != 0 ) { + if (nr_flips) { + struct xen_memory_reservation reservation = { + .nr_extents = nr_flips, + .domid = DOMID_SELF, + }; + /* Tell the ballon driver what is going on. */ balloon_update_driver_allowance(i); set_xen_guest_handle(reservation.extent_start, np->rx_pfn_array); - reservation.nr_extents = nr_flips; - reservation.extent_order = 0; - reservation.address_bits = 0; - reservation.domid = DOMID_SELF; if (!xen_feature(XENFEAT_auto_translated_physmap)) { /* After all PTEs have been zapped, flush the TLB. */ diff -r 90a9c811f4c0 -r 07b22ab8d245 drivers/xen/netfront/netfront.h --- a/drivers/xen/netfront/netfront.h Fri May 11 17:20:53 2012 +0200 +++ b/drivers/xen/netfront/netfront.h Mon Jun 04 10:38:05 2012 +0200 @@ -33,6 +33,7 @@ #ifndef NETFRONT_H #define NETFRONT_H +#include #include #include #include diff -r 90a9c811f4c0 -r 07b22ab8d245 drivers/xen/scsiback/common.h --- a/drivers/xen/scsiback/common.h Fri May 11 17:20:53 2012 +0200 +++ b/drivers/xen/scsiback/common.h Mon Jun 04 10:38:05 2012 +0200 @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include diff -r 90a9c811f4c0 -r 07b22ab8d245 drivers/xen/scsifront/common.h --- a/drivers/xen/scsifront/common.h Fri May 11 17:20:53 2012 +0200 +++ b/drivers/xen/scsifront/common.h Mon Jun 04 10:38:05 2012 +0200 @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include diff -r 90a9c811f4c0 -r 07b22ab8d245 drivers/xen/usbback/usbback.h --- a/drivers/xen/usbback/usbback.h Fri May 11 17:20:53 2012 +0200 +++ b/drivers/xen/usbback/usbback.h Mon Jun 04 10:38:05 2012 +0200 @@ -54,6 +54,7 @@ #include #include #include +#include #include #include #include diff -r 90a9c811f4c0 -r 07b22ab8d245 drivers/xen/usbfront/usbfront.h --- a/drivers/xen/usbfront/usbfront.h Fri May 11 17:20:53 2012 +0200 +++ b/drivers/xen/usbfront/usbfront.h Mon Jun 04 10:38:05 2012 +0200 @@ -52,6 +52,7 @@ #include #include #include +#include #include #include #include diff -r 90a9c811f4c0 -r 07b22ab8d245 include/xen/barrier.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/include/xen/barrier.h Mon Jun 04 10:38:05 2012 +0200 @@ -0,0 +1,10 @@ +#ifndef __XEN_BARRIER_H__ +#define __XEN_BARRIER_H__ + +#include + +#define xen_mb() mb() +#define xen_rmb() rmb() +#define xen_wmb() wmb() + +#endif /* __XEN_BARRIER_H__ */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jun 04 09:11:32 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Jun 2012 09:11: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 1SbTJv-00017d-FL; Mon, 04 Jun 2012 09:11:27 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SbTJt-00017W-P6 for xen-changelog@lists.xensource.com; Mon, 04 Jun 2012 09:11:26 +0000 Received: from [85.158.143.35:64227] by server-1.bemta-4.messagelabs.com id E3/E0-27869-DBB7CCF4; Mon, 04 Jun 2012 09:11:25 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-21.messagelabs.com!1338801064!13431767!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12773 invoked from network); 4 Jun 2012 09:11:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jun 2012 09:11:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SbTJY-00067p-Ag for xen-changelog@lists.xensource.com; Mon, 04 Jun 2012 09:11:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SbTJX-0001Uu-TQ for xen-changelog@lists.xensource.com; Mon, 04 Jun 2012 09:11:03 +0000 Message-Id: Date: Mon, 04 Jun 2012 09:11:03 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] widen use of (and introduce further) MULTI_* helpers 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 # HG changeset patch # User Jan Beulich # Date 1338800100 -7200 # Node ID b72a53f5d7563ac9b1d8e13723c5a5bc9b08e19d # Parent 07b22ab8d245b2485ae524de8c5888e327445175 widen use of (and introduce further) MULTI_* helpers This includes folding an MMU update and a grant table operation into a multicall in gnttab_copy_grant_page() Signed-off-by: Jan Beulich --- diff -r 07b22ab8d245 -r b72a53f5d756 drivers/xen/core/gnttab.c --- a/drivers/xen/core/gnttab.c Mon Jun 04 10:38:05 2012 +0200 +++ b/drivers/xen/core/gnttab.c Mon Jun 04 10:55:00 2012 +0200 @@ -607,13 +607,9 @@ static void gnttab_page_free(struct page int gnttab_copy_grant_page(grant_ref_t ref, struct page **pagep) { struct gnttab_unmap_and_replace unmap; - mmu_update_t mmu; - struct page *page; - struct page *new_page; - void *new_addr; - void *addr; - paddr_t pfn; - maddr_t mfn; + struct page *page, *new_page; + void *addr, *new_addr; + unsigned long pfn; maddr_t new_mfn; int err; @@ -631,7 +627,6 @@ int gnttab_copy_grant_page(grant_ref_t r copy_page(new_addr, addr); pfn = page_to_pfn(page); - mfn = pfn_to_mfn(pfn); new_mfn = virt_to_mfn(new_addr); write_seqlock(&gnttab_dma_lock); @@ -647,28 +642,33 @@ int gnttab_copy_grant_page(grant_ref_t r goto out; } - if (!xen_feature(XENFEAT_auto_translated_physmap)) - set_phys_to_machine(pfn, new_mfn); - gnttab_set_replace_op(&unmap, (unsigned long)addr, (unsigned long)new_addr, ref); - err = HYPERVISOR_grant_table_op(GNTTABOP_unmap_and_replace, - &unmap, 1); + if (!xen_feature(XENFEAT_auto_translated_physmap)) { + multicall_entry_t mc[2]; + mmu_update_t mmu; + + set_phys_to_machine(pfn, new_mfn); + set_phys_to_machine(page_to_pfn(new_page), INVALID_P2M_ENTRY); + + MULTI_grant_table_op(&mc[0], GNTTABOP_unmap_and_replace, + &unmap, 1); + + mmu.ptr = (new_mfn << PAGE_SHIFT) | MMU_MACHPHYS_UPDATE; + mmu.val = pfn; + MULTI_mmu_update(&mc[1], &mmu, 1, NULL, DOMID_SELF); + + err = HYPERVISOR_multicall_check(mc, 2, NULL); + } else + err = HYPERVISOR_grant_table_op(GNTTABOP_unmap_and_replace, + &unmap, 1); + BUG_ON(err); BUG_ON(unmap.status != GNTST_okay); write_sequnlock(&gnttab_dma_lock); - if (!xen_feature(XENFEAT_auto_translated_physmap)) { - set_phys_to_machine(page_to_pfn(new_page), INVALID_P2M_ENTRY); - - mmu.ptr = (new_mfn << PAGE_SHIFT) | MMU_MACHPHYS_UPDATE; - mmu.val = pfn; - err = HYPERVISOR_mmu_update(&mmu, 1, NULL, DOMID_SELF); - BUG_ON(err); - } - new_page->mapping = page->mapping; new_page->index = page->index; set_bit(PG_foreign, &new_page->flags); diff -r 07b22ab8d245 -r b72a53f5d756 drivers/xen/netback/netback.c --- a/drivers/xen/netback/netback.c Mon Jun 04 10:38:05 2012 +0200 +++ b/drivers/xen/netback/netback.c Mon Jun 04 10:55:00 2012 +0200 @@ -644,29 +644,21 @@ static void net_rx_action(unsigned long BUG_ON(mcl[-1].op != __HYPERVISOR_update_va_mapping); mcl[-1].args[MULTI_UVMFLAGS_INDEX] = UVMF_TLB_FLUSH|UVMF_ALL; - mcl->op = __HYPERVISOR_mmu_update; - mcl->args[0] = (unsigned long)rx_mmu; - mcl->args[1] = npo.mmu_prod; - mcl->args[2] = 0; - mcl->args[3] = DOMID_SELF; + MULTI_mmu_update(mcl, rx_mmu, npo.mmu_prod, 0, DOMID_SELF); } if (npo.trans_prod) { BUG_ON(npo.trans_prod > ARRAY_SIZE(grant_trans_op)); - mcl = npo.mcl + npo.mcl_prod++; - mcl->op = __HYPERVISOR_grant_table_op; - mcl->args[0] = GNTTABOP_transfer; - mcl->args[1] = (unsigned long)grant_trans_op; - mcl->args[2] = npo.trans_prod; + MULTI_grant_table_op(npo.mcl + npo.mcl_prod++, + GNTTABOP_transfer, grant_trans_op, + npo.trans_prod); } if (npo.copy_prod) { BUG_ON(npo.copy_prod > ARRAY_SIZE(grant_copy_op)); - mcl = npo.mcl + npo.mcl_prod++; - mcl->op = __HYPERVISOR_grant_table_op; - mcl->args[0] = GNTTABOP_copy; - mcl->args[1] = (unsigned long)grant_copy_op; - mcl->args[2] = npo.copy_prod; + MULTI_grant_table_op(npo.mcl + npo.mcl_prod++, + GNTTABOP_copy, grant_copy_op, + npo.copy_prod); } /* Nothing to do? */ diff -r 07b22ab8d245 -r b72a53f5d756 drivers/xen/netfront/netfront.c --- a/drivers/xen/netfront/netfront.c Mon Jun 04 10:38:05 2012 +0200 +++ b/drivers/xen/netfront/netfront.c Mon Jun 04 10:55:00 2012 +0200 @@ -841,9 +841,9 @@ no_skb: UVMF_TLB_FLUSH|UVMF_ALL; /* Give away a batch of pages. */ - np->rx_mcl[i].op = __HYPERVISOR_memory_op; - np->rx_mcl[i].args[0] = XENMEM_decrease_reservation; - np->rx_mcl[i].args[1] = (unsigned long)&reservation; + MULTI_memory_op(np->rx_mcl + i, + XENMEM_decrease_reservation, + &reservation); /* Zap PTEs and give away pages in one big * multicall. */ @@ -1326,7 +1326,6 @@ static int netif_poll(struct net_device struct netif_rx_response *rx = &rinfo.rx; struct netif_extra_info *extras = rinfo.extras; RING_IDX i, rp; - struct multicall_entry *mcl; int work_done, budget, more_to_do = 1, accel_more_to_do = 1; struct sk_buff_head rxq; struct sk_buff_head errq; @@ -1453,12 +1452,9 @@ err: /* Do all the remapping work and M2P updates. */ if (!xen_feature(XENFEAT_auto_translated_physmap)) { - mcl = np->rx_mcl + pages_flipped; - mcl->op = __HYPERVISOR_mmu_update; - mcl->args[0] = (unsigned long)np->rx_mmu; - mcl->args[1] = pages_flipped; - mcl->args[2] = 0; - mcl->args[3] = DOMID_SELF; + MULTI_mmu_update(np->rx_mcl + pages_flipped, + np->rx_mmu, pages_flipped, 0, + DOMID_SELF); err = HYPERVISOR_multicall_check(np->rx_mcl, pages_flipped + 1, NULL); @@ -1623,14 +1619,10 @@ static void netif_release_rx_bufs_flip(s if (!xen_feature(XENFEAT_auto_translated_physmap)) { /* Do all the remapping work and M2P updates. */ - mcl->op = __HYPERVISOR_mmu_update; - mcl->args[0] = (unsigned long)np->rx_mmu; - mcl->args[1] = mmu - np->rx_mmu; - mcl->args[2] = 0; - mcl->args[3] = DOMID_SELF; - mcl++; + MULTI_mmu_update(mcl, np->rx_mmu, mmu - np->rx_mmu, + 0, DOMID_SELF); rc = HYPERVISOR_multicall_check( - np->rx_mcl, mcl - np->rx_mcl, NULL); + np->rx_mcl, mcl + 1 - np->rx_mcl, NULL); BUG_ON(rc); } } diff -r 07b22ab8d245 -r b72a53f5d756 include/asm-i386/mach-xen/asm/hypervisor.h --- a/include/asm-i386/mach-xen/asm/hypervisor.h Mon Jun 04 10:38:05 2012 +0200 +++ b/include/asm-i386/mach-xen/asm/hypervisor.h Mon Jun 04 10:55:00 2012 +0200 @@ -243,6 +243,26 @@ MULTI_update_va_mapping( } static inline void +MULTI_mmu_update(multicall_entry_t *mcl, mmu_update_t *req, + unsigned int count, unsigned int *success_count, + domid_t domid) +{ + mcl->op = __HYPERVISOR_mmu_update; + mcl->args[0] = (unsigned long)req; + mcl->args[1] = count; + mcl->args[2] = (unsigned long)success_count; + mcl->args[3] = domid; +} + +static inline void +MULTI_memory_op(multicall_entry_t *mcl, unsigned int cmd, void *arg) +{ + mcl->op = __HYPERVISOR_memory_op; + mcl->args[0] = cmd; + mcl->args[1] = (unsigned long)arg; +} + +static inline void MULTI_grant_table_op(multicall_entry_t *mcl, unsigned int cmd, void *uop, unsigned int count) { @@ -255,8 +275,15 @@ MULTI_grant_table_op(multicall_entry_t * #else /* !defined(CONFIG_XEN) */ /* Multicalls not supported for HVM guests. */ -#define MULTI_update_va_mapping(a,b,c,d) ((void)0) -#define MULTI_grant_table_op(a,b,c,d) ((void)0) +static inline void MULTI_bug(multicall_entry_t *mcl, ...) +{ + BUG_ON(mcl); +} + +#define MULTI_update_va_mapping MULTI_bug +#define MULTI_mmu_update MULTI_bug +#define MULTI_memory_op MULTI_bug +#define MULTI_grant_table_op MULTI_bug #endif _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Jun 04 09:11:32 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 Jun 2012 09:11: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 1SbTJv-00017d-FL; Mon, 04 Jun 2012 09:11:27 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SbTJt-00017W-P6 for xen-changelog@lists.xensource.com; Mon, 04 Jun 2012 09:11:26 +0000 Received: from [85.158.143.35:64227] by server-1.bemta-4.messagelabs.com id E3/E0-27869-DBB7CCF4; Mon, 04 Jun 2012 09:11:25 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-21.messagelabs.com!1338801064!13431767!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12773 invoked from network); 4 Jun 2012 09:11:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Jun 2012 09:11:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SbTJY-00067p-Ag for xen-changelog@lists.xensource.com; Mon, 04 Jun 2012 09:11:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SbTJX-0001Uu-TQ for xen-changelog@lists.xensource.com; Mon, 04 Jun 2012 09:11:03 +0000 Message-Id: Date: Mon, 04 Jun 2012 09:11:03 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] widen use of (and introduce further) MULTI_* helpers 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 # HG changeset patch # User Jan Beulich # Date 1338800100 -7200 # Node ID b72a53f5d7563ac9b1d8e13723c5a5bc9b08e19d # Parent 07b22ab8d245b2485ae524de8c5888e327445175 widen use of (and introduce further) MULTI_* helpers This includes folding an MMU update and a grant table operation into a multicall in gnttab_copy_grant_page() Signed-off-by: Jan Beulich --- diff -r 07b22ab8d245 -r b72a53f5d756 drivers/xen/core/gnttab.c --- a/drivers/xen/core/gnttab.c Mon Jun 04 10:38:05 2012 +0200 +++ b/drivers/xen/core/gnttab.c Mon Jun 04 10:55:00 2012 +0200 @@ -607,13 +607,9 @@ static void gnttab_page_free(struct page int gnttab_copy_grant_page(grant_ref_t ref, struct page **pagep) { struct gnttab_unmap_and_replace unmap; - mmu_update_t mmu; - struct page *page; - struct page *new_page; - void *new_addr; - void *addr; - paddr_t pfn; - maddr_t mfn; + struct page *page, *new_page; + void *addr, *new_addr; + unsigned long pfn; maddr_t new_mfn; int err; @@ -631,7 +627,6 @@ int gnttab_copy_grant_page(grant_ref_t r copy_page(new_addr, addr); pfn = page_to_pfn(page); - mfn = pfn_to_mfn(pfn); new_mfn = virt_to_mfn(new_addr); write_seqlock(&gnttab_dma_lock); @@ -647,28 +642,33 @@ int gnttab_copy_grant_page(grant_ref_t r goto out; } - if (!xen_feature(XENFEAT_auto_translated_physmap)) - set_phys_to_machine(pfn, new_mfn); - gnttab_set_replace_op(&unmap, (unsigned long)addr, (unsigned long)new_addr, ref); - err = HYPERVISOR_grant_table_op(GNTTABOP_unmap_and_replace, - &unmap, 1); + if (!xen_feature(XENFEAT_auto_translated_physmap)) { + multicall_entry_t mc[2]; + mmu_update_t mmu; + + set_phys_to_machine(pfn, new_mfn); + set_phys_to_machine(page_to_pfn(new_page), INVALID_P2M_ENTRY); + + MULTI_grant_table_op(&mc[0], GNTTABOP_unmap_and_replace, + &unmap, 1); + + mmu.ptr = (new_mfn << PAGE_SHIFT) | MMU_MACHPHYS_UPDATE; + mmu.val = pfn; + MULTI_mmu_update(&mc[1], &mmu, 1, NULL, DOMID_SELF); + + err = HYPERVISOR_multicall_check(mc, 2, NULL); + } else + err = HYPERVISOR_grant_table_op(GNTTABOP_unmap_and_replace, + &unmap, 1); + BUG_ON(err); BUG_ON(unmap.status != GNTST_okay); write_sequnlock(&gnttab_dma_lock); - if (!xen_feature(XENFEAT_auto_translated_physmap)) { - set_phys_to_machine(page_to_pfn(new_page), INVALID_P2M_ENTRY); - - mmu.ptr = (new_mfn << PAGE_SHIFT) | MMU_MACHPHYS_UPDATE; - mmu.val = pfn; - err = HYPERVISOR_mmu_update(&mmu, 1, NULL, DOMID_SELF); - BUG_ON(err); - } - new_page->mapping = page->mapping; new_page->index = page->index; set_bit(PG_foreign, &new_page->flags); diff -r 07b22ab8d245 -r b72a53f5d756 drivers/xen/netback/netback.c --- a/drivers/xen/netback/netback.c Mon Jun 04 10:38:05 2012 +0200 +++ b/drivers/xen/netback/netback.c Mon Jun 04 10:55:00 2012 +0200 @@ -644,29 +644,21 @@ static void net_rx_action(unsigned long BUG_ON(mcl[-1].op != __HYPERVISOR_update_va_mapping); mcl[-1].args[MULTI_UVMFLAGS_INDEX] = UVMF_TLB_FLUSH|UVMF_ALL; - mcl->op = __HYPERVISOR_mmu_update; - mcl->args[0] = (unsigned long)rx_mmu; - mcl->args[1] = npo.mmu_prod; - mcl->args[2] = 0; - mcl->args[3] = DOMID_SELF; + MULTI_mmu_update(mcl, rx_mmu, npo.mmu_prod, 0, DOMID_SELF); } if (npo.trans_prod) { BUG_ON(npo.trans_prod > ARRAY_SIZE(grant_trans_op)); - mcl = npo.mcl + npo.mcl_prod++; - mcl->op = __HYPERVISOR_grant_table_op; - mcl->args[0] = GNTTABOP_transfer; - mcl->args[1] = (unsigned long)grant_trans_op; - mcl->args[2] = npo.trans_prod; + MULTI_grant_table_op(npo.mcl + npo.mcl_prod++, + GNTTABOP_transfer, grant_trans_op, + npo.trans_prod); } if (npo.copy_prod) { BUG_ON(npo.copy_prod > ARRAY_SIZE(grant_copy_op)); - mcl = npo.mcl + npo.mcl_prod++; - mcl->op = __HYPERVISOR_grant_table_op; - mcl->args[0] = GNTTABOP_copy; - mcl->args[1] = (unsigned long)grant_copy_op; - mcl->args[2] = npo.copy_prod; + MULTI_grant_table_op(npo.mcl + npo.mcl_prod++, + GNTTABOP_copy, grant_copy_op, + npo.copy_prod); } /* Nothing to do? */ diff -r 07b22ab8d245 -r b72a53f5d756 drivers/xen/netfront/netfront.c --- a/drivers/xen/netfront/netfront.c Mon Jun 04 10:38:05 2012 +0200 +++ b/drivers/xen/netfront/netfront.c Mon Jun 04 10:55:00 2012 +0200 @@ -841,9 +841,9 @@ no_skb: UVMF_TLB_FLUSH|UVMF_ALL; /* Give away a batch of pages. */ - np->rx_mcl[i].op = __HYPERVISOR_memory_op; - np->rx_mcl[i].args[0] = XENMEM_decrease_reservation; - np->rx_mcl[i].args[1] = (unsigned long)&reservation; + MULTI_memory_op(np->rx_mcl + i, + XENMEM_decrease_reservation, + &reservation); /* Zap PTEs and give away pages in one big * multicall. */ @@ -1326,7 +1326,6 @@ static int netif_poll(struct net_device struct netif_rx_response *rx = &rinfo.rx; struct netif_extra_info *extras = rinfo.extras; RING_IDX i, rp; - struct multicall_entry *mcl; int work_done, budget, more_to_do = 1, accel_more_to_do = 1; struct sk_buff_head rxq; struct sk_buff_head errq; @@ -1453,12 +1452,9 @@ err: /* Do all the remapping work and M2P updates. */ if (!xen_feature(XENFEAT_auto_translated_physmap)) { - mcl = np->rx_mcl + pages_flipped; - mcl->op = __HYPERVISOR_mmu_update; - mcl->args[0] = (unsigned long)np->rx_mmu; - mcl->args[1] = pages_flipped; - mcl->args[2] = 0; - mcl->args[3] = DOMID_SELF; + MULTI_mmu_update(np->rx_mcl + pages_flipped, + np->rx_mmu, pages_flipped, 0, + DOMID_SELF); err = HYPERVISOR_multicall_check(np->rx_mcl, pages_flipped + 1, NULL); @@ -1623,14 +1619,10 @@ static void netif_release_rx_bufs_flip(s if (!xen_feature(XENFEAT_auto_translated_physmap)) { /* Do all the remapping work and M2P updates. */ - mcl->op = __HYPERVISOR_mmu_update; - mcl->args[0] = (unsigned long)np->rx_mmu; - mcl->args[1] = mmu - np->rx_mmu; - mcl->args[2] = 0; - mcl->args[3] = DOMID_SELF; - mcl++; + MULTI_mmu_update(mcl, np->rx_mmu, mmu - np->rx_mmu, + 0, DOMID_SELF); rc = HYPERVISOR_multicall_check( - np->rx_mcl, mcl - np->rx_mcl, NULL); + np->rx_mcl, mcl + 1 - np->rx_mcl, NULL); BUG_ON(rc); } } diff -r 07b22ab8d245 -r b72a53f5d756 include/asm-i386/mach-xen/asm/hypervisor.h --- a/include/asm-i386/mach-xen/asm/hypervisor.h Mon Jun 04 10:38:05 2012 +0200 +++ b/include/asm-i386/mach-xen/asm/hypervisor.h Mon Jun 04 10:55:00 2012 +0200 @@ -243,6 +243,26 @@ MULTI_update_va_mapping( } static inline void +MULTI_mmu_update(multicall_entry_t *mcl, mmu_update_t *req, + unsigned int count, unsigned int *success_count, + domid_t domid) +{ + mcl->op = __HYPERVISOR_mmu_update; + mcl->args[0] = (unsigned long)req; + mcl->args[1] = count; + mcl->args[2] = (unsigned long)success_count; + mcl->args[3] = domid; +} + +static inline void +MULTI_memory_op(multicall_entry_t *mcl, unsigned int cmd, void *arg) +{ + mcl->op = __HYPERVISOR_memory_op; + mcl->args[0] = cmd; + mcl->args[1] = (unsigned long)arg; +} + +static inline void MULTI_grant_table_op(multicall_entry_t *mcl, unsigned int cmd, void *uop, unsigned int count) { @@ -255,8 +275,15 @@ MULTI_grant_table_op(multicall_entry_t * #else /* !defined(CONFIG_XEN) */ /* Multicalls not supported for HVM guests. */ -#define MULTI_update_va_mapping(a,b,c,d) ((void)0) -#define MULTI_grant_table_op(a,b,c,d) ((void)0) +static inline void MULTI_bug(multicall_entry_t *mcl, ...) +{ + BUG_ON(mcl); +} + +#define MULTI_update_va_mapping MULTI_bug +#define MULTI_mmu_update MULTI_bug +#define MULTI_memory_op MULTI_bug +#define MULTI_grant_table_op MULTI_bug #endif _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jun 07 02:44:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Jun 2012 02:44: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 1ScShq-0006n7-GX; Thu, 07 Jun 2012 02:44:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScShp-0006mO-3W for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:13 +0000 Received: from [85.158.138.51:58993] by server-5.bemta-3.messagelabs.com id EA/2D-03598-C7510DF4; Thu, 07 Jun 2012 02:44:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-174.messagelabs.com!1339037050!31187309!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18724 invoked from network); 7 Jun 2012 02:44:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 7 Jun 2012 02:44:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScShm-0004ht-GY for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ScShm-0002je-BR for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:10 +0000 Message-Id: Date: Thu, 07 Jun 2012 02:44:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen: enhance dump_numa output 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 # HG changeset patch # User Dario Faggioli # Date 1338996801 -3600 # Node ID 3537a8cb0835ce5e96813194d5b0825660108fe0 # Parent f2f9745c81b74dac74b4d378bef4695eece181d7 xen: enhance dump_numa output By showing the number of free pages on each node. Signed-off-by: Dario Faggioli Acked-by: Ian Jackson Committed-by: Keir Fraser --- diff -r f2f9745c81b7 -r 3537a8cb0835 xen/arch/x86/numa.c --- a/xen/arch/x86/numa.c Wed Jun 06 15:57:08 2012 +0100 +++ b/xen/arch/x86/numa.c Wed Jun 06 16:33:21 2012 +0100 @@ -365,10 +365,11 @@ static void dump_numa(unsigned char key) for_each_online_node(i) { paddr_t pa = (paddr_t)(NODE_DATA(i)->node_start_pfn + 1)<< PAGE_SHIFT; - printk("idx%d -> NODE%d start->%lu size->%lu\n", + printk("idx%d -> NODE%d start->%lu size->%lu free->%lu\n", i, NODE_DATA(i)->node_id, NODE_DATA(i)->node_start_pfn, - NODE_DATA(i)->node_spanned_pages); + NODE_DATA(i)->node_spanned_pages, + avail_node_heap_pages(i)); /* sanity check phys_to_nid() */ printk("phys_to_nid(%"PRIpaddr") -> %d should be %d\n", pa, phys_to_nid(pa), NODE_DATA(i)->node_id); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jun 07 02:44:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Jun 2012 02:44: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 1ScShq-0006n7-GX; Thu, 07 Jun 2012 02:44:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScShp-0006mO-3W for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:13 +0000 Received: from [85.158.138.51:58993] by server-5.bemta-3.messagelabs.com id EA/2D-03598-C7510DF4; Thu, 07 Jun 2012 02:44:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-174.messagelabs.com!1339037050!31187309!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18724 invoked from network); 7 Jun 2012 02:44:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 7 Jun 2012 02:44:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScShm-0004ht-GY for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ScShm-0002je-BR for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:10 +0000 Message-Id: Date: Thu, 07 Jun 2012 02:44:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen: enhance dump_numa output 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 # HG changeset patch # User Dario Faggioli # Date 1338996801 -3600 # Node ID 3537a8cb0835ce5e96813194d5b0825660108fe0 # Parent f2f9745c81b74dac74b4d378bef4695eece181d7 xen: enhance dump_numa output By showing the number of free pages on each node. Signed-off-by: Dario Faggioli Acked-by: Ian Jackson Committed-by: Keir Fraser --- diff -r f2f9745c81b7 -r 3537a8cb0835 xen/arch/x86/numa.c --- a/xen/arch/x86/numa.c Wed Jun 06 15:57:08 2012 +0100 +++ b/xen/arch/x86/numa.c Wed Jun 06 16:33:21 2012 +0100 @@ -365,10 +365,11 @@ static void dump_numa(unsigned char key) for_each_online_node(i) { paddr_t pa = (paddr_t)(NODE_DATA(i)->node_start_pfn + 1)<< PAGE_SHIFT; - printk("idx%d -> NODE%d start->%lu size->%lu\n", + printk("idx%d -> NODE%d start->%lu size->%lu free->%lu\n", i, NODE_DATA(i)->node_id, NODE_DATA(i)->node_start_pfn, - NODE_DATA(i)->node_spanned_pages); + NODE_DATA(i)->node_spanned_pages, + avail_node_heap_pages(i)); /* sanity check phys_to_nid() */ printk("phys_to_nid(%"PRIpaddr") -> %d should be %d\n", pa, phys_to_nid(pa), NODE_DATA(i)->node_id); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jun 07 02:44:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Jun 2012 02:44: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 1ScShp-0006mc-7g; Thu, 07 Jun 2012 02:44:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScShn-0006mN-Ta for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:12 +0000 Received: from [85.158.138.51:58939] by server-3.bemta-3.messagelabs.com id 9A/F7-25608-A7510DF4; Thu, 07 Jun 2012 02:44:10 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-174.messagelabs.com!1339037049!24808064!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 310 invoked from network); 7 Jun 2012 02:44:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 7 Jun 2012 02:44:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScShk-0004hh-M9 for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ScShk-0002ig-8P for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:08 +0000 Message-Id: Date: Thu, 07 Jun 2012 02:44:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: convert malloc() to libxl__zalloc(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 # HG changeset patch # User Dario Faggioli # Date 1338983177 -3600 # Node ID 47e83b338c527709124437a2947e86ea01a698f3 # Parent 6bea63e6c780de6303361e5f190d6925996cd2a2 libxl: convert malloc() to libxl__zalloc(NULL, ...) And ditch the error handling in libxl_get_cpu_topology() Signed-off-by: Dario Faggioli Acked-by: Ian Campbell [ ijc -- define and use NOGC instead of NULL to allow improvements to this infrastructure in the future ] Committed-by: Ian Campbell --- diff -r 6bea63e6c780 -r 47e83b338c52 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Sat Jun 02 08:39:45 2012 +0100 +++ b/tools/libxl/libxl.c Wed Jun 06 12:46:17 2012 +0100 @@ -3116,12 +3116,7 @@ libxl_cputopology *libxl_get_cpu_topolog if (tinfo.max_cpu_index < max_cpus - 1) max_cpus = tinfo.max_cpu_index + 1; - ret = malloc(sizeof(libxl_cputopology) * max_cpus); - if (ret == NULL) { - LIBXL__LOG_ERRNOVAL(ctx, XTL_ERROR, ENOMEM, - "Unable to allocate return value"); - goto fail; - } + ret = libxl__zalloc(NOGC, sizeof(libxl_cputopology) * max_cpus); for (i = 0; i < max_cpus; i++) { #define V(map, i) (map[i] == INVALID_TOPOLOGY_ID) ? \ diff -r 6bea63e6c780 -r 47e83b338c52 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Sat Jun 02 08:39:45 2012 +0100 +++ b/tools/libxl/libxl_internal.h Wed Jun 06 12:46:17 2012 +0100 @@ -1933,6 +1933,7 @@ struct libxl__domain_create_state { #define GC_INIT(ctx) libxl__gc gc[1]; LIBXL_INIT_GC(gc[0],ctx) #define GC_FREE libxl__free_all(gc) #define CTX libxl__gc_owner(gc) +#define NOGC NULL /* Allocation macros all of which use the gc. */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jun 07 02:44:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Jun 2012 02:44: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 1ScShp-0006mu-Ct; Thu, 07 Jun 2012 02:44:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScSho-0006mO-LE for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:12 +0000 Received: from [85.158.138.51:37826] by server-5.bemta-3.messagelabs.com id 89/2D-03598-B7510DF4; Thu, 07 Jun 2012 02:44:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-174.messagelabs.com!1339037049!31238551!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16613 invoked from network); 7 Jun 2012 02:44:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 7 Jun 2012 02:44:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScShl-0004hn-L6 for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ScShl-0002jA-9o for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:09 +0000 Message-Id: Date: Thu, 07 Jun 2012 02:44:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl.cfg: document the maxmem= option 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 # HG changeset patch # User Olaf Hering # Date 1338987239 -3600 # Node ID a24ffff4e18d3313be6ff66eb895071fd8dfef84 # Parent 123628d31cf2741fcbf7733c5089e3ef6b66ebfe xl.cfg: document the maxmem= option Signed-off-by: Olaf Hering Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 123628d31cf2 -r a24ffff4e18d docs/man/xl.cfg.pod.5 --- a/docs/man/xl.cfg.pod.5 Wed Jun 06 12:46:18 2012 +0100 +++ b/docs/man/xl.cfg.pod.5 Wed Jun 06 13:53:59 2012 +0100 @@ -174,6 +174,16 @@ Honoured by the sedf scheduler. Start the guest with MBYTES megabytes of RAM. +=item B + +Specifies the maximum amount of memory a guest can ever see. +The value of B must be equal or greater than B. + +In combination with B it will start the guest "pre-ballooned", +if the values of B and B differ. +A "pre-ballooned" HVM guest needs a balloon driver, without a balloon driver +it will crash. + =item B Specifies what should be done with the domain if it shuts itself down. @@ -971,10 +981,6 @@ XXX XXX -=item B - -XXX - =item B XXX _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jun 07 02:44:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Jun 2012 02:44: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 1ScShp-0006mc-7g; Thu, 07 Jun 2012 02:44:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScShn-0006mN-Ta for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:12 +0000 Received: from [85.158.138.51:58939] by server-3.bemta-3.messagelabs.com id 9A/F7-25608-A7510DF4; Thu, 07 Jun 2012 02:44:10 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-174.messagelabs.com!1339037049!24808064!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 310 invoked from network); 7 Jun 2012 02:44:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 7 Jun 2012 02:44:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScShk-0004hh-M9 for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ScShk-0002ig-8P for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:08 +0000 Message-Id: Date: Thu, 07 Jun 2012 02:44:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: convert malloc() to libxl__zalloc(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 # HG changeset patch # User Dario Faggioli # Date 1338983177 -3600 # Node ID 47e83b338c527709124437a2947e86ea01a698f3 # Parent 6bea63e6c780de6303361e5f190d6925996cd2a2 libxl: convert malloc() to libxl__zalloc(NULL, ...) And ditch the error handling in libxl_get_cpu_topology() Signed-off-by: Dario Faggioli Acked-by: Ian Campbell [ ijc -- define and use NOGC instead of NULL to allow improvements to this infrastructure in the future ] Committed-by: Ian Campbell --- diff -r 6bea63e6c780 -r 47e83b338c52 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Sat Jun 02 08:39:45 2012 +0100 +++ b/tools/libxl/libxl.c Wed Jun 06 12:46:17 2012 +0100 @@ -3116,12 +3116,7 @@ libxl_cputopology *libxl_get_cpu_topolog if (tinfo.max_cpu_index < max_cpus - 1) max_cpus = tinfo.max_cpu_index + 1; - ret = malloc(sizeof(libxl_cputopology) * max_cpus); - if (ret == NULL) { - LIBXL__LOG_ERRNOVAL(ctx, XTL_ERROR, ENOMEM, - "Unable to allocate return value"); - goto fail; - } + ret = libxl__zalloc(NOGC, sizeof(libxl_cputopology) * max_cpus); for (i = 0; i < max_cpus; i++) { #define V(map, i) (map[i] == INVALID_TOPOLOGY_ID) ? \ diff -r 6bea63e6c780 -r 47e83b338c52 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Sat Jun 02 08:39:45 2012 +0100 +++ b/tools/libxl/libxl_internal.h Wed Jun 06 12:46:17 2012 +0100 @@ -1933,6 +1933,7 @@ struct libxl__domain_create_state { #define GC_INIT(ctx) libxl__gc gc[1]; LIBXL_INIT_GC(gc[0],ctx) #define GC_FREE libxl__free_all(gc) #define CTX libxl__gc_owner(gc) +#define NOGC NULL /* Allocation macros all of which use the gc. */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jun 07 02:44:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Jun 2012 02:44: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 1ScShp-0006mu-Ct; Thu, 07 Jun 2012 02:44:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScSho-0006mO-LE for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:12 +0000 Received: from [85.158.138.51:37826] by server-5.bemta-3.messagelabs.com id 89/2D-03598-B7510DF4; Thu, 07 Jun 2012 02:44:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-174.messagelabs.com!1339037049!31238551!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16613 invoked from network); 7 Jun 2012 02:44:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 7 Jun 2012 02:44:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScShl-0004hn-L6 for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ScShl-0002jA-9o for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:09 +0000 Message-Id: Date: Thu, 07 Jun 2012 02:44:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xl.cfg: document the maxmem= option 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 # HG changeset patch # User Olaf Hering # Date 1338987239 -3600 # Node ID a24ffff4e18d3313be6ff66eb895071fd8dfef84 # Parent 123628d31cf2741fcbf7733c5089e3ef6b66ebfe xl.cfg: document the maxmem= option Signed-off-by: Olaf Hering Acked-by: Ian Campbell Committed-by: Ian Campbell --- diff -r 123628d31cf2 -r a24ffff4e18d docs/man/xl.cfg.pod.5 --- a/docs/man/xl.cfg.pod.5 Wed Jun 06 12:46:18 2012 +0100 +++ b/docs/man/xl.cfg.pod.5 Wed Jun 06 13:53:59 2012 +0100 @@ -174,6 +174,16 @@ Honoured by the sedf scheduler. Start the guest with MBYTES megabytes of RAM. +=item B + +Specifies the maximum amount of memory a guest can ever see. +The value of B must be equal or greater than B. + +In combination with B it will start the guest "pre-ballooned", +if the values of B and B differ. +A "pre-ballooned" HVM guest needs a balloon driver, without a balloon driver +it will crash. + =item B Specifies what should be done with the domain if it shuts itself down. @@ -971,10 +981,6 @@ XXX XXX -=item B - -XXX - =item B XXX _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jun 07 02:44:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Jun 2012 02:44: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 1ScShs-0006nd-LH; Thu, 07 Jun 2012 02:44:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScShq-0006n6-U9 for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:15 +0000 Received: from [85.158.139.83:57627] by server-5.bemta-5.messagelabs.com id D1/EA-04481-E7510DF4; Thu, 07 Jun 2012 02:44:14 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-182.messagelabs.com!1339037052!25011165!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14198 invoked from network); 7 Jun 2012 02:44:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 7 Jun 2012 02:44:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScShn-0004hz-Gy for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ScShn-0002kB-CV for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:11 +0000 Message-Id: Date: Thu, 07 Jun 2012 02:44:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen: fix page_list_splice() 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 # HG changeset patch # User Jan Beulich # Date 1338997025 -3600 # Node ID f6bfaf9daa508c31b2bca0e461202db2759426fc # Parent 8ec2c428f4dad55cf6d91b893a19c2218972db5e xen: fix page_list_splice() Other than in __list_splice(), the first element's prev pointer doesn't need adjustment here - it already is PAGE_LIST_NULL. Rather than fixing the assignment (to formally match __list_splice()), simply assert that this assignment is really unnecessary. Reported-by: Jisoo Yang Signed-off-by: Jan Beulich Also assert that the prev pointers are both PAGE_LIST_NULL. Signed-off-by: Keir Fraser Committed-by: Keir Fraser --- diff -r 8ec2c428f4da -r f6bfaf9daa50 xen/include/xen/mm.h --- a/xen/include/xen/mm.h Wed Jun 06 16:34:53 2012 +0100 +++ b/xen/include/xen/mm.h Wed Jun 06 16:37:05 2012 +0100 @@ -270,7 +270,8 @@ page_list_splice(struct page_list_head * last = list->tail; at = head->next; - first->list.prev = page_to_pdx(head->next); + ASSERT(first->list.prev == PAGE_LIST_NULL); + ASSERT(first->list.prev == at->list.prev); head->next = first; last->list.next = page_to_pdx(at); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jun 07 02:44:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Jun 2012 02:44: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 1ScShp-0006mm-AU; Thu, 07 Jun 2012 02:44:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScSho-0006mN-FY for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:12 +0000 Received: from [85.158.138.51:58971] by server-3.bemta-3.messagelabs.com id FB/F7-25608-B7510DF4; Thu, 07 Jun 2012 02:44:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-174.messagelabs.com!1339037049!12470497!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4632 invoked from network); 7 Jun 2012 02:44:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 7 Jun 2012 02:44:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScShl-0004hk-9r for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ScShk-0002iv-Pz for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:08 +0000 Message-Id: Date: Thu, 07 Jun 2012 02:44:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: Add API to retrieve domain console tty 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 # HG changeset patch # User Bamvor Jian Zhang # Date 1338983178 -3600 # Node ID 123628d31cf2741fcbf7733c5089e3ef6b66ebfe # Parent 47e83b338c527709124437a2947e86ea01a698f3 libxl: Add API to retrieve domain console tty This api retrieve domain console from xenstore. With this new api, it is easy to implement "virsh console" command in libvirt libxl driver. Signed-off-by: Bamvor Jian Zhang Acked-by: Ian Campbell [ ijc -- use NOGC instead of 0 to allow improvements to this infrastructure in the future ] Committed-by: Ian Campbell --- diff -r 47e83b338c52 -r 123628d31cf2 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Wed Jun 06 12:46:17 2012 +0100 +++ b/tools/libxl/libxl.c Wed Jun 06 12:46:18 2012 +0100 @@ -1217,7 +1217,8 @@ out: return rc; } -int libxl_console_exec(libxl_ctx *ctx, uint32_t domid, int cons_num, libxl_console_type type) +int libxl_console_exec(libxl_ctx *ctx, uint32_t domid, int cons_num, + libxl_console_type type) { GC_INIT(ctx); char *p = libxl__sprintf(gc, "%s/xenconsole", libxl__private_bindir_path()); @@ -1243,34 +1244,116 @@ out: return ERROR_FAIL; } -int libxl_primary_console_exec(libxl_ctx *ctx, uint32_t domid_vm) +int libxl_console_get_tty(libxl_ctx *ctx, uint32_t domid, int cons_num, + libxl_console_type type, char **path) +{ + GC_INIT(ctx); + char *dom_path; + char *tty_path; + char *tty; + int rc; + + dom_path = libxl__xs_get_dompath(gc, domid); + if (!dom_path) { + rc = ERROR_FAIL; + goto out; + } + + switch (type) { + case LIBXL_CONSOLE_TYPE_SERIAL: + tty_path = GCSPRINTF("%s/serial/0/tty", dom_path); + break; + case LIBXL_CONSOLE_TYPE_PV: + if (cons_num == 0) + tty_path = GCSPRINTF("%s/console/tty", dom_path); + else + tty_path = GCSPRINTF("%s/device/console/%d/tty", dom_path, + cons_num); + break; + default: + rc = ERROR_INVAL; + goto out; + } + + tty = libxl__xs_read(gc, XBT_NULL, tty_path); + if (!tty) { + LOGE(ERROR,"unable to read console tty path `%s'",tty_path); + rc = ERROR_FAIL; + goto out; + } + + *path = libxl__strdup(NOGC, tty); + rc = 0; +out: + GC_FREE; + return rc; +} + +static int libxl__primary_console_find(libxl_ctx *ctx, uint32_t domid_vm, + uint32_t *domid, int *cons_num, + libxl_console_type *type) { GC_INIT(ctx); uint32_t stubdomid = libxl_get_stubdom_id(ctx, domid_vm); int rc; - if (stubdomid) - rc = libxl_console_exec(ctx, stubdomid, - STUBDOM_CONSOLE_SERIAL, LIBXL_CONSOLE_TYPE_PV); - else { + + if (stubdomid) { + *domid = stubdomid; + *cons_num = STUBDOM_CONSOLE_SERIAL; + *type = LIBXL_CONSOLE_TYPE_PV; + } else { switch (libxl__domain_type(gc, domid_vm)) { case LIBXL_DOMAIN_TYPE_HVM: - rc = libxl_console_exec(ctx, domid_vm, 0, LIBXL_CONSOLE_TYPE_SERIAL); + *domid = domid_vm; + *cons_num = 0; + *type = LIBXL_CONSOLE_TYPE_SERIAL; break; case LIBXL_DOMAIN_TYPE_PV: - rc = libxl_console_exec(ctx, domid_vm, 0, LIBXL_CONSOLE_TYPE_PV); + *domid = domid_vm; + *cons_num = 0; + *type = LIBXL_CONSOLE_TYPE_PV; break; case -1: - LOG(ERROR,"unable to get domain type for domid=%"PRIu32,domid_vm); - rc = ERROR_FAIL; + LOG(ERROR,"unable to get domain type for domid=%"PRIu32, domid_vm); + rc = ERROR_INVAL; + goto out; break; default: abort(); } } + + rc = 0; +out: GC_FREE; return rc; } +int libxl_primary_console_exec(libxl_ctx *ctx, uint32_t domid_vm) +{ + uint32_t domid; + int cons_num; + libxl_console_type type; + int rc; + + rc = libxl__primary_console_find(ctx, domid_vm, &domid, &cons_num, &type); + if ( rc ) return rc; + return libxl_console_exec(ctx, domid, cons_num, type); +} + +int libxl_primary_console_get_tty(libxl_ctx *ctx, uint32_t domid_vm, + char **path) +{ + uint32_t domid; + int cons_num; + libxl_console_type type; + int rc; + + rc = libxl__primary_console_find(ctx, domid_vm, &domid, &cons_num, &type); + if ( rc ) return rc; + return libxl_console_get_tty(ctx, domid, cons_num, type, path); +} + int libxl_vncviewer_exec(libxl_ctx *ctx, uint32_t domid, int autopass) { GC_INIT(ctx); diff -r 47e83b338c52 -r 123628d31cf2 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Wed Jun 06 12:46:17 2012 +0100 +++ b/tools/libxl/libxl.h Wed Jun 06 12:46:18 2012 +0100 @@ -570,6 +570,18 @@ int libxl_console_exec(libxl_ctx *ctx, u * guests using pygrub. */ int libxl_primary_console_exec(libxl_ctx *ctx, uint32_t domid_vm); +/* libxl_console_get_tty retrieves the specified domain's console tty path + * and stores it in path. Caller is responsible for freeing the memory. + */ +int libxl_console_get_tty(libxl_ctx *ctx, uint32_t domid, int cons_num, + libxl_console_type type, char **path); + +/* libxl_primary_console_get_tty retrieves the specified domain's primary + * console tty path and stores it in path. Caller is responsible for freeing + * the memory. + */ +int libxl_primary_console_get_tty(libxl_ctx *ctx, uint32_t domid_vm, char **path); + /* May be called with info_r == NULL to check for domain's existance */ int libxl_domain_info(libxl_ctx*, libxl_dominfo *info_r, uint32_t domid); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jun 07 02:44:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Jun 2012 02:44: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 1ScShp-0006mm-AU; Thu, 07 Jun 2012 02:44:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScSho-0006mN-FY for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:12 +0000 Received: from [85.158.138.51:58971] by server-3.bemta-3.messagelabs.com id FB/F7-25608-B7510DF4; Thu, 07 Jun 2012 02:44:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-174.messagelabs.com!1339037049!12470497!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4632 invoked from network); 7 Jun 2012 02:44:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 7 Jun 2012 02:44:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScShl-0004hk-9r for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ScShk-0002iv-Pz for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:08 +0000 Message-Id: Date: Thu, 07 Jun 2012 02:44:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: Add API to retrieve domain console tty 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 # HG changeset patch # User Bamvor Jian Zhang # Date 1338983178 -3600 # Node ID 123628d31cf2741fcbf7733c5089e3ef6b66ebfe # Parent 47e83b338c527709124437a2947e86ea01a698f3 libxl: Add API to retrieve domain console tty This api retrieve domain console from xenstore. With this new api, it is easy to implement "virsh console" command in libvirt libxl driver. Signed-off-by: Bamvor Jian Zhang Acked-by: Ian Campbell [ ijc -- use NOGC instead of 0 to allow improvements to this infrastructure in the future ] Committed-by: Ian Campbell --- diff -r 47e83b338c52 -r 123628d31cf2 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Wed Jun 06 12:46:17 2012 +0100 +++ b/tools/libxl/libxl.c Wed Jun 06 12:46:18 2012 +0100 @@ -1217,7 +1217,8 @@ out: return rc; } -int libxl_console_exec(libxl_ctx *ctx, uint32_t domid, int cons_num, libxl_console_type type) +int libxl_console_exec(libxl_ctx *ctx, uint32_t domid, int cons_num, + libxl_console_type type) { GC_INIT(ctx); char *p = libxl__sprintf(gc, "%s/xenconsole", libxl__private_bindir_path()); @@ -1243,34 +1244,116 @@ out: return ERROR_FAIL; } -int libxl_primary_console_exec(libxl_ctx *ctx, uint32_t domid_vm) +int libxl_console_get_tty(libxl_ctx *ctx, uint32_t domid, int cons_num, + libxl_console_type type, char **path) +{ + GC_INIT(ctx); + char *dom_path; + char *tty_path; + char *tty; + int rc; + + dom_path = libxl__xs_get_dompath(gc, domid); + if (!dom_path) { + rc = ERROR_FAIL; + goto out; + } + + switch (type) { + case LIBXL_CONSOLE_TYPE_SERIAL: + tty_path = GCSPRINTF("%s/serial/0/tty", dom_path); + break; + case LIBXL_CONSOLE_TYPE_PV: + if (cons_num == 0) + tty_path = GCSPRINTF("%s/console/tty", dom_path); + else + tty_path = GCSPRINTF("%s/device/console/%d/tty", dom_path, + cons_num); + break; + default: + rc = ERROR_INVAL; + goto out; + } + + tty = libxl__xs_read(gc, XBT_NULL, tty_path); + if (!tty) { + LOGE(ERROR,"unable to read console tty path `%s'",tty_path); + rc = ERROR_FAIL; + goto out; + } + + *path = libxl__strdup(NOGC, tty); + rc = 0; +out: + GC_FREE; + return rc; +} + +static int libxl__primary_console_find(libxl_ctx *ctx, uint32_t domid_vm, + uint32_t *domid, int *cons_num, + libxl_console_type *type) { GC_INIT(ctx); uint32_t stubdomid = libxl_get_stubdom_id(ctx, domid_vm); int rc; - if (stubdomid) - rc = libxl_console_exec(ctx, stubdomid, - STUBDOM_CONSOLE_SERIAL, LIBXL_CONSOLE_TYPE_PV); - else { + + if (stubdomid) { + *domid = stubdomid; + *cons_num = STUBDOM_CONSOLE_SERIAL; + *type = LIBXL_CONSOLE_TYPE_PV; + } else { switch (libxl__domain_type(gc, domid_vm)) { case LIBXL_DOMAIN_TYPE_HVM: - rc = libxl_console_exec(ctx, domid_vm, 0, LIBXL_CONSOLE_TYPE_SERIAL); + *domid = domid_vm; + *cons_num = 0; + *type = LIBXL_CONSOLE_TYPE_SERIAL; break; case LIBXL_DOMAIN_TYPE_PV: - rc = libxl_console_exec(ctx, domid_vm, 0, LIBXL_CONSOLE_TYPE_PV); + *domid = domid_vm; + *cons_num = 0; + *type = LIBXL_CONSOLE_TYPE_PV; break; case -1: - LOG(ERROR,"unable to get domain type for domid=%"PRIu32,domid_vm); - rc = ERROR_FAIL; + LOG(ERROR,"unable to get domain type for domid=%"PRIu32, domid_vm); + rc = ERROR_INVAL; + goto out; break; default: abort(); } } + + rc = 0; +out: GC_FREE; return rc; } +int libxl_primary_console_exec(libxl_ctx *ctx, uint32_t domid_vm) +{ + uint32_t domid; + int cons_num; + libxl_console_type type; + int rc; + + rc = libxl__primary_console_find(ctx, domid_vm, &domid, &cons_num, &type); + if ( rc ) return rc; + return libxl_console_exec(ctx, domid, cons_num, type); +} + +int libxl_primary_console_get_tty(libxl_ctx *ctx, uint32_t domid_vm, + char **path) +{ + uint32_t domid; + int cons_num; + libxl_console_type type; + int rc; + + rc = libxl__primary_console_find(ctx, domid_vm, &domid, &cons_num, &type); + if ( rc ) return rc; + return libxl_console_get_tty(ctx, domid, cons_num, type, path); +} + int libxl_vncviewer_exec(libxl_ctx *ctx, uint32_t domid, int autopass) { GC_INIT(ctx); diff -r 47e83b338c52 -r 123628d31cf2 tools/libxl/libxl.h --- a/tools/libxl/libxl.h Wed Jun 06 12:46:17 2012 +0100 +++ b/tools/libxl/libxl.h Wed Jun 06 12:46:18 2012 +0100 @@ -570,6 +570,18 @@ int libxl_console_exec(libxl_ctx *ctx, u * guests using pygrub. */ int libxl_primary_console_exec(libxl_ctx *ctx, uint32_t domid_vm); +/* libxl_console_get_tty retrieves the specified domain's console tty path + * and stores it in path. Caller is responsible for freeing the memory. + */ +int libxl_console_get_tty(libxl_ctx *ctx, uint32_t domid, int cons_num, + libxl_console_type type, char **path); + +/* libxl_primary_console_get_tty retrieves the specified domain's primary + * console tty path and stores it in path. Caller is responsible for freeing + * the memory. + */ +int libxl_primary_console_get_tty(libxl_ctx *ctx, uint32_t domid_vm, char **path); + /* May be called with info_r == NULL to check for domain's existance */ int libxl_domain_info(libxl_ctx*, libxl_dominfo *info_r, uint32_t domid); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jun 07 02:44:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Jun 2012 02:44: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 1ScShs-0006nd-LH; Thu, 07 Jun 2012 02:44:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScShq-0006n6-U9 for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:15 +0000 Received: from [85.158.139.83:57627] by server-5.bemta-5.messagelabs.com id D1/EA-04481-E7510DF4; Thu, 07 Jun 2012 02:44:14 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-182.messagelabs.com!1339037052!25011165!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14198 invoked from network); 7 Jun 2012 02:44:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 7 Jun 2012 02:44:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScShn-0004hz-Gy for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ScShn-0002kB-CV for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:11 +0000 Message-Id: Date: Thu, 07 Jun 2012 02:44:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xen: fix page_list_splice() 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 # HG changeset patch # User Jan Beulich # Date 1338997025 -3600 # Node ID f6bfaf9daa508c31b2bca0e461202db2759426fc # Parent 8ec2c428f4dad55cf6d91b893a19c2218972db5e xen: fix page_list_splice() Other than in __list_splice(), the first element's prev pointer doesn't need adjustment here - it already is PAGE_LIST_NULL. Rather than fixing the assignment (to formally match __list_splice()), simply assert that this assignment is really unnecessary. Reported-by: Jisoo Yang Signed-off-by: Jan Beulich Also assert that the prev pointers are both PAGE_LIST_NULL. Signed-off-by: Keir Fraser Committed-by: Keir Fraser --- diff -r 8ec2c428f4da -r f6bfaf9daa50 xen/include/xen/mm.h --- a/xen/include/xen/mm.h Wed Jun 06 16:34:53 2012 +0100 +++ b/xen/include/xen/mm.h Wed Jun 06 16:37:05 2012 +0100 @@ -270,7 +270,8 @@ page_list_splice(struct page_list_head * last = list->tail; at = head->next; - first->list.prev = page_to_pdx(head->next); + ASSERT(first->list.prev == PAGE_LIST_NULL); + ASSERT(first->list.prev == at->list.prev); head->next = first; last->list.next = page_to_pdx(at); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jun 07 02:44:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Jun 2012 02:44: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 1ScShs-0006ni-NY; Thu, 07 Jun 2012 02:44:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScShq-0006n3-RE for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:15 +0000 Received: from [85.158.139.83:43935] by server-3.bemta-5.messagelabs.com id F3/ED-17554-D7510DF4; Thu, 07 Jun 2012 02:44:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-182.messagelabs.com!1339037051!32671335!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15033 invoked from network); 7 Jun 2012 02:44:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 7 Jun 2012 02:44:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScShn-0004hw-18 for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ScShm-0002ju-Su for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:10 +0000 Message-Id: Date: Thu, 07 Jun 2012 02:44:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xenpm, x86: Fix reporting of idle state average residency times 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 # HG changeset patch # User Boris Ostrovsky # Date 1338996893 -3600 # Node ID 8ec2c428f4dad55cf6d91b893a19c2218972db5e # Parent 3537a8cb0835ce5e96813194d5b0825660108fe0 xenpm, x86: Fix reporting of idle state average residency times If CPU stays in the same idle state for the full duration of xenpm sample then average residency may not be reported correctly since usage counter will not be incremented. In addition, in order to calculate averages correctly residence time and usage counter should be read and written atomically. Signed-off-by: Boris Ostrovsky Committed-by: Keir Fraser --- diff -r 3537a8cb0835 -r 8ec2c428f4da tools/misc/xenpm.c --- a/tools/misc/xenpm.c Wed Jun 06 16:33:21 2012 +0100 +++ b/tools/misc/xenpm.c Wed Jun 06 16:34:53 2012 +0100 @@ -389,7 +389,14 @@ static void signal_int_handler(int signo res = ( diff >= 0 ) ? diff : 0; triggers = cxstat_end[i].triggers[j] - cxstat_start[i].triggers[j]; - avg_res = (triggers==0) ? 0: (double)res/triggers/1000000.0; + /* + * triggers may be zero if the CPU has been in this state for + * the whole sample or if it never entered the state + */ + if ( triggers == 0 && cxstat_end[i].last == j ) + avg_res = (double)sum_cx[i]/1000000.0; + else + avg_res = (triggers==0) ? 0: (double)res/triggers/1000000.0; printf(" C%d\t%"PRIu64"\t(%5.2f%%)\t%.2f\n", j, res/1000000UL, 100 * res / (double)sum_cx[i], avg_res ); } diff -r 3537a8cb0835 -r 8ec2c428f4da xen/arch/x86/acpi/cpu_idle.c --- a/xen/arch/x86/acpi/cpu_idle.c Wed Jun 06 16:33:21 2012 +0100 +++ b/xen/arch/x86/acpi/cpu_idle.c Wed Jun 06 16:34:53 2012 +0100 @@ -165,29 +165,35 @@ static void print_acpi_power(uint32_t cp { uint32_t i, idle_usage = 0; uint64_t res, idle_res = 0; + u32 usage; + u8 last_state_idx; printk("==cpu%d==\n", cpu); - printk("active state:\t\tC%d\n", - power->last_state ? power->last_state->idx : -1); + last_state_idx = power->last_state ? power->last_state->idx : -1; + printk("active state:\t\tC%d\n", last_state_idx); printk("max_cstate:\t\tC%d\n", max_cstate); printk("states:\n"); for ( i = 1; i < power->count; i++ ) { + spin_lock_irq(&power->stat_lock); res = tick_to_ns(power->states[i].time); - idle_usage += power->states[i].usage; + usage = power->states[i].usage; + spin_unlock_irq(&power->stat_lock); + + idle_usage += usage; idle_res += res; - printk((power->last_state && power->last_state->idx == i) ? - " *" : " "); + printk((last_state_idx == i) ? " *" : " "); printk("C%d:\t", i); printk("type[C%d] ", power->states[i].type); printk("latency[%03d] ", power->states[i].latency); - printk("usage[%08d] ", power->states[i].usage); + printk("usage[%08d] ", usage); printk("method[%5s] ", acpi_cstate_method_name[power->states[i].entry_method]); printk("duration[%"PRId64"]\n", res); } - printk(" C0:\tusage[%08d] duration[%"PRId64"]\n", + printk((last_state_idx == 0) ? " *" : " "); + printk("C0:\tusage[%08d] duration[%"PRId64"]\n", idle_usage, NOW() - idle_res); print_hw_residencies(cpu); @@ -384,12 +390,29 @@ bool_t errata_c6_eoi_workaround(void) return (fix_needed && cpu_has_pending_apic_eoi()); } +static inline void acpi_update_idle_stats(struct acpi_processor_power *power, + struct acpi_processor_cx *cx, + int64_t sleep_ticks) +{ + /* Interrupts are disabled */ + + spin_lock(&power->stat_lock); + + cx->usage++; + if ( sleep_ticks > 0 ) + { + power->last_residency = tick_to_ns(sleep_ticks) / 1000UL; + cx->time += sleep_ticks; + } + + spin_unlock(&power->stat_lock); +} + static void acpi_processor_idle(void) { struct acpi_processor_power *power = processor_powers[smp_processor_id()]; struct acpi_processor_cx *cx = NULL; int next_state; - int64_t sleep_ticks = 0; uint64_t t1, t2 = 0; u32 exp = 0, pred = 0; u32 irq_traced[4] = { 0 }; @@ -462,10 +485,10 @@ static void acpi_processor_idle(void) /* Trace cpu idle exit */ TRACE_6D(TRC_PM_IDLE_EXIT, cx->idx, t2, irq_traced[0], irq_traced[1], irq_traced[2], irq_traced[3]); + /* Update statistics */ + acpi_update_idle_stats(power, cx, ticks_elapsed(t1, t2)); /* Re-enable interrupts */ local_irq_enable(); - /* Compute time (ticks) that we were actually asleep */ - sleep_ticks = ticks_elapsed(t1, t2); break; } @@ -537,28 +560,26 @@ static void acpi_processor_idle(void) TRACE_6D(TRC_PM_IDLE_EXIT, cx->idx, t2, irq_traced[0], irq_traced[1], irq_traced[2], irq_traced[3]); + /* Update statistics */ + acpi_update_idle_stats(power, cx, ticks_elapsed(t1, t2)); /* Re-enable interrupts */ local_irq_enable(); /* recovering APIC */ lapic_timer_on(); - /* Compute time (ticks) that we were actually asleep */ - sleep_ticks = ticks_elapsed(t1, t2); break; default: + /* Now in C0 */ + power->last_state = &power->states[0]; local_irq_enable(); sched_tick_resume(); cpufreq_dbs_timer_resume(); return; } - cx->usage++; - if ( sleep_ticks > 0 ) - { - power->last_residency = tick_to_ns(sleep_ticks) / 1000UL; - cx->time += sleep_ticks; - } + /* Now in C0 */ + power->last_state = &power->states[0]; sched_tick_resume(); cpufreq_dbs_timer_resume(); @@ -662,6 +683,7 @@ static int cpuidle_init_cpu(int cpu) acpi_power->states[1].type = ACPI_STATE_C1; acpi_power->states[1].entry_method = ACPI_CSTATE_EM_HALT; acpi_power->safe_state = &acpi_power->states[1]; + spin_lock_init(&acpi_power->stat_lock); return 0; } @@ -1064,7 +1086,8 @@ uint32_t pmstat_get_cx_nr(uint32_t cpuid int pmstat_get_cx_stat(uint32_t cpuid, struct pm_cx_stat *stat) { struct acpi_processor_power *power = processor_powers[cpuid]; - uint64_t usage, res, idle_usage = 0, idle_res = 0; + uint64_t idle_usage = 0, idle_res = 0; + uint64_t usage[ACPI_PROCESSOR_MAX_POWER], res[ACPI_PROCESSOR_MAX_POWER]; int i; struct hw_residencies hw_res; @@ -1084,16 +1107,14 @@ int pmstat_get_cx_stat(uint32_t cpuid, s if ( pm_idle_save == NULL ) { /* C1 */ - usage = 1; - res = stat->idle_time; - if ( copy_to_guest_offset(stat->triggers, 1, &usage, 1) || - copy_to_guest_offset(stat->residencies, 1, &res, 1) ) - return -EFAULT; + usage[1] = 1; + res[1] = stat->idle_time; /* C0 */ - res = NOW() - res; - if ( copy_to_guest_offset(stat->triggers, 0, &usage, 1) || - copy_to_guest_offset(stat->residencies, 0, &res, 1) ) + res[0] = NOW() - res[1]; + + if ( copy_to_guest_offset(stat->triggers, 0, &usage[0], 2) || + copy_to_guest_offset(stat->residencies, 0, &res[0], 2) ) return -EFAULT; stat->pc2 = 0; @@ -1110,21 +1131,25 @@ int pmstat_get_cx_stat(uint32_t cpuid, s { if ( i != 0 ) { - usage = power->states[i].usage; - res = tick_to_ns(power->states[i].time); - idle_usage += usage; - idle_res += res; + spin_lock_irq(&power->stat_lock); + usage[i] = power->states[i].usage; + res[i] = tick_to_ns(power->states[i].time); + spin_unlock_irq(&power->stat_lock); + + idle_usage += usage[i]; + idle_res += res[i]; } else { - usage = idle_usage; - res = NOW() - idle_res; + usage[i] = idle_usage; + res[i] = NOW() - idle_res; } - if ( copy_to_guest_offset(stat->triggers, i, &usage, 1) || - copy_to_guest_offset(stat->residencies, i, &res, 1) ) - return -EFAULT; } + if ( copy_to_guest_offset(stat->triggers, 0, &usage[0], power->count) || + copy_to_guest_offset(stat->residencies, 0, &res[0], power->count) ) + return -EFAULT; + get_hw_residencies(cpuid, &hw_res); stat->pc2 = hw_res.pc2; diff -r 3537a8cb0835 -r 8ec2c428f4da xen/include/xen/cpuidle.h --- a/xen/include/xen/cpuidle.h Wed Jun 06 16:33:21 2012 +0100 +++ b/xen/include/xen/cpuidle.h Wed Jun 06 16:34:53 2012 +0100 @@ -28,6 +28,7 @@ #define _XEN_CPUIDLE_H #include +#include #define ACPI_PROCESSOR_MAX_POWER 8 #define CPUIDLE_NAME_LEN 16 @@ -69,6 +70,7 @@ struct acpi_processor_power void *gdata; /* governor specific data */ u32 last_residency; u32 count; + spinlock_t stat_lock; struct acpi_processor_cx states[ACPI_PROCESSOR_MAX_POWER]; }; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jun 07 02:44:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Jun 2012 02:44: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 1ScShs-0006ni-NY; Thu, 07 Jun 2012 02:44:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScShq-0006n3-RE for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:15 +0000 Received: from [85.158.139.83:43935] by server-3.bemta-5.messagelabs.com id F3/ED-17554-D7510DF4; Thu, 07 Jun 2012 02:44:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-182.messagelabs.com!1339037051!32671335!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15033 invoked from network); 7 Jun 2012 02:44:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 7 Jun 2012 02:44:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScShn-0004hw-18 for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ScShm-0002ju-Su for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:10 +0000 Message-Id: Date: Thu, 07 Jun 2012 02:44:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xenpm, x86: Fix reporting of idle state average residency times 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 # HG changeset patch # User Boris Ostrovsky # Date 1338996893 -3600 # Node ID 8ec2c428f4dad55cf6d91b893a19c2218972db5e # Parent 3537a8cb0835ce5e96813194d5b0825660108fe0 xenpm, x86: Fix reporting of idle state average residency times If CPU stays in the same idle state for the full duration of xenpm sample then average residency may not be reported correctly since usage counter will not be incremented. In addition, in order to calculate averages correctly residence time and usage counter should be read and written atomically. Signed-off-by: Boris Ostrovsky Committed-by: Keir Fraser --- diff -r 3537a8cb0835 -r 8ec2c428f4da tools/misc/xenpm.c --- a/tools/misc/xenpm.c Wed Jun 06 16:33:21 2012 +0100 +++ b/tools/misc/xenpm.c Wed Jun 06 16:34:53 2012 +0100 @@ -389,7 +389,14 @@ static void signal_int_handler(int signo res = ( diff >= 0 ) ? diff : 0; triggers = cxstat_end[i].triggers[j] - cxstat_start[i].triggers[j]; - avg_res = (triggers==0) ? 0: (double)res/triggers/1000000.0; + /* + * triggers may be zero if the CPU has been in this state for + * the whole sample or if it never entered the state + */ + if ( triggers == 0 && cxstat_end[i].last == j ) + avg_res = (double)sum_cx[i]/1000000.0; + else + avg_res = (triggers==0) ? 0: (double)res/triggers/1000000.0; printf(" C%d\t%"PRIu64"\t(%5.2f%%)\t%.2f\n", j, res/1000000UL, 100 * res / (double)sum_cx[i], avg_res ); } diff -r 3537a8cb0835 -r 8ec2c428f4da xen/arch/x86/acpi/cpu_idle.c --- a/xen/arch/x86/acpi/cpu_idle.c Wed Jun 06 16:33:21 2012 +0100 +++ b/xen/arch/x86/acpi/cpu_idle.c Wed Jun 06 16:34:53 2012 +0100 @@ -165,29 +165,35 @@ static void print_acpi_power(uint32_t cp { uint32_t i, idle_usage = 0; uint64_t res, idle_res = 0; + u32 usage; + u8 last_state_idx; printk("==cpu%d==\n", cpu); - printk("active state:\t\tC%d\n", - power->last_state ? power->last_state->idx : -1); + last_state_idx = power->last_state ? power->last_state->idx : -1; + printk("active state:\t\tC%d\n", last_state_idx); printk("max_cstate:\t\tC%d\n", max_cstate); printk("states:\n"); for ( i = 1; i < power->count; i++ ) { + spin_lock_irq(&power->stat_lock); res = tick_to_ns(power->states[i].time); - idle_usage += power->states[i].usage; + usage = power->states[i].usage; + spin_unlock_irq(&power->stat_lock); + + idle_usage += usage; idle_res += res; - printk((power->last_state && power->last_state->idx == i) ? - " *" : " "); + printk((last_state_idx == i) ? " *" : " "); printk("C%d:\t", i); printk("type[C%d] ", power->states[i].type); printk("latency[%03d] ", power->states[i].latency); - printk("usage[%08d] ", power->states[i].usage); + printk("usage[%08d] ", usage); printk("method[%5s] ", acpi_cstate_method_name[power->states[i].entry_method]); printk("duration[%"PRId64"]\n", res); } - printk(" C0:\tusage[%08d] duration[%"PRId64"]\n", + printk((last_state_idx == 0) ? " *" : " "); + printk("C0:\tusage[%08d] duration[%"PRId64"]\n", idle_usage, NOW() - idle_res); print_hw_residencies(cpu); @@ -384,12 +390,29 @@ bool_t errata_c6_eoi_workaround(void) return (fix_needed && cpu_has_pending_apic_eoi()); } +static inline void acpi_update_idle_stats(struct acpi_processor_power *power, + struct acpi_processor_cx *cx, + int64_t sleep_ticks) +{ + /* Interrupts are disabled */ + + spin_lock(&power->stat_lock); + + cx->usage++; + if ( sleep_ticks > 0 ) + { + power->last_residency = tick_to_ns(sleep_ticks) / 1000UL; + cx->time += sleep_ticks; + } + + spin_unlock(&power->stat_lock); +} + static void acpi_processor_idle(void) { struct acpi_processor_power *power = processor_powers[smp_processor_id()]; struct acpi_processor_cx *cx = NULL; int next_state; - int64_t sleep_ticks = 0; uint64_t t1, t2 = 0; u32 exp = 0, pred = 0; u32 irq_traced[4] = { 0 }; @@ -462,10 +485,10 @@ static void acpi_processor_idle(void) /* Trace cpu idle exit */ TRACE_6D(TRC_PM_IDLE_EXIT, cx->idx, t2, irq_traced[0], irq_traced[1], irq_traced[2], irq_traced[3]); + /* Update statistics */ + acpi_update_idle_stats(power, cx, ticks_elapsed(t1, t2)); /* Re-enable interrupts */ local_irq_enable(); - /* Compute time (ticks) that we were actually asleep */ - sleep_ticks = ticks_elapsed(t1, t2); break; } @@ -537,28 +560,26 @@ static void acpi_processor_idle(void) TRACE_6D(TRC_PM_IDLE_EXIT, cx->idx, t2, irq_traced[0], irq_traced[1], irq_traced[2], irq_traced[3]); + /* Update statistics */ + acpi_update_idle_stats(power, cx, ticks_elapsed(t1, t2)); /* Re-enable interrupts */ local_irq_enable(); /* recovering APIC */ lapic_timer_on(); - /* Compute time (ticks) that we were actually asleep */ - sleep_ticks = ticks_elapsed(t1, t2); break; default: + /* Now in C0 */ + power->last_state = &power->states[0]; local_irq_enable(); sched_tick_resume(); cpufreq_dbs_timer_resume(); return; } - cx->usage++; - if ( sleep_ticks > 0 ) - { - power->last_residency = tick_to_ns(sleep_ticks) / 1000UL; - cx->time += sleep_ticks; - } + /* Now in C0 */ + power->last_state = &power->states[0]; sched_tick_resume(); cpufreq_dbs_timer_resume(); @@ -662,6 +683,7 @@ static int cpuidle_init_cpu(int cpu) acpi_power->states[1].type = ACPI_STATE_C1; acpi_power->states[1].entry_method = ACPI_CSTATE_EM_HALT; acpi_power->safe_state = &acpi_power->states[1]; + spin_lock_init(&acpi_power->stat_lock); return 0; } @@ -1064,7 +1086,8 @@ uint32_t pmstat_get_cx_nr(uint32_t cpuid int pmstat_get_cx_stat(uint32_t cpuid, struct pm_cx_stat *stat) { struct acpi_processor_power *power = processor_powers[cpuid]; - uint64_t usage, res, idle_usage = 0, idle_res = 0; + uint64_t idle_usage = 0, idle_res = 0; + uint64_t usage[ACPI_PROCESSOR_MAX_POWER], res[ACPI_PROCESSOR_MAX_POWER]; int i; struct hw_residencies hw_res; @@ -1084,16 +1107,14 @@ int pmstat_get_cx_stat(uint32_t cpuid, s if ( pm_idle_save == NULL ) { /* C1 */ - usage = 1; - res = stat->idle_time; - if ( copy_to_guest_offset(stat->triggers, 1, &usage, 1) || - copy_to_guest_offset(stat->residencies, 1, &res, 1) ) - return -EFAULT; + usage[1] = 1; + res[1] = stat->idle_time; /* C0 */ - res = NOW() - res; - if ( copy_to_guest_offset(stat->triggers, 0, &usage, 1) || - copy_to_guest_offset(stat->residencies, 0, &res, 1) ) + res[0] = NOW() - res[1]; + + if ( copy_to_guest_offset(stat->triggers, 0, &usage[0], 2) || + copy_to_guest_offset(stat->residencies, 0, &res[0], 2) ) return -EFAULT; stat->pc2 = 0; @@ -1110,21 +1131,25 @@ int pmstat_get_cx_stat(uint32_t cpuid, s { if ( i != 0 ) { - usage = power->states[i].usage; - res = tick_to_ns(power->states[i].time); - idle_usage += usage; - idle_res += res; + spin_lock_irq(&power->stat_lock); + usage[i] = power->states[i].usage; + res[i] = tick_to_ns(power->states[i].time); + spin_unlock_irq(&power->stat_lock); + + idle_usage += usage[i]; + idle_res += res[i]; } else { - usage = idle_usage; - res = NOW() - idle_res; + usage[i] = idle_usage; + res[i] = NOW() - idle_res; } - if ( copy_to_guest_offset(stat->triggers, i, &usage, 1) || - copy_to_guest_offset(stat->residencies, i, &res, 1) ) - return -EFAULT; } + if ( copy_to_guest_offset(stat->triggers, 0, &usage[0], power->count) || + copy_to_guest_offset(stat->residencies, 0, &res[0], power->count) ) + return -EFAULT; + get_hw_residencies(cpuid, &hw_res); stat->pc2 = hw_res.pc2; diff -r 3537a8cb0835 -r 8ec2c428f4da xen/include/xen/cpuidle.h --- a/xen/include/xen/cpuidle.h Wed Jun 06 16:33:21 2012 +0100 +++ b/xen/include/xen/cpuidle.h Wed Jun 06 16:34:53 2012 +0100 @@ -28,6 +28,7 @@ #define _XEN_CPUIDLE_H #include +#include #define ACPI_PROCESSOR_MAX_POWER 8 #define CPUIDLE_NAME_LEN 16 @@ -69,6 +70,7 @@ struct acpi_processor_power void *gdata; /* governor specific data */ u32 last_residency; u32 count; + spinlock_t stat_lock; struct acpi_processor_cx states[ACPI_PROCESSOR_MAX_POWER]; }; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jun 07 02:44:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Jun 2012 02:44: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 1ScShq-0006nC-Ix; Thu, 07 Jun 2012 02:44:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScShp-0006mT-1u for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:13 +0000 Received: from [85.158.138.51:58981] by server-1.bemta-3.messagelabs.com id A4/71-01327-C7510DF4; Thu, 07 Jun 2012 02:44:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-174.messagelabs.com!1339037050!31205391!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18208 invoked from network); 7 Jun 2012 02:44:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 7 Jun 2012 02:44:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScShl-0004hq-Sl for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ScShl-0002jP-RO for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:09 +0000 Message-Id: Date: Thu, 07 Jun 2012 02:44:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: introduce LIBXL_DOMAIN_TYPE_INVALID 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 # HG changeset patch # User Dario Faggioli # Date 1338994628 -3600 # Node ID f2f9745c81b74dac74b4d378bef4695eece181d7 # Parent a24ffff4e18d3313be6ff66eb895071fd8dfef84 libxl: introduce LIBXL_DOMAIN_TYPE_INVALID To avoid recent gcc complaining about: libxl.c: In function 'libxl_primary_console_exec': libxl.c:1233:9: error: case value '4294967295' not in enumerated type 'libxl_domain_type' [-Werror=switch] Also: - have all the call sites of libxl__domain_type() return with error in case the function returns LIBXL_DOMAIN_TYPE_INVALID; - adjust all other code segments where -Wswitch makes would claim that LIBXL_DOMAIN_TYPE_INVALID is not handled by adding a "default: abort();" clause. Signed-off-by: Dario Faggioli Signed-off-by: Christoph Egger Acked-by: Ian Campbell [ ijc -- use LIBXL_DOMAIN_TYPE_INVALID instead of -1 for libxl_domain_build_info.type's keyvar_init_val. -- what used to be libxl_primary_console_exec is now in libxl__primary_console_find so resolve the rejected hunk accordingly ] Committed-by: Ian Campbell --- diff -r a24ffff4e18d -r f2f9745c81b7 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Wed Jun 06 13:53:59 2012 +0100 +++ b/tools/libxl/libxl.c Wed Jun 06 15:57:08 2012 +0100 @@ -656,6 +656,11 @@ int libxl_domain_remus_start(libxl_ctx * libxl_domain_type type = libxl__domain_type(gc, domid); int rc = 0; + if (type == LIBXL_DOMAIN_TYPE_INVALID) { + rc = ERROR_FAIL; + goto remus_fail; + } + if (info == NULL) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "No remus_info structure supplied for domain %d", domid); @@ -1313,11 +1318,9 @@ static int libxl__primary_console_find(l *cons_num = 0; *type = LIBXL_CONSOLE_TYPE_PV; break; - case -1: - LOG(ERROR,"unable to get domain type for domid=%"PRIu32, domid_vm); + case LIBXL_DOMAIN_TYPE_INVALID: rc = ERROR_INVAL; goto out; - break; default: abort(); } diff -r a24ffff4e18d -r f2f9745c81b7 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Wed Jun 06 13:53:59 2012 +0100 +++ b/tools/libxl/libxl_dm.c Wed Jun 06 15:57:08 2012 +0100 @@ -257,6 +257,8 @@ static char ** libxl__build_device_model for (i = 0; b_info->extra_hvm && b_info->extra_hvm[i] != NULL; i++) flexarray_append(dm_args, b_info->extra_hvm[i]); break; + default: + abort(); } flexarray_append(dm_args, NULL); return (char **) flexarray_contents(dm_args); @@ -505,6 +507,8 @@ static char ** libxl__build_device_model for (i = 0; b_info->extra_hvm && b_info->extra_hvm[i] != NULL; i++) flexarray_append(dm_args, b_info->extra_hvm[i]); break; + default: + abort(); } ram_size = libxl__sizekb_to_mb(b_info->max_memkb - b_info->video_memkb); diff -r a24ffff4e18d -r f2f9745c81b7 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Wed Jun 06 13:53:59 2012 +0100 +++ b/tools/libxl/libxl_dom.c Wed Jun 06 15:57:08 2012 +0100 @@ -32,10 +32,11 @@ libxl_domain_type libxl__domain_type(lib int ret; ret = xc_domain_getinfolist(ctx->xch, domid, 1, &info); - if (ret != 1) - return -1; - if (info.domain != domid) - return -1; + if (ret != 1 || info.domain != domid) { + LIBXL__LOG(CTX, LIBXL__LOG_ERROR, + "unable to get domain type for domid=%"PRIu32, domid); + return LIBXL_DOMAIN_TYPE_INVALID; + } if (info.flags & XEN_DOMINF_hvm_guest) return LIBXL_DOMAIN_TYPE_HVM; else diff -r a24ffff4e18d -r f2f9745c81b7 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Wed Jun 06 13:53:59 2012 +0100 +++ b/tools/libxl/libxl_types.idl Wed Jun 06 15:57:08 2012 +0100 @@ -28,6 +28,7 @@ MemKB = UInt(64, init_val = "LIBXL_MEMKB # libxl_domain_type = Enumeration("domain_type", [ + (-1, "INVALID"), (1, "HVM"), (2, "PV"), ]) @@ -310,7 +311,8 @@ libxl_domain_build_info = Struct("domain # Use host's E820 for PCI passthrough. ("e820_host", libxl_defbool), ])), - ], keyvar_init_val = "-1")), + ("invalid", Struct(None, [])), + ], keyvar_init_val = "LIBXL_DOMAIN_TYPE_INVALID")), ], dir=DIR_IN ) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jun 07 02:44:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Jun 2012 02:44: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 1ScShq-0006nC-Ix; Thu, 07 Jun 2012 02:44:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScShp-0006mT-1u for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:13 +0000 Received: from [85.158.138.51:58981] by server-1.bemta-3.messagelabs.com id A4/71-01327-C7510DF4; Thu, 07 Jun 2012 02:44:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-174.messagelabs.com!1339037050!31205391!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18208 invoked from network); 7 Jun 2012 02:44:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 7 Jun 2012 02:44:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScShl-0004hq-Sl for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ScShl-0002jP-RO for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 02:44:09 +0000 Message-Id: Date: Thu, 07 Jun 2012 02:44:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: introduce LIBXL_DOMAIN_TYPE_INVALID 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 # HG changeset patch # User Dario Faggioli # Date 1338994628 -3600 # Node ID f2f9745c81b74dac74b4d378bef4695eece181d7 # Parent a24ffff4e18d3313be6ff66eb895071fd8dfef84 libxl: introduce LIBXL_DOMAIN_TYPE_INVALID To avoid recent gcc complaining about: libxl.c: In function 'libxl_primary_console_exec': libxl.c:1233:9: error: case value '4294967295' not in enumerated type 'libxl_domain_type' [-Werror=switch] Also: - have all the call sites of libxl__domain_type() return with error in case the function returns LIBXL_DOMAIN_TYPE_INVALID; - adjust all other code segments where -Wswitch makes would claim that LIBXL_DOMAIN_TYPE_INVALID is not handled by adding a "default: abort();" clause. Signed-off-by: Dario Faggioli Signed-off-by: Christoph Egger Acked-by: Ian Campbell [ ijc -- use LIBXL_DOMAIN_TYPE_INVALID instead of -1 for libxl_domain_build_info.type's keyvar_init_val. -- what used to be libxl_primary_console_exec is now in libxl__primary_console_find so resolve the rejected hunk accordingly ] Committed-by: Ian Campbell --- diff -r a24ffff4e18d -r f2f9745c81b7 tools/libxl/libxl.c --- a/tools/libxl/libxl.c Wed Jun 06 13:53:59 2012 +0100 +++ b/tools/libxl/libxl.c Wed Jun 06 15:57:08 2012 +0100 @@ -656,6 +656,11 @@ int libxl_domain_remus_start(libxl_ctx * libxl_domain_type type = libxl__domain_type(gc, domid); int rc = 0; + if (type == LIBXL_DOMAIN_TYPE_INVALID) { + rc = ERROR_FAIL; + goto remus_fail; + } + if (info == NULL) { LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "No remus_info structure supplied for domain %d", domid); @@ -1313,11 +1318,9 @@ static int libxl__primary_console_find(l *cons_num = 0; *type = LIBXL_CONSOLE_TYPE_PV; break; - case -1: - LOG(ERROR,"unable to get domain type for domid=%"PRIu32, domid_vm); + case LIBXL_DOMAIN_TYPE_INVALID: rc = ERROR_INVAL; goto out; - break; default: abort(); } diff -r a24ffff4e18d -r f2f9745c81b7 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Wed Jun 06 13:53:59 2012 +0100 +++ b/tools/libxl/libxl_dm.c Wed Jun 06 15:57:08 2012 +0100 @@ -257,6 +257,8 @@ static char ** libxl__build_device_model for (i = 0; b_info->extra_hvm && b_info->extra_hvm[i] != NULL; i++) flexarray_append(dm_args, b_info->extra_hvm[i]); break; + default: + abort(); } flexarray_append(dm_args, NULL); return (char **) flexarray_contents(dm_args); @@ -505,6 +507,8 @@ static char ** libxl__build_device_model for (i = 0; b_info->extra_hvm && b_info->extra_hvm[i] != NULL; i++) flexarray_append(dm_args, b_info->extra_hvm[i]); break; + default: + abort(); } ram_size = libxl__sizekb_to_mb(b_info->max_memkb - b_info->video_memkb); diff -r a24ffff4e18d -r f2f9745c81b7 tools/libxl/libxl_dom.c --- a/tools/libxl/libxl_dom.c Wed Jun 06 13:53:59 2012 +0100 +++ b/tools/libxl/libxl_dom.c Wed Jun 06 15:57:08 2012 +0100 @@ -32,10 +32,11 @@ libxl_domain_type libxl__domain_type(lib int ret; ret = xc_domain_getinfolist(ctx->xch, domid, 1, &info); - if (ret != 1) - return -1; - if (info.domain != domid) - return -1; + if (ret != 1 || info.domain != domid) { + LIBXL__LOG(CTX, LIBXL__LOG_ERROR, + "unable to get domain type for domid=%"PRIu32, domid); + return LIBXL_DOMAIN_TYPE_INVALID; + } if (info.flags & XEN_DOMINF_hvm_guest) return LIBXL_DOMAIN_TYPE_HVM; else diff -r a24ffff4e18d -r f2f9745c81b7 tools/libxl/libxl_types.idl --- a/tools/libxl/libxl_types.idl Wed Jun 06 13:53:59 2012 +0100 +++ b/tools/libxl/libxl_types.idl Wed Jun 06 15:57:08 2012 +0100 @@ -28,6 +28,7 @@ MemKB = UInt(64, init_val = "LIBXL_MEMKB # libxl_domain_type = Enumeration("domain_type", [ + (-1, "INVALID"), (1, "HVM"), (2, "PV"), ]) @@ -310,7 +311,8 @@ libxl_domain_build_info = Struct("domain # Use host's E820 for PCI passthrough. ("e820_host", libxl_defbool), ])), - ], keyvar_init_val = "-1")), + ("invalid", Struct(None, [])), + ], keyvar_init_val = "LIBXL_DOMAIN_TYPE_INVALID")), ], dir=DIR_IN ) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Jun 07 18:55:15 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Jun 2012 18:55: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 1SchrT-0000R9-5o; Thu, 07 Jun 2012 18:55:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SchrR-0000R4-I3 for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 18:55:09 +0000 Received: from [85.158.138.51:29540] by server-1.bemta-3.messagelabs.com id 86/BF-01327-C09F0DF4; Thu, 07 Jun 2012 18:55:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-174.messagelabs.com!1339095306!12640792!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26180 invoked from network); 7 Jun 2012 18:55:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 7 Jun 2012 18:55:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SchrN-00005A-0L for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 18:55:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SchrM-0000UR-PO for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 18:55:04 +0000 Date: Thu, 07 Jun 2012 18:55:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] qemu-xen-trad/block: use a character device if a block device is given 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 136f340531929c723113bbd625d99de2b552a871 Author: Christoph Egger Date: Thu Jun 7 19:35:28 2012 +0100 qemu-xen-trad/block: use a character device if a block device is given On NetBSD a userland process is better with the character device interface. In addition, a block device can't be opened twice; if a Xen backend opens it, qemu can't and vice-versa. This is a backport of 1de1ae0a7d956b3c87712bf2c09d277f99873f4c. Signed-off-by: Christoph Egger Signed-off-by: Kevin Wolf Backport-requested-by: Roger Pau Monne Signed-off-by: Roger Pau Monne --- block-raw-posix.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/block-raw-posix.c b/block-raw-posix.c index 9a02d4f..e7d7457 100644 --- a/block-raw-posix.c +++ b/block-raw-posix.c @@ -116,11 +116,54 @@ static int posix_aio_init(void); static int fd_open(BlockDriverState *bs); +#if defined(__NetBSD__) +static int raw_normalize_devicepath(const char **filename) +{ + static char namebuf[PATH_MAX]; + const char *dp, *fname; + struct stat sb; + + fname = *filename; + dp = strrchr(fname, '/'); + if (lstat(fname, &sb) < 0) { + fprintf(stderr, "%s: stat failed: %s\n", + fname, strerror(errno)); + return -errno; + } + + if (!S_ISBLK(sb.st_mode)) { + return 0; + } + + if (dp == NULL) { + snprintf(namebuf, PATH_MAX, "r%s", fname); + } else { + snprintf(namebuf, PATH_MAX, "%.*s/r%s", + (int)(dp - fname), fname, dp + 1); + } + fprintf(stderr, "%s is a block device", fname); + *filename = namebuf; + fprintf(stderr, ", using %s\n", *filename); + + return 0; +} +#else +static int raw_normalize_devicepath(const char **filename) +{ + return 0; +} +#endif + static int raw_open(BlockDriverState *bs, const char *filename, int flags) { BDRVRawState *s = bs->opaque; int fd, open_flags, ret; + ret = raw_normalize_devicepath(&filename); + if (ret != 0) { + return ret; + } + posix_aio_init(); s->lseek_err_cnt = 0; -- 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 Thu Jun 07 18:55:15 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Jun 2012 18:55: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 1SchrT-0000R9-5o; Thu, 07 Jun 2012 18:55:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SchrR-0000R4-I3 for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 18:55:09 +0000 Received: from [85.158.138.51:29540] by server-1.bemta-3.messagelabs.com id 86/BF-01327-C09F0DF4; Thu, 07 Jun 2012 18:55:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-174.messagelabs.com!1339095306!12640792!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26180 invoked from network); 7 Jun 2012 18:55:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 7 Jun 2012 18:55:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SchrN-00005A-0L for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 18:55:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SchrM-0000UR-PO for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 18:55:04 +0000 Date: Thu, 07 Jun 2012 18:55:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] qemu-xen-trad/block: use a character device if a block device is given 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 136f340531929c723113bbd625d99de2b552a871 Author: Christoph Egger Date: Thu Jun 7 19:35:28 2012 +0100 qemu-xen-trad/block: use a character device if a block device is given On NetBSD a userland process is better with the character device interface. In addition, a block device can't be opened twice; if a Xen backend opens it, qemu can't and vice-versa. This is a backport of 1de1ae0a7d956b3c87712bf2c09d277f99873f4c. Signed-off-by: Christoph Egger Signed-off-by: Kevin Wolf Backport-requested-by: Roger Pau Monne Signed-off-by: Roger Pau Monne --- block-raw-posix.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/block-raw-posix.c b/block-raw-posix.c index 9a02d4f..e7d7457 100644 --- a/block-raw-posix.c +++ b/block-raw-posix.c @@ -116,11 +116,54 @@ static int posix_aio_init(void); static int fd_open(BlockDriverState *bs); +#if defined(__NetBSD__) +static int raw_normalize_devicepath(const char **filename) +{ + static char namebuf[PATH_MAX]; + const char *dp, *fname; + struct stat sb; + + fname = *filename; + dp = strrchr(fname, '/'); + if (lstat(fname, &sb) < 0) { + fprintf(stderr, "%s: stat failed: %s\n", + fname, strerror(errno)); + return -errno; + } + + if (!S_ISBLK(sb.st_mode)) { + return 0; + } + + if (dp == NULL) { + snprintf(namebuf, PATH_MAX, "r%s", fname); + } else { + snprintf(namebuf, PATH_MAX, "%.*s/r%s", + (int)(dp - fname), fname, dp + 1); + } + fprintf(stderr, "%s is a block device", fname); + *filename = namebuf; + fprintf(stderr, ", using %s\n", *filename); + + return 0; +} +#else +static int raw_normalize_devicepath(const char **filename) +{ + return 0; +} +#endif + static int raw_open(BlockDriverState *bs, const char *filename, int flags) { BDRVRawState *s = bs->opaque; int fd, open_flags, ret; + ret = raw_normalize_devicepath(&filename); + if (ret != 0) { + return ret; + } + posix_aio_init(); s->lseek_err_cnt = 0; -- 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 Thu Jun 07 18:55:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Jun 2012 18:55: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 1Schrb-0000Ri-8l; Thu, 07 Jun 2012 18:55:19 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Schra-0000Rd-GZ for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 18:55:18 +0000 Received: from [85.158.143.35:17379] by server-2.bemta-4.messagelabs.com id A9/51-17938-519F0DF4; Thu, 07 Jun 2012 18:55:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1339095315!14900554!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29712 invoked from network); 7 Jun 2012 18:55:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 7 Jun 2012 18:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SchrX-00005D-9G for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 18:55:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SchrX-0000Ur-4J for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 18:55:15 +0000 Date: Thu, 07 Jun 2012 18:55:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] qemu-xen-trad/block: get right partition size 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 cbf0f291d4f1d40c59f56b8bd73292b8ad4f84b5 Author: Adam Hamsik Date: Thu Jun 7 19:36:26 2012 +0100 qemu-xen-trad/block: get right partition size use the correct way to get the size of a disk device or partition This this a backport of d1f6fd8d1400ab356aee776b1ecc3ed1e89dbeaa. From: Adam Hamsik Signed-off-by: Christoph Egger Signed-off-by: Kevin Wolf Backport-requested-by: Roger Pau Monne Signed-off-by: Roger Pau Monne --- block-raw-posix.c | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) diff --git a/block-raw-posix.c b/block-raw-posix.c index e7d7457..795cd5b 100644 --- a/block-raw-posix.c +++ b/block-raw-posix.c @@ -60,6 +60,12 @@ #include #include #endif +#ifdef __NetBSD__ +#include +#include +#include +#include +#endif #ifdef __OpenBSD__ #include @@ -811,7 +817,32 @@ static int64_t raw_getlength(BlockDriverState *bs) } else return st.st_size; } -#else /* !__OpenBSD__ */ +#elif defined(__NetBSD__) +static int64_t raw_getlength(BlockDriverState *bs) +{ + BDRVRawState *s = bs->opaque; + int fd = s->fd; + struct stat st; + + if (fstat(fd, &st)) + return -1; + if (S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode)) { + struct dkwedge_info dkw; + + if (ioctl(fd, DIOCGWEDGEINFO, &dkw) != -1) { + return dkw.dkw_size * 512; + } else { + struct disklabel dl; + + if (ioctl(fd, DIOCGDINFO, &dl)) + return -1; + return (uint64_t)dl.d_secsize * + dl.d_partitions[DISKPART(st.st_rdev)].p_size; + } + } else + return st.st_size; +} +#else /* !__OpenBSD__ && !__NetBSD__ */ static int64_t raw_getlength(BlockDriverState *bs) { BDRVRawState *s = bs->opaque; -- 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 Thu Jun 07 18:55:23 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Jun 2012 18:55: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 1Schrb-0000Ri-8l; Thu, 07 Jun 2012 18:55:19 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Schra-0000Rd-GZ for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 18:55:18 +0000 Received: from [85.158.143.35:17379] by server-2.bemta-4.messagelabs.com id A9/51-17938-519F0DF4; Thu, 07 Jun 2012 18:55:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1339095315!14900554!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29712 invoked from network); 7 Jun 2012 18:55:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 7 Jun 2012 18:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SchrX-00005D-9G for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 18:55:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SchrX-0000Ur-4J for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 18:55:15 +0000 Date: Thu, 07 Jun 2012 18:55:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] qemu-xen-trad/block: get right partition size 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 cbf0f291d4f1d40c59f56b8bd73292b8ad4f84b5 Author: Adam Hamsik Date: Thu Jun 7 19:36:26 2012 +0100 qemu-xen-trad/block: get right partition size use the correct way to get the size of a disk device or partition This this a backport of d1f6fd8d1400ab356aee776b1ecc3ed1e89dbeaa. From: Adam Hamsik Signed-off-by: Christoph Egger Signed-off-by: Kevin Wolf Backport-requested-by: Roger Pau Monne Signed-off-by: Roger Pau Monne --- block-raw-posix.c | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) diff --git a/block-raw-posix.c b/block-raw-posix.c index e7d7457..795cd5b 100644 --- a/block-raw-posix.c +++ b/block-raw-posix.c @@ -60,6 +60,12 @@ #include #include #endif +#ifdef __NetBSD__ +#include +#include +#include +#include +#endif #ifdef __OpenBSD__ #include @@ -811,7 +817,32 @@ static int64_t raw_getlength(BlockDriverState *bs) } else return st.st_size; } -#else /* !__OpenBSD__ */ +#elif defined(__NetBSD__) +static int64_t raw_getlength(BlockDriverState *bs) +{ + BDRVRawState *s = bs->opaque; + int fd = s->fd; + struct stat st; + + if (fstat(fd, &st)) + return -1; + if (S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode)) { + struct dkwedge_info dkw; + + if (ioctl(fd, DIOCGWEDGEINFO, &dkw) != -1) { + return dkw.dkw_size * 512; + } else { + struct disklabel dl; + + if (ioctl(fd, DIOCGDINFO, &dl)) + return -1; + return (uint64_t)dl.d_secsize * + dl.d_partitions[DISKPART(st.st_rdev)].p_size; + } + } else + return st.st_size; +} +#else /* !__OpenBSD__ && !__NetBSD__ */ static int64_t raw_getlength(BlockDriverState *bs) { BDRVRawState *s = bs->opaque; -- 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 Thu Jun 07 19:11:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Jun 2012 19: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 1Sci6z-00011B-OP; Thu, 07 Jun 2012 19: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 1Sci6y-00010q-PX for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 19:11:12 +0000 Received: from [85.158.139.83:39642] by server-5.bemta-5.messagelabs.com id 9B/53-04481-0DCF0DF4; Thu, 07 Jun 2012 19:11:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-182.messagelabs.com!1339096267!32418744!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9083 invoked from network); 7 Jun 2012 19:11:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 7 Jun 2012 19:11:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Sci6t-0000IC-0l for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 19:11:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Sci6q-0000yE-Bm for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 19:11:06 +0000 Date: Thu, 07 Jun 2012 19:11:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] qemu-xen-trad: fix sys-queue.h usage on BSD systems 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 50c553be472c9f4b05a0526c0aae98709ca9ffff Author: Roger Pau Monne Date: Thu Jun 7 19:44:01 2012 +0100 qemu-xen-trad: fix sys-queue.h usage on BSD systems BSD systems already have a sys/queue.h file, which has more macros than the one Qemu uses, and some header files depend on having that macros defined (sys/disk.h for example). Disable sys-queue.h on BSD systems and include the native one. This is not a backport because the original patch is too dificult to backport, it's commit 72cf2d4f0e181d0d3a3122e04129c58a95da713e. Doing a diff -bB shows that the Qemu version is just a stripped version of the original NetBSD header, with many macros removed, but no new ones added. Signed-off-by: Roger Pau Monne Acked-by: Stefano Stabellini Acked-by: Ian Jackson --- sys-queue.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/sys-queue.h b/sys-queue.h index cb6a4c8..55c26fe 100644 --- a/sys-queue.h +++ b/sys-queue.h @@ -36,6 +36,12 @@ * @(#)queue.h 8.5 (Berkeley) 8/20/94 */ +#include "config-host.h" +#ifdef _BSD +/* include native header before sys-queue.h */ +#include +#endif + #ifndef _SYS_QUEUE_H_ #define _SYS_QUEUE_H_ -- 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 Thu Jun 07 19:11:20 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 Jun 2012 19: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 1Sci6z-00011B-OP; Thu, 07 Jun 2012 19: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 1Sci6y-00010q-PX for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 19:11:12 +0000 Received: from [85.158.139.83:39642] by server-5.bemta-5.messagelabs.com id 9B/53-04481-0DCF0DF4; Thu, 07 Jun 2012 19:11:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-182.messagelabs.com!1339096267!32418744!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9083 invoked from network); 7 Jun 2012 19:11:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 7 Jun 2012 19:11:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Sci6t-0000IC-0l for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 19:11:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Sci6q-0000yE-Bm for xen-changelog@lists.xensource.com; Thu, 07 Jun 2012 19:11:06 +0000 Date: Thu, 07 Jun 2012 19:11:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] qemu-xen-trad: fix sys-queue.h usage on BSD systems 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 50c553be472c9f4b05a0526c0aae98709ca9ffff Author: Roger Pau Monne Date: Thu Jun 7 19:44:01 2012 +0100 qemu-xen-trad: fix sys-queue.h usage on BSD systems BSD systems already have a sys/queue.h file, which has more macros than the one Qemu uses, and some header files depend on having that macros defined (sys/disk.h for example). Disable sys-queue.h on BSD systems and include the native one. This is not a backport because the original patch is too dificult to backport, it's commit 72cf2d4f0e181d0d3a3122e04129c58a95da713e. Doing a diff -bB shows that the Qemu version is just a stripped version of the original NetBSD header, with many macros removed, but no new ones added. Signed-off-by: Roger Pau Monne Acked-by: Stefano Stabellini Acked-by: Ian Jackson --- sys-queue.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/sys-queue.h b/sys-queue.h index cb6a4c8..55c26fe 100644 --- a/sys-queue.h +++ b/sys-queue.h @@ -36,6 +36,12 @@ * @(#)queue.h 8.5 (Berkeley) 8/20/94 */ +#include "config-host.h" +#ifdef _BSD +/* include native header before sys-queue.h */ +#include +#endif + #ifndef _SYS_QUEUE_H_ #define _SYS_QUEUE_H_ -- 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 Jun 08 00:44:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Jun 2012 00: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 1ScnJE-0006vd-Oy; Fri, 08 Jun 2012 00:44:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScnJD-0006vD-Se for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:12 +0000 Received: from [193.109.254.147:2653] by server-10.bemta-14.messagelabs.com id AF/19-25709-BDA41DF4; Fri, 08 Jun 2012 00:44:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-27.messagelabs.com!1339116249!8701340!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3895 invoked from network); 8 Jun 2012 00:44: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; 8 Jun 2012 00:44:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScnJB-0004QH-7V for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ScnJA-0000Ac-Qi for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:08 +0000 Message-Id: Date: Fri, 08 Jun 2012 00:44:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xenstore: set read_thread stacksize 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 # HG changeset patch # User Simon Rowe # Date 1339089780 -3600 # Node ID 0474a8b847622fadc20fead17c68cd3d95dc1a7f # Parent 32a31e2cb03942f95a9453bba172e8732101761e xenstore: set read_thread stacksize xs_watch() creates a thread to wake watchers using default attributes. The stacksize can be quite large (8 MB on Linux), applications that link against xenstore end up having a larger memory footprint than necessary. Signed-off-by: Simon Rowe Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 32a31e2cb039 -r 0474a8b84762 tools/xenstore/xs.c --- a/tools/xenstore/xs.c Thu Jun 07 18:22:20 2012 +0100 +++ b/tools/xenstore/xs.c Thu Jun 07 18:23:00 2012 +0100 @@ -702,21 +702,36 @@ bool xs_watch(struct xs_handle *h, const struct iovec iov[2]; #ifdef USE_PTHREAD +#define READ_THREAD_STACKSIZE (16 * 1024) + /* We dynamically create a reader thread on demand. */ mutex_lock(&h->request_mutex); if (!h->read_thr_exists) { sigset_t set, old_set; + pthread_attr_t attr; + + if (pthread_attr_init(&attr) != 0) { + mutex_unlock(&h->request_mutex); + return false; + } + if (pthread_attr_setstacksize(&attr, READ_THREAD_STACKSIZE) != 0) { + pthread_attr_destroy(&attr); + mutex_unlock(&h->request_mutex); + return false; + } sigfillset(&set); pthread_sigmask(SIG_SETMASK, &set, &old_set); - if (pthread_create(&h->read_thr, NULL, read_thread, h) != 0) { + if (pthread_create(&h->read_thr, &attr, read_thread, h) != 0) { pthread_sigmask(SIG_SETMASK, &old_set, NULL); + pthread_attr_destroy(&attr); mutex_unlock(&h->request_mutex); return false; } h->read_thr_exists = 1; pthread_sigmask(SIG_SETMASK, &old_set, NULL); + pthread_attr_destroy(&attr); } mutex_unlock(&h->request_mutex); #endif _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jun 08 00:44:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Jun 2012 00: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 1ScnJE-0006vd-Oy; Fri, 08 Jun 2012 00:44:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScnJD-0006vD-Se for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:12 +0000 Received: from [193.109.254.147:2653] by server-10.bemta-14.messagelabs.com id AF/19-25709-BDA41DF4; Fri, 08 Jun 2012 00:44:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-27.messagelabs.com!1339116249!8701340!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3895 invoked from network); 8 Jun 2012 00:44: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; 8 Jun 2012 00:44:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScnJB-0004QH-7V for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ScnJA-0000Ac-Qi for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:08 +0000 Message-Id: Date: Fri, 08 Jun 2012 00:44:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xenstore: set read_thread stacksize 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 # HG changeset patch # User Simon Rowe # Date 1339089780 -3600 # Node ID 0474a8b847622fadc20fead17c68cd3d95dc1a7f # Parent 32a31e2cb03942f95a9453bba172e8732101761e xenstore: set read_thread stacksize xs_watch() creates a thread to wake watchers using default attributes. The stacksize can be quite large (8 MB on Linux), applications that link against xenstore end up having a larger memory footprint than necessary. Signed-off-by: Simon Rowe Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 32a31e2cb039 -r 0474a8b84762 tools/xenstore/xs.c --- a/tools/xenstore/xs.c Thu Jun 07 18:22:20 2012 +0100 +++ b/tools/xenstore/xs.c Thu Jun 07 18:23:00 2012 +0100 @@ -702,21 +702,36 @@ bool xs_watch(struct xs_handle *h, const struct iovec iov[2]; #ifdef USE_PTHREAD +#define READ_THREAD_STACKSIZE (16 * 1024) + /* We dynamically create a reader thread on demand. */ mutex_lock(&h->request_mutex); if (!h->read_thr_exists) { sigset_t set, old_set; + pthread_attr_t attr; + + if (pthread_attr_init(&attr) != 0) { + mutex_unlock(&h->request_mutex); + return false; + } + if (pthread_attr_setstacksize(&attr, READ_THREAD_STACKSIZE) != 0) { + pthread_attr_destroy(&attr); + mutex_unlock(&h->request_mutex); + return false; + } sigfillset(&set); pthread_sigmask(SIG_SETMASK, &set, &old_set); - if (pthread_create(&h->read_thr, NULL, read_thread, h) != 0) { + if (pthread_create(&h->read_thr, &attr, read_thread, h) != 0) { pthread_sigmask(SIG_SETMASK, &old_set, NULL); + pthread_attr_destroy(&attr); mutex_unlock(&h->request_mutex); return false; } h->read_thr_exists = 1; pthread_sigmask(SIG_SETMASK, &old_set, NULL); + pthread_attr_destroy(&attr); } mutex_unlock(&h->request_mutex); #endif _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jun 08 00:44:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Jun 2012 00: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 1ScnJE-0006vU-MA; Fri, 08 Jun 2012 00:44:12 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScnJD-0006vA-Bf for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:11 +0000 Received: from [85.158.143.99:21920] by server-1.bemta-4.messagelabs.com id C4/B9-10042-ADA41DF4; Fri, 08 Jun 2012 00:44:10 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-216.messagelabs.com!1339116249!24295610!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29723 invoked from network); 8 Jun 2012 00:44:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 8 Jun 2012 00:44:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScnJB-0004QE-0p for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ScnJA-0000AN-8N for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:08 +0000 Message-Id: Date: Fri, 08 Jun 2012 00:44:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xenstore: block signals in watch wakeup thread 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 # HG changeset patch # User Simon Rowe # Date 1339089740 -3600 # Node ID 32a31e2cb03942f95a9453bba172e8732101761e # Parent f6bfaf9daa508c31b2bca0e461202db2759426fc xenstore: block signals in watch wakeup thread The thread created to wakeup watchers is not intended to handle signals (and a later patch will reduce it's stack size which makes it unsuitable for doing so). Signed-off-by: Simon Rowe Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r f6bfaf9daa50 -r 32a31e2cb039 tools/xenstore/xs.c --- a/tools/xenstore/xs.c Wed Jun 06 16:37:05 2012 +0100 +++ b/tools/xenstore/xs.c Thu Jun 07 18:22:20 2012 +0100 @@ -705,11 +705,18 @@ bool xs_watch(struct xs_handle *h, const /* We dynamically create a reader thread on demand. */ mutex_lock(&h->request_mutex); if (!h->read_thr_exists) { + sigset_t set, old_set; + + sigfillset(&set); + pthread_sigmask(SIG_SETMASK, &set, &old_set); + if (pthread_create(&h->read_thr, NULL, read_thread, h) != 0) { + pthread_sigmask(SIG_SETMASK, &old_set, NULL); mutex_unlock(&h->request_mutex); return false; } h->read_thr_exists = 1; + pthread_sigmask(SIG_SETMASK, &old_set, NULL); } mutex_unlock(&h->request_mutex); #endif _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jun 08 00:44:17 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Jun 2012 00: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 1ScnJE-0006vU-MA; Fri, 08 Jun 2012 00:44:12 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScnJD-0006vA-Bf for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:11 +0000 Received: from [85.158.143.99:21920] by server-1.bemta-4.messagelabs.com id C4/B9-10042-ADA41DF4; Fri, 08 Jun 2012 00:44:10 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-11.tower-216.messagelabs.com!1339116249!24295610!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29723 invoked from network); 8 Jun 2012 00:44:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-216.messagelabs.com with AES256-SHA encrypted SMTP; 8 Jun 2012 00:44:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScnJB-0004QE-0p for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ScnJA-0000AN-8N for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:08 +0000 Message-Id: Date: Fri, 08 Jun 2012 00:44:07 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xenstore: block signals in watch wakeup thread 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 # HG changeset patch # User Simon Rowe # Date 1339089740 -3600 # Node ID 32a31e2cb03942f95a9453bba172e8732101761e # Parent f6bfaf9daa508c31b2bca0e461202db2759426fc xenstore: block signals in watch wakeup thread The thread created to wakeup watchers is not intended to handle signals (and a later patch will reduce it's stack size which makes it unsuitable for doing so). Signed-off-by: Simon Rowe Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r f6bfaf9daa50 -r 32a31e2cb039 tools/xenstore/xs.c --- a/tools/xenstore/xs.c Wed Jun 06 16:37:05 2012 +0100 +++ b/tools/xenstore/xs.c Thu Jun 07 18:22:20 2012 +0100 @@ -705,11 +705,18 @@ bool xs_watch(struct xs_handle *h, const /* We dynamically create a reader thread on demand. */ mutex_lock(&h->request_mutex); if (!h->read_thr_exists) { + sigset_t set, old_set; + + sigfillset(&set); + pthread_sigmask(SIG_SETMASK, &set, &old_set); + if (pthread_create(&h->read_thr, NULL, read_thread, h) != 0) { + pthread_sigmask(SIG_SETMASK, &old_set, NULL); mutex_unlock(&h->request_mutex); return false; } h->read_thr_exists = 1; + pthread_sigmask(SIG_SETMASK, &old_set, NULL); } mutex_unlock(&h->request_mutex); #endif _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jun 08 00:44:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Jun 2012 00:44: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 1ScnJH-0006wQ-4A; Fri, 08 Jun 2012 00:44:15 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScnJF-0006vk-Pf for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:13 +0000 Received: from [193.109.254.147:54694] by server-3.bemta-14.messagelabs.com id 03/DE-05653-CDA41DF4; Fri, 08 Jun 2012 00:44:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-27.messagelabs.com!1339116251!8526399!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22638 invoked from network); 8 Jun 2012 00:44:12 -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; 8 Jun 2012 00:44:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScnJD-0004QT-0V for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ScnJC-0000Ba-Va for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:10 +0000 Message-Id: Date: Fri, 08 Jun 2012 00:44:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] 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 # HG changeset patch # User Ian Jackson # Date 1339094423 -3600 # Node ID 15ed87e385a3828c65ca78f555d05dff3c0e44b8 # Parent 75a2bb5db2280163265c2c6b1d536869108aa9af QEMU_TAG update --- diff -r 75a2bb5db228 -r 15ed87e385a3 Config.mk --- a/Config.mk Thu Jun 07 18:51:42 2012 +0100 +++ b/Config.mk Thu Jun 07 19:40:23 2012 +0100 @@ -213,9 +213,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 7bde54662d45b0bbc2ee78c7a8bf2c97c6655445 -# Mon May 14 17:05:48 2012 +0100 -# xenstore: Use +QEMU_TAG ?= cbf0f291d4f1d40c59f56b8bd73292b8ad4f84b5 +# Thu Jun 7 19:36:26 2012 +0100 +# qemu-xen-trad/block: get right partition size # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jun 08 00:44:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Jun 2012 00:44: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 1ScnJH-0006wQ-4A; Fri, 08 Jun 2012 00:44:15 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScnJF-0006vk-Pf for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:13 +0000 Received: from [193.109.254.147:54694] by server-3.bemta-14.messagelabs.com id 03/DE-05653-CDA41DF4; Fri, 08 Jun 2012 00:44:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-27.messagelabs.com!1339116251!8526399!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22638 invoked from network); 8 Jun 2012 00:44:12 -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; 8 Jun 2012 00:44:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScnJD-0004QT-0V for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ScnJC-0000Ba-Va for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:10 +0000 Message-Id: Date: Fri, 08 Jun 2012 00:44:10 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] 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 # HG changeset patch # User Ian Jackson # Date 1339094423 -3600 # Node ID 15ed87e385a3828c65ca78f555d05dff3c0e44b8 # Parent 75a2bb5db2280163265c2c6b1d536869108aa9af QEMU_TAG update --- diff -r 75a2bb5db228 -r 15ed87e385a3 Config.mk --- a/Config.mk Thu Jun 07 18:51:42 2012 +0100 +++ b/Config.mk Thu Jun 07 19:40:23 2012 +0100 @@ -213,9 +213,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 7bde54662d45b0bbc2ee78c7a8bf2c97c6655445 -# Mon May 14 17:05:48 2012 +0100 -# xenstore: Use +QEMU_TAG ?= cbf0f291d4f1d40c59f56b8bd73292b8ad4f84b5 +# Thu Jun 7 19:36:26 2012 +0100 +# qemu-xen-trad/block: get right partition size # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jun 08 00:44:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Jun 2012 00:44: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 1ScnJF-0006vx-RX; Fri, 08 Jun 2012 00:44:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScnJE-0006vJ-Dq for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:12 +0000 Received: from [85.158.139.83:6061] by server-4.bemta-5.messagelabs.com id 25/EC-05858-BDA41DF4; Fri, 08 Jun 2012 00:44:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-182.messagelabs.com!1339116249!31986062!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5273 invoked from network); 8 Jun 2012 00:44:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 8 Jun 2012 00:44:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScnJB-0004QJ-Iy for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ScnJB-0000Ar-DY for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:09 +0000 Message-Id: Date: Fri, 08 Jun 2012 00:44:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: remove libxl__error_set prototype 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 # HG changeset patch # User Ian Campbell # Date 1339090465 -3600 # Node ID 6e9552d15118f0d285585d44eab89585d0c35813 # Parent 0474a8b847622fadc20fead17c68cd3d95dc1a7f libxl: remove libxl__error_set prototype The implementation went away in 25181:26f72d923cb9 "libxl: Crash (more sensibly) on malloc failure". Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 0474a8b84762 -r 6e9552d15118 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jun 07 18:23:00 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jun 07 18:34:25 2012 +0100 @@ -1313,8 +1313,6 @@ struct libxl__xen_console_reader { unsigned int index; }; -_hidden int libxl__error_set(libxl__gc *gc, int code); - /* parse the string @s as a sequence of 6 colon separated bytes in to @mac */ _hidden int libxl__parse_mac(const char *s, libxl_mac mac); /* compare mac address @a and @b. 0 if the same, -ve if ab */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jun 08 00:44:18 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Jun 2012 00:44: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 1ScnJF-0006vx-RX; Fri, 08 Jun 2012 00:44:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScnJE-0006vJ-Dq for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:12 +0000 Received: from [85.158.139.83:6061] by server-4.bemta-5.messagelabs.com id 25/EC-05858-BDA41DF4; Fri, 08 Jun 2012 00:44:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-182.messagelabs.com!1339116249!31986062!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5273 invoked from network); 8 Jun 2012 00:44:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-182.messagelabs.com with AES256-SHA encrypted SMTP; 8 Jun 2012 00:44:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScnJB-0004QJ-Iy for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ScnJB-0000Ar-DY for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:09 +0000 Message-Id: Date: Fri, 08 Jun 2012 00:44:08 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] libxl: remove libxl__error_set prototype 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 # HG changeset patch # User Ian Campbell # Date 1339090465 -3600 # Node ID 6e9552d15118f0d285585d44eab89585d0c35813 # Parent 0474a8b847622fadc20fead17c68cd3d95dc1a7f libxl: remove libxl__error_set prototype The implementation went away in 25181:26f72d923cb9 "libxl: Crash (more sensibly) on malloc failure". Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 0474a8b84762 -r 6e9552d15118 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Thu Jun 07 18:23:00 2012 +0100 +++ b/tools/libxl/libxl_internal.h Thu Jun 07 18:34:25 2012 +0100 @@ -1313,8 +1313,6 @@ struct libxl__xen_console_reader { unsigned int index; }; -_hidden int libxl__error_set(libxl__gc *gc, int code); - /* parse the string @s as a sequence of 6 colon separated bytes in to @mac */ _hidden int libxl__parse_mac(const char *s, libxl_mac mac); /* compare mac address @a and @b. 0 if the same, -ve if ab */ _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jun 08 00:44:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Jun 2012 00:44: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 1ScnJJ-0006xA-BX; Fri, 08 Jun 2012 00:44:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScnJH-0006wG-7x for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:15 +0000 Received: from [85.158.138.51:56597] by server-1.bemta-3.messagelabs.com id 67/8A-01327-EDA41DF4; Fri, 08 Jun 2012 00:44:14 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-174.messagelabs.com!1339116252!28491672!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8788 invoked from network); 8 Jun 2012 00:44:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 8 Jun 2012 00:44:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScnJD-0004QW-Gm for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ScnJD-0000Bq-FV for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:11 +0000 Message-Id: Date: Fri, 08 Jun 2012 00:44:11 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools: do not install qemu if just doing a build 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 # HG changeset patch # User David Vrabel # Date 1339094487 -3600 # Node ID 4195a034d81946e460182dec1f58abc4a3b7b3b9 # Parent 15ed87e385a3828c65ca78f555d05dff3c0e44b8 tools: do not install qemu if just doing a build Signed-off-by: David Vrabel Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 15ed87e385a3 -r 4195a034d819 tools/Makefile --- a/tools/Makefile Thu Jun 07 19:40:23 2012 +0100 +++ b/tools/Makefile Thu Jun 07 19:41:27 2012 +0100 @@ -118,7 +118,14 @@ qemu-xen-traditional-dir-force-update: $(GIT) reset --hard $(QEMU_TAG); \ fi -subdir-all-qemu-xen-traditional-dir subdir-install-qemu-xen-traditional-dir: qemu-xen-traditional-dir-find +subdir-all-qemu-xen-traditional-dir: qemu-xen-traditional-dir-find + set -e; \ + $(buildmakevars2shellvars); \ + cd qemu-xen-traditional-dir; \ + $(QEMU_ROOT)/xen-setup $(IOEMU_CONFIGURE_CROSS); \ + $(MAKE) all + +subdir-install-qemu-xen-traditional-dir: qemu-xen-traditional-dir-find set -e; \ $(buildmakevars2shellvars); \ cd qemu-xen-traditional-dir; \ @@ -141,7 +148,7 @@ qemu-xen-dir-force-update: $(GIT) reset --hard $(QEMU_UPSTREAM_REVISION); \ fi -subdir-all-qemu-xen-dir subdir-install-qemu-xen-dir: qemu-xen-dir-find +subdir-all-qemu-xen-dir: qemu-xen-dir-find if test -d $(QEMU_UPSTREAM_URL) ; then \ source=$(QEMU_UPSTREAM_URL); \ else \ @@ -162,6 +169,10 @@ subdir-all-qemu-xen-dir subdir-install-q --disable-kvm \ --python=$(PYTHON) \ $(IOEMU_CONFIGURE_CROSS); \ + $(MAKE) all + +subdir-install-qemu-xen-dir: subdir-all-qemu-xen-dir + cd qemu-xen-dir; \ $(MAKE) install subdir-clean-qemu-xen-dir: _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jun 08 00:44:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Jun 2012 00:44: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 1ScnJJ-0006xA-BX; Fri, 08 Jun 2012 00:44:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScnJH-0006wG-7x for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:15 +0000 Received: from [85.158.138.51:56597] by server-1.bemta-3.messagelabs.com id 67/8A-01327-EDA41DF4; Fri, 08 Jun 2012 00:44:14 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-174.messagelabs.com!1339116252!28491672!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8788 invoked from network); 8 Jun 2012 00:44:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 8 Jun 2012 00:44:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScnJD-0004QW-Gm for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ScnJD-0000Bq-FV for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:11 +0000 Message-Id: Date: Fri, 08 Jun 2012 00:44:11 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools: do not install qemu if just doing a build 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 # HG changeset patch # User David Vrabel # Date 1339094487 -3600 # Node ID 4195a034d81946e460182dec1f58abc4a3b7b3b9 # Parent 15ed87e385a3828c65ca78f555d05dff3c0e44b8 tools: do not install qemu if just doing a build Signed-off-by: David Vrabel Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 15ed87e385a3 -r 4195a034d819 tools/Makefile --- a/tools/Makefile Thu Jun 07 19:40:23 2012 +0100 +++ b/tools/Makefile Thu Jun 07 19:41:27 2012 +0100 @@ -118,7 +118,14 @@ qemu-xen-traditional-dir-force-update: $(GIT) reset --hard $(QEMU_TAG); \ fi -subdir-all-qemu-xen-traditional-dir subdir-install-qemu-xen-traditional-dir: qemu-xen-traditional-dir-find +subdir-all-qemu-xen-traditional-dir: qemu-xen-traditional-dir-find + set -e; \ + $(buildmakevars2shellvars); \ + cd qemu-xen-traditional-dir; \ + $(QEMU_ROOT)/xen-setup $(IOEMU_CONFIGURE_CROSS); \ + $(MAKE) all + +subdir-install-qemu-xen-traditional-dir: qemu-xen-traditional-dir-find set -e; \ $(buildmakevars2shellvars); \ cd qemu-xen-traditional-dir; \ @@ -141,7 +148,7 @@ qemu-xen-dir-force-update: $(GIT) reset --hard $(QEMU_UPSTREAM_REVISION); \ fi -subdir-all-qemu-xen-dir subdir-install-qemu-xen-dir: qemu-xen-dir-find +subdir-all-qemu-xen-dir: qemu-xen-dir-find if test -d $(QEMU_UPSTREAM_URL) ; then \ source=$(QEMU_UPSTREAM_URL); \ else \ @@ -162,6 +169,10 @@ subdir-all-qemu-xen-dir subdir-install-q --disable-kvm \ --python=$(PYTHON) \ $(IOEMU_CONFIGURE_CROSS); \ + $(MAKE) all + +subdir-install-qemu-xen-dir: subdir-all-qemu-xen-dir + cd qemu-xen-dir; \ $(MAKE) install subdir-clean-qemu-xen-dir: _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jun 08 00:44:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Jun 2012 00:44: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 1ScnJF-0006w6-VH; Fri, 08 Jun 2012 00:44:13 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScnJE-0006vL-G5 for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:12 +0000 Received: from [193.109.254.147:36712] by server-4.bemta-14.messagelabs.com id 16/19-27598-BDA41DF4; Fri, 08 Jun 2012 00:44:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-27.messagelabs.com!1339116250!8701341!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3908 invoked from network); 8 Jun 2012 00:44:11 -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; 8 Jun 2012 00:44:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScnJC-0004QN-6a for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ScnJB-0000B6-Uf for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:09 +0000 Message-Id: Date: Fri, 08 Jun 2012 00:44:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xend: do not run a hotplug script from qemu on Linux 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 # HG changeset patch # User Ian Campbell # Date 1339091122 -3600 # Node ID e41a97112e0cf37ec382fdc02761d0c45984010c # Parent 6e9552d15118f0d285585d44eab89585d0c35813 xend: do not run a hotplug script from qemu on Linux The current vif-hotplug-common.sh for renaming the tap device is failing because it is racing with this script and therefore the device is unexpectedly up when we come to rename it. Fix this in the same way as libxl does, by disabling the script (only on Linux). Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 6e9552d15118 -r e41a97112e0c tools/python/xen/xend/image.py --- a/tools/python/xen/xend/image.py Thu Jun 07 18:34:25 2012 +0100 +++ b/tools/python/xen/xend/image.py Thu Jun 07 18:45:22 2012 +0100 @@ -919,8 +919,13 @@ class HVMImageHandler(ImageHandler): (nics, mac, model)) vifname = "vif%d.%d-emu" % (self.vm.getDomid(), nics-1) ret.append("-net") - ret.append("tap,vlan=%d,ifname=%s,bridge=%s" % - (nics, vifname, bridge)) + if osdep.tapif_script is not None: + script=",script=%s,downscript=%s" % \ + (osdep.tapif_script, osdep.tapif_script) + else: + script="" + ret.append("tap,vlan=%d,ifname=%s,bridge=%s%s" % + (nics, vifname, bridge, script)) if nics == 0: ret.append("-net") diff -r 6e9552d15118 -r e41a97112e0c tools/python/xen/xend/osdep.py --- a/tools/python/xen/xend/osdep.py Thu Jun 07 18:34:25 2012 +0100 +++ b/tools/python/xen/xend/osdep.py Thu Jun 07 18:45:22 2012 +0100 @@ -30,6 +30,10 @@ _vif_script = { "SunOS": "vif-vnic" } +_tapif_script = { + "Linux": "no", +} + PROC_XEN_BALLOON = '/proc/xen/balloon' SYSFS_XEN_MEMORY = '/sys/devices/system/xen_memory/xen_memory0' @@ -257,6 +261,7 @@ def _get(var, default=None): xend_autorestart = _get(_xend_autorestart) vif_script = _get(_vif_script, "vif-bridge") +tapif_script = _get(_tapif_script) lookup_balloon_stat = _get(_balloon_stat, _linux_balloon_stat) get_cpuinfo = _get(_get_cpuinfo, _linux_get_cpuinfo) prefork = _get(_get_prefork, _default_prefork) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jun 08 00:44:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Jun 2012 00:44: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 1ScnJF-0006w6-VH; Fri, 08 Jun 2012 00:44:13 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScnJE-0006vL-G5 for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:12 +0000 Received: from [193.109.254.147:36712] by server-4.bemta-14.messagelabs.com id 16/19-27598-BDA41DF4; Fri, 08 Jun 2012 00:44:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-8.tower-27.messagelabs.com!1339116250!8701341!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3908 invoked from network); 8 Jun 2012 00:44:11 -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; 8 Jun 2012 00:44:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScnJC-0004QN-6a for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ScnJB-0000B6-Uf for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:09 +0000 Message-Id: Date: Fri, 08 Jun 2012 00:44:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] xend: do not run a hotplug script from qemu on Linux 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 # HG changeset patch # User Ian Campbell # Date 1339091122 -3600 # Node ID e41a97112e0cf37ec382fdc02761d0c45984010c # Parent 6e9552d15118f0d285585d44eab89585d0c35813 xend: do not run a hotplug script from qemu on Linux The current vif-hotplug-common.sh for renaming the tap device is failing because it is racing with this script and therefore the device is unexpectedly up when we come to rename it. Fix this in the same way as libxl does, by disabling the script (only on Linux). Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r 6e9552d15118 -r e41a97112e0c tools/python/xen/xend/image.py --- a/tools/python/xen/xend/image.py Thu Jun 07 18:34:25 2012 +0100 +++ b/tools/python/xen/xend/image.py Thu Jun 07 18:45:22 2012 +0100 @@ -919,8 +919,13 @@ class HVMImageHandler(ImageHandler): (nics, mac, model)) vifname = "vif%d.%d-emu" % (self.vm.getDomid(), nics-1) ret.append("-net") - ret.append("tap,vlan=%d,ifname=%s,bridge=%s" % - (nics, vifname, bridge)) + if osdep.tapif_script is not None: + script=",script=%s,downscript=%s" % \ + (osdep.tapif_script, osdep.tapif_script) + else: + script="" + ret.append("tap,vlan=%d,ifname=%s,bridge=%s%s" % + (nics, vifname, bridge, script)) if nics == 0: ret.append("-net") diff -r 6e9552d15118 -r e41a97112e0c tools/python/xen/xend/osdep.py --- a/tools/python/xen/xend/osdep.py Thu Jun 07 18:34:25 2012 +0100 +++ b/tools/python/xen/xend/osdep.py Thu Jun 07 18:45:22 2012 +0100 @@ -30,6 +30,10 @@ _vif_script = { "SunOS": "vif-vnic" } +_tapif_script = { + "Linux": "no", +} + PROC_XEN_BALLOON = '/proc/xen/balloon' SYSFS_XEN_MEMORY = '/sys/devices/system/xen_memory/xen_memory0' @@ -257,6 +261,7 @@ def _get(var, default=None): xend_autorestart = _get(_xend_autorestart) vif_script = _get(_vif_script, "vif-bridge") +tapif_script = _get(_tapif_script) lookup_balloon_stat = _get(_balloon_stat, _linux_balloon_stat) get_cpuinfo = _get(_get_cpuinfo, _linux_get_cpuinfo) prefork = _get(_get_prefork, _default_prefork) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jun 08 00:44:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Jun 2012 00:44: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 1ScnJI-0006wl-8I; Fri, 08 Jun 2012 00:44:16 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScnJG-0006wD-Th for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:15 +0000 Received: from [85.158.138.51:56555] by server-3.bemta-3.messagelabs.com id 20/C9-25608-DDA41DF4; Fri, 08 Jun 2012 00:44:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-174.messagelabs.com!1339116252!23263277!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21395 invoked from network); 8 Jun 2012 00:44:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 8 Jun 2012 00:44:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScnJE-0004QZ-1F for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ScnJD-0000C7-W9 for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:12 +0000 Message-Id: Date: Fri, 08 Jun 2012 00:44:11 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] 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 # HG changeset patch # User Ian Jackson # Date 1339094817 -3600 # Node ID 32034d1914a607d7b6f1f060352b4cac973600f8 # Parent 4195a034d81946e460182dec1f58abc4a3b7b3b9 QEMU_TAG update --- diff -r 4195a034d819 -r 32034d1914a6 Config.mk --- a/Config.mk Thu Jun 07 19:41:27 2012 +0100 +++ b/Config.mk Thu Jun 07 19:46:57 2012 +0100 @@ -213,9 +213,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= cbf0f291d4f1d40c59f56b8bd73292b8ad4f84b5 -# Thu Jun 7 19:36:26 2012 +0100 -# qemu-xen-trad/block: get right partition size +QEMU_TAG ?= 50c553be472c9f4b05a0526c0aae98709ca9ffff +# Thu Jun 7 19:44:01 2012 +0100 +# qemu-xen-trad: fix sys-queue.h usage on BSD systems # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jun 08 00:44:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Jun 2012 00:44: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 1ScnJI-0006wl-8I; Fri, 08 Jun 2012 00:44:16 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScnJG-0006wD-Th for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:15 +0000 Received: from [85.158.138.51:56555] by server-3.bemta-3.messagelabs.com id 20/C9-25608-DDA41DF4; Fri, 08 Jun 2012 00:44:13 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-174.messagelabs.com!1339116252!23263277!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21395 invoked from network); 8 Jun 2012 00:44:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 8 Jun 2012 00:44:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScnJE-0004QZ-1F for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ScnJD-0000C7-W9 for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:12 +0000 Message-Id: Date: Fri, 08 Jun 2012 00:44:11 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] 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 # HG changeset patch # User Ian Jackson # Date 1339094817 -3600 # Node ID 32034d1914a607d7b6f1f060352b4cac973600f8 # Parent 4195a034d81946e460182dec1f58abc4a3b7b3b9 QEMU_TAG update --- diff -r 4195a034d819 -r 32034d1914a6 Config.mk --- a/Config.mk Thu Jun 07 19:41:27 2012 +0100 +++ b/Config.mk Thu Jun 07 19:46:57 2012 +0100 @@ -213,9 +213,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= cbf0f291d4f1d40c59f56b8bd73292b8ad4f84b5 -# Thu Jun 7 19:36:26 2012 +0100 -# qemu-xen-trad/block: get right partition size +QEMU_TAG ?= 50c553be472c9f4b05a0526c0aae98709ca9ffff +# Thu Jun 7 19:44:01 2012 +0100 +# qemu-xen-trad: fix sys-queue.h usage on BSD systems # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jun 08 00:44:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Jun 2012 00:44: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 1ScnJH-0006wI-1s; Fri, 08 Jun 2012 00:44:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScnJF-0006vj-IV for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:13 +0000 Received: from [85.158.138.51:35556] by server-12.bemta-3.messagelabs.com id F0/59-24185-CDA41DF4; Fri, 08 Jun 2012 00:44:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-174.messagelabs.com!1339116250!22462232!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26234 invoked from network); 8 Jun 2012 00:44:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 8 Jun 2012 00:44:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScnJC-0004QQ-Nx for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ScnJC-0000BL-FA for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:10 +0000 Message-Id: Date: Fri, 08 Jun 2012 00:44:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools: pass EXTRA_CFLAGS via environment 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 # HG changeset patch # User Olaf Hering # Date 1339091502 -3600 # Node ID 75a2bb5db2280163265c2c6b1d536869108aa9af # Parent e41a97112e0cf37ec382fdc02761d0c45984010c tools: pass EXTRA_CFLAGS via environment Currently qemu-xen will be compiled with CFLAGS only if CFLAGS was already in the environment during make invocation. If CFLAGS is in environment then make will append all of the various flags specified in xen Makefiles to this environment variable, which is then used in qemu configure. Since qemu-xen is not ready for compiler flags like "-std=gnu99" compilation will fail. If CFLAGS is not in environment, then configure will use just its own "-O2 -g" because make does not export its own CFLAGS variable. >From a distro perspective, it is required to build libraries and binaries with certain global cflags (arbitrary gcc options). Up to the point when qemu-xen was imported it worked as expected by exporting CFLAGS before 'make tools'. Now qemu-upstream reuses these CFLAGS, but it cant deal with the result. This patch extends the tools Makefiles so that three new environment variables are recognized: EXTRA_CFLAGS_XEN_TOOLS= specifies CFLAGS for the tools build. EXTRA_CFLAGS_QEMU_TRADITIONAL= specifies CFLAGS for old qemu. EXTRA_CFLAGS_QEMU_XEN= specifies CFLAGS for new qemu. Special care needs to be taken in tools/firmware because the resulting binaries are not linked with the hosts runtime libraries. These binaries run in guest context. To avoid build errors from gcc options like -fstack-protector, reuse existing practice to unset the new EXTRA_CFLAGS_XEN_TOOLS for the firmware dirs. The new feature can be used like this in a rpm xen.spec file: export EXTRA_CFLAGS_XEN_TOOLS="${RPM_OPT_FLAGS}" export EXTRA_CFLAGS_QEMU_TRADITIONAL="${RPM_OPT_FLAGS}" export EXTRA_CFLAGS_QEMU_XEN="${RPM_OPT_FLAGS}" ./configure \ --libdir=%{_libdir} \ --prefix=/usr make Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r e41a97112e0c -r 75a2bb5db228 tools/Makefile --- a/tools/Makefile Thu Jun 07 18:45:22 2012 +0100 +++ b/tools/Makefile Thu Jun 07 18:51:42 2012 +0100 @@ -122,7 +122,9 @@ subdir-all-qemu-xen-traditional-dir subd set -e; \ $(buildmakevars2shellvars); \ cd qemu-xen-traditional-dir; \ - $(QEMU_ROOT)/xen-setup $(IOEMU_CONFIGURE_CROSS); \ + $(QEMU_ROOT)/xen-setup \ + --extra-cflags="$(EXTRA_CFLAGS_QEMU_TRADITIONAL)" \ + $(IOEMU_CONFIGURE_CROSS); \ $(MAKE) install subdir-clean-qemu-xen-traditional-dir: @@ -151,7 +153,8 @@ subdir-all-qemu-xen-dir subdir-install-q --extra-cflags="-I$(XEN_ROOT)/tools/include \ -I$(XEN_ROOT)/tools/libxc \ -I$(XEN_ROOT)/tools/xenstore \ - -I$(XEN_ROOT)/tools/xenstore/compat" \ + -I$(XEN_ROOT)/tools/xenstore/compat \ + $(EXTRA_CFLAGS_QEMU_XEN)" \ --extra-ldflags="-L$(XEN_ROOT)/tools/libxc \ -L$(XEN_ROOT)/tools/xenstore" \ --bindir=$(LIBEXEC) \ diff -r e41a97112e0c -r 75a2bb5db228 tools/Rules.mk --- a/tools/Rules.mk Thu Jun 07 18:45:22 2012 +0100 +++ b/tools/Rules.mk Thu Jun 07 18:51:42 2012 +0100 @@ -76,6 +76,8 @@ endif CFLAGS-$(CONFIG_X86_32) += $(call cc-option,$(CC),-mno-tls-direct-seg-refs) CFLAGS += $(CFLAGS-y) +CFLAGS += $(EXTRA_CFLAGS_XEN_TOOLS) + # Require GCC v3.4+ (to avoid issues with alignment constraints in Xen headers) check-$(CONFIG_X86) = $(call cc-ver-check,CC,0x030400,\ "Xen requires at least gcc-3.4") diff -r e41a97112e0c -r 75a2bb5db228 tools/firmware/Rules.mk --- a/tools/firmware/Rules.mk Thu Jun 07 18:45:22 2012 +0100 +++ b/tools/firmware/Rules.mk Thu Jun 07 18:51:42 2012 +0100 @@ -3,6 +3,7 @@ override XEN_TARGET_ARCH = x86_32 # User-supplied CFLAGS are not useful here. CFLAGS = +EXTRA_CFLAGS_XEN_TOOLS = include $(XEN_ROOT)/tools/Rules.mk _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Jun 08 00:44:19 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 Jun 2012 00:44: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 1ScnJH-0006wI-1s; Fri, 08 Jun 2012 00:44:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScnJF-0006vj-IV for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:13 +0000 Received: from [85.158.138.51:35556] by server-12.bemta-3.messagelabs.com id F0/59-24185-CDA41DF4; Fri, 08 Jun 2012 00:44:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-174.messagelabs.com!1339116250!22462232!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26234 invoked from network); 8 Jun 2012 00:44:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-174.messagelabs.com with AES256-SHA encrypted SMTP; 8 Jun 2012 00:44:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ScnJC-0004QQ-Nx for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ScnJC-0000BL-FA for xen-changelog@lists.xensource.com; Fri, 08 Jun 2012 00:44:10 +0000 Message-Id: Date: Fri, 08 Jun 2012 00:44:09 +0000 From: Xen patchbot-unstable To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen-unstable] tools: pass EXTRA_CFLAGS via environment 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 # HG changeset patch # User Olaf Hering # Date 1339091502 -3600 # Node ID 75a2bb5db2280163265c2c6b1d536869108aa9af # Parent e41a97112e0cf37ec382fdc02761d0c45984010c tools: pass EXTRA_CFLAGS via environment Currently qemu-xen will be compiled with CFLAGS only if CFLAGS was already in the environment during make invocation. If CFLAGS is in environment then make will append all of the various flags specified in xen Makefiles to this environment variable, which is then used in qemu configure. Since qemu-xen is not ready for compiler flags like "-std=gnu99" compilation will fail. If CFLAGS is not in environment, then configure will use just its own "-O2 -g" because make does not export its own CFLAGS variable. >From a distro perspective, it is required to build libraries and binaries with certain global cflags (arbitrary gcc options). Up to the point when qemu-xen was imported it worked as expected by exporting CFLAGS before 'make tools'. Now qemu-upstream reuses these CFLAGS, but it cant deal with the result. This patch extends the tools Makefiles so that three new environment variables are recognized: EXTRA_CFLAGS_XEN_TOOLS= specifies CFLAGS for the tools build. EXTRA_CFLAGS_QEMU_TRADITIONAL= specifies CFLAGS for old qemu. EXTRA_CFLAGS_QEMU_XEN= specifies CFLAGS for new qemu. Special care needs to be taken in tools/firmware because the resulting binaries are not linked with the hosts runtime libraries. These binaries run in guest context. To avoid build errors from gcc options like -fstack-protector, reuse existing practice to unset the new EXTRA_CFLAGS_XEN_TOOLS for the firmware dirs. The new feature can be used like this in a rpm xen.spec file: export EXTRA_CFLAGS_XEN_TOOLS="${RPM_OPT_FLAGS}" export EXTRA_CFLAGS_QEMU_TRADITIONAL="${RPM_OPT_FLAGS}" export EXTRA_CFLAGS_QEMU_XEN="${RPM_OPT_FLAGS}" ./configure \ --libdir=%{_libdir} \ --prefix=/usr make Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff -r e41a97112e0c -r 75a2bb5db228 tools/Makefile --- a/tools/Makefile Thu Jun 07 18:45:22 2012 +0100 +++ b/tools/Makefile Thu Jun 07 18:51:42 2012 +0100 @@ -122,7 +122,9 @@ subdir-all-qemu-xen-traditional-dir subd set -e; \ $(buildmakevars2shellvars); \ cd qemu-xen-traditional-dir; \ - $(QEMU_ROOT)/xen-setup $(IOEMU_CONFIGURE_CROSS); \ + $(QEMU_ROOT)/xen-setup \ + --extra-cflags="$(EXTRA_CFLAGS_QEMU_TRADITIONAL)" \ + $(IOEMU_CONFIGURE_CROSS); \ $(MAKE) install subdir-clean-qemu-xen-traditional-dir: @@ -151,7 +153,8 @@ subdir-all-qemu-xen-dir subdir-install-q --extra-cflags="-I$(XEN_ROOT)/tools/include \ -I$(XEN_ROOT)/tools/libxc \ -I$(XEN_ROOT)/tools/xenstore \ - -I$(XEN_ROOT)/tools/xenstore/compat" \ + -I$(XEN_ROOT)/tools/xenstore/compat \ + $(EXTRA_CFLAGS_QEMU_XEN)" \ --extra-ldflags="-L$(XEN_ROOT)/tools/libxc \ -L$(XEN_ROOT)/tools/xenstore" \ --bindir=$(LIBEXEC) \ diff -r e41a97112e0c -r 75a2bb5db228 tools/Rules.mk --- a/tools/Rules.mk Thu Jun 07 18:45:22 2012 +0100 +++ b/tools/Rules.mk Thu Jun 07 18:51:42 2012 +0100 @@ -76,6 +76,8 @@ endif CFLAGS-$(CONFIG_X86_32) += $(call cc-option,$(CC),-mno-tls-direct-seg-refs) CFLAGS += $(CFLAGS-y) +CFLAGS += $(EXTRA_CFLAGS_XEN_TOOLS) + # Require GCC v3.4+ (to avoid issues with alignment constraints in Xen headers) check-$(CONFIG_X86) = $(call cc-ver-check,CC,0x030400,\ "Xen requires at least gcc-3.4") diff -r e41a97112e0c -r 75a2bb5db228 tools/firmware/Rules.mk --- a/tools/firmware/Rules.mk Thu Jun 07 18:45:22 2012 +0100 +++ b/tools/firmware/Rules.mk Thu Jun 07 18:51:42 2012 +0100 @@ -3,6 +3,7 @@ override XEN_TARGET_ARCH = x86_32 # User-supplied CFLAGS are not useful here. CFLAGS = +EXTRA_CFLAGS_XEN_TOOLS = include $(XEN_ROOT)/tools/Rules.mk _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Jun 12 13:11:15 2012 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 Jun 2012 13:11: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 1SeQsG-0007vb-8G; Tue, 12 Jun 2012 13:11:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SeQsF-0007vW-JQ for xen-changelog@lists.xensource.com; Tue, 12 Jun 2012 13:11:07 +0000 Received: from [85.158.143.35:2936] by server-3.bemta-4.messagelabs.com id AD/F0-05808-AEF37DF4; Tue, 12 Jun 2012 13:11:06 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-13.tower-21.messagelabs.com!1339506664!14664222!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Version: 6.5.10; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25235 invoked from network); 12 Jun 2012 13:11:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Jun 2012 13:11:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1SeQsC-0000Rb-Ft for xen-changelog@lists.xensource.com; Tue, 12 Jun 2012 13:11:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1SeQsC-00041H-EQ for xen-changelog@lists.xensource.com; Tue, 12 Jun 2012 13:11:04 +0000 Message-Id: Date: Tue, 12 Jun 2012 13:11:04 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] drivers/xen/core/firmware.c should include xen/firmware.h 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 # HG changeset patch # User Jan Beulich # Date 1339505853 -7200 # Node ID 31e001f38b57f01265a15aa555355075a943897e # Parent 607eb9bebe75b171c790eb104fbcc33a47d7aa35 drivers/xen/core/firmware.c should include xen/firmware.h Signed-off-by: Jan Beulich --- diff -r 607eb9bebe75 -r 31e001f38b57 drivers/xen/core/firmware.c --- a/drivers/xen/core/firmware.c Tue Jun 12 14:56:53 2012 +0200 +++ b/drivers/xen/core/firmware.c Tue Jun 12 14:57:33 2012 +0200 @@ -4,6 +4,7 @@ #include #include