From xen-changelog-bounces@lists.xen.org Sat Feb 01 20:11:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Feb 2014 20:11:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9guC-0005hQ-7v; Sat, 01 Feb 2014 20: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 1W9guA-0005hC-Ii for xen-changelog@lists.xensource.com; Sat, 01 Feb 2014 20:11:07 +0000 Received: from [85.158.143.35:36611] by server-3.bemta-4.messagelabs.com id DC/DE-11539-9D45DE25; Sat, 01 Feb 2014 20:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1391285464!2439205!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14786 invoked from network); 1 Feb 2014 20:11:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Feb 2014 20:11:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9gu7-0004xz-Os for xen-changelog@lists.xensource.com; Sat, 01 Feb 2014 20:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1W9gu7-0002k0-Gz for xen-changelog@lists.xensource.com; Sat, 01 Feb 2014 20:11:03 +0000 Date: Sat, 01 Feb 2014 20:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] dbg_rw_guest_mem: need to call put_gfn in error path X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ed234b1af2bc3edb05a7597b7b89c947a94f7c8b Author: Andrew Cooper AuthorDate: Thu Jan 30 09:00:09 2014 +0100 Commit: Jan Beulich CommitDate: Thu Jan 30 09:00:09 2014 +0100 dbg_rw_guest_mem: need to call put_gfn in error path Using a 1G hvm domU (in grub) and gdbsx: (gdb) set arch i8086 warning: A handler for the OS ABI "GNU/Linux" is not built into this configuration of GDB. Attempting to continue with the default i8086 settings. The target architecture is assumed to be i8086 (gdb) target remote localhost:9999 Remote debugging using localhost:9999 Remote debugging from host 127.0.0.1 0x0000d475 in ?? () (gdb) x/1xh 0x6ae9168b Will reproduce this bug. With a debug=y build you will get: Assertion '!preempt_count()' failed at preempt.c:37 For a debug=n build you will get a dom0 VCPU hung (at some point) in: [ffff82c4c0126eec] _write_lock+0x3c/0x50 ffff82c4c01e43a0 __get_gfn_type_access+0x150/0x230 ffff82c4c0158885 dbg_rw_mem+0x115/0x360 ffff82c4c0158fc8 arch_do_domctl+0x4b8/0x22f0 ffff82c4c01709ed get_page+0x2d/0x100 ffff82c4c01031aa do_domctl+0x2ba/0x11e0 ffff82c4c0179662 do_mmuext_op+0x8d2/0x1b20 ffff82c4c0183598 __update_vcpu_system_time+0x288/0x340 ffff82c4c015c719 continue_nonidle_domain+0x9/0x30 ffff82c4c012938b add_entry+0x4b/0xb0 ffff82c4c02223f9 syscall_enter+0xa9/0xae And gdb output: (gdb) x/1xh 0x6ae9168b 0x6ae9168b: 0x3024 (gdb) x/1xh 0x6ae9168b 0x6ae9168b: Ignoring packet error, continuing... Reply contains invalid hex digit 116 The 1st one worked because the p2m.lock is recursive and the PCPU had not yet changed. crash reports (for example): crash> mm_rwlock_t 0xffff83083f913010 struct mm_rwlock_t { lock = { raw = { lock = 2147483647 }, debug = {} }, unlock_level = 0, recurse_count = 1, locker = 1, locker_function = 0xffff82c4c022c640 <__func__.13514> "__get_gfn_type_access" } Signed-off-by: Andrew Cooper Signed-off-by: Don Slutz Acked-by: Mukesh Rathor master commit: 3dbab7a8bf4bef1bb2967cb3a8c7ed2146482ab3 master date: 2014-01-10 17:45:01 +0100 --- xen/arch/x86/debug.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/debug.c b/xen/arch/x86/debug.c index 35f8d2e..e477ccd 100644 --- a/xen/arch/x86/debug.c +++ b/xen/arch/x86/debug.c @@ -63,10 +63,17 @@ dbg_hvm_va2mfn(dbgva_t vaddr, struct domain *dp, int toaddr, if ( p2m_is_readonly(gfntype) && toaddr ) { DBGP2("kdb:p2m_is_readonly: gfntype:%x\n", gfntype); - return INVALID_MFN; + mfn = INVALID_MFN; + } + else + DBGP2("X: vaddr:%lx domid:%d mfn:%lx\n", vaddr, dp->domain_id, mfn); + + if ( mfn == INVALID_MFN ) + { + put_gfn(dp, *gfn); + *gfn = INVALID_GFN; } - DBGP2("X: vaddr:%lx domid:%d mfn:%lx\n", vaddr, dp->domain_id, mfn); return mfn; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Feb 01 20:11:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Feb 2014 20:11:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9guC-0005hQ-7v; Sat, 01 Feb 2014 20: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 1W9guA-0005hC-Ii for xen-changelog@lists.xensource.com; Sat, 01 Feb 2014 20:11:07 +0000 Received: from [85.158.143.35:36611] by server-3.bemta-4.messagelabs.com id DC/DE-11539-9D45DE25; Sat, 01 Feb 2014 20:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1391285464!2439205!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14786 invoked from network); 1 Feb 2014 20:11:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Feb 2014 20:11:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9gu7-0004xz-Os for xen-changelog@lists.xensource.com; Sat, 01 Feb 2014 20:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1W9gu7-0002k0-Gz for xen-changelog@lists.xensource.com; Sat, 01 Feb 2014 20:11:03 +0000 Date: Sat, 01 Feb 2014 20:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] dbg_rw_guest_mem: need to call put_gfn in error path X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ed234b1af2bc3edb05a7597b7b89c947a94f7c8b Author: Andrew Cooper AuthorDate: Thu Jan 30 09:00:09 2014 +0100 Commit: Jan Beulich CommitDate: Thu Jan 30 09:00:09 2014 +0100 dbg_rw_guest_mem: need to call put_gfn in error path Using a 1G hvm domU (in grub) and gdbsx: (gdb) set arch i8086 warning: A handler for the OS ABI "GNU/Linux" is not built into this configuration of GDB. Attempting to continue with the default i8086 settings. The target architecture is assumed to be i8086 (gdb) target remote localhost:9999 Remote debugging using localhost:9999 Remote debugging from host 127.0.0.1 0x0000d475 in ?? () (gdb) x/1xh 0x6ae9168b Will reproduce this bug. With a debug=y build you will get: Assertion '!preempt_count()' failed at preempt.c:37 For a debug=n build you will get a dom0 VCPU hung (at some point) in: [ffff82c4c0126eec] _write_lock+0x3c/0x50 ffff82c4c01e43a0 __get_gfn_type_access+0x150/0x230 ffff82c4c0158885 dbg_rw_mem+0x115/0x360 ffff82c4c0158fc8 arch_do_domctl+0x4b8/0x22f0 ffff82c4c01709ed get_page+0x2d/0x100 ffff82c4c01031aa do_domctl+0x2ba/0x11e0 ffff82c4c0179662 do_mmuext_op+0x8d2/0x1b20 ffff82c4c0183598 __update_vcpu_system_time+0x288/0x340 ffff82c4c015c719 continue_nonidle_domain+0x9/0x30 ffff82c4c012938b add_entry+0x4b/0xb0 ffff82c4c02223f9 syscall_enter+0xa9/0xae And gdb output: (gdb) x/1xh 0x6ae9168b 0x6ae9168b: 0x3024 (gdb) x/1xh 0x6ae9168b 0x6ae9168b: Ignoring packet error, continuing... Reply contains invalid hex digit 116 The 1st one worked because the p2m.lock is recursive and the PCPU had not yet changed. crash reports (for example): crash> mm_rwlock_t 0xffff83083f913010 struct mm_rwlock_t { lock = { raw = { lock = 2147483647 }, debug = {} }, unlock_level = 0, recurse_count = 1, locker = 1, locker_function = 0xffff82c4c022c640 <__func__.13514> "__get_gfn_type_access" } Signed-off-by: Andrew Cooper Signed-off-by: Don Slutz Acked-by: Mukesh Rathor master commit: 3dbab7a8bf4bef1bb2967cb3a8c7ed2146482ab3 master date: 2014-01-10 17:45:01 +0100 --- xen/arch/x86/debug.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/debug.c b/xen/arch/x86/debug.c index 35f8d2e..e477ccd 100644 --- a/xen/arch/x86/debug.c +++ b/xen/arch/x86/debug.c @@ -63,10 +63,17 @@ dbg_hvm_va2mfn(dbgva_t vaddr, struct domain *dp, int toaddr, if ( p2m_is_readonly(gfntype) && toaddr ) { DBGP2("kdb:p2m_is_readonly: gfntype:%x\n", gfntype); - return INVALID_MFN; + mfn = INVALID_MFN; + } + else + DBGP2("X: vaddr:%lx domid:%d mfn:%lx\n", vaddr, dp->domain_id, mfn); + + if ( mfn == INVALID_MFN ) + { + put_gfn(dp, *gfn); + *gfn = INVALID_GFN; } - DBGP2("X: vaddr:%lx domid:%d mfn:%lx\n", vaddr, dp->domain_id, mfn); return mfn; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Feb 01 20:11:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Feb 2014 20:11:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9guM-0005iF-Ar; Sat, 01 Feb 2014 20:11:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9guL-0005i5-1l for xen-changelog@lists.xensource.com; Sat, 01 Feb 2014 20:11:17 +0000 Received: from [85.158.139.211:52831] by server-4.bemta-5.messagelabs.com id F1/AA-08092-4E45DE25; Sat, 01 Feb 2014 20:11:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1391285474!1029386!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31759 invoked from network); 1 Feb 2014 20:11:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 1 Feb 2014 20:11:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9guH-0004y2-Va for xen-changelog@lists.xensource.com; Sat, 01 Feb 2014 20:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1W9guH-0002oj-RX for xen-changelog@lists.xensource.com; Sat, 01 Feb 2014 20:11:13 +0000 Date: Sat, 01 Feb 2014 20:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] mce: fix race condition in mctelem_xchg_head X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 142cf790dcecee00efa880ea6737916d0661ed8f Author: Frediano Ziglio AuthorDate: Thu Jan 30 09:01:01 2014 +0100 Commit: Jan Beulich CommitDate: Thu Jan 30 09:01:01 2014 +0100 mce: fix race condition in mctelem_xchg_head The function (mctelem_xchg_head()) used to exchange mce telemetry list heads is racy. It may write to the head twice, with the second write linking to an element in the wrong state. If there are two threads, T1 inserting on committed list; and T2 trying to consume it. 1. T1 starts inserting an element (A), sets prev pointer (mcte_prev). 2. T1 is interrupted after the cmpxchg succeeded. 3. T2 gets the list and changes element A and updates the commit list head. 4. T1 resumes, reads pointer to prev again and compare with result from the cmpxchg which succeeded but in the meantime prev changed in memory. 5. T1 thinks the cmpxchg failed and goes around the loop again, linking head to A again. To solve the race use temporary variable for prev pointer. *linkp (which point to a field in the element) must be updated before the cmpxchg() as after a successful cmpxchg the element might be immediately removed and reinitialized. The wmb() prior to the cmpchgptr() call is not necessary since it is already a full memory barrier. This wmb() is thus removed. Signed-off-by: Frediano Ziglio Reviewed-by: Liu Jinsong master commit: e9af61b969906976188609379183cb304935f448 master date: 2014-01-17 15:58:27 +0100 --- xen/arch/x86/cpu/mcheck/mctelem.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mctelem.c b/xen/arch/x86/cpu/mcheck/mctelem.c index 37d830f..895ce1a 100644 --- a/xen/arch/x86/cpu/mcheck/mctelem.c +++ b/xen/arch/x86/cpu/mcheck/mctelem.c @@ -127,13 +127,14 @@ static DEFINE_PER_CPU(struct mc_telem_cpu_ctl, mctctl); static DEFINE_SPINLOCK(processing_lock); static void mctelem_xchg_head(struct mctelem_ent **headp, - struct mctelem_ent **old, + struct mctelem_ent **linkp, struct mctelem_ent *new) { for (;;) { - *old = *headp; - wmb(); - if (cmpxchgptr(headp, *old, new) == *old) + struct mctelem_ent *old; + + *linkp = old = *headp; + if (cmpxchgptr(headp, old, new) == old) break; } } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Feb 01 20:11:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Feb 2014 20:11:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9guM-0005iF-Ar; Sat, 01 Feb 2014 20:11:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9guL-0005i5-1l for xen-changelog@lists.xensource.com; Sat, 01 Feb 2014 20:11:17 +0000 Received: from [85.158.139.211:52831] by server-4.bemta-5.messagelabs.com id F1/AA-08092-4E45DE25; Sat, 01 Feb 2014 20:11:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1391285474!1029386!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31759 invoked from network); 1 Feb 2014 20:11:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 1 Feb 2014 20:11:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9guH-0004y2-Va for xen-changelog@lists.xensource.com; Sat, 01 Feb 2014 20:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1W9guH-0002oj-RX for xen-changelog@lists.xensource.com; Sat, 01 Feb 2014 20:11:13 +0000 Date: Sat, 01 Feb 2014 20:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] mce: fix race condition in mctelem_xchg_head X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 142cf790dcecee00efa880ea6737916d0661ed8f Author: Frediano Ziglio AuthorDate: Thu Jan 30 09:01:01 2014 +0100 Commit: Jan Beulich CommitDate: Thu Jan 30 09:01:01 2014 +0100 mce: fix race condition in mctelem_xchg_head The function (mctelem_xchg_head()) used to exchange mce telemetry list heads is racy. It may write to the head twice, with the second write linking to an element in the wrong state. If there are two threads, T1 inserting on committed list; and T2 trying to consume it. 1. T1 starts inserting an element (A), sets prev pointer (mcte_prev). 2. T1 is interrupted after the cmpxchg succeeded. 3. T2 gets the list and changes element A and updates the commit list head. 4. T1 resumes, reads pointer to prev again and compare with result from the cmpxchg which succeeded but in the meantime prev changed in memory. 5. T1 thinks the cmpxchg failed and goes around the loop again, linking head to A again. To solve the race use temporary variable for prev pointer. *linkp (which point to a field in the element) must be updated before the cmpxchg() as after a successful cmpxchg the element might be immediately removed and reinitialized. The wmb() prior to the cmpchgptr() call is not necessary since it is already a full memory barrier. This wmb() is thus removed. Signed-off-by: Frediano Ziglio Reviewed-by: Liu Jinsong master commit: e9af61b969906976188609379183cb304935f448 master date: 2014-01-17 15:58:27 +0100 --- xen/arch/x86/cpu/mcheck/mctelem.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mctelem.c b/xen/arch/x86/cpu/mcheck/mctelem.c index 37d830f..895ce1a 100644 --- a/xen/arch/x86/cpu/mcheck/mctelem.c +++ b/xen/arch/x86/cpu/mcheck/mctelem.c @@ -127,13 +127,14 @@ static DEFINE_PER_CPU(struct mc_telem_cpu_ctl, mctctl); static DEFINE_SPINLOCK(processing_lock); static void mctelem_xchg_head(struct mctelem_ent **headp, - struct mctelem_ent **old, + struct mctelem_ent **linkp, struct mctelem_ent *new) { for (;;) { - *old = *headp; - wmb(); - if (cmpxchgptr(headp, *old, new) == *old) + struct mctelem_ent *old; + + *linkp = old = *headp; + if (cmpxchgptr(headp, old, new) == old) break; } } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Feb 01 20:11:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Feb 2014 20:11:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9guW-0005jQ-EZ; Sat, 01 Feb 2014 20:11:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9guU-0005jF-VT for xen-changelog@lists.xensource.com; Sat, 01 Feb 2014 20:11:27 +0000 Received: from [85.158.143.35:37155] by server-1.bemta-4.messagelabs.com id 24/34-31661-EE45DE25; Sat, 01 Feb 2014 20:11:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1391285484!2426913!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25911 invoked from network); 1 Feb 2014 20:11:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Feb 2014 20:11:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9guS-0004yB-AM for xen-changelog@lists.xensource.com; Sat, 01 Feb 2014 20:11:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1W9guS-0002q5-1u for xen-changelog@lists.xensource.com; Sat, 01 Feb 2014 20:11:24 +0000 Date: Sat, 01 Feb 2014 20:11:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] common/sysctl: Don't leak status in SYSCTL_page_offline_op X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 0037ec360b8792f966acc154e06ac9f627b00f9f Author: Andrew Cooper AuthorDate: Thu Jan 30 09:01:28 2014 +0100 Commit: Jan Beulich CommitDate: Thu Jan 30 09:01:28 2014 +0100 common/sysctl: Don't leak status in SYSCTL_page_offline_op Also fix the indentation of the arguments to copy_to_guest() to help clarify that the 'ret = -EFAULT' is not part of the condition. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Keir Fraser master commit: efd8ff0a04740a698b2b8b2b9adccd639e0fa6c9 master date: 2014-01-20 09:48:11 +0100 --- xen/common/sysctl.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c index ea68278..779872c 100644 --- a/xen/common/sysctl.c +++ b/xen/common/sysctl.c @@ -309,12 +309,9 @@ long do_sysctl(XEN_GUEST_HANDLE(xen_sysctl_t) u_sysctl) } if ( copy_to_guest( - op->u.page_offline.status, status, - op->u.page_offline.end - op->u.page_offline.start + 1) ) - { + op->u.page_offline.status, status, + op->u.page_offline.end - op->u.page_offline.start + 1) ) ret = -EFAULT; - break; - } xfree(status); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Feb 01 20:11:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 01 Feb 2014 20:11:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9guW-0005jQ-EZ; Sat, 01 Feb 2014 20:11:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9guU-0005jF-VT for xen-changelog@lists.xensource.com; Sat, 01 Feb 2014 20:11:27 +0000 Received: from [85.158.143.35:37155] by server-1.bemta-4.messagelabs.com id 24/34-31661-EE45DE25; Sat, 01 Feb 2014 20:11:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1391285484!2426913!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25911 invoked from network); 1 Feb 2014 20:11:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 1 Feb 2014 20:11:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9guS-0004yB-AM for xen-changelog@lists.xensource.com; Sat, 01 Feb 2014 20:11:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1W9guS-0002q5-1u for xen-changelog@lists.xensource.com; Sat, 01 Feb 2014 20:11:24 +0000 Date: Sat, 01 Feb 2014 20:11:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] common/sysctl: Don't leak status in SYSCTL_page_offline_op X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 0037ec360b8792f966acc154e06ac9f627b00f9f Author: Andrew Cooper AuthorDate: Thu Jan 30 09:01:28 2014 +0100 Commit: Jan Beulich CommitDate: Thu Jan 30 09:01:28 2014 +0100 common/sysctl: Don't leak status in SYSCTL_page_offline_op Also fix the indentation of the arguments to copy_to_guest() to help clarify that the 'ret = -EFAULT' is not part of the condition. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Keir Fraser master commit: efd8ff0a04740a698b2b8b2b9adccd639e0fa6c9 master date: 2014-01-20 09:48:11 +0100 --- xen/common/sysctl.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c index ea68278..779872c 100644 --- a/xen/common/sysctl.c +++ b/xen/common/sysctl.c @@ -309,12 +309,9 @@ long do_sysctl(XEN_GUEST_HANDLE(xen_sysctl_t) u_sysctl) } if ( copy_to_guest( - op->u.page_offline.status, status, - op->u.page_offline.end - op->u.page_offline.start + 1) ) - { + op->u.page_offline.status, status, + op->u.page_offline.end - op->u.page_offline.start + 1) ) ret = -EFAULT; - break; - } xfree(status); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Feb 02 00:11:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 02 Feb 2014 00:11:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9keR-0002yw-Q8; Sun, 02 Feb 2014 00:11:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9keQ-0002ym-Bg for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 00:11:06 +0000 Received: from [85.158.139.211:19077] by server-16.bemta-5.messagelabs.com id 42/62-05060-91D8DE25; Sun, 02 Feb 2014 00:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1391299863!1054916!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27223 invoked from network); 2 Feb 2014 00:11:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 2 Feb 2014 00:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9keN-000806-HF for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 00:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1W9keN-0001O8-2e for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 00:11:03 +0000 Date: Sun, 02 Feb 2014 00:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/unlz4: always set an error return code on failures X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 55d207597e05b79fb0d90868abfe0f77b3ba66f2 Author: Jan Beulich AuthorDate: Tue Jan 28 13:31:28 2014 +0100 Commit: Jan Beulich CommitDate: Tue Jan 28 13:31:28 2014 +0100 xen/unlz4: always set an error return code on failures "ret", being set to -1 early on, gets cleared by the first invocation of lz4_decompress()/lz4_decompress_unknownoutputsize(), and hence subsequent failures wouldn't be noticed by the caller without setting it back to -1 right after those calls. Linux commit: 2a1d689c9ba42a6066540fb221b6ecbd6298b728 Reported-by: Matthew Daley Signed-off-by: Jan Beulich --- xen/common/unlz4.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/common/unlz4.c b/xen/common/unlz4.c index 195d829..9dcaec7 100644 --- a/xen/common/unlz4.c +++ b/xen/common/unlz4.c @@ -133,6 +133,7 @@ STATIC int INIT unlz4(unsigned char *input, unsigned int in_len, goto exit_2; } + ret = -1; if (flush && flush(outp, dest_len) != dest_len) goto exit_2; if (output) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Feb 02 00:11:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 02 Feb 2014 00:11:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9keR-0002yw-Q8; Sun, 02 Feb 2014 00:11:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9keQ-0002ym-Bg for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 00:11:06 +0000 Received: from [85.158.139.211:19077] by server-16.bemta-5.messagelabs.com id 42/62-05060-91D8DE25; Sun, 02 Feb 2014 00:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1391299863!1054916!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27223 invoked from network); 2 Feb 2014 00:11:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 2 Feb 2014 00:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9keN-000806-HF for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 00:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1W9keN-0001O8-2e for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 00:11:03 +0000 Date: Sun, 02 Feb 2014 00:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/unlz4: always set an error return code on failures X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 55d207597e05b79fb0d90868abfe0f77b3ba66f2 Author: Jan Beulich AuthorDate: Tue Jan 28 13:31:28 2014 +0100 Commit: Jan Beulich CommitDate: Tue Jan 28 13:31:28 2014 +0100 xen/unlz4: always set an error return code on failures "ret", being set to -1 early on, gets cleared by the first invocation of lz4_decompress()/lz4_decompress_unknownoutputsize(), and hence subsequent failures wouldn't be noticed by the caller without setting it back to -1 right after those calls. Linux commit: 2a1d689c9ba42a6066540fb221b6ecbd6298b728 Reported-by: Matthew Daley Signed-off-by: Jan Beulich --- xen/common/unlz4.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/common/unlz4.c b/xen/common/unlz4.c index 195d829..9dcaec7 100644 --- a/xen/common/unlz4.c +++ b/xen/common/unlz4.c @@ -133,6 +133,7 @@ STATIC int INIT unlz4(unsigned char *input, unsigned int in_len, goto exit_2; } + ret = -1; if (flush && flush(outp, dest_len) != dest_len) goto exit_2; if (output) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Feb 02 00:11:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 02 Feb 2014 00:11:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9keb-0002zo-So; Sun, 02 Feb 2014 00: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 1W9kea-0002zc-LN for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 00:11:16 +0000 Received: from [85.158.143.35:30558] by server-3.bemta-4.messagelabs.com id 46/A3-11539-32D8DE25; Sun, 02 Feb 2014 00:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1391299874!2462188!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22643 invoked from network); 2 Feb 2014 00:11:14 -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 Feb 2014 00:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9keX-00080C-Me for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 00:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1W9keX-0001OZ-K0 for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 00:11:13 +0000 Date: Sun, 02 Feb 2014 00:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] blkif.h: enhance comments related to the discard feature X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 927a13de6c85faa388eef1041baae17744be6791 Author: Olaf Hering AuthorDate: Tue Jan 28 13:33:57 2014 +0100 Commit: Jan Beulich CommitDate: Tue Jan 28 13:33:57 2014 +0100 blkif.h: enhance comments related to the discard feature Also fix the name of the discard-alignment property, add the missing 'n'. Signed-off-by: Olaf Hering Acked-by: Keir Fraser Acked-by: Konrad Rzeszutek Wilk --- xen/include/public/io/blkif.h | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/xen/include/public/io/blkif.h b/xen/include/public/io/blkif.h index 84eb7fd..542f123 100644 --- a/xen/include/public/io/blkif.h +++ b/xen/include/public/io/blkif.h @@ -175,7 +175,7 @@ * *------------------------- Backend Device Properties ------------------------- * - * discard-aligment + * discard-alignment * Values: * Default Value: 0 * Notes: 4, 5 @@ -194,6 +194,7 @@ * discard-secure * Values: 0/1 (boolean) * Default Value: 0 + * Notes: 10 * * A value of "1" indicates that the backend can process BLKIF_OP_DISCARD * requests with the BLKIF_DISCARD_SECURE flag set. @@ -323,9 +324,15 @@ * For full interoperability, block front and backends should publish * identical ring parameters, adjusted for unit differences, to the * XenStore nodes used in both schemes. - * (4) Devices that support discard functionality may internally allocate - * space (discardable extents) in units that are larger than the - * exported logical block size. + * (4) Devices that support discard functionality may internally allocate space + * (discardable extents) in units that are larger than the exported logical + * block size. If the backing device has such discardable extents the + * backend should provide both discard-granularity and discard-alignment. + * Providing just one of the two may be considered an error by the frontend. + * Backends supporting discard should include discard-granularity and + * discard-alignment even if it supports discarding individual sectors. + * Frontends should assume discard-alignment == 0 and discard-granularity + * == sector size if these keys are missing. * (5) The discard-alignment parameter allows a physical device to be * partitioned into virtual devices that do not necessarily begin or * end on a discardable extent boundary. @@ -344,6 +351,8 @@ * grants that can be persistently mapped in the frontend driver, but * due to the frontent driver implementation it should never be bigger * than RING_SIZE * BLKIF_MAX_SEGMENTS_PER_REQUEST. + *(10) The discard-secure property may be present and will be set to 1 if the + * backing device supports secure discard. */ /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Feb 02 00:11:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 02 Feb 2014 00:11:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9keb-0002zo-So; Sun, 02 Feb 2014 00: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 1W9kea-0002zc-LN for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 00:11:16 +0000 Received: from [85.158.143.35:30558] by server-3.bemta-4.messagelabs.com id 46/A3-11539-32D8DE25; Sun, 02 Feb 2014 00:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1391299874!2462188!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22643 invoked from network); 2 Feb 2014 00:11:14 -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 Feb 2014 00:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9keX-00080C-Me for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 00:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1W9keX-0001OZ-K0 for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 00:11:13 +0000 Date: Sun, 02 Feb 2014 00:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] blkif.h: enhance comments related to the discard feature X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 927a13de6c85faa388eef1041baae17744be6791 Author: Olaf Hering AuthorDate: Tue Jan 28 13:33:57 2014 +0100 Commit: Jan Beulich CommitDate: Tue Jan 28 13:33:57 2014 +0100 blkif.h: enhance comments related to the discard feature Also fix the name of the discard-alignment property, add the missing 'n'. Signed-off-by: Olaf Hering Acked-by: Keir Fraser Acked-by: Konrad Rzeszutek Wilk --- xen/include/public/io/blkif.h | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/xen/include/public/io/blkif.h b/xen/include/public/io/blkif.h index 84eb7fd..542f123 100644 --- a/xen/include/public/io/blkif.h +++ b/xen/include/public/io/blkif.h @@ -175,7 +175,7 @@ * *------------------------- Backend Device Properties ------------------------- * - * discard-aligment + * discard-alignment * Values: * Default Value: 0 * Notes: 4, 5 @@ -194,6 +194,7 @@ * discard-secure * Values: 0/1 (boolean) * Default Value: 0 + * Notes: 10 * * A value of "1" indicates that the backend can process BLKIF_OP_DISCARD * requests with the BLKIF_DISCARD_SECURE flag set. @@ -323,9 +324,15 @@ * For full interoperability, block front and backends should publish * identical ring parameters, adjusted for unit differences, to the * XenStore nodes used in both schemes. - * (4) Devices that support discard functionality may internally allocate - * space (discardable extents) in units that are larger than the - * exported logical block size. + * (4) Devices that support discard functionality may internally allocate space + * (discardable extents) in units that are larger than the exported logical + * block size. If the backing device has such discardable extents the + * backend should provide both discard-granularity and discard-alignment. + * Providing just one of the two may be considered an error by the frontend. + * Backends supporting discard should include discard-granularity and + * discard-alignment even if it supports discarding individual sectors. + * Frontends should assume discard-alignment == 0 and discard-granularity + * == sector size if these keys are missing. * (5) The discard-alignment parameter allows a physical device to be * partitioned into virtual devices that do not necessarily begin or * end on a discardable extent boundary. @@ -344,6 +351,8 @@ * grants that can be persistently mapped in the frontend driver, but * due to the frontent driver implementation it should never be bigger * than RING_SIZE * BLKIF_MAX_SEGMENTS_PER_REQUEST. + *(10) The discard-secure property may be present and will be set to 1 if the + * backing device supports secure discard. */ /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Feb 02 00:11:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 02 Feb 2014 00:11:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9kel-00030l-Vf; Sun, 02 Feb 2014 00:11:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9kel-00030d-5H for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 00:11:27 +0000 Received: from [85.158.137.68:38946] by server-4.bemta-3.messagelabs.com id 96/25-11750-E2D8DE25; Sun, 02 Feb 2014 00:11:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1391299884!12796052!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1750 invoked from network); 2 Feb 2014 00:11:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 2 Feb 2014 00:11:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9keh-00080I-Ry for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 00:11:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1W9keh-0001Ov-PK for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 00:11:23 +0000 Date: Sun, 02 Feb 2014 00:11:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Update QEMU_UPSTREAM_REVISION X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 7754fb8cab292dfb2047b1cb38004d7290f8b6aa Author: Stefano Stabellini AuthorDate: Tue Jan 28 16:48:55 2014 +0100 Commit: Jan Beulich CommitDate: Tue Jan 28 16:48:55 2014 +0100 Update QEMU_UPSTREAM_REVISION Switch back to master. Signed-off-by: Stefano Stabellini --- Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index 55dce20..484cfdb 100644 --- a/Config.mk +++ b/Config.mk @@ -234,7 +234,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.4.0-rc1 +QEMU_UPSTREAM_REVISION ?= master SEABIOS_UPSTREAM_TAG ?= rel-1.7.3.1 # Fri Aug 2 14:12:09 2013 -0400 # Fix bug in CBFS file walking with compressed files. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Feb 02 00:11:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 02 Feb 2014 00:11:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9kel-00030l-Vf; Sun, 02 Feb 2014 00:11:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9kel-00030d-5H for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 00:11:27 +0000 Received: from [85.158.137.68:38946] by server-4.bemta-3.messagelabs.com id 96/25-11750-E2D8DE25; Sun, 02 Feb 2014 00:11:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1391299884!12796052!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1750 invoked from network); 2 Feb 2014 00:11:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 2 Feb 2014 00:11:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9keh-00080I-Ry for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 00:11:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1W9keh-0001Ov-PK for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 00:11:23 +0000 Date: Sun, 02 Feb 2014 00:11:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Update QEMU_UPSTREAM_REVISION X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 7754fb8cab292dfb2047b1cb38004d7290f8b6aa Author: Stefano Stabellini AuthorDate: Tue Jan 28 16:48:55 2014 +0100 Commit: Jan Beulich CommitDate: Tue Jan 28 16:48:55 2014 +0100 Update QEMU_UPSTREAM_REVISION Switch back to master. Signed-off-by: Stefano Stabellini --- Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index 55dce20..484cfdb 100644 --- a/Config.mk +++ b/Config.mk @@ -234,7 +234,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.4.0-rc1 +QEMU_UPSTREAM_REVISION ?= master SEABIOS_UPSTREAM_TAG ?= rel-1.7.3.1 # Fri Aug 2 14:12:09 2013 -0400 # Fix bug in CBFS file walking with compressed files. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Feb 02 00:11:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 02 Feb 2014 00:11:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9kew-00032F-2J; Sun, 02 Feb 2014 00:11:38 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9keu-000324-T2 for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 00:11:37 +0000 Received: from [85.158.137.68:39154] by server-16.bemta-3.messagelabs.com id 9D/08-29917-83D8DE25; Sun, 02 Feb 2014 00:11:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1391299894!12796065!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1963 invoked from network); 2 Feb 2014 00:11:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 2 Feb 2014 00:11:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9ker-00080Q-VZ for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 00:11:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1W9ker-0001PL-UM for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 00:11:33 +0000 Date: Sun, 02 Feb 2014 00:11:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Update QEMU_TAG and QEMU_UPSTREAM_REVISION for 4.4.0-rc3 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 a96bbe5fd79ea8ac6b40e90965f84aab839d3391 Author: Ian Jackson AuthorDate: Thu Jan 30 03:47:11 2014 +0000 Commit: Ian Jackson CommitDate: Thu Jan 30 03:47:11 2014 +0000 Update QEMU_TAG and QEMU_UPSTREAM_REVISION for 4.4.0-rc3 Signed-off-by: Ian Jackson --- Config.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.mk b/Config.mk index 484cfdb..e061a9f 100644 --- a/Config.mk +++ b/Config.mk @@ -234,7 +234,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 -QEMU_UPSTREAM_REVISION ?= master +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.4.0-rc3 SEABIOS_UPSTREAM_TAG ?= rel-1.7.3.1 # Fri Aug 2 14:12:09 2013 -0400 # Fix bug in CBFS file walking with compressed files. @@ -246,7 +246,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.4.0-rc2 +QEMU_TAG ?= xen-4.4.0-rc3 # Wed Dec 18 15:25:14 2013 +0000 # qemu-traditional: Fix build warnings on Wheezy -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Feb 02 00:11:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 02 Feb 2014 00:11:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9kew-00032F-2J; Sun, 02 Feb 2014 00:11:38 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9keu-000324-T2 for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 00:11:37 +0000 Received: from [85.158.137.68:39154] by server-16.bemta-3.messagelabs.com id 9D/08-29917-83D8DE25; Sun, 02 Feb 2014 00:11:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1391299894!12796065!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1963 invoked from network); 2 Feb 2014 00:11:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 2 Feb 2014 00:11:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9ker-00080Q-VZ for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 00:11:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1W9ker-0001PL-UM for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 00:11:33 +0000 Date: Sun, 02 Feb 2014 00:11:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Update QEMU_TAG and QEMU_UPSTREAM_REVISION for 4.4.0-rc3 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 a96bbe5fd79ea8ac6b40e90965f84aab839d3391 Author: Ian Jackson AuthorDate: Thu Jan 30 03:47:11 2014 +0000 Commit: Ian Jackson CommitDate: Thu Jan 30 03:47:11 2014 +0000 Update QEMU_TAG and QEMU_UPSTREAM_REVISION for 4.4.0-rc3 Signed-off-by: Ian Jackson --- Config.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.mk b/Config.mk index 484cfdb..e061a9f 100644 --- a/Config.mk +++ b/Config.mk @@ -234,7 +234,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 -QEMU_UPSTREAM_REVISION ?= master +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.4.0-rc3 SEABIOS_UPSTREAM_TAG ?= rel-1.7.3.1 # Fri Aug 2 14:12:09 2013 -0400 # Fix bug in CBFS file walking with compressed files. @@ -246,7 +246,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.4.0-rc2 +QEMU_TAG ?= xen-4.4.0-rc3 # Wed Dec 18 15:25:14 2013 +0000 # qemu-traditional: Fix build warnings on Wheezy -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Feb 02 00:11:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 02 Feb 2014 00:11:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9kf6-00033x-4y; Sun, 02 Feb 2014 00:11:48 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9kf4-00033m-Ta for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 00:11:47 +0000 Received: from [85.158.137.68:34169] by server-14.bemta-3.messagelabs.com id 02/B0-08196-24D8DE25; Sun, 02 Feb 2014 00:11:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1391299904!12740401!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27619 invoked from network); 2 Feb 2014 00:11:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 2 Feb 2014 00:11:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9kf2-00080W-8W for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 00:11:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1W9kf2-0001QE-2b for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 00:11:44 +0000 Date: Sun, 02 Feb 2014 00:11:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Merge branch 'master' into staging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit feee1ace547cf6247a358d082dd64fa762be2488 Merge: a96bbe5fd79ea8ac6b40e90965f84aab839d3391 a731bb25c072004a7c073625eb6ef14cc9011c74 Author: Ian Jackson AuthorDate: Fri Jan 31 11:21:55 2014 +0000 Commit: Ian Jackson CommitDate: Fri Jan 31 11:21:55 2014 +0000 Merge branch 'master' into staging -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Feb 02 00:11:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 02 Feb 2014 00:11:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9kf6-00033x-4y; Sun, 02 Feb 2014 00:11:48 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9kf4-00033m-Ta for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 00:11:47 +0000 Received: from [85.158.137.68:34169] by server-14.bemta-3.messagelabs.com id 02/B0-08196-24D8DE25; Sun, 02 Feb 2014 00:11:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1391299904!12740401!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27619 invoked from network); 2 Feb 2014 00:11:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 2 Feb 2014 00:11:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9kf2-00080W-8W for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 00:11:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1W9kf2-0001QE-2b for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 00:11:44 +0000 Date: Sun, 02 Feb 2014 00:11:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Merge branch 'master' into staging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit feee1ace547cf6247a358d082dd64fa762be2488 Merge: a96bbe5fd79ea8ac6b40e90965f84aab839d3391 a731bb25c072004a7c073625eb6ef14cc9011c74 Author: Ian Jackson AuthorDate: Fri Jan 31 11:21:55 2014 +0000 Commit: Ian Jackson CommitDate: Fri Jan 31 11:21:55 2014 +0000 Merge branch 'master' into staging -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Feb 02 00:55:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 02 Feb 2014 00:55:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9lL2-00040K-3X; Sun, 02 Feb 2014 00:55:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9lL0-000405-Op for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 00:55:06 +0000 Received: from [85.158.139.211:57881] by server-3.bemta-5.messagelabs.com id EA/C1-13671-9679DE25; Sun, 02 Feb 2014 00:55:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1391302504!1067633!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9772 invoked from network); 2 Feb 2014 00:55:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 2 Feb 2014 00:55:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9lKx-0008Qs-IM for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 00:55:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1W9lKw-0002Vf-MN for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 00:55:02 +0000 Date: Sun, 02 Feb 2014 00:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen_pt: Fix passthrough of device with ROM. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 90d35066387e1d9c9deeda042c5a907cd57c11cf Author: Anthony PERARD AuthorDate: Fri Jan 10 15:56:33 2014 +0000 Commit: Stefano Stabellini CommitDate: Fri Jan 31 12:38:23 2014 +0000 xen_pt: Fix passthrough of device with ROM. QEMU does not need and should not allocate memory for the ROM of a passthrough PCI device. So this patch initialize the particular region like any other PCI BAR of a passthrough device. When a guest will access the ROM, Xen will take care of the IO, QEMU will not be involved in it. Xen set a limit of memory available for each guest, allocating memory for a ROM can hit this limit. upstream-commit-id: 794798e36eda77802ce7cc7d7d6b1c65751e8a76 Signed-off-by: Anthony PERARD Signed-off-by: Stefano Stabellini Reported-and-Tested-by: Konrad Rzeszutek Wilk --- hw/xen/xen_pt.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index ca2d460..65968df 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -440,8 +440,8 @@ static int xen_pt_register_regions(XenPCIPassthroughState *s) s->bases[PCI_ROM_SLOT].access.maddr = d->rom.base_addr; - memory_region_init_rom_device(&s->rom, OBJECT(s), NULL, NULL, - "xen-pci-pt-rom", d->rom.size); + memory_region_init_io(&s->rom, OBJECT(s), &ops, &s->dev, + "xen-pci-pt-rom", d->rom.size); pci_register_bar(&s->dev, PCI_ROM_SLOT, PCI_BASE_ADDRESS_MEM_PREFETCH, &s->rom); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Feb 02 00:55:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 02 Feb 2014 00:55:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9lL2-00040K-3X; Sun, 02 Feb 2014 00:55:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9lL0-000405-Op for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 00:55:06 +0000 Received: from [85.158.139.211:57881] by server-3.bemta-5.messagelabs.com id EA/C1-13671-9679DE25; Sun, 02 Feb 2014 00:55:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1391302504!1067633!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9772 invoked from network); 2 Feb 2014 00:55:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 2 Feb 2014 00:55:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9lKx-0008Qs-IM for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 00:55:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1W9lKw-0002Vf-MN for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 00:55:02 +0000 Date: Sun, 02 Feb 2014 00:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen_pt: Fix passthrough of device with ROM. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 90d35066387e1d9c9deeda042c5a907cd57c11cf Author: Anthony PERARD AuthorDate: Fri Jan 10 15:56:33 2014 +0000 Commit: Stefano Stabellini CommitDate: Fri Jan 31 12:38:23 2014 +0000 xen_pt: Fix passthrough of device with ROM. QEMU does not need and should not allocate memory for the ROM of a passthrough PCI device. So this patch initialize the particular region like any other PCI BAR of a passthrough device. When a guest will access the ROM, Xen will take care of the IO, QEMU will not be involved in it. Xen set a limit of memory available for each guest, allocating memory for a ROM can hit this limit. upstream-commit-id: 794798e36eda77802ce7cc7d7d6b1c65751e8a76 Signed-off-by: Anthony PERARD Signed-off-by: Stefano Stabellini Reported-and-Tested-by: Konrad Rzeszutek Wilk --- hw/xen/xen_pt.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index ca2d460..65968df 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -440,8 +440,8 @@ static int xen_pt_register_regions(XenPCIPassthroughState *s) s->bases[PCI_ROM_SLOT].access.maddr = d->rom.base_addr; - memory_region_init_rom_device(&s->rom, OBJECT(s), NULL, NULL, - "xen-pci-pt-rom", d->rom.size); + memory_region_init_io(&s->rom, OBJECT(s), &ops, &s->dev, + "xen-pci-pt-rom", d->rom.size); pci_register_bar(&s->dev, PCI_ROM_SLOT, PCI_BASE_ADDRESS_MEM_PREFETCH, &s->rom); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Feb 02 11:22:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 02 Feb 2014 11:22:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9v7n-0000w5-2W; Sun, 02 Feb 2014 11:22:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9v7m-0000vw-37 for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 11:22:06 +0000 Received: from [85.158.143.35:51976] by server-2.bemta-4.messagelabs.com id A7/87-10891-D5A2EE25; Sun, 02 Feb 2014 11:22:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1391340123!2496175!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12397 invoked from network); 2 Feb 2014 11:22:04 -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 Feb 2014 11:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9v7j-0007hX-CW for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 11:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1W9v7j-0002aW-8F for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 11:22:03 +0000 Date: Sun, 02 Feb 2014 11:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] dbg_rw_guest_mem: need to call put_gfn in error path X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit df75a2685c21158817092e34ee20cbf7ca770e75 Author: Andrew Cooper AuthorDate: Wed Jan 29 11:52:14 2014 +0100 Commit: Jan Beulich CommitDate: Wed Jan 29 11:52:14 2014 +0100 dbg_rw_guest_mem: need to call put_gfn in error path Using a 1G hvm domU (in grub) and gdbsx: (gdb) set arch i8086 warning: A handler for the OS ABI "GNU/Linux" is not built into this configuration of GDB. Attempting to continue with the default i8086 settings. The target architecture is assumed to be i8086 (gdb) target remote localhost:9999 Remote debugging using localhost:9999 Remote debugging from host 127.0.0.1 0x0000d475 in ?? () (gdb) x/1xh 0x6ae9168b Will reproduce this bug. With a debug=y build you will get: Assertion '!preempt_count()' failed at preempt.c:37 For a debug=n build you will get a dom0 VCPU hung (at some point) in: [ffff82c4c0126eec] _write_lock+0x3c/0x50 ffff82c4c01e43a0 __get_gfn_type_access+0x150/0x230 ffff82c4c0158885 dbg_rw_mem+0x115/0x360 ffff82c4c0158fc8 arch_do_domctl+0x4b8/0x22f0 ffff82c4c01709ed get_page+0x2d/0x100 ffff82c4c01031aa do_domctl+0x2ba/0x11e0 ffff82c4c0179662 do_mmuext_op+0x8d2/0x1b20 ffff82c4c0183598 __update_vcpu_system_time+0x288/0x340 ffff82c4c015c719 continue_nonidle_domain+0x9/0x30 ffff82c4c012938b add_entry+0x4b/0xb0 ffff82c4c02223f9 syscall_enter+0xa9/0xae And gdb output: (gdb) x/1xh 0x6ae9168b 0x6ae9168b: 0x3024 (gdb) x/1xh 0x6ae9168b 0x6ae9168b: Ignoring packet error, continuing... Reply contains invalid hex digit 116 The 1st one worked because the p2m.lock is recursive and the PCPU had not yet changed. crash reports (for example): crash> mm_rwlock_t 0xffff83083f913010 struct mm_rwlock_t { lock = { raw = { lock = 2147483647 }, debug = {} }, unlock_level = 0, recurse_count = 1, locker = 1, locker_function = 0xffff82c4c022c640 <__func__.13514> "__get_gfn_type_access" } Signed-off-by: Andrew Cooper Signed-off-by: Don Slutz Acked-by: Mukesh Rathor master commit: 3dbab7a8bf4bef1bb2967cb3a8c7ed2146482ab3 master date: 2014-01-10 17:45:01 +0100 --- xen/arch/x86/debug.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/debug.c b/xen/arch/x86/debug.c index e67473e..cc7d827 100644 --- a/xen/arch/x86/debug.c +++ b/xen/arch/x86/debug.c @@ -63,10 +63,17 @@ dbg_hvm_va2mfn(dbgva_t vaddr, struct domain *dp, int toaddr, if ( p2m_is_readonly(gfntype) && toaddr ) { DBGP2("kdb:p2m_is_readonly: gfntype:%x\n", gfntype); - return INVALID_MFN; + mfn = INVALID_MFN; + } + else + DBGP2("X: vaddr:%lx domid:%d mfn:%lx\n", vaddr, dp->domain_id, mfn); + + if ( mfn == INVALID_MFN ) + { + put_gfn(dp, *gfn); + *gfn = INVALID_GFN; } - DBGP2("X: vaddr:%lx domid:%d mfn:%lx\n", vaddr, dp->domain_id, mfn); return mfn; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Feb 02 11:22:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 02 Feb 2014 11:22:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9v7n-0000w5-2W; Sun, 02 Feb 2014 11:22:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9v7m-0000vw-37 for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 11:22:06 +0000 Received: from [85.158.143.35:51976] by server-2.bemta-4.messagelabs.com id A7/87-10891-D5A2EE25; Sun, 02 Feb 2014 11:22:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1391340123!2496175!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12397 invoked from network); 2 Feb 2014 11:22:04 -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 Feb 2014 11:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9v7j-0007hX-CW for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 11:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1W9v7j-0002aW-8F for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 11:22:03 +0000 Date: Sun, 02 Feb 2014 11:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] dbg_rw_guest_mem: need to call put_gfn in error path X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit df75a2685c21158817092e34ee20cbf7ca770e75 Author: Andrew Cooper AuthorDate: Wed Jan 29 11:52:14 2014 +0100 Commit: Jan Beulich CommitDate: Wed Jan 29 11:52:14 2014 +0100 dbg_rw_guest_mem: need to call put_gfn in error path Using a 1G hvm domU (in grub) and gdbsx: (gdb) set arch i8086 warning: A handler for the OS ABI "GNU/Linux" is not built into this configuration of GDB. Attempting to continue with the default i8086 settings. The target architecture is assumed to be i8086 (gdb) target remote localhost:9999 Remote debugging using localhost:9999 Remote debugging from host 127.0.0.1 0x0000d475 in ?? () (gdb) x/1xh 0x6ae9168b Will reproduce this bug. With a debug=y build you will get: Assertion '!preempt_count()' failed at preempt.c:37 For a debug=n build you will get a dom0 VCPU hung (at some point) in: [ffff82c4c0126eec] _write_lock+0x3c/0x50 ffff82c4c01e43a0 __get_gfn_type_access+0x150/0x230 ffff82c4c0158885 dbg_rw_mem+0x115/0x360 ffff82c4c0158fc8 arch_do_domctl+0x4b8/0x22f0 ffff82c4c01709ed get_page+0x2d/0x100 ffff82c4c01031aa do_domctl+0x2ba/0x11e0 ffff82c4c0179662 do_mmuext_op+0x8d2/0x1b20 ffff82c4c0183598 __update_vcpu_system_time+0x288/0x340 ffff82c4c015c719 continue_nonidle_domain+0x9/0x30 ffff82c4c012938b add_entry+0x4b/0xb0 ffff82c4c02223f9 syscall_enter+0xa9/0xae And gdb output: (gdb) x/1xh 0x6ae9168b 0x6ae9168b: 0x3024 (gdb) x/1xh 0x6ae9168b 0x6ae9168b: Ignoring packet error, continuing... Reply contains invalid hex digit 116 The 1st one worked because the p2m.lock is recursive and the PCPU had not yet changed. crash reports (for example): crash> mm_rwlock_t 0xffff83083f913010 struct mm_rwlock_t { lock = { raw = { lock = 2147483647 }, debug = {} }, unlock_level = 0, recurse_count = 1, locker = 1, locker_function = 0xffff82c4c022c640 <__func__.13514> "__get_gfn_type_access" } Signed-off-by: Andrew Cooper Signed-off-by: Don Slutz Acked-by: Mukesh Rathor master commit: 3dbab7a8bf4bef1bb2967cb3a8c7ed2146482ab3 master date: 2014-01-10 17:45:01 +0100 --- xen/arch/x86/debug.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/debug.c b/xen/arch/x86/debug.c index e67473e..cc7d827 100644 --- a/xen/arch/x86/debug.c +++ b/xen/arch/x86/debug.c @@ -63,10 +63,17 @@ dbg_hvm_va2mfn(dbgva_t vaddr, struct domain *dp, int toaddr, if ( p2m_is_readonly(gfntype) && toaddr ) { DBGP2("kdb:p2m_is_readonly: gfntype:%x\n", gfntype); - return INVALID_MFN; + mfn = INVALID_MFN; + } + else + DBGP2("X: vaddr:%lx domid:%d mfn:%lx\n", vaddr, dp->domain_id, mfn); + + if ( mfn == INVALID_MFN ) + { + put_gfn(dp, *gfn); + *gfn = INVALID_GFN; } - DBGP2("X: vaddr:%lx domid:%d mfn:%lx\n", vaddr, dp->domain_id, mfn); return mfn; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Feb 02 11:22:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 02 Feb 2014 11:22: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 1W9v7x-0000wz-59; Sun, 02 Feb 2014 11:22:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9v7w-0000wo-B5 for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 11:22:16 +0000 Received: from [85.158.137.68:23922] by server-3.bemta-3.messagelabs.com id 47/13-14520-76A2EE25; Sun, 02 Feb 2014 11:22:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1391340133!12855916!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2975 invoked from network); 2 Feb 2014 11:22:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 2 Feb 2014 11:22:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9v7t-0007ha-Ha for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 11:22:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1W9v7t-0002au-Fq for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 11:22:13 +0000 Date: Sun, 02 Feb 2014 11:22:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] mce: fix race condition in mctelem_xchg_head X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 9c5b7fb63a79570e4bc14fcbe2d15a23a0f1b433 Author: Frediano Ziglio AuthorDate: Wed Jan 29 11:53:22 2014 +0100 Commit: Jan Beulich CommitDate: Wed Jan 29 11:53:22 2014 +0100 mce: fix race condition in mctelem_xchg_head The function (mctelem_xchg_head()) used to exchange mce telemetry list heads is racy. It may write to the head twice, with the second write linking to an element in the wrong state. If there are two threads, T1 inserting on committed list; and T2 trying to consume it. 1. T1 starts inserting an element (A), sets prev pointer (mcte_prev). 2. T1 is interrupted after the cmpxchg succeeded. 3. T2 gets the list and changes element A and updates the commit list head. 4. T1 resumes, reads pointer to prev again and compare with result from the cmpxchg which succeeded but in the meantime prev changed in memory. 5. T1 thinks the cmpxchg failed and goes around the loop again, linking head to A again. To solve the race use temporary variable for prev pointer. *linkp (which point to a field in the element) must be updated before the cmpxchg() as after a successful cmpxchg the element might be immediately removed and reinitialized. The wmb() prior to the cmpchgptr() call is not necessary since it is already a full memory barrier. This wmb() is thus removed. Signed-off-by: Frediano Ziglio Reviewed-by: Liu Jinsong master commit: e9af61b969906976188609379183cb304935f448 master date: 2014-01-17 15:58:27 +0100 --- xen/arch/x86/cpu/mcheck/mctelem.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mctelem.c b/xen/arch/x86/cpu/mcheck/mctelem.c index 37d830f..895ce1a 100644 --- a/xen/arch/x86/cpu/mcheck/mctelem.c +++ b/xen/arch/x86/cpu/mcheck/mctelem.c @@ -127,13 +127,14 @@ static DEFINE_PER_CPU(struct mc_telem_cpu_ctl, mctctl); static DEFINE_SPINLOCK(processing_lock); static void mctelem_xchg_head(struct mctelem_ent **headp, - struct mctelem_ent **old, + struct mctelem_ent **linkp, struct mctelem_ent *new) { for (;;) { - *old = *headp; - wmb(); - if (cmpxchgptr(headp, *old, new) == *old) + struct mctelem_ent *old; + + *linkp = old = *headp; + if (cmpxchgptr(headp, old, new) == old) break; } } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Feb 02 11:22:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 02 Feb 2014 11:22: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 1W9v7x-0000wz-59; Sun, 02 Feb 2014 11:22:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9v7w-0000wo-B5 for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 11:22:16 +0000 Received: from [85.158.137.68:23922] by server-3.bemta-3.messagelabs.com id 47/13-14520-76A2EE25; Sun, 02 Feb 2014 11:22:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1391340133!12855916!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2975 invoked from network); 2 Feb 2014 11:22:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 2 Feb 2014 11:22:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9v7t-0007ha-Ha for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 11:22:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1W9v7t-0002au-Fq for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 11:22:13 +0000 Date: Sun, 02 Feb 2014 11:22:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] mce: fix race condition in mctelem_xchg_head X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 9c5b7fb63a79570e4bc14fcbe2d15a23a0f1b433 Author: Frediano Ziglio AuthorDate: Wed Jan 29 11:53:22 2014 +0100 Commit: Jan Beulich CommitDate: Wed Jan 29 11:53:22 2014 +0100 mce: fix race condition in mctelem_xchg_head The function (mctelem_xchg_head()) used to exchange mce telemetry list heads is racy. It may write to the head twice, with the second write linking to an element in the wrong state. If there are two threads, T1 inserting on committed list; and T2 trying to consume it. 1. T1 starts inserting an element (A), sets prev pointer (mcte_prev). 2. T1 is interrupted after the cmpxchg succeeded. 3. T2 gets the list and changes element A and updates the commit list head. 4. T1 resumes, reads pointer to prev again and compare with result from the cmpxchg which succeeded but in the meantime prev changed in memory. 5. T1 thinks the cmpxchg failed and goes around the loop again, linking head to A again. To solve the race use temporary variable for prev pointer. *linkp (which point to a field in the element) must be updated before the cmpxchg() as after a successful cmpxchg the element might be immediately removed and reinitialized. The wmb() prior to the cmpchgptr() call is not necessary since it is already a full memory barrier. This wmb() is thus removed. Signed-off-by: Frediano Ziglio Reviewed-by: Liu Jinsong master commit: e9af61b969906976188609379183cb304935f448 master date: 2014-01-17 15:58:27 +0100 --- xen/arch/x86/cpu/mcheck/mctelem.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mctelem.c b/xen/arch/x86/cpu/mcheck/mctelem.c index 37d830f..895ce1a 100644 --- a/xen/arch/x86/cpu/mcheck/mctelem.c +++ b/xen/arch/x86/cpu/mcheck/mctelem.c @@ -127,13 +127,14 @@ static DEFINE_PER_CPU(struct mc_telem_cpu_ctl, mctctl); static DEFINE_SPINLOCK(processing_lock); static void mctelem_xchg_head(struct mctelem_ent **headp, - struct mctelem_ent **old, + struct mctelem_ent **linkp, struct mctelem_ent *new) { for (;;) { - *old = *headp; - wmb(); - if (cmpxchgptr(headp, *old, new) == *old) + struct mctelem_ent *old; + + *linkp = old = *headp; + if (cmpxchgptr(headp, old, new) == old) break; } } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Feb 02 11:22:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 02 Feb 2014 11:22:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9v87-0000yC-7n; Sun, 02 Feb 2014 11:22:27 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9v86-0000y4-77 for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 11:22:26 +0000 Received: from [85.158.143.35:49857] by server-1.bemta-4.messagelabs.com id 6B/B5-31661-17A2EE25; Sun, 02 Feb 2014 11:22:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1391340143!2514762!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27927 invoked from network); 2 Feb 2014 11:22:24 -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 Feb 2014 11:22:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9v83-0007hj-Nn for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 11:22:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1W9v83-0002bG-Kw for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 11:22:23 +0000 Date: Sun, 02 Feb 2014 11:22:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] nested EPT: fixing wrong handling for L2 guest's direct mmio access X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 f7d6d69edc9c98d25c2b2300eb925bec637d0b2e Author: Yang Zhang AuthorDate: Wed Jan 29 11:54:02 2014 +0100 Commit: Jan Beulich CommitDate: Wed Jan 29 11:54:02 2014 +0100 nested EPT: fixing wrong handling for L2 guest's direct mmio access L2 guest will access the physical device directly(nested VT-d). For such access, Shadow EPT table should point to device's MMIO. But in current logic, L0 doesn't distinguish the MMIO whether from qemu or physical device when building shadow EPT table. This is wrong. This patch will setup the correct shadow EPT table for such MMIO ranges. Signed-off-by: Yang Zhang Acked-by: Tim Deegan master commit: 0b988ba711171b39aed9851cfe90fded50f775c5 master date: 2014-01-17 16:00:21 +0100 --- xen/arch/x86/mm/hap/nested_hap.c | 10 ++++++++-- xen/include/asm-x86/hvm/nestedhvm.h | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/mm/hap/nested_hap.c b/xen/arch/x86/mm/hap/nested_hap.c index c2ef1d1..38e2327 100644 --- a/xen/arch/x86/mm/hap/nested_hap.c +++ b/xen/arch/x86/mm/hap/nested_hap.c @@ -170,8 +170,11 @@ nestedhap_walk_L0_p2m(struct p2m_domain *p2m, paddr_t L1_gpa, paddr_t *L0_gpa, mfn = get_gfn_type_access(p2m, L1_gpa >> PAGE_SHIFT, p2mt, p2ma, 0, page_order); + rc = NESTEDHVM_PAGEFAULT_DIRECT_MMIO; + if ( *p2mt == p2m_mmio_direct ) + goto direct_mmio_out; rc = NESTEDHVM_PAGEFAULT_MMIO; - if ( p2m_is_mmio(*p2mt) ) + if ( *p2mt == p2m_mmio_dm ) goto out; rc = NESTEDHVM_PAGEFAULT_L0_ERROR; @@ -184,8 +187,9 @@ nestedhap_walk_L0_p2m(struct p2m_domain *p2m, paddr_t L1_gpa, paddr_t *L0_gpa, if ( !mfn_valid(mfn) ) goto out; - *L0_gpa = (mfn_x(mfn) << PAGE_SHIFT) + (L1_gpa & ~PAGE_MASK); rc = NESTEDHVM_PAGEFAULT_DONE; +direct_mmio_out: + *L0_gpa = (mfn_x(mfn) << PAGE_SHIFT) + (L1_gpa & ~PAGE_MASK); out: __put_gfn(p2m, L1_gpa >> PAGE_SHIFT); return rc; @@ -245,6 +249,8 @@ nestedhvm_hap_nested_page_fault(struct vcpu *v, paddr_t *L2_gpa, break; case NESTEDHVM_PAGEFAULT_MMIO: return rv; + case NESTEDHVM_PAGEFAULT_DIRECT_MMIO: + break; default: BUG(); break; diff --git a/xen/include/asm-x86/hvm/nestedhvm.h b/xen/include/asm-x86/hvm/nestedhvm.h index d8124cf..cca41b3 100644 --- a/xen/include/asm-x86/hvm/nestedhvm.h +++ b/xen/include/asm-x86/hvm/nestedhvm.h @@ -53,6 +53,7 @@ bool_t nestedhvm_vcpu_in_guestmode(struct vcpu *v); #define NESTEDHVM_PAGEFAULT_L0_ERROR 3 #define NESTEDHVM_PAGEFAULT_MMIO 4 #define NESTEDHVM_PAGEFAULT_RETRY 5 +#define NESTEDHVM_PAGEFAULT_DIRECT_MMIO 6 int nestedhvm_hap_nested_page_fault(struct vcpu *v, paddr_t *L2_gpa, bool_t access_r, bool_t access_w, bool_t access_x); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Feb 02 11:22:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 02 Feb 2014 11:22:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9v87-0000yC-7n; Sun, 02 Feb 2014 11:22:27 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9v86-0000y4-77 for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 11:22:26 +0000 Received: from [85.158.143.35:49857] by server-1.bemta-4.messagelabs.com id 6B/B5-31661-17A2EE25; Sun, 02 Feb 2014 11:22:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1391340143!2514762!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27927 invoked from network); 2 Feb 2014 11:22:24 -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 Feb 2014 11:22:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9v83-0007hj-Nn for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 11:22:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1W9v83-0002bG-Kw for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 11:22:23 +0000 Date: Sun, 02 Feb 2014 11:22:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] nested EPT: fixing wrong handling for L2 guest's direct mmio access X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 f7d6d69edc9c98d25c2b2300eb925bec637d0b2e Author: Yang Zhang AuthorDate: Wed Jan 29 11:54:02 2014 +0100 Commit: Jan Beulich CommitDate: Wed Jan 29 11:54:02 2014 +0100 nested EPT: fixing wrong handling for L2 guest's direct mmio access L2 guest will access the physical device directly(nested VT-d). For such access, Shadow EPT table should point to device's MMIO. But in current logic, L0 doesn't distinguish the MMIO whether from qemu or physical device when building shadow EPT table. This is wrong. This patch will setup the correct shadow EPT table for such MMIO ranges. Signed-off-by: Yang Zhang Acked-by: Tim Deegan master commit: 0b988ba711171b39aed9851cfe90fded50f775c5 master date: 2014-01-17 16:00:21 +0100 --- xen/arch/x86/mm/hap/nested_hap.c | 10 ++++++++-- xen/include/asm-x86/hvm/nestedhvm.h | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/mm/hap/nested_hap.c b/xen/arch/x86/mm/hap/nested_hap.c index c2ef1d1..38e2327 100644 --- a/xen/arch/x86/mm/hap/nested_hap.c +++ b/xen/arch/x86/mm/hap/nested_hap.c @@ -170,8 +170,11 @@ nestedhap_walk_L0_p2m(struct p2m_domain *p2m, paddr_t L1_gpa, paddr_t *L0_gpa, mfn = get_gfn_type_access(p2m, L1_gpa >> PAGE_SHIFT, p2mt, p2ma, 0, page_order); + rc = NESTEDHVM_PAGEFAULT_DIRECT_MMIO; + if ( *p2mt == p2m_mmio_direct ) + goto direct_mmio_out; rc = NESTEDHVM_PAGEFAULT_MMIO; - if ( p2m_is_mmio(*p2mt) ) + if ( *p2mt == p2m_mmio_dm ) goto out; rc = NESTEDHVM_PAGEFAULT_L0_ERROR; @@ -184,8 +187,9 @@ nestedhap_walk_L0_p2m(struct p2m_domain *p2m, paddr_t L1_gpa, paddr_t *L0_gpa, if ( !mfn_valid(mfn) ) goto out; - *L0_gpa = (mfn_x(mfn) << PAGE_SHIFT) + (L1_gpa & ~PAGE_MASK); rc = NESTEDHVM_PAGEFAULT_DONE; +direct_mmio_out: + *L0_gpa = (mfn_x(mfn) << PAGE_SHIFT) + (L1_gpa & ~PAGE_MASK); out: __put_gfn(p2m, L1_gpa >> PAGE_SHIFT); return rc; @@ -245,6 +249,8 @@ nestedhvm_hap_nested_page_fault(struct vcpu *v, paddr_t *L2_gpa, break; case NESTEDHVM_PAGEFAULT_MMIO: return rv; + case NESTEDHVM_PAGEFAULT_DIRECT_MMIO: + break; default: BUG(); break; diff --git a/xen/include/asm-x86/hvm/nestedhvm.h b/xen/include/asm-x86/hvm/nestedhvm.h index d8124cf..cca41b3 100644 --- a/xen/include/asm-x86/hvm/nestedhvm.h +++ b/xen/include/asm-x86/hvm/nestedhvm.h @@ -53,6 +53,7 @@ bool_t nestedhvm_vcpu_in_guestmode(struct vcpu *v); #define NESTEDHVM_PAGEFAULT_L0_ERROR 3 #define NESTEDHVM_PAGEFAULT_MMIO 4 #define NESTEDHVM_PAGEFAULT_RETRY 5 +#define NESTEDHVM_PAGEFAULT_DIRECT_MMIO 6 int nestedhvm_hap_nested_page_fault(struct vcpu *v, paddr_t *L2_gpa, bool_t access_r, bool_t access_w, bool_t access_x); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Feb 02 11:22:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 02 Feb 2014 11:22:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9v8I-0000zm-Ak; Sun, 02 Feb 2014 11:22:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9v8G-0000zN-Jo for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 11:22:36 +0000 Received: from [85.158.139.211:4748] by server-4.bemta-5.messagelabs.com id FE/5B-08092-B7A2EE25; Sun, 02 Feb 2014 11:22:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1391340154!1112477!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19625 invoked from network); 2 Feb 2014 11:22:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 2 Feb 2014 11:22:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9v8D-0007hr-SA for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 11:22:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1W9v8D-0002cC-QO for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 11:22:33 +0000 Date: Sun, 02 Feb 2014 11:22:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] common/sysctl: Don't leak status in SYSCTL_page_offline_op X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 a4c215abc86dad8ccca4992f14f62550e5c02cf6 Author: Andrew Cooper AuthorDate: Wed Jan 29 11:54:32 2014 +0100 Commit: Jan Beulich CommitDate: Wed Jan 29 11:54:32 2014 +0100 common/sysctl: Don't leak status in SYSCTL_page_offline_op In addition, 'copyback' should be cleared even in the error case. Also fix the indentation of the arguments to copy_to_guest() to help clarify that the 'ret = -EFAULT' is not part of the condition. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Keir Fraser master commit: efd8ff0a04740a698b2b8b2b9adccd639e0fa6c9 master date: 2014-01-20 09:48:11 +0100 --- xen/common/sysctl.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c index 117e095..0cb6ee1 100644 --- a/xen/common/sysctl.c +++ b/xen/common/sysctl.c @@ -230,12 +230,9 @@ long do_sysctl(XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl) } if ( copy_to_guest( - op->u.page_offline.status, status, - op->u.page_offline.end - op->u.page_offline.start + 1) ) - { + op->u.page_offline.status, status, + op->u.page_offline.end - op->u.page_offline.start + 1) ) ret = -EFAULT; - break; - } xfree(status); copyback = 0; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Feb 02 11:22:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 02 Feb 2014 11:22:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9v8I-0000zm-Ak; Sun, 02 Feb 2014 11:22:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9v8G-0000zN-Jo for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 11:22:36 +0000 Received: from [85.158.139.211:4748] by server-4.bemta-5.messagelabs.com id FE/5B-08092-B7A2EE25; Sun, 02 Feb 2014 11:22:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1391340154!1112477!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19625 invoked from network); 2 Feb 2014 11:22:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 2 Feb 2014 11:22:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9v8D-0007hr-SA for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 11:22:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1W9v8D-0002cC-QO for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 11:22:33 +0000 Date: Sun, 02 Feb 2014 11:22:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] common/sysctl: Don't leak status in SYSCTL_page_offline_op X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 a4c215abc86dad8ccca4992f14f62550e5c02cf6 Author: Andrew Cooper AuthorDate: Wed Jan 29 11:54:32 2014 +0100 Commit: Jan Beulich CommitDate: Wed Jan 29 11:54:32 2014 +0100 common/sysctl: Don't leak status in SYSCTL_page_offline_op In addition, 'copyback' should be cleared even in the error case. Also fix the indentation of the arguments to copy_to_guest() to help clarify that the 'ret = -EFAULT' is not part of the condition. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Keir Fraser master commit: efd8ff0a04740a698b2b8b2b9adccd639e0fa6c9 master date: 2014-01-20 09:48:11 +0100 --- xen/common/sysctl.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c index 117e095..0cb6ee1 100644 --- a/xen/common/sysctl.c +++ b/xen/common/sysctl.c @@ -230,12 +230,9 @@ long do_sysctl(XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl) } if ( copy_to_guest( - op->u.page_offline.status, status, - op->u.page_offline.end - op->u.page_offline.start + 1) ) - { + op->u.page_offline.status, status, + op->u.page_offline.end - op->u.page_offline.start + 1) ) ret = -EFAULT; - break; - } xfree(status); copyback = 0; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Feb 02 11:22:47 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 02 Feb 2014 11:22:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9v8R-00011Z-DN; Sun, 02 Feb 2014 11:22:47 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9v8Q-00011I-DA for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 11:22:46 +0000 Received: from [85.158.143.35:53438] by server-3.bemta-4.messagelabs.com id 6E/E4-11539-58A2EE25; Sun, 02 Feb 2014 11:22:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1391340164!2520990!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27882 invoked from network); 2 Feb 2014 11:22:45 -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 Feb 2014 11:22:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9v8O-0007i0-0E for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 11:22:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1W9v8N-0002cb-Ur for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 11:22:43 +0000 Date: Sun, 02 Feb 2014 11:22:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] Nested VMX: prohibit virtual vmentry/vmexit during IO emulation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 affb7e6bc3d3db4880613cf012b8f6cee0fd9c07 Author: Yang Zhang AuthorDate: Wed Jan 29 11:55:41 2014 +0100 Commit: Jan Beulich CommitDate: Wed Jan 29 11:55:41 2014 +0100 Nested VMX: prohibit virtual vmentry/vmexit during IO emulation Sometimes, L0 needs to decode L2's instruction to handle IO access directly. And L0 may get X86EMUL_RETRY when handling this IO request. At same time, if there is a virtual vmexit pending (for example, an interrupt pending to inject to L1) and hypervisor will switch the VCPU context from L2 to L1. Now we already are in L1's context, but since we got a X86EMUL_RETRY just now and this means hypervisor will retry to handle the IO request later and unfortunately, the retry will happen in L1's context. And it will cause the problem. The fixing is that if there is a pending IO request, no virtual vmexit/vmentry is allowed. Signed-off-by: Yang Zhang Acked-by: Jun Nakajima master commit: 09bb434748af9bfe3f7fca4b6eef721a7d5042a4 master date: 2014-01-23 10:27:34 +0100 --- xen/arch/x86/hvm/vmx/vvmx.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index aad108c..cbf3203 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -1395,6 +1395,13 @@ void nvmx_switch_guest(void) struct cpu_user_regs *regs = guest_cpu_user_regs(); /* + * a pending IO emualtion may still no finished. In this case, + * no virtual vmswith is allowed. Or else, the following IO + * emulation will handled in a wrong VCPU context. + */ + if ( get_ioreq(v)->state != STATE_IOREQ_NONE ) + return; + /* * a softirq may interrupt us between a virtual vmentry is * just handled and the true vmentry. If during this window, * a L1 virtual interrupt causes another virtual vmexit, we -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Feb 02 11:22:47 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 02 Feb 2014 11:22:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9v8R-00011Z-DN; Sun, 02 Feb 2014 11:22:47 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9v8Q-00011I-DA for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 11:22:46 +0000 Received: from [85.158.143.35:53438] by server-3.bemta-4.messagelabs.com id 6E/E4-11539-58A2EE25; Sun, 02 Feb 2014 11:22:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1391340164!2520990!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27882 invoked from network); 2 Feb 2014 11:22:45 -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 Feb 2014 11:22:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9v8O-0007i0-0E for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 11:22:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1W9v8N-0002cb-Ur for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 11:22:43 +0000 Date: Sun, 02 Feb 2014 11:22:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] Nested VMX: prohibit virtual vmentry/vmexit during IO emulation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 affb7e6bc3d3db4880613cf012b8f6cee0fd9c07 Author: Yang Zhang AuthorDate: Wed Jan 29 11:55:41 2014 +0100 Commit: Jan Beulich CommitDate: Wed Jan 29 11:55:41 2014 +0100 Nested VMX: prohibit virtual vmentry/vmexit during IO emulation Sometimes, L0 needs to decode L2's instruction to handle IO access directly. And L0 may get X86EMUL_RETRY when handling this IO request. At same time, if there is a virtual vmexit pending (for example, an interrupt pending to inject to L1) and hypervisor will switch the VCPU context from L2 to L1. Now we already are in L1's context, but since we got a X86EMUL_RETRY just now and this means hypervisor will retry to handle the IO request later and unfortunately, the retry will happen in L1's context. And it will cause the problem. The fixing is that if there is a pending IO request, no virtual vmexit/vmentry is allowed. Signed-off-by: Yang Zhang Acked-by: Jun Nakajima master commit: 09bb434748af9bfe3f7fca4b6eef721a7d5042a4 master date: 2014-01-23 10:27:34 +0100 --- xen/arch/x86/hvm/vmx/vvmx.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index aad108c..cbf3203 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -1395,6 +1395,13 @@ void nvmx_switch_guest(void) struct cpu_user_regs *regs = guest_cpu_user_regs(); /* + * a pending IO emualtion may still no finished. In this case, + * no virtual vmswith is allowed. Or else, the following IO + * emulation will handled in a wrong VCPU context. + */ + if ( get_ioreq(v)->state != STATE_IOREQ_NONE ) + return; + /* * a softirq may interrupt us between a virtual vmentry is * just handled and the true vmentry. If during this window, * a L1 virtual interrupt causes another virtual vmexit, we -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Feb 02 11:22:58 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 02 Feb 2014 11:22:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9v8c-00013E-G4; Sun, 02 Feb 2014 11:22:58 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9v8b-00012y-1H for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 11:22:57 +0000 Received: from [193.109.254.147:12056] by server-5.bemta-14.messagelabs.com id F9/3F-16688-09A2EE25; Sun, 02 Feb 2014 11:22:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1391340174!1428464!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6099 invoked from network); 2 Feb 2014 11:22:55 -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; 2 Feb 2014 11:22:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9v8Y-0007i9-4o for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 11:22:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1W9v8Y-0002cy-3B for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 11:22:54 +0000 Date: Sun, 02 Feb 2014 11:22:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86: don't drop guest visible state updates when 64-bit PV guest is in user mode X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c450908dc9168c3f20787aab268fcc295feaed7d Author: Jan Beulich AuthorDate: Wed Jan 29 11:56:17 2014 +0100 Commit: Jan Beulich CommitDate: Wed Jan 29 11:56:17 2014 +0100 x86: don't drop guest visible state updates when 64-bit PV guest is in user mode Since 64-bit PV uses separate kernel and user mode page tables, kernel addresses (as usually provided via VCPUOP_register_runstate_memory_area and possibly via VCPUOP_register_vcpu_time_memory_area) aren't necessarily accessible when the respective updating occurs. Add logic for toggle_guest_mode() to take care of this (if necessary) the next time the vCPU switches to kernel mode. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 231d7f4098c8ac9cdb78f18fcb820d8618c8b0c2 master date: 2014-01-23 10:30:08 +0100 --- xen/arch/x86/domain.c | 24 ++++++++++++++++-------- xen/arch/x86/time.c | 39 +++++++++++++++++++++++++-------------- xen/arch/x86/x86_64/traps.c | 12 ++++++++++++ xen/include/asm-x86/domain.h | 8 ++++++++ 4 files changed, 61 insertions(+), 22 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index f01c7e3..c0a11c0 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1287,10 +1287,10 @@ static void paravirt_ctxt_switch_to(struct vcpu *v) } /* Update per-VCPU guest runstate shared memory area (if registered). */ -static void update_runstate_area(struct vcpu *v) +bool_t update_runstate_area(const struct vcpu *v) { if ( guest_handle_is_null(runstate_guest(v)) ) - return; + return 1; if ( has_32bit_shinfo(v->domain) ) { @@ -1298,10 +1298,18 @@ static void update_runstate_area(struct vcpu *v) XLAT_vcpu_runstate_info(&info, &v->runstate); __copy_to_guest(v->runstate_guest.compat, &info, 1); - return; + return 1; } - __copy_to_guest(runstate_guest(v), &v->runstate, 1); + return __copy_to_guest(runstate_guest(v), &v->runstate, 1) != + sizeof(v->runstate); +} + +static void _update_runstate_area(struct vcpu *v) +{ + if ( !update_runstate_area(v) && !is_hvm_vcpu(v) && + !(v->arch.flags & TF_kernel_mode) ) + v->arch.pv_vcpu.need_update_runstate_area = 1; } static inline int need_full_gdt(struct vcpu *v) @@ -1407,8 +1415,8 @@ void context_switch(struct vcpu *prev, struct vcpu *next) flush_tlb_mask(&dirty_mask); } - if (prev != next) - update_runstate_area(prev); + if ( prev != next ) + _update_runstate_area(prev); if ( is_hvm_vcpu(prev) ) { @@ -1461,8 +1469,8 @@ void context_switch(struct vcpu *prev, struct vcpu *next) context_saved(prev); - if (prev != next) - update_runstate_area(next); + if ( prev != next ) + _update_runstate_area(next); /* Ensure that the vcpu has an up-to-date time base. */ update_vcpu_system_time(next); diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index c31029c..7809bc9 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -805,7 +805,6 @@ static void __update_vcpu_system_time(struct vcpu *v, int force) { struct cpu_time *t; struct vcpu_time_info *u, _u; - XEN_GUEST_HANDLE(vcpu_time_info_t) user_u; struct domain *d = v->domain; s_time_t tsc_stamp = 0; @@ -870,19 +869,31 @@ static void __update_vcpu_system_time(struct vcpu *v, int force) /* 3. Update guest kernel version. */ u->version = version_update_end(u->version); - user_u = v->arch.time_info_guest; - if ( !guest_handle_is_null(user_u) ) - { - /* 1. Update userspace version. */ - __copy_field_to_guest(user_u, &_u, version); - wmb(); - /* 2. Update all other userspavce fields. */ - __copy_to_guest(user_u, &_u, 1); - wmb(); - /* 3. Update userspace version. */ - _u.version = version_update_end(_u.version); - __copy_field_to_guest(user_u, &_u, version); - } + if ( !update_secondary_system_time(v, &_u) && !is_hvm_domain(d) && + !is_pv_32bit_domain(d) && !(v->arch.flags & TF_kernel_mode) ) + v->arch.pv_vcpu.pending_system_time = _u; +} + +bool_t update_secondary_system_time(const struct vcpu *v, + struct vcpu_time_info *u) +{ + XEN_GUEST_HANDLE(vcpu_time_info_t) user_u = v->arch.time_info_guest; + + if ( guest_handle_is_null(user_u) ) + return 1; + + /* 1. Update userspace version. */ + if ( __copy_field_to_guest(user_u, u, version) == sizeof(u->version) ) + return 0; + wmb(); + /* 2. Update all other userspace fields. */ + __copy_to_guest(user_u, u, 1); + wmb(); + /* 3. Update userspace version. */ + u->version = version_update_end(u->version); + __copy_field_to_guest(user_u, u, version); + + return 1; } void update_vcpu_system_time(struct vcpu *v) diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index fe02261..81705f9 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -265,6 +265,18 @@ void toggle_guest_mode(struct vcpu *v) #else write_ptbase(v); #endif + + if ( !(v->arch.flags & TF_kernel_mode) ) + return; + + if ( v->arch.pv_vcpu.need_update_runstate_area && + update_runstate_area(v) ) + v->arch.pv_vcpu.need_update_runstate_area = 0; + + if ( v->arch.pv_vcpu.pending_system_time.version && + update_secondary_system_time(v, + &v->arch.pv_vcpu.pending_system_time) ) + v->arch.pv_vcpu.pending_system_time.version = 0; } unsigned long do_iret(void) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index eaec0137..1df8ea9 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -373,6 +373,10 @@ struct pv_vcpu /* Current LDT details. */ unsigned long shadow_ldt_mapcnt; spinlock_t shadow_ldt_lock; + + /* Deferred VA-based update state. */ + bool_t need_update_runstate_area; + struct vcpu_time_info pending_system_time; }; struct arch_vcpu @@ -445,6 +449,10 @@ struct arch_vcpu #define hvm_vmx hvm_vcpu.u.vmx #define hvm_svm hvm_vcpu.u.svm +bool_t update_runstate_area(const struct vcpu *); +bool_t update_secondary_system_time(const struct vcpu *, + struct vcpu_time_info *); + void vcpu_show_execution_state(struct vcpu *); void vcpu_show_registers(const struct vcpu *); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Feb 02 11:22:58 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 02 Feb 2014 11:22:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9v8c-00013E-G4; Sun, 02 Feb 2014 11:22:58 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9v8b-00012y-1H for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 11:22:57 +0000 Received: from [193.109.254.147:12056] by server-5.bemta-14.messagelabs.com id F9/3F-16688-09A2EE25; Sun, 02 Feb 2014 11:22:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1391340174!1428464!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6099 invoked from network); 2 Feb 2014 11:22:55 -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; 2 Feb 2014 11:22:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W9v8Y-0007i9-4o for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 11:22:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1W9v8Y-0002cy-3B for xen-changelog@lists.xensource.com; Sun, 02 Feb 2014 11:22:54 +0000 Date: Sun, 02 Feb 2014 11:22:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86: don't drop guest visible state updates when 64-bit PV guest is in user mode X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c450908dc9168c3f20787aab268fcc295feaed7d Author: Jan Beulich AuthorDate: Wed Jan 29 11:56:17 2014 +0100 Commit: Jan Beulich CommitDate: Wed Jan 29 11:56:17 2014 +0100 x86: don't drop guest visible state updates when 64-bit PV guest is in user mode Since 64-bit PV uses separate kernel and user mode page tables, kernel addresses (as usually provided via VCPUOP_register_runstate_memory_area and possibly via VCPUOP_register_vcpu_time_memory_area) aren't necessarily accessible when the respective updating occurs. Add logic for toggle_guest_mode() to take care of this (if necessary) the next time the vCPU switches to kernel mode. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 231d7f4098c8ac9cdb78f18fcb820d8618c8b0c2 master date: 2014-01-23 10:30:08 +0100 --- xen/arch/x86/domain.c | 24 ++++++++++++++++-------- xen/arch/x86/time.c | 39 +++++++++++++++++++++++++-------------- xen/arch/x86/x86_64/traps.c | 12 ++++++++++++ xen/include/asm-x86/domain.h | 8 ++++++++ 4 files changed, 61 insertions(+), 22 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index f01c7e3..c0a11c0 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1287,10 +1287,10 @@ static void paravirt_ctxt_switch_to(struct vcpu *v) } /* Update per-VCPU guest runstate shared memory area (if registered). */ -static void update_runstate_area(struct vcpu *v) +bool_t update_runstate_area(const struct vcpu *v) { if ( guest_handle_is_null(runstate_guest(v)) ) - return; + return 1; if ( has_32bit_shinfo(v->domain) ) { @@ -1298,10 +1298,18 @@ static void update_runstate_area(struct vcpu *v) XLAT_vcpu_runstate_info(&info, &v->runstate); __copy_to_guest(v->runstate_guest.compat, &info, 1); - return; + return 1; } - __copy_to_guest(runstate_guest(v), &v->runstate, 1); + return __copy_to_guest(runstate_guest(v), &v->runstate, 1) != + sizeof(v->runstate); +} + +static void _update_runstate_area(struct vcpu *v) +{ + if ( !update_runstate_area(v) && !is_hvm_vcpu(v) && + !(v->arch.flags & TF_kernel_mode) ) + v->arch.pv_vcpu.need_update_runstate_area = 1; } static inline int need_full_gdt(struct vcpu *v) @@ -1407,8 +1415,8 @@ void context_switch(struct vcpu *prev, struct vcpu *next) flush_tlb_mask(&dirty_mask); } - if (prev != next) - update_runstate_area(prev); + if ( prev != next ) + _update_runstate_area(prev); if ( is_hvm_vcpu(prev) ) { @@ -1461,8 +1469,8 @@ void context_switch(struct vcpu *prev, struct vcpu *next) context_saved(prev); - if (prev != next) - update_runstate_area(next); + if ( prev != next ) + _update_runstate_area(next); /* Ensure that the vcpu has an up-to-date time base. */ update_vcpu_system_time(next); diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index c31029c..7809bc9 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -805,7 +805,6 @@ static void __update_vcpu_system_time(struct vcpu *v, int force) { struct cpu_time *t; struct vcpu_time_info *u, _u; - XEN_GUEST_HANDLE(vcpu_time_info_t) user_u; struct domain *d = v->domain; s_time_t tsc_stamp = 0; @@ -870,19 +869,31 @@ static void __update_vcpu_system_time(struct vcpu *v, int force) /* 3. Update guest kernel version. */ u->version = version_update_end(u->version); - user_u = v->arch.time_info_guest; - if ( !guest_handle_is_null(user_u) ) - { - /* 1. Update userspace version. */ - __copy_field_to_guest(user_u, &_u, version); - wmb(); - /* 2. Update all other userspavce fields. */ - __copy_to_guest(user_u, &_u, 1); - wmb(); - /* 3. Update userspace version. */ - _u.version = version_update_end(_u.version); - __copy_field_to_guest(user_u, &_u, version); - } + if ( !update_secondary_system_time(v, &_u) && !is_hvm_domain(d) && + !is_pv_32bit_domain(d) && !(v->arch.flags & TF_kernel_mode) ) + v->arch.pv_vcpu.pending_system_time = _u; +} + +bool_t update_secondary_system_time(const struct vcpu *v, + struct vcpu_time_info *u) +{ + XEN_GUEST_HANDLE(vcpu_time_info_t) user_u = v->arch.time_info_guest; + + if ( guest_handle_is_null(user_u) ) + return 1; + + /* 1. Update userspace version. */ + if ( __copy_field_to_guest(user_u, u, version) == sizeof(u->version) ) + return 0; + wmb(); + /* 2. Update all other userspace fields. */ + __copy_to_guest(user_u, u, 1); + wmb(); + /* 3. Update userspace version. */ + u->version = version_update_end(u->version); + __copy_field_to_guest(user_u, u, version); + + return 1; } void update_vcpu_system_time(struct vcpu *v) diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index fe02261..81705f9 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -265,6 +265,18 @@ void toggle_guest_mode(struct vcpu *v) #else write_ptbase(v); #endif + + if ( !(v->arch.flags & TF_kernel_mode) ) + return; + + if ( v->arch.pv_vcpu.need_update_runstate_area && + update_runstate_area(v) ) + v->arch.pv_vcpu.need_update_runstate_area = 0; + + if ( v->arch.pv_vcpu.pending_system_time.version && + update_secondary_system_time(v, + &v->arch.pv_vcpu.pending_system_time) ) + v->arch.pv_vcpu.pending_system_time.version = 0; } unsigned long do_iret(void) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index eaec0137..1df8ea9 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -373,6 +373,10 @@ struct pv_vcpu /* Current LDT details. */ unsigned long shadow_ldt_mapcnt; spinlock_t shadow_ldt_lock; + + /* Deferred VA-based update state. */ + bool_t need_update_runstate_area; + struct vcpu_time_info pending_system_time; }; struct arch_vcpu @@ -445,6 +449,10 @@ struct arch_vcpu #define hvm_vmx hvm_vcpu.u.vmx #define hvm_svm hvm_vcpu.u.svm +bool_t update_runstate_area(const struct vcpu *); +bool_t update_secondary_system_time(const struct vcpu *, + struct vcpu_time_info *); + void vcpu_show_execution_state(struct vcpu *); void vcpu_show_registers(const struct vcpu *); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Feb 03 20:00:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 03 Feb 2014 20:00: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 1WAPgj-0001P4-R2; Mon, 03 Feb 2014 20:00:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WAPgi-0001Ox-O2 for xen-changelog@lists.xensource.com; Mon, 03 Feb 2014 20:00:12 +0000 Received: from [85.158.139.211:16590] by server-7.bemta-5.messagelabs.com id DE/87-14867-C45FFE25; Mon, 03 Feb 2014 20:00:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1391457610!1380995!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6494 invoked from network); 3 Feb 2014 20:00:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 3 Feb 2014 20:00:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WAPga-0003wq-O6 for xen-changelog@lists.xensource.com; Mon, 03 Feb 2014 20:00:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WAPga-0007dP-9y for xen-changelog@lists.xensource.com; Mon, 03 Feb 2014 20:00:04 +0000 Date: Mon, 03 Feb 2014 20:00:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] address_space_translate: do not cross page boundaries X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 a41087bc7110e8378cd49ddd06aa7c9d361f3673 Author: Stefano Stabellini AuthorDate: Thu Jan 30 12:46:05 2014 +0000 Commit: Stefano Stabellini CommitDate: Mon Feb 3 10:50:03 2014 +0000 address_space_translate: do not cross page boundaries The following commit: commit 149f54b53b7666a3facd45e86eece60ce7d3b114 Author: Paolo Bonzini Date: Fri May 24 12:59:37 2013 +0200 memory: add address_space_translate breaks Xen support in QEMU, in particular the Xen mapcache. The effect is that one Windows XP installation out of ten would end up with BSOD. The reason is that after this commit l in address_space_rw can span a page boundary, however qemu_get_ram_ptr still calls xen_map_cache asking to map a single page (if block->offset == 0). Fix the issue by reverting to the previous behaviour: do not return a length from address_space_translate_internal that can span a page boundary. Also in address_space_translate do not ignore the length returned by address_space_translate_internal. This patch should be backported to QEMU 1.6.x. upstream-commit-id: 360e607b88a23d378f6efaa769c76d26f538234d Signed-off-by: Stefano Stabellini Signed-off-by: Anthony Perard Tested-by: Paolo Bonzini Acked-by: Paolo Bonzini Cc: qemu-stable@nongnu.org --- exec.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/exec.c b/exec.c index 667a718..f3797b7 100644 --- a/exec.c +++ b/exec.c @@ -251,7 +251,7 @@ address_space_translate_internal(AddressSpaceDispatch *d, hwaddr addr, hwaddr *x hwaddr *plen, bool resolve_subpage) { MemoryRegionSection *section; - Int128 diff; + Int128 diff, diff_page; section = address_space_lookup_region(d, addr, resolve_subpage); /* Compute offset within MemoryRegionSection */ @@ -260,7 +260,9 @@ address_space_translate_internal(AddressSpaceDispatch *d, hwaddr addr, hwaddr *x /* Compute offset within MemoryRegion */ *xlat = addr + section->offset_within_region; + diff_page = int128_make64(((addr & TARGET_PAGE_MASK) + TARGET_PAGE_SIZE) - addr); diff = int128_sub(section->mr->size, int128_make64(addr)); + diff = int128_min(diff, diff_page); *plen = int128_get64(int128_min(diff, int128_make64(*plen))); return section; } @@ -275,7 +277,7 @@ MemoryRegion *address_space_translate(AddressSpace *as, hwaddr addr, hwaddr len = *plen; for (;;) { - section = address_space_translate_internal(as->dispatch, addr, &addr, plen, true); + section = address_space_translate_internal(as->dispatch, addr, &addr, &len, true); mr = section->mr; if (!mr->iommu_ops) { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Feb 03 20:00:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 03 Feb 2014 20:00: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 1WAPgj-0001P4-R2; Mon, 03 Feb 2014 20:00:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WAPgi-0001Ox-O2 for xen-changelog@lists.xensource.com; Mon, 03 Feb 2014 20:00:12 +0000 Received: from [85.158.139.211:16590] by server-7.bemta-5.messagelabs.com id DE/87-14867-C45FFE25; Mon, 03 Feb 2014 20:00:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1391457610!1380995!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6494 invoked from network); 3 Feb 2014 20:00:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 3 Feb 2014 20:00:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WAPga-0003wq-O6 for xen-changelog@lists.xensource.com; Mon, 03 Feb 2014 20:00:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WAPga-0007dP-9y for xen-changelog@lists.xensource.com; Mon, 03 Feb 2014 20:00:04 +0000 Date: Mon, 03 Feb 2014 20:00:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] address_space_translate: do not cross page boundaries X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 a41087bc7110e8378cd49ddd06aa7c9d361f3673 Author: Stefano Stabellini AuthorDate: Thu Jan 30 12:46:05 2014 +0000 Commit: Stefano Stabellini CommitDate: Mon Feb 3 10:50:03 2014 +0000 address_space_translate: do not cross page boundaries The following commit: commit 149f54b53b7666a3facd45e86eece60ce7d3b114 Author: Paolo Bonzini Date: Fri May 24 12:59:37 2013 +0200 memory: add address_space_translate breaks Xen support in QEMU, in particular the Xen mapcache. The effect is that one Windows XP installation out of ten would end up with BSOD. The reason is that after this commit l in address_space_rw can span a page boundary, however qemu_get_ram_ptr still calls xen_map_cache asking to map a single page (if block->offset == 0). Fix the issue by reverting to the previous behaviour: do not return a length from address_space_translate_internal that can span a page boundary. Also in address_space_translate do not ignore the length returned by address_space_translate_internal. This patch should be backported to QEMU 1.6.x. upstream-commit-id: 360e607b88a23d378f6efaa769c76d26f538234d Signed-off-by: Stefano Stabellini Signed-off-by: Anthony Perard Tested-by: Paolo Bonzini Acked-by: Paolo Bonzini Cc: qemu-stable@nongnu.org --- exec.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/exec.c b/exec.c index 667a718..f3797b7 100644 --- a/exec.c +++ b/exec.c @@ -251,7 +251,7 @@ address_space_translate_internal(AddressSpaceDispatch *d, hwaddr addr, hwaddr *x hwaddr *plen, bool resolve_subpage) { MemoryRegionSection *section; - Int128 diff; + Int128 diff, diff_page; section = address_space_lookup_region(d, addr, resolve_subpage); /* Compute offset within MemoryRegionSection */ @@ -260,7 +260,9 @@ address_space_translate_internal(AddressSpaceDispatch *d, hwaddr addr, hwaddr *x /* Compute offset within MemoryRegion */ *xlat = addr + section->offset_within_region; + diff_page = int128_make64(((addr & TARGET_PAGE_MASK) + TARGET_PAGE_SIZE) - addr); diff = int128_sub(section->mr->size, int128_make64(addr)); + diff = int128_min(diff, diff_page); *plen = int128_get64(int128_min(diff, int128_make64(*plen))); return section; } @@ -275,7 +277,7 @@ MemoryRegion *address_space_translate(AddressSpace *as, hwaddr addr, hwaddr len = *plen; for (;;) { - section = address_space_translate_internal(as->dispatch, addr, &addr, plen, true); + section = address_space_translate_internal(as->dispatch, addr, &addr, &len, true); mr = section->mr; if (!mr->iommu_ops) { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 04 01:33:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 04 Feb 2014 01:33:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WAUss-0005US-QZ; Tue, 04 Feb 2014 01:33:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WAUsr-0005UL-FJ for xen-changelog@lists.xensource.com; Tue, 04 Feb 2014 01:33:05 +0000 Received: from [85.158.139.211:57263] by server-15.bemta-5.messagelabs.com id A2/77-24395-05340F25; Tue, 04 Feb 2014 01:33:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1391477582!1430320!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2679 invoked from network); 4 Feb 2014 01:33:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 4 Feb 2014 01:33:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WAUso-0005wv-4L for xen-changelog@lists.xensource.com; Tue, 04 Feb 2014 01:33:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WAUso-0000Qr-00 for xen-changelog@lists.xensource.com; Tue, 04 Feb 2014 01:33:02 +0000 Date: Tue, 04 Feb 2014 01:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] QEMU_UPSTREAM_REVISION -> master again X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 04d31ea1b1caeac7f77b5d18910761abd540545f Author: Jan Beulich AuthorDate: Mon Feb 3 09:31:03 2014 +0100 Commit: Jan Beulich CommitDate: Mon Feb 3 09:31:03 2014 +0100 QEMU_UPSTREAM_REVISION -> master again --- Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index e061a9f..1e034f7 100644 --- a/Config.mk +++ b/Config.mk @@ -234,7 +234,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.4.0-rc3 +QEMU_UPSTREAM_REVISION ?= master SEABIOS_UPSTREAM_TAG ?= rel-1.7.3.1 # Fri Aug 2 14:12:09 2013 -0400 # Fix bug in CBFS file walking with compressed files. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 04 01:33:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 04 Feb 2014 01:33:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WAUss-0005US-QZ; Tue, 04 Feb 2014 01:33:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WAUsr-0005UL-FJ for xen-changelog@lists.xensource.com; Tue, 04 Feb 2014 01:33:05 +0000 Received: from [85.158.139.211:57263] by server-15.bemta-5.messagelabs.com id A2/77-24395-05340F25; Tue, 04 Feb 2014 01:33:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1391477582!1430320!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2679 invoked from network); 4 Feb 2014 01:33:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 4 Feb 2014 01:33:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WAUso-0005wv-4L for xen-changelog@lists.xensource.com; Tue, 04 Feb 2014 01:33:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WAUso-0000Qr-00 for xen-changelog@lists.xensource.com; Tue, 04 Feb 2014 01:33:02 +0000 Date: Tue, 04 Feb 2014 01:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] QEMU_UPSTREAM_REVISION -> master again X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 04d31ea1b1caeac7f77b5d18910761abd540545f Author: Jan Beulich AuthorDate: Mon Feb 3 09:31:03 2014 +0100 Commit: Jan Beulich CommitDate: Mon Feb 3 09:31:03 2014 +0100 QEMU_UPSTREAM_REVISION -> master again --- Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index e061a9f..1e034f7 100644 --- a/Config.mk +++ b/Config.mk @@ -234,7 +234,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.4.0-rc3 +QEMU_UPSTREAM_REVISION ?= master SEABIOS_UPSTREAM_TAG ?= rel-1.7.3.1 # Fri Aug 2 14:12:09 2013 -0400 # Fix bug in CBFS file walking with compressed files. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Feb 05 12:11:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Feb 2014 12:11:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1Jv-0004Cp-Je; Wed, 05 Feb 2014 12:11:11 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1Jt-0004Cg-Sh for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:11:10 +0000 Received: from [193.109.254.147:55022] by server-12.bemta-14.messagelabs.com id 91/01-17220-D5A22F25; Wed, 05 Feb 2014 12:11:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1391602263!2181508!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8098 invoked from network); 5 Feb 2014 12:11:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 5 Feb 2014 12:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1Jn-00039i-G6 for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WB1Jn-00014X-09 for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:11:03 +0000 Date: Wed, 05 Feb 2014 12:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/domctl: don't ignore errors from vmce_restore_vcpu() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 af172d655c3900822d1f710ac13ee38ee9d482d2 Author: Jan Beulich AuthorDate: Tue Feb 4 09:22:12 2014 +0100 Commit: Jan Beulich CommitDate: Tue Feb 4 09:22:12 2014 +0100 x86/domctl: don't ignore errors from vmce_restore_vcpu() What started out as a simple cleanup patch (eliminating the redundant check of domctl->cmd before setting "copyback", which as a result turned the "ext_vcpucontext_out" label useless) revealed a bug in the handling of XEN_DOMCTL_set_ext_vcpucontext. Fix this, retaining the cleanup, and at once dropping a stale comment and an accompanying formatting issue. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/domctl.c | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index ef6c140..41cfd7c 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -815,7 +815,7 @@ long arch_do_domctl( ret = -ESRCH; if ( (evc->vcpu >= d->max_vcpus) || ((v = d->vcpu[evc->vcpu]) == NULL) ) - goto ext_vcpucontext_out; + break; if ( domctl->cmd == XEN_DOMCTL_get_ext_vcpucontext ) { @@ -847,17 +847,20 @@ long arch_do_domctl( evc->vmce.caps = v->arch.vmce.mcg_cap; evc->vmce.mci_ctl2_bank0 = v->arch.vmce.bank[0].mci_ctl2; evc->vmce.mci_ctl2_bank1 = v->arch.vmce.bank[1].mci_ctl2; + + ret = 0; + copyback = 1; } else { ret = -EINVAL; if ( evc->size < offsetof(typeof(*evc), vmce) ) - goto ext_vcpucontext_out; + break; if ( is_pv_domain(d) ) { if ( !is_canonical_address(evc->sysenter_callback_eip) || !is_canonical_address(evc->syscall32_callback_eip) ) - goto ext_vcpucontext_out; + break; fixup_guest_code_selector(d, evc->sysenter_callback_cs); v->arch.pv_vcpu.sysenter_callback_cs = evc->sysenter_callback_cs; @@ -873,13 +876,11 @@ long arch_do_domctl( v->arch.pv_vcpu.syscall32_disables_events = evc->syscall32_disables_events; } - else - /* We do not support syscall/syscall32/sysenter on 32-bit Xen. */ - if ( (evc->sysenter_callback_cs & ~3) || - evc->sysenter_callback_eip || - (evc->syscall32_callback_cs & ~3) || - evc->syscall32_callback_eip ) - goto ext_vcpucontext_out; + else if ( (evc->sysenter_callback_cs & ~3) || + evc->sysenter_callback_eip || + (evc->syscall32_callback_cs & ~3) || + evc->syscall32_callback_eip ) + break; BUILD_BUG_ON(offsetof(struct xen_domctl_ext_vcpucontext, mcg_cap) != @@ -896,13 +897,9 @@ long arch_do_domctl( ret = vmce_restore_vcpu(v, &vmce); } + else + ret = 0; } - - ret = 0; - - ext_vcpucontext_out: - if ( domctl->cmd == XEN_DOMCTL_get_ext_vcpucontext ) - copyback = 1; } break; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Feb 05 12:11:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Feb 2014 12:11:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1Jv-0004Cp-Je; Wed, 05 Feb 2014 12:11:11 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1Jt-0004Cg-Sh for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:11:10 +0000 Received: from [193.109.254.147:55022] by server-12.bemta-14.messagelabs.com id 91/01-17220-D5A22F25; Wed, 05 Feb 2014 12:11:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1391602263!2181508!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8098 invoked from network); 5 Feb 2014 12:11:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 5 Feb 2014 12:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1Jn-00039i-G6 for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WB1Jn-00014X-09 for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:11:03 +0000 Date: Wed, 05 Feb 2014 12:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/domctl: don't ignore errors from vmce_restore_vcpu() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 af172d655c3900822d1f710ac13ee38ee9d482d2 Author: Jan Beulich AuthorDate: Tue Feb 4 09:22:12 2014 +0100 Commit: Jan Beulich CommitDate: Tue Feb 4 09:22:12 2014 +0100 x86/domctl: don't ignore errors from vmce_restore_vcpu() What started out as a simple cleanup patch (eliminating the redundant check of domctl->cmd before setting "copyback", which as a result turned the "ext_vcpucontext_out" label useless) revealed a bug in the handling of XEN_DOMCTL_set_ext_vcpucontext. Fix this, retaining the cleanup, and at once dropping a stale comment and an accompanying formatting issue. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/domctl.c | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index ef6c140..41cfd7c 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -815,7 +815,7 @@ long arch_do_domctl( ret = -ESRCH; if ( (evc->vcpu >= d->max_vcpus) || ((v = d->vcpu[evc->vcpu]) == NULL) ) - goto ext_vcpucontext_out; + break; if ( domctl->cmd == XEN_DOMCTL_get_ext_vcpucontext ) { @@ -847,17 +847,20 @@ long arch_do_domctl( evc->vmce.caps = v->arch.vmce.mcg_cap; evc->vmce.mci_ctl2_bank0 = v->arch.vmce.bank[0].mci_ctl2; evc->vmce.mci_ctl2_bank1 = v->arch.vmce.bank[1].mci_ctl2; + + ret = 0; + copyback = 1; } else { ret = -EINVAL; if ( evc->size < offsetof(typeof(*evc), vmce) ) - goto ext_vcpucontext_out; + break; if ( is_pv_domain(d) ) { if ( !is_canonical_address(evc->sysenter_callback_eip) || !is_canonical_address(evc->syscall32_callback_eip) ) - goto ext_vcpucontext_out; + break; fixup_guest_code_selector(d, evc->sysenter_callback_cs); v->arch.pv_vcpu.sysenter_callback_cs = evc->sysenter_callback_cs; @@ -873,13 +876,11 @@ long arch_do_domctl( v->arch.pv_vcpu.syscall32_disables_events = evc->syscall32_disables_events; } - else - /* We do not support syscall/syscall32/sysenter on 32-bit Xen. */ - if ( (evc->sysenter_callback_cs & ~3) || - evc->sysenter_callback_eip || - (evc->syscall32_callback_cs & ~3) || - evc->syscall32_callback_eip ) - goto ext_vcpucontext_out; + else if ( (evc->sysenter_callback_cs & ~3) || + evc->sysenter_callback_eip || + (evc->syscall32_callback_cs & ~3) || + evc->syscall32_callback_eip ) + break; BUILD_BUG_ON(offsetof(struct xen_domctl_ext_vcpucontext, mcg_cap) != @@ -896,13 +897,9 @@ long arch_do_domctl( ret = vmce_restore_vcpu(v, &vmce); } + else + ret = 0; } - - ret = 0; - - ext_vcpucontext_out: - if ( domctl->cmd == XEN_DOMCTL_get_ext_vcpucontext ) - copyback = 1; } break; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Feb 05 12:11:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Feb 2014 12:11:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1K2-0004DW-MD; Wed, 05 Feb 2014 12:11:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1K0-0004DG-KR for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:11:16 +0000 Received: from [85.158.137.68:43876] by server-1.bemta-3.messagelabs.com id EB/F5-17293-36A22F25; Wed, 05 Feb 2014 12:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1391602274!9879091!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4852 invoked from network); 5 Feb 2014 12:11:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Feb 2014 12:11:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1Jx-00039l-Rb for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WB1Jx-00015e-IR for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:11:13 +0000 Date: Wed, 05 Feb 2014 12:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: goto correct label on error paths X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 c2ba706c44813342269eb5cb2288552dc5f2a9a7 Author: Andrew Cooper AuthorDate: Mon Jan 27 16:25:24 2014 +0000 Commit: Ian Campbell CommitDate: Tue Feb 4 14:37:10 2014 +0000 tools/libxc: goto correct label on error paths Both of these "goto finish;" statements are actually errors, and need to "goto out;" instead, which will correctly destroy the domain and return an error, rather than trying to finish the migration (and in at least one scenario, return success). Signed-off-by: Andrew Cooper Acked-by: Ian Campbell CC: Ian Jackson CC: George Dunlap --- tools/libxc/xc_domain_restore.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c index ca2fb51..5ba47d7 100644 --- a/tools/libxc/xc_domain_restore.c +++ b/tools/libxc/xc_domain_restore.c @@ -1778,14 +1778,14 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, if ( pagebuf_get(xch, ctx, &pagebuf, io_fd, dom) ) { PERROR("error when buffering batch, finishing"); - goto finish; + goto out; } memset(&tmptail, 0, sizeof(tmptail)); tmptail.ishvm = hvm; if ( buffer_tail(xch, ctx, &tmptail, io_fd, max_vcpu_id, vcpumap, ext_vcpucontext, vcpuextstate, vcpuextstate_size) < 0 ) { ERROR ("error buffering image tail, finishing"); - goto finish; + goto out; } tailbuf_free(&tailbuf); memcpy(&tailbuf, &tmptail, sizeof(tailbuf)); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Feb 05 12:11:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Feb 2014 12:11:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1K2-0004DW-MD; Wed, 05 Feb 2014 12:11:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1K0-0004DG-KR for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:11:16 +0000 Received: from [85.158.137.68:43876] by server-1.bemta-3.messagelabs.com id EB/F5-17293-36A22F25; Wed, 05 Feb 2014 12:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1391602274!9879091!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4852 invoked from network); 5 Feb 2014 12:11:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Feb 2014 12:11:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1Jx-00039l-Rb for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WB1Jx-00015e-IR for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:11:13 +0000 Date: Wed, 05 Feb 2014 12:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: goto correct label on error paths X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 c2ba706c44813342269eb5cb2288552dc5f2a9a7 Author: Andrew Cooper AuthorDate: Mon Jan 27 16:25:24 2014 +0000 Commit: Ian Campbell CommitDate: Tue Feb 4 14:37:10 2014 +0000 tools/libxc: goto correct label on error paths Both of these "goto finish;" statements are actually errors, and need to "goto out;" instead, which will correctly destroy the domain and return an error, rather than trying to finish the migration (and in at least one scenario, return success). Signed-off-by: Andrew Cooper Acked-by: Ian Campbell CC: Ian Jackson CC: George Dunlap --- tools/libxc/xc_domain_restore.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c index ca2fb51..5ba47d7 100644 --- a/tools/libxc/xc_domain_restore.c +++ b/tools/libxc/xc_domain_restore.c @@ -1778,14 +1778,14 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, if ( pagebuf_get(xch, ctx, &pagebuf, io_fd, dom) ) { PERROR("error when buffering batch, finishing"); - goto finish; + goto out; } memset(&tmptail, 0, sizeof(tmptail)); tmptail.ishvm = hvm; if ( buffer_tail(xch, ctx, &tmptail, io_fd, max_vcpu_id, vcpumap, ext_vcpucontext, vcpuextstate, vcpuextstate_size) < 0 ) { ERROR ("error buffering image tail, finishing"); - goto finish; + goto out; } tailbuf_free(&tailbuf); memcpy(&tailbuf, &tmptail, sizeof(tailbuf)); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Feb 05 12:11:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Feb 2014 12:11:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1KC-0004Ek-Ou; Wed, 05 Feb 2014 12:11:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1KB-0004Ea-AD for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:11:27 +0000 Received: from [85.158.139.211:10533] by server-13.bemta-5.messagelabs.com id 56/63-18801-E6A22F25; Wed, 05 Feb 2014 12:11:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1391602284!1817601!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4652 invoked from network); 5 Feb 2014 12:11:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 5 Feb 2014 12:11:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1K8-00039u-AD for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:11:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WB1K7-000160-UD for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:11:23 +0000 Date: Wed, 05 Feb 2014 12:11:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] doc: Better documentation about the usbdevice=['host:bus.addr'] format X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 834eec157a20746135054d519b8e4ccd3f6a8088 Author: Anthony PERARD AuthorDate: Tue Jan 28 16:03:03 2014 +0000 Commit: Ian Campbell CommitDate: Tue Feb 4 14:38:49 2014 +0000 doc: Better documentation about the usbdevice=['host:bus.addr'] format Signed-off-by: Anthony PERARD Acked-by: Ian Campbell [ ijc -- minor wording tweak ] --- docs/man/xl.cfg.pod.5 | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 9941395..9c0b438 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -1251,6 +1251,10 @@ Host devices can also be passed through in this way, by specifying host:USBID, where USBID is of the form xxxx:yyyy. The USBID can typically be found by using lsusb or usb-devices. +If you wish to use the "host:bus.addr" format, remove any leading '0' from the +bus and addr. For example, for the USB device on bus 008 dev 002, you will +write "host:8.2". + The form usbdevice=DEVICE is also accepted for backwards compatibility. More valid options can be found in the "usbdevice" section of the qemu -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Feb 05 12:11:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Feb 2014 12:11:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1KC-0004Ek-Ou; Wed, 05 Feb 2014 12:11:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1KB-0004Ea-AD for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:11:27 +0000 Received: from [85.158.139.211:10533] by server-13.bemta-5.messagelabs.com id 56/63-18801-E6A22F25; Wed, 05 Feb 2014 12:11:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1391602284!1817601!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4652 invoked from network); 5 Feb 2014 12:11:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 5 Feb 2014 12:11:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1K8-00039u-AD for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:11:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WB1K7-000160-UD for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:11:23 +0000 Date: Wed, 05 Feb 2014 12:11:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] doc: Better documentation about the usbdevice=['host:bus.addr'] format X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 834eec157a20746135054d519b8e4ccd3f6a8088 Author: Anthony PERARD AuthorDate: Tue Jan 28 16:03:03 2014 +0000 Commit: Ian Campbell CommitDate: Tue Feb 4 14:38:49 2014 +0000 doc: Better documentation about the usbdevice=['host:bus.addr'] format Signed-off-by: Anthony PERARD Acked-by: Ian Campbell [ ijc -- minor wording tweak ] --- docs/man/xl.cfg.pod.5 | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 9941395..9c0b438 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -1251,6 +1251,10 @@ Host devices can also be passed through in this way, by specifying host:USBID, where USBID is of the form xxxx:yyyy. The USBID can typically be found by using lsusb or usb-devices. +If you wish to use the "host:bus.addr" format, remove any leading '0' from the +bus and addr. For example, for the USB device on bus 008 dev 002, you will +write "host:8.2". + The form usbdevice=DEVICE is also accepted for backwards compatibility. More valid options can be found in the "usbdevice" section of the qemu -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Feb 05 12:11:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Feb 2014 12:11:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1KM-0004G7-SJ; Wed, 05 Feb 2014 12:11:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1KK-0004Fl-VD for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:11:37 +0000 Received: from [193.109.254.147:61147] by server-3.bemta-14.messagelabs.com id B2/9F-00432-87A22F25; Wed, 05 Feb 2014 12:11:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1391602294!2177363!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22541 invoked from network); 5 Feb 2014 12:11:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 5 Feb 2014 12:11:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1KI-0003A0-Kb for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:11:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WB1KI-00016R-Cd for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:11:34 +0000 Date: Wed, 05 Feb 2014 12:11:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: update check-xl-disk-parse to handle backend_domname X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 3f4218742f5efc7c89fc1c61af546942f9d2dbb8 Author: Olaf Hering AuthorDate: Tue Jan 28 19:12:16 2014 +0100 Commit: Ian Campbell CommitDate: Tue Feb 4 14:39:42 2014 +0000 xl: update check-xl-disk-parse to handle backend_domname Signed-off-by: Olaf Hering Acked-by: Ian Campbell --- docs/man/xl.cfg.pod.5 | 2 +- tools/libxl/check-xl-disk-parse | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 9c0b438..e15a49f 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -1252,7 +1252,7 @@ host:USBID, where USBID is of the form xxxx:yyyy. The USBID can typically be found by using lsusb or usb-devices. If you wish to use the "host:bus.addr" format, remove any leading '0' from the -bus and addr. For example, for the USB device on bus 008 dev 002, you will +bus and addr. For example, for the USB device on bus 008 dev 002, you should write "host:8.2". The form usbdevice=DEVICE is also accepted for backwards compatibility. diff --git a/tools/libxl/check-xl-disk-parse b/tools/libxl/check-xl-disk-parse index 41fb7af..797277c 100755 --- a/tools/libxl/check-xl-disk-parse +++ b/tools/libxl/check-xl-disk-parse @@ -53,6 +53,7 @@ one $e foo expected < Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Feb 2014 12:11:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1KM-0004G7-SJ; Wed, 05 Feb 2014 12:11:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1KK-0004Fl-VD for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:11:37 +0000 Received: from [193.109.254.147:61147] by server-3.bemta-14.messagelabs.com id B2/9F-00432-87A22F25; Wed, 05 Feb 2014 12:11:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1391602294!2177363!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22541 invoked from network); 5 Feb 2014 12:11:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 5 Feb 2014 12:11:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1KI-0003A0-Kb for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:11:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WB1KI-00016R-Cd for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:11:34 +0000 Date: Wed, 05 Feb 2014 12:11:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: update check-xl-disk-parse to handle backend_domname X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 3f4218742f5efc7c89fc1c61af546942f9d2dbb8 Author: Olaf Hering AuthorDate: Tue Jan 28 19:12:16 2014 +0100 Commit: Ian Campbell CommitDate: Tue Feb 4 14:39:42 2014 +0000 xl: update check-xl-disk-parse to handle backend_domname Signed-off-by: Olaf Hering Acked-by: Ian Campbell --- docs/man/xl.cfg.pod.5 | 2 +- tools/libxl/check-xl-disk-parse | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 9c0b438..e15a49f 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -1252,7 +1252,7 @@ host:USBID, where USBID is of the form xxxx:yyyy. The USBID can typically be found by using lsusb or usb-devices. If you wish to use the "host:bus.addr" format, remove any leading '0' from the -bus and addr. For example, for the USB device on bus 008 dev 002, you will +bus and addr. For example, for the USB device on bus 008 dev 002, you should write "host:8.2". The form usbdevice=DEVICE is also accepted for backwards compatibility. diff --git a/tools/libxl/check-xl-disk-parse b/tools/libxl/check-xl-disk-parse index 41fb7af..797277c 100755 --- a/tools/libxl/check-xl-disk-parse +++ b/tools/libxl/check-xl-disk-parse @@ -53,6 +53,7 @@ one $e foo expected < Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Feb 2014 12:11:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1KW-0004Hu-W2; Wed, 05 Feb 2014 12:11:48 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1KV-0004HX-A8 for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:11:47 +0000 Received: from [193.109.254.147:62767] by server-3.bemta-14.messagelabs.com id ED/CF-00432-28A22F25; Wed, 05 Feb 2014 12:11:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1391602304!2181781!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19640 invoked from network); 5 Feb 2014 12:11:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 5 Feb 2014 12:11:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1KS-0003A6-OD for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:11:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WB1KS-00016n-Mu for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:11:44 +0000 Date: Wed, 05 Feb 2014 12:11:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: fix claim mode when creating HVM guest X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 46b5f0fd1fe7a49fb993fbad8a1fa232e2253afc Author: Wei Liu AuthorDate: Mon Jan 27 17:53:38 2014 +0000 Commit: Ian Campbell CommitDate: Tue Feb 4 14:40:49 2014 +0000 libxc: fix claim mode when creating HVM guest The original code is wrong because: * claim mode wants to know the total number of pages needed while original code provides the additional number of pages needed. * if pod is enabled memory will already be allocated by the time we try to claim memory. So the fix would be: * move claim mode before actual memory allocation. * pass the right number of pages to hypervisor. The "right number of pages" should be number of pages of target memory minus VGA_HOLE_SIZE, regardless of whether PoD is enabled. This fixes bug #32. Signed-off-by: Wei Liu Reviewed-by: Konrad Rzeszutek Wilk Reviewed-by: George Dunlap Acked-by: Ian Campbell Tested-by: Konrad Rzeszutek Wilk Cc: Ian Jackson --- tools/libxc/xc_hvm_build_x86.c | 36 +++++++++++++++++++++++------------- 1 files changed, 23 insertions(+), 13 deletions(-) diff --git a/tools/libxc/xc_hvm_build_x86.c b/tools/libxc/xc_hvm_build_x86.c index 77bd365..dd3b522 100644 --- a/tools/libxc/xc_hvm_build_x86.c +++ b/tools/libxc/xc_hvm_build_x86.c @@ -49,6 +49,8 @@ #define NR_SPECIAL_PAGES 8 #define special_pfn(x) (0xff000u - NR_SPECIAL_PAGES + (x)) +#define VGA_HOLE_SIZE (0x20) + static int modules_init(struct xc_hvm_build_args *args, uint64_t vend, struct elf_binary *elf, uint64_t *mstart_out, uint64_t *mend_out) @@ -302,14 +304,31 @@ static int setup_guest(xc_interface *xch, for ( i = mmio_start >> PAGE_SHIFT; i < nr_pages; i++ ) page_array[i] += mmio_size >> PAGE_SHIFT; + /* + * Try to claim pages for early warning of insufficient memory available. + * This should go before xc_domain_set_pod_target, becuase that function + * actually allocates memory for the guest. Claiming after memory has been + * allocated is pointless. + */ + if ( claim_enabled ) { + rc = xc_domain_claim_pages(xch, dom, target_pages - VGA_HOLE_SIZE); + if ( rc != 0 ) + { + PERROR("Could not allocate memory for HVM guest as we cannot claim memory!"); + goto error_out; + } + } + if ( pod_mode ) { /* - * Subtract 0x20 from target_pages for the VGA "hole". Xen will - * adjust the PoD cache size so that domain tot_pages will be - * target_pages - 0x20 after this call. + * Subtract VGA_HOLE_SIZE from target_pages for the VGA + * "hole". Xen will adjust the PoD cache size so that domain + * tot_pages will be target_pages - VGA_HOLE_SIZE after + * this call. */ - rc = xc_domain_set_pod_target(xch, dom, target_pages - 0x20, + rc = xc_domain_set_pod_target(xch, dom, + target_pages - VGA_HOLE_SIZE, NULL, NULL, NULL); if ( rc != 0 ) { @@ -333,15 +352,6 @@ static int setup_guest(xc_interface *xch, cur_pages = 0xc0; stat_normal_pages = 0xc0; - /* try to claim pages for early warning of insufficient memory available */ - if ( claim_enabled ) { - rc = xc_domain_claim_pages(xch, dom, nr_pages - cur_pages); - if ( rc != 0 ) - { - PERROR("Could not allocate memory for HVM guest as we cannot claim memory!"); - goto error_out; - } - } while ( (rc == 0) && (nr_pages > cur_pages) ) { /* Clip count to maximum 1GB extent. */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Feb 05 12:11:49 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Feb 2014 12:11:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1KW-0004Hu-W2; Wed, 05 Feb 2014 12:11:48 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1KV-0004HX-A8 for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:11:47 +0000 Received: from [193.109.254.147:62767] by server-3.bemta-14.messagelabs.com id ED/CF-00432-28A22F25; Wed, 05 Feb 2014 12:11:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1391602304!2181781!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19640 invoked from network); 5 Feb 2014 12:11:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 5 Feb 2014 12:11:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1KS-0003A6-OD for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:11:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WB1KS-00016n-Mu for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:11:44 +0000 Date: Wed, 05 Feb 2014 12:11:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: fix claim mode when creating HVM guest X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 46b5f0fd1fe7a49fb993fbad8a1fa232e2253afc Author: Wei Liu AuthorDate: Mon Jan 27 17:53:38 2014 +0000 Commit: Ian Campbell CommitDate: Tue Feb 4 14:40:49 2014 +0000 libxc: fix claim mode when creating HVM guest The original code is wrong because: * claim mode wants to know the total number of pages needed while original code provides the additional number of pages needed. * if pod is enabled memory will already be allocated by the time we try to claim memory. So the fix would be: * move claim mode before actual memory allocation. * pass the right number of pages to hypervisor. The "right number of pages" should be number of pages of target memory minus VGA_HOLE_SIZE, regardless of whether PoD is enabled. This fixes bug #32. Signed-off-by: Wei Liu Reviewed-by: Konrad Rzeszutek Wilk Reviewed-by: George Dunlap Acked-by: Ian Campbell Tested-by: Konrad Rzeszutek Wilk Cc: Ian Jackson --- tools/libxc/xc_hvm_build_x86.c | 36 +++++++++++++++++++++++------------- 1 files changed, 23 insertions(+), 13 deletions(-) diff --git a/tools/libxc/xc_hvm_build_x86.c b/tools/libxc/xc_hvm_build_x86.c index 77bd365..dd3b522 100644 --- a/tools/libxc/xc_hvm_build_x86.c +++ b/tools/libxc/xc_hvm_build_x86.c @@ -49,6 +49,8 @@ #define NR_SPECIAL_PAGES 8 #define special_pfn(x) (0xff000u - NR_SPECIAL_PAGES + (x)) +#define VGA_HOLE_SIZE (0x20) + static int modules_init(struct xc_hvm_build_args *args, uint64_t vend, struct elf_binary *elf, uint64_t *mstart_out, uint64_t *mend_out) @@ -302,14 +304,31 @@ static int setup_guest(xc_interface *xch, for ( i = mmio_start >> PAGE_SHIFT; i < nr_pages; i++ ) page_array[i] += mmio_size >> PAGE_SHIFT; + /* + * Try to claim pages for early warning of insufficient memory available. + * This should go before xc_domain_set_pod_target, becuase that function + * actually allocates memory for the guest. Claiming after memory has been + * allocated is pointless. + */ + if ( claim_enabled ) { + rc = xc_domain_claim_pages(xch, dom, target_pages - VGA_HOLE_SIZE); + if ( rc != 0 ) + { + PERROR("Could not allocate memory for HVM guest as we cannot claim memory!"); + goto error_out; + } + } + if ( pod_mode ) { /* - * Subtract 0x20 from target_pages for the VGA "hole". Xen will - * adjust the PoD cache size so that domain tot_pages will be - * target_pages - 0x20 after this call. + * Subtract VGA_HOLE_SIZE from target_pages for the VGA + * "hole". Xen will adjust the PoD cache size so that domain + * tot_pages will be target_pages - VGA_HOLE_SIZE after + * this call. */ - rc = xc_domain_set_pod_target(xch, dom, target_pages - 0x20, + rc = xc_domain_set_pod_target(xch, dom, + target_pages - VGA_HOLE_SIZE, NULL, NULL, NULL); if ( rc != 0 ) { @@ -333,15 +352,6 @@ static int setup_guest(xc_interface *xch, cur_pages = 0xc0; stat_normal_pages = 0xc0; - /* try to claim pages for early warning of insufficient memory available */ - if ( claim_enabled ) { - rc = xc_domain_claim_pages(xch, dom, nr_pages - cur_pages); - if ( rc != 0 ) - { - PERROR("Could not allocate memory for HVM guest as we cannot claim memory!"); - goto error_out; - } - } while ( (rc == 0) && (nr_pages > cur_pages) ) { /* Clip count to maximum 1GB extent. */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Feb 05 12:11:58 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Feb 2014 12:11:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1Kg-0004Jh-3f; Wed, 05 Feb 2014 12:11:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1Kf-0004JV-Ou for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:11:57 +0000 Received: from [85.158.137.68:54162] by server-2.bemta-3.messagelabs.com id AB/31-06531-C8A22F25; Wed, 05 Feb 2014 12:11:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1391602315!13560658!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15378 invoked from network); 5 Feb 2014 12:11:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Feb 2014 12:11:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1Kd-0003AC-03 for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:11:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WB1Kc-00017A-Qa for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:11:54 +0000 Date: Wed, 05 Feb 2014 12:11:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Directly return NULL if Xen fails to allocate domain struct X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 ea527eda9e1f7a8dcd4cf799c01c4b11468e952f Author: Julien Grall AuthorDate: Fri Jan 31 22:22:45 2014 +0000 Commit: Ian Campbell CommitDate: Tue Feb 4 14:48:44 2014 +0000 xen/arm: Directly return NULL if Xen fails to allocate domain struct The current implementation of alloc_domain_struct, dereference the newly allocated pointer even if the allocation has failed. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/domain.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 635a9a4..c279a27 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -409,8 +409,10 @@ struct domain *alloc_domain_struct(void) struct domain *d; BUILD_BUG_ON(sizeof(*d) > PAGE_SIZE); d = alloc_xenheap_pages(0, 0); - if ( d != NULL ) - clear_page(d); + if ( d == NULL ) + return NULL; + + clear_page(d); d->arch.grant_table_gpfn = xmalloc_array(xen_pfn_t, max_nr_grant_frames); return d; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Feb 05 12:11:58 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Feb 2014 12:11:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1Kg-0004Jh-3f; Wed, 05 Feb 2014 12:11:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1Kf-0004JV-Ou for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:11:57 +0000 Received: from [85.158.137.68:54162] by server-2.bemta-3.messagelabs.com id AB/31-06531-C8A22F25; Wed, 05 Feb 2014 12:11:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1391602315!13560658!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15378 invoked from network); 5 Feb 2014 12:11:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 5 Feb 2014 12:11:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1Kd-0003AC-03 for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:11:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WB1Kc-00017A-Qa for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:11:54 +0000 Date: Wed, 05 Feb 2014 12:11:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Directly return NULL if Xen fails to allocate domain struct X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 ea527eda9e1f7a8dcd4cf799c01c4b11468e952f Author: Julien Grall AuthorDate: Fri Jan 31 22:22:45 2014 +0000 Commit: Ian Campbell CommitDate: Tue Feb 4 14:48:44 2014 +0000 xen/arm: Directly return NULL if Xen fails to allocate domain struct The current implementation of alloc_domain_struct, dereference the newly allocated pointer even if the allocation has failed. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/domain.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 635a9a4..c279a27 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -409,8 +409,10 @@ struct domain *alloc_domain_struct(void) struct domain *d; BUILD_BUG_ON(sizeof(*d) > PAGE_SIZE); d = alloc_xenheap_pages(0, 0); - if ( d != NULL ) - clear_page(d); + if ( d == NULL ) + return NULL; + + clear_page(d); d->arch.grant_table_gpfn = xmalloc_array(xen_pfn_t, max_nr_grant_frames); return d; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Feb 05 12:12:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Feb 2014 12:12:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1Ku-0004LW-6k; Wed, 05 Feb 2014 12:12:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1Ks-0004LI-Vv for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:12:11 +0000 Received: from [85.158.139.211:44055] by server-5.bemta-5.messagelabs.com id B2/FA-32749-A9A22F25; Wed, 05 Feb 2014 12:12:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1391602325!1813479!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18564 invoked from network); 5 Feb 2014 12:12:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 5 Feb 2014 12:12:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1Kn-0003Al-6k for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:12:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WB1Kn-00017g-2M for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:12:05 +0000 Date: Wed, 05 Feb 2014 12:12:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: correct use of find_next_bit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 5224a733d3bd4d0db3548712047506c50487085e Author: Ian Campbell AuthorDate: Fri Jan 24 14:23:07 2014 +0000 Commit: Ian Campbell CommitDate: Tue Feb 4 14:55:45 2014 +0000 xen: arm: correct use of find_next_bit find_next_bit takes a "const unsigned long *" but forcing a cast of an "uint32_t *" throws away the alignment constraints and ends up causing an alignment fault on arm64 if the input happened to be 4 but not 8 byte aligned. Instead of casting use a temporary variable of the right type. I've had a look around for similar constructs and the only thing I found was maintenance_interrupt which cases a uint64_t down to an unsigned long, which although perhaps not best advised is safe I think. This was observed with the AArch64 Linaro toolchain 2013.12 but I think that is just coincidental due to subtle changes to the stack layout etc. Reported-by: Fu Wei Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/vgic.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 90e9707..553411d 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -362,11 +362,12 @@ read_as_zero: static void vgic_disable_irqs(struct vcpu *v, uint32_t r, int n) { + const unsigned long mask = r; struct pending_irq *p; unsigned int irq; int i = 0; - while ( (i = find_next_bit((const long unsigned int *) &r, 32, i)) < 32 ) { + while ( (i = find_next_bit(&mask, 32, i)) < 32 ) { irq = i + (32 * n); p = irq_to_pending(v, irq); clear_bit(GIC_IRQ_GUEST_ENABLED, &p->status); @@ -379,11 +380,12 @@ static void vgic_disable_irqs(struct vcpu *v, uint32_t r, int n) static void vgic_enable_irqs(struct vcpu *v, uint32_t r, int n) { + const unsigned long mask = r; struct pending_irq *p; unsigned int irq; int i = 0; - while ( (i = find_next_bit((const long unsigned int *) &r, 32, i)) < 32 ) { + while ( (i = find_next_bit(&mask, 32, i)) < 32 ) { irq = i + (32 * n); p = irq_to_pending(v, irq); set_bit(GIC_IRQ_GUEST_ENABLED, &p->status); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Feb 05 12:12:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Feb 2014 12:12:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1Ku-0004LW-6k; Wed, 05 Feb 2014 12:12:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1Ks-0004LI-Vv for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:12:11 +0000 Received: from [85.158.139.211:44055] by server-5.bemta-5.messagelabs.com id B2/FA-32749-A9A22F25; Wed, 05 Feb 2014 12:12:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1391602325!1813479!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18564 invoked from network); 5 Feb 2014 12:12:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 5 Feb 2014 12:12:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1Kn-0003Al-6k for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:12:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WB1Kn-00017g-2M for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:12:05 +0000 Date: Wed, 05 Feb 2014 12:12:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: correct use of find_next_bit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 5224a733d3bd4d0db3548712047506c50487085e Author: Ian Campbell AuthorDate: Fri Jan 24 14:23:07 2014 +0000 Commit: Ian Campbell CommitDate: Tue Feb 4 14:55:45 2014 +0000 xen: arm: correct use of find_next_bit find_next_bit takes a "const unsigned long *" but forcing a cast of an "uint32_t *" throws away the alignment constraints and ends up causing an alignment fault on arm64 if the input happened to be 4 but not 8 byte aligned. Instead of casting use a temporary variable of the right type. I've had a look around for similar constructs and the only thing I found was maintenance_interrupt which cases a uint64_t down to an unsigned long, which although perhaps not best advised is safe I think. This was observed with the AArch64 Linaro toolchain 2013.12 but I think that is just coincidental due to subtle changes to the stack layout etc. Reported-by: Fu Wei Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/vgic.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 90e9707..553411d 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -362,11 +362,12 @@ read_as_zero: static void vgic_disable_irqs(struct vcpu *v, uint32_t r, int n) { + const unsigned long mask = r; struct pending_irq *p; unsigned int irq; int i = 0; - while ( (i = find_next_bit((const long unsigned int *) &r, 32, i)) < 32 ) { + while ( (i = find_next_bit(&mask, 32, i)) < 32 ) { irq = i + (32 * n); p = irq_to_pending(v, irq); clear_bit(GIC_IRQ_GUEST_ENABLED, &p->status); @@ -379,11 +380,12 @@ static void vgic_disable_irqs(struct vcpu *v, uint32_t r, int n) static void vgic_enable_irqs(struct vcpu *v, uint32_t r, int n) { + const unsigned long mask = r; struct pending_irq *p; unsigned int irq; int i = 0; - while ( (i = find_next_bit((const long unsigned int *) &r, 32, i)) < 32 ) { + while ( (i = find_next_bit(&mask, 32, i)) < 32 ) { irq = i + (32 * n); p = irq_to_pending(v, irq); set_bit(GIC_IRQ_GUEST_ENABLED, &p->status); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Feb 05 12:12:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Feb 2014 12:12: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 1WB1L0-0004N6-BZ; Wed, 05 Feb 2014 12:12:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1Kz-0004Mp-Mp for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:12:17 +0000 Received: from [193.109.254.147:7671] by server-15.bemta-14.messagelabs.com id 87/BD-10839-1AA22F25; Wed, 05 Feb 2014 12:12:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1391602335!2171713!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19703 invoked from network); 5 Feb 2014 12:12:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 5 Feb 2014 12:12:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1Kx-0003Ar-Aa for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:12:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WB1Kx-00018a-94 for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:12:15 +0000 Date: Wed, 05 Feb 2014 12:12:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: libxl: do not set the PoD target on ARM X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ff1745d5882b7356ea423709919e46e55c31b615 Author: Ian Campbell AuthorDate: Thu Jan 16 15:27:59 2014 +0000 Commit: Ian Campbell CommitDate: Tue Feb 4 15:27:46 2014 +0000 tools: libxl: do not set the PoD target on ARM ARM does not implemented PoD and so returns ENOSYS from XENMEM_set_pod_target. The correct solution here would be to check for ENOSYS in libxl, unfortunately xc_domain_set_pod_target suffers from the same broken error reporting as the rest of libxc and throws away the errno. So for now conditionally define xc_domain_set_pod_target to return success (which is what PoD does if nothing needs doing). xc_domain_get_pod_target sets errno==-1 and returns -1, which matches the broken error reporting of the existing function. It appears to have no in tree callers in any case. The conditional should be removed once libxc has been fixed. This makes ballooning (xl mem-set) work for ARM domains. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Acked-by: Julien Grall Cc: george.dunlap@citrix.com --- tools/libxc/xc_domain.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index c2fdd74..e1d1bec 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -986,6 +986,12 @@ out: return rc; } +/* Currently only implemented on x86. This cannot be handled in the + * caller, e.g. by looking for errno==ENOSYS because of the broken + * error reporting style. Once this is fixed then this condition can + * be removed. + */ +#if defined(__i386__)||defined(__x86_64__) static int xc_domain_pod_target(xc_interface *xch, int op, uint32_t domid, @@ -1055,6 +1061,28 @@ int xc_domain_get_pod_target(xc_interface *xch, pod_cache_pages, pod_entries); } +#else +int xc_domain_set_pod_target(xc_interface *xch, + uint32_t domid, + uint64_t target_pages, + uint64_t *tot_pages, + uint64_t *pod_cache_pages, + uint64_t *pod_entries) +{ + return 0; +} +int xc_domain_get_pod_target(xc_interface *xch, + uint32_t domid, + uint64_t *tot_pages, + uint64_t *pod_cache_pages, + uint64_t *pod_entries) +{ + /* On x86 (above) xc_domain_pod_target will incorrectly return -1 + * with errno==-1 on error. Do the same for least surprise. */ + errno = -1; + return -1; +} +#endif int xc_domain_max_vcpus(xc_interface *xch, uint32_t domid, unsigned int max) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Feb 05 12:12:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 05 Feb 2014 12:12: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 1WB1L0-0004N6-BZ; Wed, 05 Feb 2014 12:12:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1Kz-0004Mp-Mp for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:12:17 +0000 Received: from [193.109.254.147:7671] by server-15.bemta-14.messagelabs.com id 87/BD-10839-1AA22F25; Wed, 05 Feb 2014 12:12:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1391602335!2171713!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19703 invoked from network); 5 Feb 2014 12:12:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 5 Feb 2014 12:12:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WB1Kx-0003Ar-Aa for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:12:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WB1Kx-00018a-94 for xen-changelog@lists.xensource.com; Wed, 05 Feb 2014 12:12:15 +0000 Date: Wed, 05 Feb 2014 12:12:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: libxl: do not set the PoD target on ARM X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ff1745d5882b7356ea423709919e46e55c31b615 Author: Ian Campbell AuthorDate: Thu Jan 16 15:27:59 2014 +0000 Commit: Ian Campbell CommitDate: Tue Feb 4 15:27:46 2014 +0000 tools: libxl: do not set the PoD target on ARM ARM does not implemented PoD and so returns ENOSYS from XENMEM_set_pod_target. The correct solution here would be to check for ENOSYS in libxl, unfortunately xc_domain_set_pod_target suffers from the same broken error reporting as the rest of libxc and throws away the errno. So for now conditionally define xc_domain_set_pod_target to return success (which is what PoD does if nothing needs doing). xc_domain_get_pod_target sets errno==-1 and returns -1, which matches the broken error reporting of the existing function. It appears to have no in tree callers in any case. The conditional should be removed once libxc has been fixed. This makes ballooning (xl mem-set) work for ARM domains. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Acked-by: Julien Grall Cc: george.dunlap@citrix.com --- tools/libxc/xc_domain.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index c2fdd74..e1d1bec 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -986,6 +986,12 @@ out: return rc; } +/* Currently only implemented on x86. This cannot be handled in the + * caller, e.g. by looking for errno==ENOSYS because of the broken + * error reporting style. Once this is fixed then this condition can + * be removed. + */ +#if defined(__i386__)||defined(__x86_64__) static int xc_domain_pod_target(xc_interface *xch, int op, uint32_t domid, @@ -1055,6 +1061,28 @@ int xc_domain_get_pod_target(xc_interface *xch, pod_cache_pages, pod_entries); } +#else +int xc_domain_set_pod_target(xc_interface *xch, + uint32_t domid, + uint64_t target_pages, + uint64_t *tot_pages, + uint64_t *pod_cache_pages, + uint64_t *pod_entries) +{ + return 0; +} +int xc_domain_get_pod_target(xc_interface *xch, + uint32_t domid, + uint64_t *tot_pages, + uint64_t *pod_cache_pages, + uint64_t *pod_entries) +{ + /* On x86 (above) xc_domain_pod_target will incorrectly return -1 + * with errno==-1 on error. Do the same for least surprise. */ + errno = -1; + return -1; +} +#endif int xc_domain_max_vcpus(xc_interface *xch, uint32_t domid, unsigned int max) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 06 01:33:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 06 Feb 2014 01:33:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBDpz-0007Cs-E0; Thu, 06 Feb 2014 01:33:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBDpy-0007Cn-CA for xen-changelog@lists.xensource.com; Thu, 06 Feb 2014 01:33:06 +0000 Received: from [85.158.139.211:10237] by server-5.bemta-5.messagelabs.com id 10/53-32749-156E2F25; Thu, 06 Feb 2014 01:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1391650383!1949577!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1490 invoked from network); 6 Feb 2014 01:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 6 Feb 2014 01:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBDpv-0001GI-EG for xen-changelog@lists.xensource.com; Thu, 06 Feb 2014 01:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WBDpu-0007F6-WB for xen-changelog@lists.xensource.com; Thu, 06 Feb 2014 01:33:03 +0000 Date: Thu, 06 Feb 2014 01:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] configure: Disable libtool if -fPIE does not work with it (bug #1257099) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 027c412ff71ad8bff6e335cc7932857f4ea74391 Author: Don Slutz AuthorDate: Sat Dec 14 19:43:56 2013 +0000 Commit: Stefano Stabellini CommitDate: Wed Feb 5 16:59:14 2014 +0000 configure: Disable libtool if -fPIE does not work with it (bug #1257099) Adjust TMPO and added TMPB, TMPL, and TMPA. libtool needs the names to be fixed (TMPB). Add new functions do_libtool and libtool_prog. Add check for broken gcc and libtool. Signed-off-by: Don Slutz Signed-off-by: Stefano Stabellini --- configure | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 62 insertions(+), 1 deletions(-) diff --git a/configure b/configure index ff7933b..3aaf0b6 100755 --- a/configure +++ b/configure @@ -12,7 +12,10 @@ else fi TMPC="${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}.c" -TMPO="${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}.o" +TMPB="qemu-conf-${RANDOM}-$$-${RANDOM}" +TMPO="${TMPDIR1}/${TMPB}.o" +TMPL="${TMPDIR1}/${TMPB}.lo" +TMPA="${TMPDIR1}/lib${TMPB}.la" TMPE="${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}.exe" # NB: do not call "exit" in the trap handler; this is buggy with some shells; @@ -73,6 +76,38 @@ compile_prog() { do_cc $QEMU_CFLAGS $local_cflags -o $TMPE $TMPC $LDFLAGS $local_ldflags } +do_libtool() { + local mode=$1 + shift + # Run the compiler, capturing its output to the log. + echo $libtool $mode --tag=CC $cc "$@" >> config.log + $libtool $mode --tag=CC $cc "$@" >> config.log 2>&1 || return $? + # Test passed. If this is an --enable-werror build, rerun + # the test with -Werror and bail out if it fails. This + # makes warning-generating-errors in configure test code + # obvious to developers. + if test "$werror" != "yes"; then + return 0 + fi + # Don't bother rerunning the compile if we were already using -Werror + case "$*" in + *-Werror*) + return 0 + ;; + esac + echo $libtool $mode --tag=CC $cc -Werror "$@" >> config.log + $libtool $mode --tag=CC $cc -Werror "$@" >> config.log 2>&1 && return $? + error_exit "configure test passed without -Werror but failed with -Werror." \ + "This is probably a bug in the configure script. The failing command" \ + "will be at the bottom of config.log." \ + "You can run configure with --disable-werror to bypass this check." +} + +libtool_prog() { + do_libtool --mode=compile $QEMU_CFLAGS -c -fPIE -DPIE -o $TMPO $TMPC || return $? + do_libtool --mode=link $LDFLAGS -o $TMPA $TMPL -rpath /usr/local/lib +} + # symbolically link $1 to $2. Portable version of "ln -sf". symlink() { rm -rf "$2" @@ -1300,6 +1335,32 @@ EOF fi fi +# check for broken gcc and libtool in RHEL5 +if test -n "$libtool" -a "$pie" != "no" ; then + cat > $TMPC < Envelope-to: archives@lists.xen.org Delivery-date: Thu, 06 Feb 2014 01:33:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBDpz-0007Cs-E0; Thu, 06 Feb 2014 01:33:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBDpy-0007Cn-CA for xen-changelog@lists.xensource.com; Thu, 06 Feb 2014 01:33:06 +0000 Received: from [85.158.139.211:10237] by server-5.bemta-5.messagelabs.com id 10/53-32749-156E2F25; Thu, 06 Feb 2014 01:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1391650383!1949577!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1490 invoked from network); 6 Feb 2014 01:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 6 Feb 2014 01:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBDpv-0001GI-EG for xen-changelog@lists.xensource.com; Thu, 06 Feb 2014 01:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WBDpu-0007F6-WB for xen-changelog@lists.xensource.com; Thu, 06 Feb 2014 01:33:03 +0000 Date: Thu, 06 Feb 2014 01:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] configure: Disable libtool if -fPIE does not work with it (bug #1257099) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 027c412ff71ad8bff6e335cc7932857f4ea74391 Author: Don Slutz AuthorDate: Sat Dec 14 19:43:56 2013 +0000 Commit: Stefano Stabellini CommitDate: Wed Feb 5 16:59:14 2014 +0000 configure: Disable libtool if -fPIE does not work with it (bug #1257099) Adjust TMPO and added TMPB, TMPL, and TMPA. libtool needs the names to be fixed (TMPB). Add new functions do_libtool and libtool_prog. Add check for broken gcc and libtool. Signed-off-by: Don Slutz Signed-off-by: Stefano Stabellini --- configure | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 62 insertions(+), 1 deletions(-) diff --git a/configure b/configure index ff7933b..3aaf0b6 100755 --- a/configure +++ b/configure @@ -12,7 +12,10 @@ else fi TMPC="${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}.c" -TMPO="${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}.o" +TMPB="qemu-conf-${RANDOM}-$$-${RANDOM}" +TMPO="${TMPDIR1}/${TMPB}.o" +TMPL="${TMPDIR1}/${TMPB}.lo" +TMPA="${TMPDIR1}/lib${TMPB}.la" TMPE="${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}.exe" # NB: do not call "exit" in the trap handler; this is buggy with some shells; @@ -73,6 +76,38 @@ compile_prog() { do_cc $QEMU_CFLAGS $local_cflags -o $TMPE $TMPC $LDFLAGS $local_ldflags } +do_libtool() { + local mode=$1 + shift + # Run the compiler, capturing its output to the log. + echo $libtool $mode --tag=CC $cc "$@" >> config.log + $libtool $mode --tag=CC $cc "$@" >> config.log 2>&1 || return $? + # Test passed. If this is an --enable-werror build, rerun + # the test with -Werror and bail out if it fails. This + # makes warning-generating-errors in configure test code + # obvious to developers. + if test "$werror" != "yes"; then + return 0 + fi + # Don't bother rerunning the compile if we were already using -Werror + case "$*" in + *-Werror*) + return 0 + ;; + esac + echo $libtool $mode --tag=CC $cc -Werror "$@" >> config.log + $libtool $mode --tag=CC $cc -Werror "$@" >> config.log 2>&1 && return $? + error_exit "configure test passed without -Werror but failed with -Werror." \ + "This is probably a bug in the configure script. The failing command" \ + "will be at the bottom of config.log." \ + "You can run configure with --disable-werror to bypass this check." +} + +libtool_prog() { + do_libtool --mode=compile $QEMU_CFLAGS -c -fPIE -DPIE -o $TMPO $TMPC || return $? + do_libtool --mode=link $LDFLAGS -o $TMPA $TMPL -rpath /usr/local/lib +} + # symbolically link $1 to $2. Portable version of "ln -sf". symlink() { rm -rf "$2" @@ -1300,6 +1335,32 @@ EOF fi fi +# check for broken gcc and libtool in RHEL5 +if test -n "$libtool" -a "$pie" != "no" ; then + cat > $TMPC < Envelope-to: archives@lists.xen.org Delivery-date: Thu, 06 Feb 2014 18:44:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBTvl-0005Xr-DY; Thu, 06 Feb 2014 18:44:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBTvj-0005Xj-Q8 for xen-changelog@lists.xensource.com; Thu, 06 Feb 2014 18:44:08 +0000 Received: from [85.158.137.68:62122] by server-5.bemta-3.messagelabs.com id 3B/7D-04712-7F7D3F25; Thu, 06 Feb 2014 18:44:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1391712244!153540!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5214 invoked from network); 6 Feb 2014 18:44:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 6 Feb 2014 18:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBTvf-0003xC-TB for xen-changelog@lists.xensource.com; Thu, 06 Feb 2014 18:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WBTvf-00045m-Lq for xen-changelog@lists.xensource.com; Thu, 06 Feb 2014 18:44:03 +0000 Date: Thu, 06 Feb 2014 18:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: fix FS/GS base handling when using the fsgsbase feature X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 c42494acb2f7f31e561d38f06c59a50ee4198f36 Author: Jan Beulich AuthorDate: Thu Feb 6 12:19:06 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 6 12:19:06 2014 +0100 x86: fix FS/GS base handling when using the fsgsbase feature In that case, due to the respective instructions not being privileged, we can't rely on our in-memory data to always be correct: While the guest is running, it may change without us knowing about it. Therefore we need to - read the correct values from hardware during context switch out (save_segments()) - read the correct values from hardware during RDMSR emulation - update in-memory values during guest mode change (toggle_guest_mode()) For completeness/consistency, WRMSR emulation is also being switched to use wr[fg]sbase(). Signed-off-by: Jan Beulich Acked-by: Keir Fraser Reviewed-by: Andrew Cooper Release-acked-by: George Dunlap --- xen/arch/x86/domain.c | 9 +++++++++ xen/arch/x86/traps.c | 17 +++++++---------- xen/arch/x86/x86_64/traps.c | 7 +++++++ xen/include/asm-x86/msr.h | 42 ++++++++++++++++++++++++++++++------------ 4 files changed, 53 insertions(+), 22 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 16f2b50..6618ae6 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1251,6 +1251,15 @@ static void save_segments(struct vcpu *v) regs->fs = read_segment_register(fs); regs->gs = read_segment_register(gs); + if ( cpu_has_fsgsbase && !is_pv_32bit_vcpu(v) ) + { + v->arch.pv_vcpu.fs_base = __rdfsbase(); + if ( v->arch.flags & TF_kernel_mode ) + v->arch.pv_vcpu.gs_base_kernel = __rdgsbase(); + else + v->arch.pv_vcpu.gs_base_user = __rdgsbase(); + } + if ( regs->ds ) dirty_segment_mask |= DIRTY_DS; diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 3f7a3c7..0bd43b9 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -2382,15 +2382,13 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) case MSR_FS_BASE: if ( is_pv_32on64_vcpu(v) ) goto fail; - if ( wrmsr_safe(MSR_FS_BASE, msr_content) ) - goto fail; + wrfsbase(msr_content); v->arch.pv_vcpu.fs_base = msr_content; break; case MSR_GS_BASE: if ( is_pv_32on64_vcpu(v) ) goto fail; - if ( wrmsr_safe(MSR_GS_BASE, msr_content) ) - goto fail; + wrgsbase(msr_content); v->arch.pv_vcpu.gs_base_kernel = msr_content; break; case MSR_SHADOW_GS_BASE: @@ -2535,15 +2533,14 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) case MSR_FS_BASE: if ( is_pv_32on64_vcpu(v) ) goto fail; - regs->eax = v->arch.pv_vcpu.fs_base & 0xFFFFFFFFUL; - regs->edx = v->arch.pv_vcpu.fs_base >> 32; - break; + val = cpu_has_fsgsbase ? __rdfsbase() : v->arch.pv_vcpu.fs_base; + goto rdmsr_writeback; case MSR_GS_BASE: if ( is_pv_32on64_vcpu(v) ) goto fail; - regs->eax = v->arch.pv_vcpu.gs_base_kernel & 0xFFFFFFFFUL; - regs->edx = v->arch.pv_vcpu.gs_base_kernel >> 32; - break; + val = cpu_has_fsgsbase ? __rdgsbase() + : v->arch.pv_vcpu.gs_base_kernel; + goto rdmsr_writeback; case MSR_SHADOW_GS_BASE: if ( is_pv_32on64_vcpu(v) ) goto fail; diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index d8303f9..90072c1 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -257,6 +257,13 @@ void toggle_guest_mode(struct vcpu *v) { if ( is_pv_32bit_vcpu(v) ) return; + if ( cpu_has_fsgsbase ) + { + if ( v->arch.flags & TF_kernel_mode ) + v->arch.pv_vcpu.gs_base_kernel = __rdgsbase(); + else + v->arch.pv_vcpu.gs_base_user = __rdgsbase(); + } v->arch.flags ^= TF_kernel_mode; asm volatile ( "swapgs" ); update_cr3(v); diff --git a/xen/include/asm-x86/msr.h b/xen/include/asm-x86/msr.h index 5277c2b..61f579a 100644 --- a/xen/include/asm-x86/msr.h +++ b/xen/include/asm-x86/msr.h @@ -98,34 +98,52 @@ static inline int wrmsr_safe(unsigned int msr, uint64_t val) : "=a" (low), "=d" (high) \ : "c" (counter)) -static inline unsigned long rdfsbase(void) +static inline unsigned long __rdfsbase(void) { unsigned long base; - if ( cpu_has_fsgsbase ) #ifdef HAVE_GAS_FSGSBASE - asm volatile ( "rdfsbase %0" : "=r" (base) ); + asm volatile ( "rdfsbase %0" : "=r" (base) ); #else - asm volatile ( ".byte 0xf3, 0x48, 0x0f, 0xae, 0xc0" : "=a" (base) ); + asm volatile ( ".byte 0xf3, 0x48, 0x0f, 0xae, 0xc0" : "=a" (base) ); #endif - else - rdmsrl(MSR_FS_BASE, base); return base; } -static inline unsigned long rdgsbase(void) +static inline unsigned long __rdgsbase(void) { unsigned long base; - if ( cpu_has_fsgsbase ) #ifdef HAVE_GAS_FSGSBASE - asm volatile ( "rdgsbase %0" : "=r" (base) ); + asm volatile ( "rdgsbase %0" : "=r" (base) ); #else - asm volatile ( ".byte 0xf3, 0x48, 0x0f, 0xae, 0xc8" : "=a" (base) ); + asm volatile ( ".byte 0xf3, 0x48, 0x0f, 0xae, 0xc8" : "=a" (base) ); #endif - else - rdmsrl(MSR_GS_BASE, base); + + return base; +} + +static inline unsigned long rdfsbase(void) +{ + unsigned long base; + + if ( cpu_has_fsgsbase ) + return __rdfsbase(); + + rdmsrl(MSR_FS_BASE, base); + + return base; +} + +static inline unsigned long rdgsbase(void) +{ + unsigned long base; + + if ( cpu_has_fsgsbase ) + return __rdgsbase(); + + rdmsrl(MSR_GS_BASE, base); return base; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 06 18:44:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 06 Feb 2014 18:44:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBTvl-0005Xr-DY; Thu, 06 Feb 2014 18:44:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBTvj-0005Xj-Q8 for xen-changelog@lists.xensource.com; Thu, 06 Feb 2014 18:44:08 +0000 Received: from [85.158.137.68:62122] by server-5.bemta-3.messagelabs.com id 3B/7D-04712-7F7D3F25; Thu, 06 Feb 2014 18:44:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1391712244!153540!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5214 invoked from network); 6 Feb 2014 18:44:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 6 Feb 2014 18:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBTvf-0003xC-TB for xen-changelog@lists.xensource.com; Thu, 06 Feb 2014 18:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WBTvf-00045m-Lq for xen-changelog@lists.xensource.com; Thu, 06 Feb 2014 18:44:03 +0000 Date: Thu, 06 Feb 2014 18:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: fix FS/GS base handling when using the fsgsbase feature X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 c42494acb2f7f31e561d38f06c59a50ee4198f36 Author: Jan Beulich AuthorDate: Thu Feb 6 12:19:06 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 6 12:19:06 2014 +0100 x86: fix FS/GS base handling when using the fsgsbase feature In that case, due to the respective instructions not being privileged, we can't rely on our in-memory data to always be correct: While the guest is running, it may change without us knowing about it. Therefore we need to - read the correct values from hardware during context switch out (save_segments()) - read the correct values from hardware during RDMSR emulation - update in-memory values during guest mode change (toggle_guest_mode()) For completeness/consistency, WRMSR emulation is also being switched to use wr[fg]sbase(). Signed-off-by: Jan Beulich Acked-by: Keir Fraser Reviewed-by: Andrew Cooper Release-acked-by: George Dunlap --- xen/arch/x86/domain.c | 9 +++++++++ xen/arch/x86/traps.c | 17 +++++++---------- xen/arch/x86/x86_64/traps.c | 7 +++++++ xen/include/asm-x86/msr.h | 42 ++++++++++++++++++++++++++++++------------ 4 files changed, 53 insertions(+), 22 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 16f2b50..6618ae6 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1251,6 +1251,15 @@ static void save_segments(struct vcpu *v) regs->fs = read_segment_register(fs); regs->gs = read_segment_register(gs); + if ( cpu_has_fsgsbase && !is_pv_32bit_vcpu(v) ) + { + v->arch.pv_vcpu.fs_base = __rdfsbase(); + if ( v->arch.flags & TF_kernel_mode ) + v->arch.pv_vcpu.gs_base_kernel = __rdgsbase(); + else + v->arch.pv_vcpu.gs_base_user = __rdgsbase(); + } + if ( regs->ds ) dirty_segment_mask |= DIRTY_DS; diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 3f7a3c7..0bd43b9 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -2382,15 +2382,13 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) case MSR_FS_BASE: if ( is_pv_32on64_vcpu(v) ) goto fail; - if ( wrmsr_safe(MSR_FS_BASE, msr_content) ) - goto fail; + wrfsbase(msr_content); v->arch.pv_vcpu.fs_base = msr_content; break; case MSR_GS_BASE: if ( is_pv_32on64_vcpu(v) ) goto fail; - if ( wrmsr_safe(MSR_GS_BASE, msr_content) ) - goto fail; + wrgsbase(msr_content); v->arch.pv_vcpu.gs_base_kernel = msr_content; break; case MSR_SHADOW_GS_BASE: @@ -2535,15 +2533,14 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) case MSR_FS_BASE: if ( is_pv_32on64_vcpu(v) ) goto fail; - regs->eax = v->arch.pv_vcpu.fs_base & 0xFFFFFFFFUL; - regs->edx = v->arch.pv_vcpu.fs_base >> 32; - break; + val = cpu_has_fsgsbase ? __rdfsbase() : v->arch.pv_vcpu.fs_base; + goto rdmsr_writeback; case MSR_GS_BASE: if ( is_pv_32on64_vcpu(v) ) goto fail; - regs->eax = v->arch.pv_vcpu.gs_base_kernel & 0xFFFFFFFFUL; - regs->edx = v->arch.pv_vcpu.gs_base_kernel >> 32; - break; + val = cpu_has_fsgsbase ? __rdgsbase() + : v->arch.pv_vcpu.gs_base_kernel; + goto rdmsr_writeback; case MSR_SHADOW_GS_BASE: if ( is_pv_32on64_vcpu(v) ) goto fail; diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index d8303f9..90072c1 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -257,6 +257,13 @@ void toggle_guest_mode(struct vcpu *v) { if ( is_pv_32bit_vcpu(v) ) return; + if ( cpu_has_fsgsbase ) + { + if ( v->arch.flags & TF_kernel_mode ) + v->arch.pv_vcpu.gs_base_kernel = __rdgsbase(); + else + v->arch.pv_vcpu.gs_base_user = __rdgsbase(); + } v->arch.flags ^= TF_kernel_mode; asm volatile ( "swapgs" ); update_cr3(v); diff --git a/xen/include/asm-x86/msr.h b/xen/include/asm-x86/msr.h index 5277c2b..61f579a 100644 --- a/xen/include/asm-x86/msr.h +++ b/xen/include/asm-x86/msr.h @@ -98,34 +98,52 @@ static inline int wrmsr_safe(unsigned int msr, uint64_t val) : "=a" (low), "=d" (high) \ : "c" (counter)) -static inline unsigned long rdfsbase(void) +static inline unsigned long __rdfsbase(void) { unsigned long base; - if ( cpu_has_fsgsbase ) #ifdef HAVE_GAS_FSGSBASE - asm volatile ( "rdfsbase %0" : "=r" (base) ); + asm volatile ( "rdfsbase %0" : "=r" (base) ); #else - asm volatile ( ".byte 0xf3, 0x48, 0x0f, 0xae, 0xc0" : "=a" (base) ); + asm volatile ( ".byte 0xf3, 0x48, 0x0f, 0xae, 0xc0" : "=a" (base) ); #endif - else - rdmsrl(MSR_FS_BASE, base); return base; } -static inline unsigned long rdgsbase(void) +static inline unsigned long __rdgsbase(void) { unsigned long base; - if ( cpu_has_fsgsbase ) #ifdef HAVE_GAS_FSGSBASE - asm volatile ( "rdgsbase %0" : "=r" (base) ); + asm volatile ( "rdgsbase %0" : "=r" (base) ); #else - asm volatile ( ".byte 0xf3, 0x48, 0x0f, 0xae, 0xc8" : "=a" (base) ); + asm volatile ( ".byte 0xf3, 0x48, 0x0f, 0xae, 0xc8" : "=a" (base) ); #endif - else - rdmsrl(MSR_GS_BASE, base); + + return base; +} + +static inline unsigned long rdfsbase(void) +{ + unsigned long base; + + if ( cpu_has_fsgsbase ) + return __rdfsbase(); + + rdmsrl(MSR_FS_BASE, base); + + return base; +} + +static inline unsigned long rdgsbase(void) +{ + unsigned long base; + + if ( cpu_has_fsgsbase ) + return __rdgsbase(); + + rdmsrl(MSR_GS_BASE, base); return base; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 06 18:44:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 06 Feb 2014 18: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 1WBTvw-0005Yd-HG; Thu, 06 Feb 2014 18:44:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBTvv-0005YU-QX for xen-changelog@lists.xensource.com; Thu, 06 Feb 2014 18:44:20 +0000 Received: from [85.158.139.211:65426] by server-8.bemta-5.messagelabs.com id 30/D9-05298-308D3F25; Thu, 06 Feb 2014 18:44:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1391712254!2192987!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1275 invoked from network); 6 Feb 2014 18:44:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 6 Feb 2014 18:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBTvq-0003xF-9g for xen-changelog@lists.xensource.com; Thu, 06 Feb 2014 18:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WBTvq-00046A-12 for xen-changelog@lists.xensource.com; Thu, 06 Feb 2014 18:44:14 +0000 Date: Thu, 06 Feb 2014 18:44:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] domctl: also pause domain for "extended" context updates X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 53f808a3880da13d0a0909f446698891a41f6869 Author: Jan Beulich AuthorDate: Thu Feb 6 12:20:20 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 6 12:20:20 2014 +0100 domctl: also pause domain for "extended" context updates This is not just for consistency with "base" context updates, but actually needed so that guest side accesses can't race with control domain side updates. This would have been a security issue if XSA-77 hadn't waived them on the affected domctl operation. While looking at the code I also spotted a redundant NULL check in the "base" context update handling code, which is being removed. Signed-off-by: Jan Beulich Acked-by: Keir Fraser Reviewed-by: Andrew Cooper Release-acked-by: George Dunlap --- xen/arch/x86/domctl.c | 7 +++++++ xen/common/domctl.c | 4 ---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 41cfd7c..432a180 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -853,6 +853,8 @@ long arch_do_domctl( } else { + if ( d == current->domain ) /* no domain_pause() */ + break; ret = -EINVAL; if ( evc->size < offsetof(typeof(*evc), vmce) ) break; @@ -861,6 +863,7 @@ long arch_do_domctl( if ( !is_canonical_address(evc->sysenter_callback_eip) || !is_canonical_address(evc->syscall32_callback_eip) ) break; + domain_pause(d); fixup_guest_code_selector(d, evc->sysenter_callback_cs); v->arch.pv_vcpu.sysenter_callback_cs = evc->sysenter_callback_cs; @@ -881,6 +884,8 @@ long arch_do_domctl( (evc->syscall32_callback_cs & ~3) || evc->syscall32_callback_eip ) break; + else + domain_pause(d); BUILD_BUG_ON(offsetof(struct xen_domctl_ext_vcpucontext, mcg_cap) != @@ -899,6 +904,8 @@ long arch_do_domctl( } else ret = 0; + + domain_unpause(d); } } break; diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 904d27b..f237be4 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -334,10 +334,6 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) unsigned int vcpu = op->u.vcpucontext.vcpu; struct vcpu *v; - ret = -ESRCH; - if ( d == NULL ) - break; - ret = -EINVAL; if ( (d == current->domain) || /* no domain_pause() */ (vcpu >= d->max_vcpus) || ((v = d->vcpu[vcpu]) == NULL) ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 06 18:44:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 06 Feb 2014 18: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 1WBTvw-0005Yd-HG; Thu, 06 Feb 2014 18:44:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBTvv-0005YU-QX for xen-changelog@lists.xensource.com; Thu, 06 Feb 2014 18:44:20 +0000 Received: from [85.158.139.211:65426] by server-8.bemta-5.messagelabs.com id 30/D9-05298-308D3F25; Thu, 06 Feb 2014 18:44:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1391712254!2192987!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1275 invoked from network); 6 Feb 2014 18:44:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 6 Feb 2014 18:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBTvq-0003xF-9g for xen-changelog@lists.xensource.com; Thu, 06 Feb 2014 18:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WBTvq-00046A-12 for xen-changelog@lists.xensource.com; Thu, 06 Feb 2014 18:44:14 +0000 Date: Thu, 06 Feb 2014 18:44:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] domctl: also pause domain for "extended" context updates X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 53f808a3880da13d0a0909f446698891a41f6869 Author: Jan Beulich AuthorDate: Thu Feb 6 12:20:20 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 6 12:20:20 2014 +0100 domctl: also pause domain for "extended" context updates This is not just for consistency with "base" context updates, but actually needed so that guest side accesses can't race with control domain side updates. This would have been a security issue if XSA-77 hadn't waived them on the affected domctl operation. While looking at the code I also spotted a redundant NULL check in the "base" context update handling code, which is being removed. Signed-off-by: Jan Beulich Acked-by: Keir Fraser Reviewed-by: Andrew Cooper Release-acked-by: George Dunlap --- xen/arch/x86/domctl.c | 7 +++++++ xen/common/domctl.c | 4 ---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 41cfd7c..432a180 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -853,6 +853,8 @@ long arch_do_domctl( } else { + if ( d == current->domain ) /* no domain_pause() */ + break; ret = -EINVAL; if ( evc->size < offsetof(typeof(*evc), vmce) ) break; @@ -861,6 +863,7 @@ long arch_do_domctl( if ( !is_canonical_address(evc->sysenter_callback_eip) || !is_canonical_address(evc->syscall32_callback_eip) ) break; + domain_pause(d); fixup_guest_code_selector(d, evc->sysenter_callback_cs); v->arch.pv_vcpu.sysenter_callback_cs = evc->sysenter_callback_cs; @@ -881,6 +884,8 @@ long arch_do_domctl( (evc->syscall32_callback_cs & ~3) || evc->syscall32_callback_eip ) break; + else + domain_pause(d); BUILD_BUG_ON(offsetof(struct xen_domctl_ext_vcpucontext, mcg_cap) != @@ -899,6 +904,8 @@ long arch_do_domctl( } else ret = 0; + + domain_unpause(d); } } break; diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 904d27b..f237be4 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -334,10 +334,6 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) unsigned int vcpu = op->u.vcpucontext.vcpu; struct vcpu *v; - ret = -ESRCH; - if ( d == NULL ) - break; - ret = -EINVAL; if ( (d == current->domain) || /* no domain_pause() */ (vcpu >= d->max_vcpus) || ((v = d->vcpu[vcpu]) == NULL) ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 06 18:44:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 06 Feb 2014 18:44:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBTw4-0005ZU-K4; Thu, 06 Feb 2014 18:44:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBTw3-0005ZO-Fr for xen-changelog@lists.xensource.com; Thu, 06 Feb 2014 18:44:27 +0000 Received: from [85.158.139.211:27233] by server-7.bemta-5.messagelabs.com id B5/0F-14867-A08D3F25; Thu, 06 Feb 2014 18:44:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1391712264!2177241!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7954 invoked from network); 6 Feb 2014 18:44:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 6 Feb 2014 18:44:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBTw0-0003xO-Hx for xen-changelog@lists.xensource.com; Thu, 06 Feb 2014 18:44:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WBTw0-00046W-DC for xen-changelog@lists.xensource.com; Thu, 06 Feb 2014 18:44:24 +0000 Date: Thu, 06 Feb 2014 18:44:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] domctl: pause vCPU for context reads X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 fee61634e8f3fec7c137f0d16478c64c7f355587 Author: Jan Beulich AuthorDate: Thu Feb 6 12:20:48 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 6 12:20:48 2014 +0100 domctl: pause vCPU for context reads "Base" context reads already paused the subject vCPU when being the current one, but that special case isn't being properly dealt with anyway (at the very least when x86's fsgsbase feature is in use), so just disallow it. "Extended" context reads so far didn't do any pausing. While we can't avoid the reported data being stale by the time it arrives at the caller, this way we at least guarantee that it is consistent. Signed-off-by: Jan Beulich Acked-by: Keir Fraser Reviewed-by: Andrew Cooper Release-acked-by: George Dunlap --- xen/arch/x86/domctl.c | 7 +++++++ xen/common/domctl.c | 14 +++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 432a180..26635ff 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -819,7 +819,13 @@ long arch_do_domctl( if ( domctl->cmd == XEN_DOMCTL_get_ext_vcpucontext ) { + if ( v == current ) /* no vcpu_pause() */ + break; + evc->size = sizeof(*evc); + + vcpu_pause(v); + if ( is_pv_domain(d) ) { evc->sysenter_callback_cs = @@ -849,6 +855,7 @@ long arch_do_domctl( evc->vmce.mci_ctl2_bank1 = v->arch.vmce.bank[1].mci_ctl2; ret = 0; + vcpu_unpause(v); copyback = 1; } else diff --git a/xen/common/domctl.c b/xen/common/domctl.c index f237be4..7cf610a 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -675,11 +675,9 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) struct vcpu *v; ret = -EINVAL; - if ( op->u.vcpucontext.vcpu >= d->max_vcpus ) - goto getvcpucontext_out; - - ret = -ESRCH; - if ( (v = d->vcpu[op->u.vcpucontext.vcpu]) == NULL ) + if ( op->u.vcpucontext.vcpu >= d->max_vcpus || + (v = d->vcpu[op->u.vcpucontext.vcpu]) == NULL || + v == current ) /* no vcpu_pause() */ goto getvcpucontext_out; ret = -ENODATA; @@ -694,14 +692,12 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) if ( (c.nat = xmalloc(struct vcpu_guest_context)) == NULL ) goto getvcpucontext_out; - if ( v != current ) - vcpu_pause(v); + vcpu_pause(v); arch_get_info_guest(v, c); ret = 0; - if ( v != current ) - vcpu_unpause(v); + vcpu_unpause(v); #ifdef CONFIG_COMPAT if ( !is_pv_32on64_vcpu(v) ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 06 18:44:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 06 Feb 2014 18:44:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBTw4-0005ZU-K4; Thu, 06 Feb 2014 18:44:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBTw3-0005ZO-Fr for xen-changelog@lists.xensource.com; Thu, 06 Feb 2014 18:44:27 +0000 Received: from [85.158.139.211:27233] by server-7.bemta-5.messagelabs.com id B5/0F-14867-A08D3F25; Thu, 06 Feb 2014 18:44:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1391712264!2177241!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7954 invoked from network); 6 Feb 2014 18:44:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 6 Feb 2014 18:44:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBTw0-0003xO-Hx for xen-changelog@lists.xensource.com; Thu, 06 Feb 2014 18:44:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WBTw0-00046W-DC for xen-changelog@lists.xensource.com; Thu, 06 Feb 2014 18:44:24 +0000 Date: Thu, 06 Feb 2014 18:44:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] domctl: pause vCPU for context reads X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 fee61634e8f3fec7c137f0d16478c64c7f355587 Author: Jan Beulich AuthorDate: Thu Feb 6 12:20:48 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 6 12:20:48 2014 +0100 domctl: pause vCPU for context reads "Base" context reads already paused the subject vCPU when being the current one, but that special case isn't being properly dealt with anyway (at the very least when x86's fsgsbase feature is in use), so just disallow it. "Extended" context reads so far didn't do any pausing. While we can't avoid the reported data being stale by the time it arrives at the caller, this way we at least guarantee that it is consistent. Signed-off-by: Jan Beulich Acked-by: Keir Fraser Reviewed-by: Andrew Cooper Release-acked-by: George Dunlap --- xen/arch/x86/domctl.c | 7 +++++++ xen/common/domctl.c | 14 +++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 432a180..26635ff 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -819,7 +819,13 @@ long arch_do_domctl( if ( domctl->cmd == XEN_DOMCTL_get_ext_vcpucontext ) { + if ( v == current ) /* no vcpu_pause() */ + break; + evc->size = sizeof(*evc); + + vcpu_pause(v); + if ( is_pv_domain(d) ) { evc->sysenter_callback_cs = @@ -849,6 +855,7 @@ long arch_do_domctl( evc->vmce.mci_ctl2_bank1 = v->arch.vmce.bank[1].mci_ctl2; ret = 0; + vcpu_unpause(v); copyback = 1; } else diff --git a/xen/common/domctl.c b/xen/common/domctl.c index f237be4..7cf610a 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -675,11 +675,9 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) struct vcpu *v; ret = -EINVAL; - if ( op->u.vcpucontext.vcpu >= d->max_vcpus ) - goto getvcpucontext_out; - - ret = -ESRCH; - if ( (v = d->vcpu[op->u.vcpucontext.vcpu]) == NULL ) + if ( op->u.vcpucontext.vcpu >= d->max_vcpus || + (v = d->vcpu[op->u.vcpucontext.vcpu]) == NULL || + v == current ) /* no vcpu_pause() */ goto getvcpucontext_out; ret = -ENODATA; @@ -694,14 +692,12 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) if ( (c.nat = xmalloc(struct vcpu_guest_context)) == NULL ) goto getvcpucontext_out; - if ( v != current ) - vcpu_pause(v); + vcpu_pause(v); arch_get_info_guest(v, c); ret = 0; - if ( v != current ) - vcpu_unpause(v); + vcpu_unpause(v); #ifdef CONFIG_COMPAT if ( !is_pv_32on64_vcpu(v) ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 06 23:00:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 06 Feb 2014 23:00: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 1WBXvY-0000LQ-VL; Thu, 06 Feb 2014 23:00:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBXvY-0000LK-CA for xen-changelog@lists.xensource.com; Thu, 06 Feb 2014 23:00:12 +0000 Received: from [85.158.137.68:56238] by server-2.bemta-3.messagelabs.com id 28/8A-06531-BF314F25; Thu, 06 Feb 2014 23:00:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1391727609!180106!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6951 invoked from network); 6 Feb 2014 23:00:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 6 Feb 2014 23:00:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBXvQ-0006Uv-D4 for xen-changelog@lists.xensource.com; Thu, 06 Feb 2014 23:00:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WBXvO-0002fH-Me for xen-changelog@lists.xensource.com; Thu, 06 Feb 2014 23:00:03 +0000 Date: Thu, 06 Feb 2014 23:00:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] flask: restrict allocations done by hypercall interface X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 f0d0e5efe15a8ce53eaaeee64cf568358ec197ca Author: Jan Beulich AuthorDate: Thu Feb 6 17:41:28 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 6 17:41:28 2014 +0100 flask: restrict allocations done by hypercall interface Other than in 4.2 and newer, we're not having an overflow issue here, but uncontrolled exposure of the operations opens the host to be driven out of memory by an arbitrary guest. Since all operations other than FLASK_LOAD simply deal with ASCII strings, limiting the allocations (and incoming buffer sizes) to a page worth of memory seems like the best thing we can do. Consequently, in order to not expose the larger allocation to arbitrary guests, the permission check for FLASK_LOAD needs to be pulled ahead of the allocation (and it's perhaps worth noting that - afaict - it was pointlessly done with the sel_sem spin lock held). Note that this breaks FLASK_AVC_CACHESTATS on systems with sufficiently many CPUs (as requiring a buffer bigger than PAGE_SIZE there). No attempt is made to address this here, as it would needlessly complicate this fix with rather little gain. This is XSA-84. Reported-by: Matthew Daley Signed-off-by: Jan Beulich The index of boolean variables in FLASK_{GET,SET}BOOL was not always checked against the bounds of the array. Reported-by: John McDermott Signed-off-by: Daniel De Graaf --- xen/xsm/flask/flask_op.c | 19 +++++++++++++------ xen/xsm/flask/ss/services.c | 2 +- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index 265a3cf..5107178 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -573,7 +573,7 @@ static int flask_security_setavc_threshold(char *buf, uint32_t count) static int flask_security_set_bool(char *buf, uint32_t count) { int length = -EFAULT; - int i, new_value; + unsigned int i, new_value; spin_lock(&sel_sem); @@ -585,6 +585,9 @@ static int flask_security_set_bool(char *buf, uint32_t count) if ( sscanf(buf, "%d %d", &i, &new_value) != 2 ) goto out; + if ( i >= bool_num ) + goto out; + if ( new_value ) { new_value = 1; @@ -734,10 +737,6 @@ static int flask_security_load(char *buf, uint32_t count) spin_lock(&sel_sem); - length = domain_has_security(current->domain, SECURITY__LOAD_POLICY); - if ( length ) - goto out; - length = security_load_policy(buf, count); if ( length ) goto out; @@ -853,7 +852,15 @@ long do_flask_op(XEN_GUEST_HANDLE(xsm_op_t) u_flask_op) if ( op->cmd > FLASK_LAST) return -EINVAL; - if ( op->size > MAX_POLICY_SIZE ) + if ( op->cmd == FLASK_LOAD ) + { + rc = domain_has_security(current->domain, SECURITY__LOAD_POLICY); + if ( rc ) + return rc; + if ( op->size > MAX_POLICY_SIZE ) + return -EINVAL; + } + else if ( op->size >= PAGE_SIZE ) return -EINVAL; if ( (op->buf == NULL && op->size != 0) || diff --git a/xen/xsm/flask/ss/services.c b/xen/xsm/flask/ss/services.c index b880762..d3958c9 100644 --- a/xen/xsm/flask/ss/services.c +++ b/xen/xsm/flask/ss/services.c @@ -1991,7 +1991,7 @@ int security_get_bool_value(int bool) POLICY_RDLOCK; len = policydb.p_bools.nprim; - if ( bool >= len ) + if ( bool >= len || bool < 0 ) { rc = -EFAULT; goto out; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 06 23:00:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 06 Feb 2014 23:00: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 1WBXvY-0000LQ-VL; Thu, 06 Feb 2014 23:00:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBXvY-0000LK-CA for xen-changelog@lists.xensource.com; Thu, 06 Feb 2014 23:00:12 +0000 Received: from [85.158.137.68:56238] by server-2.bemta-3.messagelabs.com id 28/8A-06531-BF314F25; Thu, 06 Feb 2014 23:00:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1391727609!180106!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6951 invoked from network); 6 Feb 2014 23:00:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 6 Feb 2014 23:00:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBXvQ-0006Uv-D4 for xen-changelog@lists.xensource.com; Thu, 06 Feb 2014 23:00:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WBXvO-0002fH-Me for xen-changelog@lists.xensource.com; Thu, 06 Feb 2014 23:00:03 +0000 Date: Thu, 06 Feb 2014 23:00:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] flask: restrict allocations done by hypercall interface X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 f0d0e5efe15a8ce53eaaeee64cf568358ec197ca Author: Jan Beulich AuthorDate: Thu Feb 6 17:41:28 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 6 17:41:28 2014 +0100 flask: restrict allocations done by hypercall interface Other than in 4.2 and newer, we're not having an overflow issue here, but uncontrolled exposure of the operations opens the host to be driven out of memory by an arbitrary guest. Since all operations other than FLASK_LOAD simply deal with ASCII strings, limiting the allocations (and incoming buffer sizes) to a page worth of memory seems like the best thing we can do. Consequently, in order to not expose the larger allocation to arbitrary guests, the permission check for FLASK_LOAD needs to be pulled ahead of the allocation (and it's perhaps worth noting that - afaict - it was pointlessly done with the sel_sem spin lock held). Note that this breaks FLASK_AVC_CACHESTATS on systems with sufficiently many CPUs (as requiring a buffer bigger than PAGE_SIZE there). No attempt is made to address this here, as it would needlessly complicate this fix with rather little gain. This is XSA-84. Reported-by: Matthew Daley Signed-off-by: Jan Beulich The index of boolean variables in FLASK_{GET,SET}BOOL was not always checked against the bounds of the array. Reported-by: John McDermott Signed-off-by: Daniel De Graaf --- xen/xsm/flask/flask_op.c | 19 +++++++++++++------ xen/xsm/flask/ss/services.c | 2 +- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index 265a3cf..5107178 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -573,7 +573,7 @@ static int flask_security_setavc_threshold(char *buf, uint32_t count) static int flask_security_set_bool(char *buf, uint32_t count) { int length = -EFAULT; - int i, new_value; + unsigned int i, new_value; spin_lock(&sel_sem); @@ -585,6 +585,9 @@ static int flask_security_set_bool(char *buf, uint32_t count) if ( sscanf(buf, "%d %d", &i, &new_value) != 2 ) goto out; + if ( i >= bool_num ) + goto out; + if ( new_value ) { new_value = 1; @@ -734,10 +737,6 @@ static int flask_security_load(char *buf, uint32_t count) spin_lock(&sel_sem); - length = domain_has_security(current->domain, SECURITY__LOAD_POLICY); - if ( length ) - goto out; - length = security_load_policy(buf, count); if ( length ) goto out; @@ -853,7 +852,15 @@ long do_flask_op(XEN_GUEST_HANDLE(xsm_op_t) u_flask_op) if ( op->cmd > FLASK_LAST) return -EINVAL; - if ( op->size > MAX_POLICY_SIZE ) + if ( op->cmd == FLASK_LOAD ) + { + rc = domain_has_security(current->domain, SECURITY__LOAD_POLICY); + if ( rc ) + return rc; + if ( op->size > MAX_POLICY_SIZE ) + return -EINVAL; + } + else if ( op->size >= PAGE_SIZE ) return -EINVAL; if ( (op->buf == NULL && op->size != 0) || diff --git a/xen/xsm/flask/ss/services.c b/xen/xsm/flask/ss/services.c index b880762..d3958c9 100644 --- a/xen/xsm/flask/ss/services.c +++ b/xen/xsm/flask/ss/services.c @@ -1991,7 +1991,7 @@ int security_get_bool_value(int bool) POLICY_RDLOCK; len = policydb.p_bools.nprim; - if ( bool >= len ) + if ( bool >= len || bool < 0 ) { rc = -EFAULT; goto out; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Feb 07 09:11:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Feb 2014 09:11:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBhSl-000545-W0; Fri, 07 Feb 2014 09:11:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBhSk-00053q-8s for xen-changelog@lists.xensource.com; Fri, 07 Feb 2014 09:11:06 +0000 Received: from [85.158.137.68:59089] by server-6.bemta-3.messagelabs.com id 4D/99-09180-923A4F25; Fri, 07 Feb 2014 09:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1391764263!257536!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1135 invoked from network); 7 Feb 2014 09:11:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 Feb 2014 09:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBhSh-000315-92 for xen-changelog@lists.xensource.com; Fri, 07 Feb 2014 09:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WBhSh-0003Uv-4c for xen-changelog@lists.xensource.com; Fri, 07 Feb 2014 09:11:03 +0000 Date: Fri, 07 Feb 2014 09:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] flask: fix reading strings from guest memory X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 e9c5e56b4c17fd1ce28577df23cc53cc62c0d792 Author: Jan Beulich AuthorDate: Thu Feb 6 17:21:16 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 6 17:21:16 2014 +0100 flask: fix reading strings from guest memory Since the string size is being specified by the guest, we must range check it properly before doing allocations based on it. While for the two cases that are exposed only to trusted guests (via policy restriction) this just uses an arbitrary upper limit (PAGE_SIZE), for the FLASK_[GS]ETBOOL case (which any guest can use) the upper limit gets enforced based on the longest name across all boolean settings. This is XSA-84. Reported-by: Matthew Daley Signed-off-by: Jan Beulich Acked-by: Daniel De Graaf master commit: 6c79e0ab9ac6042e60434c02e1d99b0cf0cc3470 master date: 2014-02-06 16:33:50 +0100 --- xen/xsm/flask/flask_op.c | 21 ++++++++++++++------- xen/xsm/flask/include/conditional.h | 4 +++- xen/xsm/flask/ss/services.c | 17 ++++++++++------- 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index 4426ab9..f8deb37 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -53,6 +53,7 @@ static DEFINE_SPINLOCK(sel_sem); /* global data for booleans */ static int bool_num = 0; static int *bool_pending_values = NULL; +static size_t bool_maxstr; static int flask_security_make_bools(void); extern int ss_initialized; @@ -71,9 +72,15 @@ static int domain_has_security(struct domain *d, u32 perms) perms, NULL); } -static int flask_copyin_string(XEN_GUEST_HANDLE_PARAM(char) u_buf, char **buf, uint32_t size) +static int flask_copyin_string(XEN_GUEST_HANDLE_PARAM(char) u_buf, char **buf, + size_t size, size_t max_size) { - char *tmp = xmalloc_bytes(size + 1); + char *tmp; + + if ( size > max_size ) + return -ENOENT; + + tmp = xmalloc_array(char, size + 1); if ( !tmp ) return -ENOMEM; @@ -99,7 +106,7 @@ static int flask_security_user(struct xen_flask_userlist *arg) if ( rv ) return rv; - rv = flask_copyin_string(arg->u.user, &user, arg->size); + rv = flask_copyin_string(arg->u.user, &user, arg->size, PAGE_SIZE); if ( rv ) return rv; @@ -210,7 +217,7 @@ static int flask_security_context(struct xen_flask_sid_context *arg) if ( rv ) return rv; - rv = flask_copyin_string(arg->context, &buf, arg->size); + rv = flask_copyin_string(arg->context, &buf, arg->size, PAGE_SIZE); if ( rv ) return rv; @@ -303,7 +310,7 @@ static int flask_security_resolve_bool(struct xen_flask_boolean *arg) if ( arg->bool_id != -1 ) return 0; - rv = flask_copyin_string(arg->name, &name, arg->size); + rv = flask_copyin_string(arg->name, &name, arg->size, bool_maxstr); if ( rv ) return rv; @@ -334,7 +341,7 @@ static int flask_security_set_bool(struct xen_flask_boolean *arg) int num; int *values; - rv = security_get_bools(&num, NULL, &values); + rv = security_get_bools(&num, NULL, &values, NULL); if ( rv != 0 ) goto out; @@ -440,7 +447,7 @@ static int flask_security_make_bools(void) xfree(bool_pending_values); - ret = security_get_bools(&num, NULL, &values); + ret = security_get_bools(&num, NULL, &values, &bool_maxstr); if ( ret != 0 ) goto out; diff --git a/xen/xsm/flask/include/conditional.h b/xen/xsm/flask/include/conditional.h index 2fa0a30..043cfd8 100644 --- a/xen/xsm/flask/include/conditional.h +++ b/xen/xsm/flask/include/conditional.h @@ -13,7 +13,9 @@ #ifndef _FLASK_CONDITIONAL_H_ #define _FLASK_CONDITIONAL_H_ -int security_get_bools(int *len, char ***names, int **values); +#include + +int security_get_bools(int *len, char ***names, int **values, size_t *maxstr); int security_set_bools(int len, int *values); diff --git a/xen/xsm/flask/ss/services.c b/xen/xsm/flask/ss/services.c index 1bf3b0c..5cb9537 100644 --- a/xen/xsm/flask/ss/services.c +++ b/xen/xsm/flask/ss/services.c @@ -1850,7 +1850,7 @@ int security_find_bool(const char *name) return rv; } -int security_get_bools(int *len, char ***names, int **values) +int security_get_bools(int *len, char ***names, int **values, size_t *maxstr) { int i, rc = -ENOMEM; @@ -1858,6 +1858,8 @@ int security_get_bools(int *len, char ***names, int **values) if ( names ) *names = NULL; *values = NULL; + if ( maxstr ) + *maxstr = 0; *len = policydb.p_bools.nprim; if ( !*len ) @@ -1879,16 +1881,17 @@ int security_get_bools(int *len, char ***names, int **values) for ( i = 0; i < *len; i++ ) { - size_t name_len; + size_t name_len = strlen(policydb.p_bool_val_to_name[i]); + (*values)[i] = policydb.bool_val_to_struct[i]->state; if ( names ) { - name_len = strlen(policydb.p_bool_val_to_name[i]) + 1; - (*names)[i] = (char*)xmalloc_array(char, name_len); + (*names)[i] = xmalloc_array(char, name_len + 1); if ( !(*names)[i] ) goto err; - strlcpy((*names)[i], policydb.p_bool_val_to_name[i], name_len); - (*names)[i][name_len - 1] = 0; + strlcpy((*names)[i], policydb.p_bool_val_to_name[i], name_len + 1); } + if ( maxstr && name_len > *maxstr ) + *maxstr = name_len; } rc = 0; out: @@ -2006,7 +2009,7 @@ static int security_preserve_bools(struct policydb *p) struct cond_bool_datum *booldatum; struct cond_node *cur; - rc = security_get_bools(&nbools, &bnames, &bvalues); + rc = security_get_bools(&nbools, &bnames, &bvalues, NULL); if ( rc ) goto out; for ( i = 0; i < nbools; i++ ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Feb 07 09:11:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Feb 2014 09:11:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBhSl-000545-W0; Fri, 07 Feb 2014 09:11:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBhSk-00053q-8s for xen-changelog@lists.xensource.com; Fri, 07 Feb 2014 09:11:06 +0000 Received: from [85.158.137.68:59089] by server-6.bemta-3.messagelabs.com id 4D/99-09180-923A4F25; Fri, 07 Feb 2014 09:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1391764263!257536!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1135 invoked from network); 7 Feb 2014 09:11:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 Feb 2014 09:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBhSh-000315-92 for xen-changelog@lists.xensource.com; Fri, 07 Feb 2014 09:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WBhSh-0003Uv-4c for xen-changelog@lists.xensource.com; Fri, 07 Feb 2014 09:11:03 +0000 Date: Fri, 07 Feb 2014 09:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] flask: fix reading strings from guest memory X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 e9c5e56b4c17fd1ce28577df23cc53cc62c0d792 Author: Jan Beulich AuthorDate: Thu Feb 6 17:21:16 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 6 17:21:16 2014 +0100 flask: fix reading strings from guest memory Since the string size is being specified by the guest, we must range check it properly before doing allocations based on it. While for the two cases that are exposed only to trusted guests (via policy restriction) this just uses an arbitrary upper limit (PAGE_SIZE), for the FLASK_[GS]ETBOOL case (which any guest can use) the upper limit gets enforced based on the longest name across all boolean settings. This is XSA-84. Reported-by: Matthew Daley Signed-off-by: Jan Beulich Acked-by: Daniel De Graaf master commit: 6c79e0ab9ac6042e60434c02e1d99b0cf0cc3470 master date: 2014-02-06 16:33:50 +0100 --- xen/xsm/flask/flask_op.c | 21 ++++++++++++++------- xen/xsm/flask/include/conditional.h | 4 +++- xen/xsm/flask/ss/services.c | 17 ++++++++++------- 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index 4426ab9..f8deb37 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -53,6 +53,7 @@ static DEFINE_SPINLOCK(sel_sem); /* global data for booleans */ static int bool_num = 0; static int *bool_pending_values = NULL; +static size_t bool_maxstr; static int flask_security_make_bools(void); extern int ss_initialized; @@ -71,9 +72,15 @@ static int domain_has_security(struct domain *d, u32 perms) perms, NULL); } -static int flask_copyin_string(XEN_GUEST_HANDLE_PARAM(char) u_buf, char **buf, uint32_t size) +static int flask_copyin_string(XEN_GUEST_HANDLE_PARAM(char) u_buf, char **buf, + size_t size, size_t max_size) { - char *tmp = xmalloc_bytes(size + 1); + char *tmp; + + if ( size > max_size ) + return -ENOENT; + + tmp = xmalloc_array(char, size + 1); if ( !tmp ) return -ENOMEM; @@ -99,7 +106,7 @@ static int flask_security_user(struct xen_flask_userlist *arg) if ( rv ) return rv; - rv = flask_copyin_string(arg->u.user, &user, arg->size); + rv = flask_copyin_string(arg->u.user, &user, arg->size, PAGE_SIZE); if ( rv ) return rv; @@ -210,7 +217,7 @@ static int flask_security_context(struct xen_flask_sid_context *arg) if ( rv ) return rv; - rv = flask_copyin_string(arg->context, &buf, arg->size); + rv = flask_copyin_string(arg->context, &buf, arg->size, PAGE_SIZE); if ( rv ) return rv; @@ -303,7 +310,7 @@ static int flask_security_resolve_bool(struct xen_flask_boolean *arg) if ( arg->bool_id != -1 ) return 0; - rv = flask_copyin_string(arg->name, &name, arg->size); + rv = flask_copyin_string(arg->name, &name, arg->size, bool_maxstr); if ( rv ) return rv; @@ -334,7 +341,7 @@ static int flask_security_set_bool(struct xen_flask_boolean *arg) int num; int *values; - rv = security_get_bools(&num, NULL, &values); + rv = security_get_bools(&num, NULL, &values, NULL); if ( rv != 0 ) goto out; @@ -440,7 +447,7 @@ static int flask_security_make_bools(void) xfree(bool_pending_values); - ret = security_get_bools(&num, NULL, &values); + ret = security_get_bools(&num, NULL, &values, &bool_maxstr); if ( ret != 0 ) goto out; diff --git a/xen/xsm/flask/include/conditional.h b/xen/xsm/flask/include/conditional.h index 2fa0a30..043cfd8 100644 --- a/xen/xsm/flask/include/conditional.h +++ b/xen/xsm/flask/include/conditional.h @@ -13,7 +13,9 @@ #ifndef _FLASK_CONDITIONAL_H_ #define _FLASK_CONDITIONAL_H_ -int security_get_bools(int *len, char ***names, int **values); +#include + +int security_get_bools(int *len, char ***names, int **values, size_t *maxstr); int security_set_bools(int len, int *values); diff --git a/xen/xsm/flask/ss/services.c b/xen/xsm/flask/ss/services.c index 1bf3b0c..5cb9537 100644 --- a/xen/xsm/flask/ss/services.c +++ b/xen/xsm/flask/ss/services.c @@ -1850,7 +1850,7 @@ int security_find_bool(const char *name) return rv; } -int security_get_bools(int *len, char ***names, int **values) +int security_get_bools(int *len, char ***names, int **values, size_t *maxstr) { int i, rc = -ENOMEM; @@ -1858,6 +1858,8 @@ int security_get_bools(int *len, char ***names, int **values) if ( names ) *names = NULL; *values = NULL; + if ( maxstr ) + *maxstr = 0; *len = policydb.p_bools.nprim; if ( !*len ) @@ -1879,16 +1881,17 @@ int security_get_bools(int *len, char ***names, int **values) for ( i = 0; i < *len; i++ ) { - size_t name_len; + size_t name_len = strlen(policydb.p_bool_val_to_name[i]); + (*values)[i] = policydb.bool_val_to_struct[i]->state; if ( names ) { - name_len = strlen(policydb.p_bool_val_to_name[i]) + 1; - (*names)[i] = (char*)xmalloc_array(char, name_len); + (*names)[i] = xmalloc_array(char, name_len + 1); if ( !(*names)[i] ) goto err; - strlcpy((*names)[i], policydb.p_bool_val_to_name[i], name_len); - (*names)[i][name_len - 1] = 0; + strlcpy((*names)[i], policydb.p_bool_val_to_name[i], name_len + 1); } + if ( maxstr && name_len > *maxstr ) + *maxstr = name_len; } rc = 0; out: @@ -2006,7 +2009,7 @@ static int security_preserve_bools(struct policydb *p) struct cond_bool_datum *booldatum; struct cond_node *cur; - rc = security_get_bools(&nbools, &bnames, &bvalues); + rc = security_get_bools(&nbools, &bnames, &bvalues, NULL); if ( rc ) goto out; for ( i = 0; i < nbools; i++ ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Feb 07 09:11:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Feb 2014 09:11:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBhT6-000560-4d; Fri, 07 Feb 2014 09:11:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBhT4-00055i-IP for xen-changelog@lists.xensource.com; Fri, 07 Feb 2014 09:11:26 +0000 Received: from [85.158.137.68:8606] by server-9.bemta-3.messagelabs.com id 7C/50-10184-D33A4F25; Fri, 07 Feb 2014 09:11:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1391764283!254009!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11998 invoked from network); 7 Feb 2014 09:11:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 Feb 2014 09:11:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBhT1-00031B-IT for xen-changelog@lists.xensource.com; Fri, 07 Feb 2014 09:11:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WBhT1-0003Vf-GO for xen-changelog@lists.xensource.com; Fri, 07 Feb 2014 09:11:23 +0000 Date: Fri, 07 Feb 2014 09:11:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libvchan: Fix handling of invalid ring buffer indices X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2367674771004249115==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============2367674771004249115== Content-Type: text/plain commit d7c6be61836b0a4d996f82d3e7c7e50150996701 Author: Marek Marczykowski-Górecki AuthorDate: Thu Feb 6 17:27:10 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 6 17:27:10 2014 +0100 libvchan: Fix handling of invalid ring buffer indices The remote (hostile) process can set ring buffer indices to any value at any time. If that happens, it is possible to get "buffer space" (either for writing data, or ready for reading) negative or greater than buffer size. This will end up with buffer overflow in the second memcpy inside of do_send/do_recv. Fix this by introducing new available bytes accessor functions raw_get_data_ready and raw_get_buffer_space which are robust against mad ring states, and only return sanitised values. Proof sketch of correctness: Now {rd,wr}_{cons,prod} are only ever used in the raw available bytes functions, and in do_send and do_recv. The raw available bytes functions do unsigned arithmetic on the returned values. If the result is "negative" or too big it will be >ring_size (since we used unsigned arithmetic). Otherwise the result is a positive in-range value representing a reasonable ring state, in which case we can safely convert it to int (as the rest of the code expects). do_send and do_recv immediately mask the ring index value with the ring size. The result is always going to be plausible. If the ring state has become mad, the worst case is that our behaviour is inconsistent with the peer's ring pointer. I.e. we read or write to arguably-incorrect parts of the ring - but always parts of the ring. And of course if a peer misoperates the ring they can achieve this effect anyway. So the security problem is fixed. This is XSA-86. (The patch is essentially Ian Jackson's work, although parts of the commit message are by Marek.) Signed-off-by: Marek Marczykowski-Górecki Signed-off-by: Ian Jackson master commit: 2efcb0193bf3916c8ce34882e845f5ceb1e511f7 master date: 2014-02-06 16:44:41 +0100 --- tools/libvchan/io.c | 47 +++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 41 insertions(+), 6 deletions(-) diff --git a/tools/libvchan/io.c b/tools/libvchan/io.c index 3c8d236..40d072d 100644 --- a/tools/libvchan/io.c +++ b/tools/libvchan/io.c @@ -111,12 +111,26 @@ static inline int send_notify(struct libxenvchan *ctrl, uint8_t bit) return 0; } +/* + * Get the amount of buffer space available, and do nothing about + * notifications. + */ +static inline int raw_get_data_ready(struct libxenvchan *ctrl) +{ + uint32_t ready = rd_prod(ctrl) - rd_cons(ctrl); + if (ready >= rd_ring_size(ctrl)) + /* We have no way to return errors. Locking up the ring is + * better than the alternatives. */ + return 0; + return ready; +} + /** * Get the amount of buffer space available and enable notifications if needed. */ static inline int fast_get_data_ready(struct libxenvchan *ctrl, size_t request) { - int ready = rd_prod(ctrl) - rd_cons(ctrl); + int ready = raw_get_data_ready(ctrl); if (ready >= request) return ready; /* We plan to consume all data; please tell us if you send more */ @@ -126,7 +140,7 @@ static inline int fast_get_data_ready(struct libxenvchan *ctrl, size_t request) * will not get notified even though the actual amount of data ready is * above request. Reread rd_prod to cover this case. */ - return rd_prod(ctrl) - rd_cons(ctrl); + return raw_get_data_ready(ctrl); } int libxenvchan_data_ready(struct libxenvchan *ctrl) @@ -135,7 +149,21 @@ int libxenvchan_data_ready(struct libxenvchan *ctrl) * when it changes */ request_notify(ctrl, VCHAN_NOTIFY_WRITE); - return rd_prod(ctrl) - rd_cons(ctrl); + return raw_get_data_ready(ctrl); +} + +/** + * Get the amount of buffer space available, and do nothing + * about notifications + */ +static inline int raw_get_buffer_space(struct libxenvchan *ctrl) +{ + uint32_t ready = wr_ring_size(ctrl) - (wr_prod(ctrl) - wr_cons(ctrl)); + if (ready > wr_ring_size(ctrl)) + /* We have no way to return errors. Locking up the ring is + * better than the alternatives. */ + return 0; + return ready; } /** @@ -143,7 +171,7 @@ int libxenvchan_data_ready(struct libxenvchan *ctrl) */ static inline int fast_get_buffer_space(struct libxenvchan *ctrl, size_t request) { - int ready = wr_ring_size(ctrl) - (wr_prod(ctrl) - wr_cons(ctrl)); + int ready = raw_get_buffer_space(ctrl); if (ready >= request) return ready; /* We plan to fill the buffer; please tell us when you've read it */ @@ -153,7 +181,7 @@ static inline int fast_get_buffer_space(struct libxenvchan *ctrl, size_t request * will not get notified even though the actual amount of buffer space * is above request. Reread wr_cons to cover this case. */ - return wr_ring_size(ctrl) - (wr_prod(ctrl) - wr_cons(ctrl)); + return raw_get_buffer_space(ctrl); } int libxenvchan_buffer_space(struct libxenvchan *ctrl) @@ -162,7 +190,7 @@ int libxenvchan_buffer_space(struct libxenvchan *ctrl) * when it changes */ request_notify(ctrl, VCHAN_NOTIFY_READ); - return wr_ring_size(ctrl) - (wr_prod(ctrl) - wr_cons(ctrl)); + return raw_get_buffer_space(ctrl); } int libxenvchan_wait(struct libxenvchan *ctrl) @@ -176,6 +204,8 @@ int libxenvchan_wait(struct libxenvchan *ctrl) /** * returns -1 on error, or size on success + * + * caller must have checked that enough space is available */ static int do_send(struct libxenvchan *ctrl, const void *data, size_t size) { @@ -248,6 +278,11 @@ int libxenvchan_write(struct libxenvchan *ctrl, const void *data, size_t size) } } +/** + * returns -1 on error, or size on success + * + * caller must have checked that enough data is available + */ static int do_recv(struct libxenvchan *ctrl, void *data, size_t size) { int real_idx = rd_cons(ctrl) & (rd_ring_size(ctrl) - 1); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 --===============2367674771004249115== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============2367674771004249115==-- From xen-changelog-bounces@lists.xen.org Fri Feb 07 09:11:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Feb 2014 09:11:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBhT6-000560-4d; Fri, 07 Feb 2014 09:11:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBhT4-00055i-IP for xen-changelog@lists.xensource.com; Fri, 07 Feb 2014 09:11:26 +0000 Received: from [85.158.137.68:8606] by server-9.bemta-3.messagelabs.com id 7C/50-10184-D33A4F25; Fri, 07 Feb 2014 09:11:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1391764283!254009!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11998 invoked from network); 7 Feb 2014 09:11:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 Feb 2014 09:11:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBhT1-00031B-IT for xen-changelog@lists.xensource.com; Fri, 07 Feb 2014 09:11:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WBhT1-0003Vf-GO for xen-changelog@lists.xensource.com; Fri, 07 Feb 2014 09:11:23 +0000 Date: Fri, 07 Feb 2014 09:11:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libvchan: Fix handling of invalid ring buffer indices X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2367674771004249115==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============2367674771004249115== Content-Type: text/plain commit d7c6be61836b0a4d996f82d3e7c7e50150996701 Author: Marek Marczykowski-Górecki AuthorDate: Thu Feb 6 17:27:10 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 6 17:27:10 2014 +0100 libvchan: Fix handling of invalid ring buffer indices The remote (hostile) process can set ring buffer indices to any value at any time. If that happens, it is possible to get "buffer space" (either for writing data, or ready for reading) negative or greater than buffer size. This will end up with buffer overflow in the second memcpy inside of do_send/do_recv. Fix this by introducing new available bytes accessor functions raw_get_data_ready and raw_get_buffer_space which are robust against mad ring states, and only return sanitised values. Proof sketch of correctness: Now {rd,wr}_{cons,prod} are only ever used in the raw available bytes functions, and in do_send and do_recv. The raw available bytes functions do unsigned arithmetic on the returned values. If the result is "negative" or too big it will be >ring_size (since we used unsigned arithmetic). Otherwise the result is a positive in-range value representing a reasonable ring state, in which case we can safely convert it to int (as the rest of the code expects). do_send and do_recv immediately mask the ring index value with the ring size. The result is always going to be plausible. If the ring state has become mad, the worst case is that our behaviour is inconsistent with the peer's ring pointer. I.e. we read or write to arguably-incorrect parts of the ring - but always parts of the ring. And of course if a peer misoperates the ring they can achieve this effect anyway. So the security problem is fixed. This is XSA-86. (The patch is essentially Ian Jackson's work, although parts of the commit message are by Marek.) Signed-off-by: Marek Marczykowski-Górecki Signed-off-by: Ian Jackson master commit: 2efcb0193bf3916c8ce34882e845f5ceb1e511f7 master date: 2014-02-06 16:44:41 +0100 --- tools/libvchan/io.c | 47 +++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 41 insertions(+), 6 deletions(-) diff --git a/tools/libvchan/io.c b/tools/libvchan/io.c index 3c8d236..40d072d 100644 --- a/tools/libvchan/io.c +++ b/tools/libvchan/io.c @@ -111,12 +111,26 @@ static inline int send_notify(struct libxenvchan *ctrl, uint8_t bit) return 0; } +/* + * Get the amount of buffer space available, and do nothing about + * notifications. + */ +static inline int raw_get_data_ready(struct libxenvchan *ctrl) +{ + uint32_t ready = rd_prod(ctrl) - rd_cons(ctrl); + if (ready >= rd_ring_size(ctrl)) + /* We have no way to return errors. Locking up the ring is + * better than the alternatives. */ + return 0; + return ready; +} + /** * Get the amount of buffer space available and enable notifications if needed. */ static inline int fast_get_data_ready(struct libxenvchan *ctrl, size_t request) { - int ready = rd_prod(ctrl) - rd_cons(ctrl); + int ready = raw_get_data_ready(ctrl); if (ready >= request) return ready; /* We plan to consume all data; please tell us if you send more */ @@ -126,7 +140,7 @@ static inline int fast_get_data_ready(struct libxenvchan *ctrl, size_t request) * will not get notified even though the actual amount of data ready is * above request. Reread rd_prod to cover this case. */ - return rd_prod(ctrl) - rd_cons(ctrl); + return raw_get_data_ready(ctrl); } int libxenvchan_data_ready(struct libxenvchan *ctrl) @@ -135,7 +149,21 @@ int libxenvchan_data_ready(struct libxenvchan *ctrl) * when it changes */ request_notify(ctrl, VCHAN_NOTIFY_WRITE); - return rd_prod(ctrl) - rd_cons(ctrl); + return raw_get_data_ready(ctrl); +} + +/** + * Get the amount of buffer space available, and do nothing + * about notifications + */ +static inline int raw_get_buffer_space(struct libxenvchan *ctrl) +{ + uint32_t ready = wr_ring_size(ctrl) - (wr_prod(ctrl) - wr_cons(ctrl)); + if (ready > wr_ring_size(ctrl)) + /* We have no way to return errors. Locking up the ring is + * better than the alternatives. */ + return 0; + return ready; } /** @@ -143,7 +171,7 @@ int libxenvchan_data_ready(struct libxenvchan *ctrl) */ static inline int fast_get_buffer_space(struct libxenvchan *ctrl, size_t request) { - int ready = wr_ring_size(ctrl) - (wr_prod(ctrl) - wr_cons(ctrl)); + int ready = raw_get_buffer_space(ctrl); if (ready >= request) return ready; /* We plan to fill the buffer; please tell us when you've read it */ @@ -153,7 +181,7 @@ static inline int fast_get_buffer_space(struct libxenvchan *ctrl, size_t request * will not get notified even though the actual amount of buffer space * is above request. Reread wr_cons to cover this case. */ - return wr_ring_size(ctrl) - (wr_prod(ctrl) - wr_cons(ctrl)); + return raw_get_buffer_space(ctrl); } int libxenvchan_buffer_space(struct libxenvchan *ctrl) @@ -162,7 +190,7 @@ int libxenvchan_buffer_space(struct libxenvchan *ctrl) * when it changes */ request_notify(ctrl, VCHAN_NOTIFY_READ); - return wr_ring_size(ctrl) - (wr_prod(ctrl) - wr_cons(ctrl)); + return raw_get_buffer_space(ctrl); } int libxenvchan_wait(struct libxenvchan *ctrl) @@ -176,6 +204,8 @@ int libxenvchan_wait(struct libxenvchan *ctrl) /** * returns -1 on error, or size on success + * + * caller must have checked that enough space is available */ static int do_send(struct libxenvchan *ctrl, const void *data, size_t size) { @@ -248,6 +278,11 @@ int libxenvchan_write(struct libxenvchan *ctrl, const void *data, size_t size) } } +/** + * returns -1 on error, or size on success + * + * caller must have checked that enough data is available + */ static int do_recv(struct libxenvchan *ctrl, void *data, size_t size) { int real_idx = rd_cons(ctrl) & (rd_ring_size(ctrl) - 1); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 --===============2367674771004249115== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============2367674771004249115==-- From xen-changelog-bounces@lists.xen.org Fri Feb 07 09:11:31 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Feb 2014 09:11:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBhT9-00056q-8q; Fri, 07 Feb 2014 09:11:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBhT7-00056Z-WE for xen-changelog@lists.xensource.com; Fri, 07 Feb 2014 09:11:30 +0000 Received: from [193.109.254.147:2821] by server-7.bemta-14.messagelabs.com id A2/57-23424-143A4F25; Fri, 07 Feb 2014 09:11:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1391764287!2678709!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12121 invoked from network); 7 Feb 2014 09:11:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 7 Feb 2014 09:11:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBhSr-000318-E2 for xen-changelog@lists.xensource.com; Fri, 07 Feb 2014 09:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WBhSr-0003VJ-BE for xen-changelog@lists.xensource.com; Fri, 07 Feb 2014 09:11:13 +0000 Date: Fri, 07 Feb 2014 09:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] xsm/flask: correct off-by-one in flask_security_avc_cachestats cpu id check X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 11b3280cc0ce64b375492416a23aa6a15f45a796 Author: Matthew Daley AuthorDate: Thu Feb 6 17:25:43 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 6 17:25:43 2014 +0100 xsm/flask: correct off-by-one in flask_security_avc_cachestats cpu id check This is XSA-85. Signed-off-by: Matthew Daley Reviewed-by: Jan Beulich Reviewed-by: Ian Campbell master commit: 2e1cba2da4631c5cd7218a8f30d521dce0f41370 master date: 2014-02-06 16:42:36 +0100 --- xen/xsm/flask/flask_op.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index f8deb37..4b93e71 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -464,7 +464,7 @@ static int flask_security_avc_cachestats(struct xen_flask_cache_stats *arg) { struct avc_cache_stats *st; - if ( arg->cpu > nr_cpu_ids ) + if ( arg->cpu >= nr_cpu_ids ) return -ENOENT; if ( !cpu_online(arg->cpu) ) return -ENOENT; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Feb 07 09:11:31 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 07 Feb 2014 09:11:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBhT9-00056q-8q; Fri, 07 Feb 2014 09:11:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBhT7-00056Z-WE for xen-changelog@lists.xensource.com; Fri, 07 Feb 2014 09:11:30 +0000 Received: from [193.109.254.147:2821] by server-7.bemta-14.messagelabs.com id A2/57-23424-143A4F25; Fri, 07 Feb 2014 09:11:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1391764287!2678709!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12121 invoked from network); 7 Feb 2014 09:11:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 7 Feb 2014 09:11:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WBhSr-000318-E2 for xen-changelog@lists.xensource.com; Fri, 07 Feb 2014 09:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WBhSr-0003VJ-BE for xen-changelog@lists.xensource.com; Fri, 07 Feb 2014 09:11:13 +0000 Date: Fri, 07 Feb 2014 09:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] xsm/flask: correct off-by-one in flask_security_avc_cachestats cpu id check X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 11b3280cc0ce64b375492416a23aa6a15f45a796 Author: Matthew Daley AuthorDate: Thu Feb 6 17:25:43 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 6 17:25:43 2014 +0100 xsm/flask: correct off-by-one in flask_security_avc_cachestats cpu id check This is XSA-85. Signed-off-by: Matthew Daley Reviewed-by: Jan Beulich Reviewed-by: Ian Campbell master commit: 2e1cba2da4631c5cd7218a8f30d521dce0f41370 master date: 2014-02-06 16:42:36 +0100 --- xen/xsm/flask/flask_op.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index f8deb37..4b93e71 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -464,7 +464,7 @@ static int flask_security_avc_cachestats(struct xen_flask_cache_stats *arg) { struct avc_cache_stats *st; - if ( arg->cpu > nr_cpu_ids ) + if ( arg->cpu >= nr_cpu_ids ) return -ENOENT; if ( !cpu_online(arg->cpu) ) return -ENOENT; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Feb 09 04:33:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 09 Feb 2014 04:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WCM4p-0003QC-Gl; Sun, 09 Feb 2014 04:33:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WCM4o-0003Q5-65 for xen-changelog@lists.xensource.com; Sun, 09 Feb 2014 04:33:06 +0000 Received: from [85.158.143.35:17190] by server-1.bemta-4.messagelabs.com id C4/45-31661-10507F25; Sun, 09 Feb 2014 04:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1391920383!4227808!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17651 invoked from network); 9 Feb 2014 04:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 9 Feb 2014 04:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WCM4l-000147-9X for xen-changelog@lists.xensource.com; Sun, 09 Feb 2014 04:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WCM4k-0000k8-UG for xen-changelog@lists.xensource.com; Sun, 09 Feb 2014 04:33:03 +0000 Date: Sun, 09 Feb 2014 04:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] flask: fix reading strings from guest memory X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 6c6b5568e8d2342de1bb653eb70aee4615430db0 Author: Jan Beulich AuthorDate: Thu Feb 6 17:36:40 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 6 17:36:40 2014 +0100 flask: fix reading strings from guest memory Since the string size is being specified by the guest, we must range check it properly before doing allocations based on it. While for the two cases that are exposed only to trusted guests (via policy restriction) this just uses an arbitrary upper limit (PAGE_SIZE), for the FLASK_[GS]ETBOOL case (which any guest can use) the upper limit gets enforced based on the longest name across all boolean settings. This is XSA-84. Reported-by: Matthew Daley Signed-off-by: Jan Beulich Acked-by: Daniel De Graaf master commit: 6c79e0ab9ac6042e60434c02e1d99b0cf0cc3470 master date: 2014-02-06 16:33:50 +0100 --- xen/xsm/flask/flask_op.c | 21 ++++++++++++++------- xen/xsm/flask/include/conditional.h | 4 +++- xen/xsm/flask/ss/services.c | 17 ++++++++++------- 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index bd4db37..60b606e 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -53,6 +53,7 @@ static DEFINE_SPINLOCK(sel_sem); /* global data for booleans */ static int bool_num = 0; static int *bool_pending_values = NULL; +static size_t bool_maxstr; static int flask_security_make_bools(void); extern int ss_initialized; @@ -71,9 +72,15 @@ static int domain_has_security(struct domain *d, u32 perms) perms, NULL); } -static int flask_copyin_string(XEN_GUEST_HANDLE(char) u_buf, char **buf, uint32_t size) +static int flask_copyin_string(XEN_GUEST_HANDLE(char) u_buf, char **buf, + size_t size, size_t max_size) { - char *tmp = xmalloc_bytes(size + 1); + char *tmp; + + if ( size > max_size ) + return -ENOENT; + + tmp = xmalloc_array(char, size + 1); if ( !tmp ) return -ENOMEM; @@ -99,7 +106,7 @@ static int flask_security_user(struct xen_flask_userlist *arg) if ( rv ) return rv; - rv = flask_copyin_string(arg->u.user, &user, arg->size); + rv = flask_copyin_string(arg->u.user, &user, arg->size, PAGE_SIZE); if ( rv ) return rv; @@ -210,7 +217,7 @@ static int flask_security_context(struct xen_flask_sid_context *arg) if ( rv ) return rv; - rv = flask_copyin_string(arg->context, &buf, arg->size); + rv = flask_copyin_string(arg->context, &buf, arg->size, PAGE_SIZE); if ( rv ) return rv; @@ -303,7 +310,7 @@ static int flask_security_resolve_bool(struct xen_flask_boolean *arg) if ( arg->bool_id != -1 ) return 0; - rv = flask_copyin_string(arg->name, &name, arg->size); + rv = flask_copyin_string(arg->name, &name, arg->size, bool_maxstr); if ( rv ) return rv; @@ -334,7 +341,7 @@ static int flask_security_set_bool(struct xen_flask_boolean *arg) int num; int *values; - rv = security_get_bools(&num, NULL, &values); + rv = security_get_bools(&num, NULL, &values, NULL); if ( rv != 0 ) goto out; @@ -440,7 +447,7 @@ static int flask_security_make_bools(void) xfree(bool_pending_values); - ret = security_get_bools(&num, NULL, &values); + ret = security_get_bools(&num, NULL, &values, &bool_maxstr); if ( ret != 0 ) goto out; diff --git a/xen/xsm/flask/include/conditional.h b/xen/xsm/flask/include/conditional.h index 2fa0a30..043cfd8 100644 --- a/xen/xsm/flask/include/conditional.h +++ b/xen/xsm/flask/include/conditional.h @@ -13,7 +13,9 @@ #ifndef _FLASK_CONDITIONAL_H_ #define _FLASK_CONDITIONAL_H_ -int security_get_bools(int *len, char ***names, int **values); +#include + +int security_get_bools(int *len, char ***names, int **values, size_t *maxstr); int security_set_bools(int len, int *values); diff --git a/xen/xsm/flask/ss/services.c b/xen/xsm/flask/ss/services.c index 363f586..c4704c4 100644 --- a/xen/xsm/flask/ss/services.c +++ b/xen/xsm/flask/ss/services.c @@ -1900,7 +1900,7 @@ int security_find_bool(const char *name) return rv; } -int security_get_bools(int *len, char ***names, int **values) +int security_get_bools(int *len, char ***names, int **values, size_t *maxstr) { int i, rc = -ENOMEM; @@ -1908,6 +1908,8 @@ int security_get_bools(int *len, char ***names, int **values) if ( names ) *names = NULL; *values = NULL; + if ( maxstr ) + *maxstr = 0; *len = policydb.p_bools.nprim; if ( !*len ) @@ -1929,16 +1931,17 @@ int security_get_bools(int *len, char ***names, int **values) for ( i = 0; i < *len; i++ ) { - size_t name_len; + size_t name_len = strlen(policydb.p_bool_val_to_name[i]); + (*values)[i] = policydb.bool_val_to_struct[i]->state; if ( names ) { - name_len = strlen(policydb.p_bool_val_to_name[i]) + 1; - (*names)[i] = (char*)xmalloc_array(char, name_len); + (*names)[i] = xmalloc_array(char, name_len + 1); if ( !(*names)[i] ) goto err; - strlcpy((*names)[i], policydb.p_bool_val_to_name[i], name_len); - (*names)[i][name_len - 1] = 0; + strlcpy((*names)[i], policydb.p_bool_val_to_name[i], name_len + 1); } + if ( maxstr && name_len > *maxstr ) + *maxstr = name_len; } rc = 0; out: @@ -2056,7 +2059,7 @@ static int security_preserve_bools(struct policydb *p) struct cond_bool_datum *booldatum; struct cond_node *cur; - rc = security_get_bools(&nbools, &bnames, &bvalues); + rc = security_get_bools(&nbools, &bnames, &bvalues, NULL); if ( rc ) goto out; for ( i = 0; i < nbools; i++ ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Feb 09 04:33:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 09 Feb 2014 04:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WCM4p-0003QC-Gl; Sun, 09 Feb 2014 04:33:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WCM4o-0003Q5-65 for xen-changelog@lists.xensource.com; Sun, 09 Feb 2014 04:33:06 +0000 Received: from [85.158.143.35:17190] by server-1.bemta-4.messagelabs.com id C4/45-31661-10507F25; Sun, 09 Feb 2014 04:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1391920383!4227808!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17651 invoked from network); 9 Feb 2014 04:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 9 Feb 2014 04:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WCM4l-000147-9X for xen-changelog@lists.xensource.com; Sun, 09 Feb 2014 04:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WCM4k-0000k8-UG for xen-changelog@lists.xensource.com; Sun, 09 Feb 2014 04:33:03 +0000 Date: Sun, 09 Feb 2014 04:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] flask: fix reading strings from guest memory X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 6c6b5568e8d2342de1bb653eb70aee4615430db0 Author: Jan Beulich AuthorDate: Thu Feb 6 17:36:40 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 6 17:36:40 2014 +0100 flask: fix reading strings from guest memory Since the string size is being specified by the guest, we must range check it properly before doing allocations based on it. While for the two cases that are exposed only to trusted guests (via policy restriction) this just uses an arbitrary upper limit (PAGE_SIZE), for the FLASK_[GS]ETBOOL case (which any guest can use) the upper limit gets enforced based on the longest name across all boolean settings. This is XSA-84. Reported-by: Matthew Daley Signed-off-by: Jan Beulich Acked-by: Daniel De Graaf master commit: 6c79e0ab9ac6042e60434c02e1d99b0cf0cc3470 master date: 2014-02-06 16:33:50 +0100 --- xen/xsm/flask/flask_op.c | 21 ++++++++++++++------- xen/xsm/flask/include/conditional.h | 4 +++- xen/xsm/flask/ss/services.c | 17 ++++++++++------- 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index bd4db37..60b606e 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -53,6 +53,7 @@ static DEFINE_SPINLOCK(sel_sem); /* global data for booleans */ static int bool_num = 0; static int *bool_pending_values = NULL; +static size_t bool_maxstr; static int flask_security_make_bools(void); extern int ss_initialized; @@ -71,9 +72,15 @@ static int domain_has_security(struct domain *d, u32 perms) perms, NULL); } -static int flask_copyin_string(XEN_GUEST_HANDLE(char) u_buf, char **buf, uint32_t size) +static int flask_copyin_string(XEN_GUEST_HANDLE(char) u_buf, char **buf, + size_t size, size_t max_size) { - char *tmp = xmalloc_bytes(size + 1); + char *tmp; + + if ( size > max_size ) + return -ENOENT; + + tmp = xmalloc_array(char, size + 1); if ( !tmp ) return -ENOMEM; @@ -99,7 +106,7 @@ static int flask_security_user(struct xen_flask_userlist *arg) if ( rv ) return rv; - rv = flask_copyin_string(arg->u.user, &user, arg->size); + rv = flask_copyin_string(arg->u.user, &user, arg->size, PAGE_SIZE); if ( rv ) return rv; @@ -210,7 +217,7 @@ static int flask_security_context(struct xen_flask_sid_context *arg) if ( rv ) return rv; - rv = flask_copyin_string(arg->context, &buf, arg->size); + rv = flask_copyin_string(arg->context, &buf, arg->size, PAGE_SIZE); if ( rv ) return rv; @@ -303,7 +310,7 @@ static int flask_security_resolve_bool(struct xen_flask_boolean *arg) if ( arg->bool_id != -1 ) return 0; - rv = flask_copyin_string(arg->name, &name, arg->size); + rv = flask_copyin_string(arg->name, &name, arg->size, bool_maxstr); if ( rv ) return rv; @@ -334,7 +341,7 @@ static int flask_security_set_bool(struct xen_flask_boolean *arg) int num; int *values; - rv = security_get_bools(&num, NULL, &values); + rv = security_get_bools(&num, NULL, &values, NULL); if ( rv != 0 ) goto out; @@ -440,7 +447,7 @@ static int flask_security_make_bools(void) xfree(bool_pending_values); - ret = security_get_bools(&num, NULL, &values); + ret = security_get_bools(&num, NULL, &values, &bool_maxstr); if ( ret != 0 ) goto out; diff --git a/xen/xsm/flask/include/conditional.h b/xen/xsm/flask/include/conditional.h index 2fa0a30..043cfd8 100644 --- a/xen/xsm/flask/include/conditional.h +++ b/xen/xsm/flask/include/conditional.h @@ -13,7 +13,9 @@ #ifndef _FLASK_CONDITIONAL_H_ #define _FLASK_CONDITIONAL_H_ -int security_get_bools(int *len, char ***names, int **values); +#include + +int security_get_bools(int *len, char ***names, int **values, size_t *maxstr); int security_set_bools(int len, int *values); diff --git a/xen/xsm/flask/ss/services.c b/xen/xsm/flask/ss/services.c index 363f586..c4704c4 100644 --- a/xen/xsm/flask/ss/services.c +++ b/xen/xsm/flask/ss/services.c @@ -1900,7 +1900,7 @@ int security_find_bool(const char *name) return rv; } -int security_get_bools(int *len, char ***names, int **values) +int security_get_bools(int *len, char ***names, int **values, size_t *maxstr) { int i, rc = -ENOMEM; @@ -1908,6 +1908,8 @@ int security_get_bools(int *len, char ***names, int **values) if ( names ) *names = NULL; *values = NULL; + if ( maxstr ) + *maxstr = 0; *len = policydb.p_bools.nprim; if ( !*len ) @@ -1929,16 +1931,17 @@ int security_get_bools(int *len, char ***names, int **values) for ( i = 0; i < *len; i++ ) { - size_t name_len; + size_t name_len = strlen(policydb.p_bool_val_to_name[i]); + (*values)[i] = policydb.bool_val_to_struct[i]->state; if ( names ) { - name_len = strlen(policydb.p_bool_val_to_name[i]) + 1; - (*names)[i] = (char*)xmalloc_array(char, name_len); + (*names)[i] = xmalloc_array(char, name_len + 1); if ( !(*names)[i] ) goto err; - strlcpy((*names)[i], policydb.p_bool_val_to_name[i], name_len); - (*names)[i][name_len - 1] = 0; + strlcpy((*names)[i], policydb.p_bool_val_to_name[i], name_len + 1); } + if ( maxstr && name_len > *maxstr ) + *maxstr = name_len; } rc = 0; out: @@ -2056,7 +2059,7 @@ static int security_preserve_bools(struct policydb *p) struct cond_bool_datum *booldatum; struct cond_node *cur; - rc = security_get_bools(&nbools, &bnames, &bvalues); + rc = security_get_bools(&nbools, &bnames, &bvalues, NULL); if ( rc ) goto out; for ( i = 0; i < nbools; i++ ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Feb 09 04:33:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 09 Feb 2014 04:33: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 1WCM4z-0003Qo-JV; Sun, 09 Feb 2014 04:33:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WCM4y-0003Qf-Iq for xen-changelog@lists.xensource.com; Sun, 09 Feb 2014 04:33:16 +0000 Received: from [85.158.137.68:9686] by server-7.bemta-3.messagelabs.com id E3/1C-13775-B0507F25; Sun, 09 Feb 2014 04:33:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1391920394!585409!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10449 invoked from network); 9 Feb 2014 04:33:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Feb 2014 04:33:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WCM4v-00014A-NC for xen-changelog@lists.xensource.com; Sun, 09 Feb 2014 04:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WCM4v-0000lG-DM for xen-changelog@lists.xensource.com; Sun, 09 Feb 2014 04:33:13 +0000 Date: Sun, 09 Feb 2014 04:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] xsm/flask: correct off-by-one in flask_security_avc_cachestats cpu id check X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 1d65af769af52199132df8ebacc0e7a52fd1f4ca Author: Matthew Daley AuthorDate: Thu Feb 6 17:38:22 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 6 17:38:22 2014 +0100 xsm/flask: correct off-by-one in flask_security_avc_cachestats cpu id check This is XSA-85. Signed-off-by: Matthew Daley Reviewed-by: Jan Beulich Reviewed-by: Ian Campbell master commit: 2e1cba2da4631c5cd7218a8f30d521dce0f41370 master date: 2014-02-06 16:42:36 +0100 --- xen/xsm/flask/flask_op.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index 60b606e..537d287 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -464,7 +464,7 @@ static int flask_security_avc_cachestats(struct xen_flask_cache_stats *arg) { struct avc_cache_stats *st; - if ( arg->cpu > nr_cpu_ids ) + if ( arg->cpu >= nr_cpu_ids ) return -ENOENT; if ( !cpu_online(arg->cpu) ) return -ENOENT; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Feb 09 04:33:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 09 Feb 2014 04:33: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 1WCM4z-0003Qo-JV; Sun, 09 Feb 2014 04:33:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WCM4y-0003Qf-Iq for xen-changelog@lists.xensource.com; Sun, 09 Feb 2014 04:33:16 +0000 Received: from [85.158.137.68:9686] by server-7.bemta-3.messagelabs.com id E3/1C-13775-B0507F25; Sun, 09 Feb 2014 04:33:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1391920394!585409!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10449 invoked from network); 9 Feb 2014 04:33:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Feb 2014 04:33:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WCM4v-00014A-NC for xen-changelog@lists.xensource.com; Sun, 09 Feb 2014 04:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WCM4v-0000lG-DM for xen-changelog@lists.xensource.com; Sun, 09 Feb 2014 04:33:13 +0000 Date: Sun, 09 Feb 2014 04:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] xsm/flask: correct off-by-one in flask_security_avc_cachestats cpu id check X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 1d65af769af52199132df8ebacc0e7a52fd1f4ca Author: Matthew Daley AuthorDate: Thu Feb 6 17:38:22 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 6 17:38:22 2014 +0100 xsm/flask: correct off-by-one in flask_security_avc_cachestats cpu id check This is XSA-85. Signed-off-by: Matthew Daley Reviewed-by: Jan Beulich Reviewed-by: Ian Campbell master commit: 2e1cba2da4631c5cd7218a8f30d521dce0f41370 master date: 2014-02-06 16:42:36 +0100 --- xen/xsm/flask/flask_op.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index 60b606e..537d287 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -464,7 +464,7 @@ static int flask_security_avc_cachestats(struct xen_flask_cache_stats *arg) { struct avc_cache_stats *st; - if ( arg->cpu > nr_cpu_ids ) + if ( arg->cpu >= nr_cpu_ids ) return -ENOENT; if ( !cpu_online(arg->cpu) ) return -ENOENT; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Feb 09 04:33:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 09 Feb 2014 04:33:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WCM5A-0003Rx-MT; Sun, 09 Feb 2014 04:33:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WCM58-0003Rm-V7 for xen-changelog@lists.xensource.com; Sun, 09 Feb 2014 04:33:27 +0000 Received: from [85.158.139.211:8010] by server-12.bemta-5.messagelabs.com id C5/7C-15415-61507F25; Sun, 09 Feb 2014 04:33:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1391920404!2634906!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14935 invoked from network); 9 Feb 2014 04:33:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 9 Feb 2014 04:33:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WCM55-00014J-TT for xen-changelog@lists.xensource.com; Sun, 09 Feb 2014 04:33:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WCM55-0000lc-R9 for xen-changelog@lists.xensource.com; Sun, 09 Feb 2014 04:33:23 +0000 Date: Sun, 09 Feb 2014 04:33:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] libvchan: Fix handling of invalid ring buffer indices X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8742582885886563135==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============8742582885886563135== Content-Type: text/plain commit ae5d69f1c6d6cf5960e72d79ac0840eec1d75856 Author: Marek Marczykowski-Górecki AuthorDate: Thu Feb 6 17:39:17 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 6 17:39:17 2014 +0100 libvchan: Fix handling of invalid ring buffer indices The remote (hostile) process can set ring buffer indices to any value at any time. If that happens, it is possible to get "buffer space" (either for writing data, or ready for reading) negative or greater than buffer size. This will end up with buffer overflow in the second memcpy inside of do_send/do_recv. Fix this by introducing new available bytes accessor functions raw_get_data_ready and raw_get_buffer_space which are robust against mad ring states, and only return sanitised values. Proof sketch of correctness: Now {rd,wr}_{cons,prod} are only ever used in the raw available bytes functions, and in do_send and do_recv. The raw available bytes functions do unsigned arithmetic on the returned values. If the result is "negative" or too big it will be >ring_size (since we used unsigned arithmetic). Otherwise the result is a positive in-range value representing a reasonable ring state, in which case we can safely convert it to int (as the rest of the code expects). do_send and do_recv immediately mask the ring index value with the ring size. The result is always going to be plausible. If the ring state has become mad, the worst case is that our behaviour is inconsistent with the peer's ring pointer. I.e. we read or write to arguably-incorrect parts of the ring - but always parts of the ring. And of course if a peer misoperates the ring they can achieve this effect anyway. So the security problem is fixed. This is XSA-86. (The patch is essentially Ian Jackson's work, although parts of the commit message are by Marek.) Signed-off-by: Marek Marczykowski-Górecki Signed-off-by: Ian Jackson master commit: 2efcb0193bf3916c8ce34882e845f5ceb1e511f7 master date: 2014-02-06 16:44:41 +0100 --- tools/libvchan/io.c | 47 +++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 41 insertions(+), 6 deletions(-) diff --git a/tools/libvchan/io.c b/tools/libvchan/io.c index 3c8d236..40d072d 100644 --- a/tools/libvchan/io.c +++ b/tools/libvchan/io.c @@ -111,12 +111,26 @@ static inline int send_notify(struct libxenvchan *ctrl, uint8_t bit) return 0; } +/* + * Get the amount of buffer space available, and do nothing about + * notifications. + */ +static inline int raw_get_data_ready(struct libxenvchan *ctrl) +{ + uint32_t ready = rd_prod(ctrl) - rd_cons(ctrl); + if (ready >= rd_ring_size(ctrl)) + /* We have no way to return errors. Locking up the ring is + * better than the alternatives. */ + return 0; + return ready; +} + /** * Get the amount of buffer space available and enable notifications if needed. */ static inline int fast_get_data_ready(struct libxenvchan *ctrl, size_t request) { - int ready = rd_prod(ctrl) - rd_cons(ctrl); + int ready = raw_get_data_ready(ctrl); if (ready >= request) return ready; /* We plan to consume all data; please tell us if you send more */ @@ -126,7 +140,7 @@ static inline int fast_get_data_ready(struct libxenvchan *ctrl, size_t request) * will not get notified even though the actual amount of data ready is * above request. Reread rd_prod to cover this case. */ - return rd_prod(ctrl) - rd_cons(ctrl); + return raw_get_data_ready(ctrl); } int libxenvchan_data_ready(struct libxenvchan *ctrl) @@ -135,7 +149,21 @@ int libxenvchan_data_ready(struct libxenvchan *ctrl) * when it changes */ request_notify(ctrl, VCHAN_NOTIFY_WRITE); - return rd_prod(ctrl) - rd_cons(ctrl); + return raw_get_data_ready(ctrl); +} + +/** + * Get the amount of buffer space available, and do nothing + * about notifications + */ +static inline int raw_get_buffer_space(struct libxenvchan *ctrl) +{ + uint32_t ready = wr_ring_size(ctrl) - (wr_prod(ctrl) - wr_cons(ctrl)); + if (ready > wr_ring_size(ctrl)) + /* We have no way to return errors. Locking up the ring is + * better than the alternatives. */ + return 0; + return ready; } /** @@ -143,7 +171,7 @@ int libxenvchan_data_ready(struct libxenvchan *ctrl) */ static inline int fast_get_buffer_space(struct libxenvchan *ctrl, size_t request) { - int ready = wr_ring_size(ctrl) - (wr_prod(ctrl) - wr_cons(ctrl)); + int ready = raw_get_buffer_space(ctrl); if (ready >= request) return ready; /* We plan to fill the buffer; please tell us when you've read it */ @@ -153,7 +181,7 @@ static inline int fast_get_buffer_space(struct libxenvchan *ctrl, size_t request * will not get notified even though the actual amount of buffer space * is above request. Reread wr_cons to cover this case. */ - return wr_ring_size(ctrl) - (wr_prod(ctrl) - wr_cons(ctrl)); + return raw_get_buffer_space(ctrl); } int libxenvchan_buffer_space(struct libxenvchan *ctrl) @@ -162,7 +190,7 @@ int libxenvchan_buffer_space(struct libxenvchan *ctrl) * when it changes */ request_notify(ctrl, VCHAN_NOTIFY_READ); - return wr_ring_size(ctrl) - (wr_prod(ctrl) - wr_cons(ctrl)); + return raw_get_buffer_space(ctrl); } int libxenvchan_wait(struct libxenvchan *ctrl) @@ -176,6 +204,8 @@ int libxenvchan_wait(struct libxenvchan *ctrl) /** * returns -1 on error, or size on success + * + * caller must have checked that enough space is available */ static int do_send(struct libxenvchan *ctrl, const void *data, size_t size) { @@ -248,6 +278,11 @@ int libxenvchan_write(struct libxenvchan *ctrl, const void *data, size_t size) } } +/** + * returns -1 on error, or size on success + * + * caller must have checked that enough data is available + */ static int do_recv(struct libxenvchan *ctrl, void *data, size_t size) { int real_idx = rd_cons(ctrl) & (rd_ring_size(ctrl) - 1); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 --===============8742582885886563135== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============8742582885886563135==-- From xen-changelog-bounces@lists.xen.org Sun Feb 09 04:33:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 09 Feb 2014 04:33:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WCM5A-0003Rx-MT; Sun, 09 Feb 2014 04:33:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WCM58-0003Rm-V7 for xen-changelog@lists.xensource.com; Sun, 09 Feb 2014 04:33:27 +0000 Received: from [85.158.139.211:8010] by server-12.bemta-5.messagelabs.com id C5/7C-15415-61507F25; Sun, 09 Feb 2014 04:33:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1391920404!2634906!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14935 invoked from network); 9 Feb 2014 04:33:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 9 Feb 2014 04:33:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WCM55-00014J-TT for xen-changelog@lists.xensource.com; Sun, 09 Feb 2014 04:33:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WCM55-0000lc-R9 for xen-changelog@lists.xensource.com; Sun, 09 Feb 2014 04:33:23 +0000 Date: Sun, 09 Feb 2014 04:33:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] libvchan: Fix handling of invalid ring buffer indices X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8742582885886563135==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============8742582885886563135== Content-Type: text/plain commit ae5d69f1c6d6cf5960e72d79ac0840eec1d75856 Author: Marek Marczykowski-Górecki AuthorDate: Thu Feb 6 17:39:17 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 6 17:39:17 2014 +0100 libvchan: Fix handling of invalid ring buffer indices The remote (hostile) process can set ring buffer indices to any value at any time. If that happens, it is possible to get "buffer space" (either for writing data, or ready for reading) negative or greater than buffer size. This will end up with buffer overflow in the second memcpy inside of do_send/do_recv. Fix this by introducing new available bytes accessor functions raw_get_data_ready and raw_get_buffer_space which are robust against mad ring states, and only return sanitised values. Proof sketch of correctness: Now {rd,wr}_{cons,prod} are only ever used in the raw available bytes functions, and in do_send and do_recv. The raw available bytes functions do unsigned arithmetic on the returned values. If the result is "negative" or too big it will be >ring_size (since we used unsigned arithmetic). Otherwise the result is a positive in-range value representing a reasonable ring state, in which case we can safely convert it to int (as the rest of the code expects). do_send and do_recv immediately mask the ring index value with the ring size. The result is always going to be plausible. If the ring state has become mad, the worst case is that our behaviour is inconsistent with the peer's ring pointer. I.e. we read or write to arguably-incorrect parts of the ring - but always parts of the ring. And of course if a peer misoperates the ring they can achieve this effect anyway. So the security problem is fixed. This is XSA-86. (The patch is essentially Ian Jackson's work, although parts of the commit message are by Marek.) Signed-off-by: Marek Marczykowski-Górecki Signed-off-by: Ian Jackson master commit: 2efcb0193bf3916c8ce34882e845f5ceb1e511f7 master date: 2014-02-06 16:44:41 +0100 --- tools/libvchan/io.c | 47 +++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 41 insertions(+), 6 deletions(-) diff --git a/tools/libvchan/io.c b/tools/libvchan/io.c index 3c8d236..40d072d 100644 --- a/tools/libvchan/io.c +++ b/tools/libvchan/io.c @@ -111,12 +111,26 @@ static inline int send_notify(struct libxenvchan *ctrl, uint8_t bit) return 0; } +/* + * Get the amount of buffer space available, and do nothing about + * notifications. + */ +static inline int raw_get_data_ready(struct libxenvchan *ctrl) +{ + uint32_t ready = rd_prod(ctrl) - rd_cons(ctrl); + if (ready >= rd_ring_size(ctrl)) + /* We have no way to return errors. Locking up the ring is + * better than the alternatives. */ + return 0; + return ready; +} + /** * Get the amount of buffer space available and enable notifications if needed. */ static inline int fast_get_data_ready(struct libxenvchan *ctrl, size_t request) { - int ready = rd_prod(ctrl) - rd_cons(ctrl); + int ready = raw_get_data_ready(ctrl); if (ready >= request) return ready; /* We plan to consume all data; please tell us if you send more */ @@ -126,7 +140,7 @@ static inline int fast_get_data_ready(struct libxenvchan *ctrl, size_t request) * will not get notified even though the actual amount of data ready is * above request. Reread rd_prod to cover this case. */ - return rd_prod(ctrl) - rd_cons(ctrl); + return raw_get_data_ready(ctrl); } int libxenvchan_data_ready(struct libxenvchan *ctrl) @@ -135,7 +149,21 @@ int libxenvchan_data_ready(struct libxenvchan *ctrl) * when it changes */ request_notify(ctrl, VCHAN_NOTIFY_WRITE); - return rd_prod(ctrl) - rd_cons(ctrl); + return raw_get_data_ready(ctrl); +} + +/** + * Get the amount of buffer space available, and do nothing + * about notifications + */ +static inline int raw_get_buffer_space(struct libxenvchan *ctrl) +{ + uint32_t ready = wr_ring_size(ctrl) - (wr_prod(ctrl) - wr_cons(ctrl)); + if (ready > wr_ring_size(ctrl)) + /* We have no way to return errors. Locking up the ring is + * better than the alternatives. */ + return 0; + return ready; } /** @@ -143,7 +171,7 @@ int libxenvchan_data_ready(struct libxenvchan *ctrl) */ static inline int fast_get_buffer_space(struct libxenvchan *ctrl, size_t request) { - int ready = wr_ring_size(ctrl) - (wr_prod(ctrl) - wr_cons(ctrl)); + int ready = raw_get_buffer_space(ctrl); if (ready >= request) return ready; /* We plan to fill the buffer; please tell us when you've read it */ @@ -153,7 +181,7 @@ static inline int fast_get_buffer_space(struct libxenvchan *ctrl, size_t request * will not get notified even though the actual amount of buffer space * is above request. Reread wr_cons to cover this case. */ - return wr_ring_size(ctrl) - (wr_prod(ctrl) - wr_cons(ctrl)); + return raw_get_buffer_space(ctrl); } int libxenvchan_buffer_space(struct libxenvchan *ctrl) @@ -162,7 +190,7 @@ int libxenvchan_buffer_space(struct libxenvchan *ctrl) * when it changes */ request_notify(ctrl, VCHAN_NOTIFY_READ); - return wr_ring_size(ctrl) - (wr_prod(ctrl) - wr_cons(ctrl)); + return raw_get_buffer_space(ctrl); } int libxenvchan_wait(struct libxenvchan *ctrl) @@ -176,6 +204,8 @@ int libxenvchan_wait(struct libxenvchan *ctrl) /** * returns -1 on error, or size on success + * + * caller must have checked that enough space is available */ static int do_send(struct libxenvchan *ctrl, const void *data, size_t size) { @@ -248,6 +278,11 @@ int libxenvchan_write(struct libxenvchan *ctrl, const void *data, size_t size) } } +/** + * returns -1 on error, or size on success + * + * caller must have checked that enough data is available + */ static int do_recv(struct libxenvchan *ctrl, void *data, size_t size) { int real_idx = rd_cons(ctrl) & (rd_ring_size(ctrl) - 1); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 --===============8742582885886563135== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============8742582885886563135==-- From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:55:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:55:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFfx-00032Q-5z; Tue, 11 Feb 2014 15:55:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFfv-000328-Rp for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:55:08 +0000 Received: from [85.158.143.35:35049] by server-1.bemta-4.messagelabs.com id EA/7B-31661-BD74AF25; Tue, 11 Feb 2014 15:55:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1392134105!4873093!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10975 invoked from network); 11 Feb 2014 15:55:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:55:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFfs-0001Cg-Qe for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFfs-0004Un-M6 for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:55:04 +0000 Date: Tue, 11 Feb 2014 15:55:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Fix vcpu-set for PV guest. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 21953764044f943d10bacce409ff4492d882d7cd Author: Anthony PERARD AuthorDate: Fri Jan 31 16:35:47 2014 +0000 Commit: Ian Campbell CommitDate: Thu Feb 6 11:48:16 2014 +0000 libxl: Fix vcpu-set for PV guest. vcpu-set will try to use the HVM path (through QEMU) instead of the PV path (through xenstore) for a PV guest, if there is a QEMU running for this domain. This patch check which kind of guest is running before before doing any call. Signed-off-by: Anthony PERARD Acked-by: Ian Campbell --- tools/libxl/libxl.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 2845ca4..c4fe6af 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4692,12 +4692,21 @@ int libxl_set_vcpuonline(libxl_ctx *ctx, uint32_t domid, libxl_bitmap *cpumap) { GC_INIT(ctx); int rc; - switch (libxl__device_model_version_running(gc, domid)) { - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - rc = libxl__set_vcpuonline_xenstore(gc, domid, cpumap); + switch (libxl__domain_type(gc, domid)) { + case LIBXL_DOMAIN_TYPE_HVM: + switch (libxl__device_model_version_running(gc, domid)) { + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: + rc = libxl__set_vcpuonline_xenstore(gc, domid, cpumap); + break; + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: + rc = libxl__set_vcpuonline_qmp(gc, domid, cpumap); + break; + default: + rc = ERROR_INVAL; + } break; - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: - rc = libxl__set_vcpuonline_qmp(gc, domid, cpumap); + case LIBXL_DOMAIN_TYPE_PV: + rc = libxl__set_vcpuonline_xenstore(gc, domid, cpumap); break; default: rc = ERROR_INVAL; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:55:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:55:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFfx-00032Q-5z; Tue, 11 Feb 2014 15:55:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFfv-000328-Rp for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:55:08 +0000 Received: from [85.158.143.35:35049] by server-1.bemta-4.messagelabs.com id EA/7B-31661-BD74AF25; Tue, 11 Feb 2014 15:55:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1392134105!4873093!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10975 invoked from network); 11 Feb 2014 15:55:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:55:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFfs-0001Cg-Qe for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFfs-0004Un-M6 for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:55:04 +0000 Date: Tue, 11 Feb 2014 15:55:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Fix vcpu-set for PV guest. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 21953764044f943d10bacce409ff4492d882d7cd Author: Anthony PERARD AuthorDate: Fri Jan 31 16:35:47 2014 +0000 Commit: Ian Campbell CommitDate: Thu Feb 6 11:48:16 2014 +0000 libxl: Fix vcpu-set for PV guest. vcpu-set will try to use the HVM path (through QEMU) instead of the PV path (through xenstore) for a PV guest, if there is a QEMU running for this domain. This patch check which kind of guest is running before before doing any call. Signed-off-by: Anthony PERARD Acked-by: Ian Campbell --- tools/libxl/libxl.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 2845ca4..c4fe6af 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4692,12 +4692,21 @@ int libxl_set_vcpuonline(libxl_ctx *ctx, uint32_t domid, libxl_bitmap *cpumap) { GC_INIT(ctx); int rc; - switch (libxl__device_model_version_running(gc, domid)) { - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: - rc = libxl__set_vcpuonline_xenstore(gc, domid, cpumap); + switch (libxl__domain_type(gc, domid)) { + case LIBXL_DOMAIN_TYPE_HVM: + switch (libxl__device_model_version_running(gc, domid)) { + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: + rc = libxl__set_vcpuonline_xenstore(gc, domid, cpumap); + break; + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: + rc = libxl__set_vcpuonline_qmp(gc, domid, cpumap); + break; + default: + rc = ERROR_INVAL; + } break; - case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: - rc = libxl__set_vcpuonline_qmp(gc, domid, cpumap); + case LIBXL_DOMAIN_TYPE_PV: + rc = libxl__set_vcpuonline_xenstore(gc, domid, cpumap); break; default: rc = ERROR_INVAL; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:55:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:55: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 1WDFg7-00033k-8r; Tue, 11 Feb 2014 15:55:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFg5-00033P-Lw for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:55:17 +0000 Received: from [193.109.254.147:32578] by server-10.bemta-14.messagelabs.com id C2/ED-10711-5E74AF25; Tue, 11 Feb 2014 15:55:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1392134115!3587628!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2701 invoked from network); 11 Feb 2014 15:55:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFg3-0001Cj-0Z for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:55:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFg2-0004VB-Uu for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:55:14 +0000 Date: Tue, 11 Feb 2014 15:55:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Remove determining reset specific values from dts for XGENE. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 aa9332e9410b728c7b1ebf9b40e51622728703f6 Author: Pranavkumar Sawargaonkar AuthorDate: Tue Feb 4 11:35:32 2014 +0530 Commit: Ian Campbell CommitDate: Thu Feb 6 11:49:41 2014 +0000 xen: arm: Remove determining reset specific values from dts for XGENE. This patch removes reading reset specific values (address, size and mask) from dts and uses values defined in the code now. This is because currently xgene reset driver (submitted in linux) is going through a change (which is not yet accepted), this new driver has a new type of dts bindings for reset. Hence till linux driver comes to some conclusion, we will use hardcoded values instead of reading from dts so that xen code will not break due to the linux transition. Ref: http://lists.xen.org/archives/html/xen-devel/2014-01/msg02256.html http://www.gossamer-threads.com/lists/linux/kernel/1845585 Signed-off-by: Pranavkumar Sawargaonkar Signed-off-by: Anup Patel Acked-by: Ian Campbell --- xen/arch/arm/platforms/xgene-storm.c | 43 ++++++++------------------------- 1 files changed, 11 insertions(+), 32 deletions(-) diff --git a/xen/arch/arm/platforms/xgene-storm.c b/xen/arch/arm/platforms/xgene-storm.c index 4fc185b..af3b71c 100644 --- a/xen/arch/arm/platforms/xgene-storm.c +++ b/xen/arch/arm/platforms/xgene-storm.c @@ -25,6 +25,11 @@ #include #include +/* XGENE RESET Specific defines */ +#define XGENE_RESET_ADDR 0x17000014UL +#define XGENE_RESET_SIZE 0x100 +#define XGENE_RESET_MASK 0x1 + /* Variables to save reset address of soc during platform initialization. */ static u64 reset_addr, reset_size; static u32 reset_mask; @@ -141,38 +146,12 @@ static void xgene_storm_reset(void) static int xgene_storm_init(void) { - static const struct dt_device_match reset_ids[] __initconst = - { - DT_MATCH_COMPATIBLE("apm,xgene-reboot"), - {}, - }; - struct dt_device_node *dev; - int res; - - dev = dt_find_matching_node(NULL, reset_ids); - if ( !dev ) - { - printk("XGENE: Unable to find a compatible reset node in the device tree"); - return 0; - } - - dt_device_set_used_by(dev, DOMID_XEN); - - /* Retrieve base address and size */ - res = dt_device_get_address(dev, 0, &reset_addr, &reset_size); - if ( res ) - { - printk("XGENE: Unable to retrieve the base address for reset\n"); - return 0; - } - - /* Get reset mask */ - res = dt_property_read_u32(dev, "mask", &reset_mask); - if ( !res ) - { - printk("XGENE: Unable to retrieve the reset mask\n"); - return 0; - } + /* TBD: Once Linux side device tree bindings are finalized retrieve + * these values from dts. + */ + reset_addr = XGENE_RESET_ADDR; + reset_size = XGENE_RESET_SIZE; + reset_mask = XGENE_RESET_MASK; reset_vals_valid = true; return 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:55:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:55: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 1WDFg7-00033k-8r; Tue, 11 Feb 2014 15:55:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFg5-00033P-Lw for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:55:17 +0000 Received: from [193.109.254.147:32578] by server-10.bemta-14.messagelabs.com id C2/ED-10711-5E74AF25; Tue, 11 Feb 2014 15:55:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1392134115!3587628!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2701 invoked from network); 11 Feb 2014 15:55:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFg3-0001Cj-0Z for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:55:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFg2-0004VB-Uu for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:55:14 +0000 Date: Tue, 11 Feb 2014 15:55:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Remove determining reset specific values from dts for XGENE. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 aa9332e9410b728c7b1ebf9b40e51622728703f6 Author: Pranavkumar Sawargaonkar AuthorDate: Tue Feb 4 11:35:32 2014 +0530 Commit: Ian Campbell CommitDate: Thu Feb 6 11:49:41 2014 +0000 xen: arm: Remove determining reset specific values from dts for XGENE. This patch removes reading reset specific values (address, size and mask) from dts and uses values defined in the code now. This is because currently xgene reset driver (submitted in linux) is going through a change (which is not yet accepted), this new driver has a new type of dts bindings for reset. Hence till linux driver comes to some conclusion, we will use hardcoded values instead of reading from dts so that xen code will not break due to the linux transition. Ref: http://lists.xen.org/archives/html/xen-devel/2014-01/msg02256.html http://www.gossamer-threads.com/lists/linux/kernel/1845585 Signed-off-by: Pranavkumar Sawargaonkar Signed-off-by: Anup Patel Acked-by: Ian Campbell --- xen/arch/arm/platforms/xgene-storm.c | 43 ++++++++------------------------- 1 files changed, 11 insertions(+), 32 deletions(-) diff --git a/xen/arch/arm/platforms/xgene-storm.c b/xen/arch/arm/platforms/xgene-storm.c index 4fc185b..af3b71c 100644 --- a/xen/arch/arm/platforms/xgene-storm.c +++ b/xen/arch/arm/platforms/xgene-storm.c @@ -25,6 +25,11 @@ #include #include +/* XGENE RESET Specific defines */ +#define XGENE_RESET_ADDR 0x17000014UL +#define XGENE_RESET_SIZE 0x100 +#define XGENE_RESET_MASK 0x1 + /* Variables to save reset address of soc during platform initialization. */ static u64 reset_addr, reset_size; static u32 reset_mask; @@ -141,38 +146,12 @@ static void xgene_storm_reset(void) static int xgene_storm_init(void) { - static const struct dt_device_match reset_ids[] __initconst = - { - DT_MATCH_COMPATIBLE("apm,xgene-reboot"), - {}, - }; - struct dt_device_node *dev; - int res; - - dev = dt_find_matching_node(NULL, reset_ids); - if ( !dev ) - { - printk("XGENE: Unable to find a compatible reset node in the device tree"); - return 0; - } - - dt_device_set_used_by(dev, DOMID_XEN); - - /* Retrieve base address and size */ - res = dt_device_get_address(dev, 0, &reset_addr, &reset_size); - if ( res ) - { - printk("XGENE: Unable to retrieve the base address for reset\n"); - return 0; - } - - /* Get reset mask */ - res = dt_property_read_u32(dev, "mask", &reset_mask); - if ( !res ) - { - printk("XGENE: Unable to retrieve the reset mask\n"); - return 0; - } + /* TBD: Once Linux side device tree bindings are finalized retrieve + * these values from dts. + */ + reset_addr = XGENE_RESET_ADDR; + reset_size = XGENE_RESET_SIZE; + reset_mask = XGENE_RESET_MASK; reset_vals_valid = true; return 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:55:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:55:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFgI-00035j-Ou; Tue, 11 Feb 2014 15:55:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFgG-00035G-PI for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:55:28 +0000 Received: from [85.158.137.68:61080] by server-12.bemta-3.messagelabs.com id 98/CE-01674-FE74AF25; Tue, 11 Feb 2014 15:55:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1392134125!1157388!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1381 invoked from network); 11 Feb 2014 15:55:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:55:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFgD-0001Cs-Ck for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:55:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFgD-0004VX-59 for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:55:25 +0000 Date: Tue, 11 Feb 2014 15:55:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: arm64: Adding VFP save/restore support. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 712eb2e04da2cbcd9908f74ebd47c6df60d6d12f Author: Pranavkumar Sawargaonkar AuthorDate: Thu Feb 6 12:58:42 2014 +0530 Commit: Ian Campbell CommitDate: Thu Feb 6 11:53:56 2014 +0000 xen: arm: arm64: Adding VFP save/restore support. This patch adds VFP save/restore support form arm64 across context switch. Signed-off-by: Pranavkumar Sawargaonkar Signed-off-by: Anup Patel Acked-by: Ian Campbell [ ijc -- dropped now obsolete TODO comments ] --- xen/arch/arm/arm64/vfp.c | 51 +++++++++++++++++++++++++++++++++++++- xen/include/asm-arm/arm64/vfp.h | 4 +++ 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/arm64/vfp.c b/xen/arch/arm/arm64/vfp.c index 74e6a50..c09cf0c 100644 --- a/xen/arch/arm/arm64/vfp.c +++ b/xen/arch/arm/arm64/vfp.c @@ -1,13 +1,60 @@ #include #include +#include #include void vfp_save_state(struct vcpu *v) { - /* TODO: implement it */ + if ( !cpu_has_fp ) + return; + + asm volatile("stp q0, q1, [%0, #16 * 0]\n\t" + "stp q2, q3, [%0, #16 * 2]\n\t" + "stp q4, q5, [%0, #16 * 4]\n\t" + "stp q6, q7, [%0, #16 * 6]\n\t" + "stp q8, q9, [%0, #16 * 8]\n\t" + "stp q10, q11, [%0, #16 * 10]\n\t" + "stp q12, q13, [%0, #16 * 12]\n\t" + "stp q14, q15, [%0, #16 * 14]\n\t" + "stp q16, q17, [%0, #16 * 16]\n\t" + "stp q18, q19, [%0, #16 * 18]\n\t" + "stp q20, q21, [%0, #16 * 20]\n\t" + "stp q22, q23, [%0, #16 * 22]\n\t" + "stp q24, q25, [%0, #16 * 24]\n\t" + "stp q26, q27, [%0, #16 * 26]\n\t" + "stp q28, q29, [%0, #16 * 28]\n\t" + "stp q30, q31, [%0, #16 * 30]\n\t" + :: "r" ((char *)(&v->arch.vfp.fpregs)): "memory"); + + v->arch.vfp.fpsr = READ_SYSREG32(FPSR); + v->arch.vfp.fpcr = READ_SYSREG32(FPCR); + v->arch.vfp.fpexc32_el2 = READ_SYSREG32(FPEXC32_EL2); } void vfp_restore_state(struct vcpu *v) { - /* TODO: implement it */ + if ( !cpu_has_fp ) + return; + + asm volatile("ldp q0, q1, [%0, #16 * 0]\n\t" + "ldp q2, q3, [%0, #16 * 2]\n\t" + "ldp q4, q5, [%0, #16 * 4]\n\t" + "ldp q6, q7, [%0, #16 * 6]\n\t" + "ldp q8, q9, [%0, #16 * 8]\n\t" + "ldp q10, q11, [%0, #16 * 10]\n\t" + "ldp q12, q13, [%0, #16 * 12]\n\t" + "ldp q14, q15, [%0, #16 * 14]\n\t" + "ldp q16, q17, [%0, #16 * 16]\n\t" + "ldp q18, q19, [%0, #16 * 18]\n\t" + "ldp q20, q21, [%0, #16 * 20]\n\t" + "ldp q22, q23, [%0, #16 * 22]\n\t" + "ldp q24, q25, [%0, #16 * 24]\n\t" + "ldp q26, q27, [%0, #16 * 26]\n\t" + "ldp q28, q29, [%0, #16 * 28]\n\t" + "ldp q30, q31, [%0, #16 * 30]\n\t" + :: "r" ((char *)(&v->arch.vfp.fpregs)): "memory"); + + WRITE_SYSREG32(v->arch.vfp.fpsr, FPSR); + WRITE_SYSREG32(v->arch.vfp.fpcr, FPCR); + WRITE_SYSREG32(v->arch.vfp.fpexc32_el2, FPEXC32_EL2); } diff --git a/xen/include/asm-arm/arm64/vfp.h b/xen/include/asm-arm/arm64/vfp.h index 3733d2c..373f156 100644 --- a/xen/include/asm-arm/arm64/vfp.h +++ b/xen/include/asm-arm/arm64/vfp.h @@ -3,6 +3,10 @@ struct vfp_state { + uint64_t fpregs[64]; + uint32_t fpcr; + uint32_t fpexc32_el2; + uint32_t fpsr; }; #endif /* _ARM_ARM64_VFP_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:55:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:55:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFgI-00035j-Ou; Tue, 11 Feb 2014 15:55:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFgG-00035G-PI for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:55:28 +0000 Received: from [85.158.137.68:61080] by server-12.bemta-3.messagelabs.com id 98/CE-01674-FE74AF25; Tue, 11 Feb 2014 15:55:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1392134125!1157388!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1381 invoked from network); 11 Feb 2014 15:55:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:55:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFgD-0001Cs-Ck for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:55:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFgD-0004VX-59 for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:55:25 +0000 Date: Tue, 11 Feb 2014 15:55:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: arm64: Adding VFP save/restore support. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 712eb2e04da2cbcd9908f74ebd47c6df60d6d12f Author: Pranavkumar Sawargaonkar AuthorDate: Thu Feb 6 12:58:42 2014 +0530 Commit: Ian Campbell CommitDate: Thu Feb 6 11:53:56 2014 +0000 xen: arm: arm64: Adding VFP save/restore support. This patch adds VFP save/restore support form arm64 across context switch. Signed-off-by: Pranavkumar Sawargaonkar Signed-off-by: Anup Patel Acked-by: Ian Campbell [ ijc -- dropped now obsolete TODO comments ] --- xen/arch/arm/arm64/vfp.c | 51 +++++++++++++++++++++++++++++++++++++- xen/include/asm-arm/arm64/vfp.h | 4 +++ 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/arm64/vfp.c b/xen/arch/arm/arm64/vfp.c index 74e6a50..c09cf0c 100644 --- a/xen/arch/arm/arm64/vfp.c +++ b/xen/arch/arm/arm64/vfp.c @@ -1,13 +1,60 @@ #include #include +#include #include void vfp_save_state(struct vcpu *v) { - /* TODO: implement it */ + if ( !cpu_has_fp ) + return; + + asm volatile("stp q0, q1, [%0, #16 * 0]\n\t" + "stp q2, q3, [%0, #16 * 2]\n\t" + "stp q4, q5, [%0, #16 * 4]\n\t" + "stp q6, q7, [%0, #16 * 6]\n\t" + "stp q8, q9, [%0, #16 * 8]\n\t" + "stp q10, q11, [%0, #16 * 10]\n\t" + "stp q12, q13, [%0, #16 * 12]\n\t" + "stp q14, q15, [%0, #16 * 14]\n\t" + "stp q16, q17, [%0, #16 * 16]\n\t" + "stp q18, q19, [%0, #16 * 18]\n\t" + "stp q20, q21, [%0, #16 * 20]\n\t" + "stp q22, q23, [%0, #16 * 22]\n\t" + "stp q24, q25, [%0, #16 * 24]\n\t" + "stp q26, q27, [%0, #16 * 26]\n\t" + "stp q28, q29, [%0, #16 * 28]\n\t" + "stp q30, q31, [%0, #16 * 30]\n\t" + :: "r" ((char *)(&v->arch.vfp.fpregs)): "memory"); + + v->arch.vfp.fpsr = READ_SYSREG32(FPSR); + v->arch.vfp.fpcr = READ_SYSREG32(FPCR); + v->arch.vfp.fpexc32_el2 = READ_SYSREG32(FPEXC32_EL2); } void vfp_restore_state(struct vcpu *v) { - /* TODO: implement it */ + if ( !cpu_has_fp ) + return; + + asm volatile("ldp q0, q1, [%0, #16 * 0]\n\t" + "ldp q2, q3, [%0, #16 * 2]\n\t" + "ldp q4, q5, [%0, #16 * 4]\n\t" + "ldp q6, q7, [%0, #16 * 6]\n\t" + "ldp q8, q9, [%0, #16 * 8]\n\t" + "ldp q10, q11, [%0, #16 * 10]\n\t" + "ldp q12, q13, [%0, #16 * 12]\n\t" + "ldp q14, q15, [%0, #16 * 14]\n\t" + "ldp q16, q17, [%0, #16 * 16]\n\t" + "ldp q18, q19, [%0, #16 * 18]\n\t" + "ldp q20, q21, [%0, #16 * 20]\n\t" + "ldp q22, q23, [%0, #16 * 22]\n\t" + "ldp q24, q25, [%0, #16 * 24]\n\t" + "ldp q26, q27, [%0, #16 * 26]\n\t" + "ldp q28, q29, [%0, #16 * 28]\n\t" + "ldp q30, q31, [%0, #16 * 30]\n\t" + :: "r" ((char *)(&v->arch.vfp.fpregs)): "memory"); + + WRITE_SYSREG32(v->arch.vfp.fpsr, FPSR); + WRITE_SYSREG32(v->arch.vfp.fpcr, FPCR); + WRITE_SYSREG32(v->arch.vfp.fpexc32_el2, FPEXC32_EL2); } diff --git a/xen/include/asm-arm/arm64/vfp.h b/xen/include/asm-arm/arm64/vfp.h index 3733d2c..373f156 100644 --- a/xen/include/asm-arm/arm64/vfp.h +++ b/xen/include/asm-arm/arm64/vfp.h @@ -3,6 +3,10 @@ struct vfp_state { + uint64_t fpregs[64]; + uint32_t fpcr; + uint32_t fpexc32_el2; + uint32_t fpsr; }; #endif /* _ARM_ARM64_VFP_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:55:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:55:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFgR-00037U-Ro; Tue, 11 Feb 2014 15:55:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFgQ-000377-A1 for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:55:38 +0000 Received: from [85.158.137.68:4392] by server-13.bemta-3.messagelabs.com id F6/07-26923-9F74AF25; Tue, 11 Feb 2014 15:55:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1392134135!1155570!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18811 invoked from network); 11 Feb 2014 15:55:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:55:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFgN-0001Cy-II for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:55:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFgN-0004WT-GY for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:55:35 +0000 Date: Tue, 11 Feb 2014 15:55:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: remove innaccurate statement about multiboot module path X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit af82a77f3abc600c735e12e14874d64c80fa986f Author: Ian Campbell AuthorDate: Wed Feb 5 09:12:24 2014 +0000 Commit: Ian Campbell CommitDate: Thu Feb 6 11:54:58 2014 +0000 xen: arm: remove innaccurate statement about multiboot module path It is the compatible string which matters, not the absolute path, and in any case /chosen/module@N is more often used than /chosen/modules/module@N. Reported-by: Fu Wei Signed-off-by: Ian Campbell Acked-by: Julien Grall --- docs/misc/arm/device-tree/booting.txt | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index 8da1e0b..07fde27 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -4,8 +4,7 @@ Dom0 kernel and ramdisk modules Xen is passed the dom0 kernel and initrd via a reference in the /chosen node of the device tree. -Each node has the form /chosen/modules/module@ and contains the following -properties: +Each node contains the following properties: - compatible -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:55:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:55:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFgR-00037U-Ro; Tue, 11 Feb 2014 15:55:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFgQ-000377-A1 for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:55:38 +0000 Received: from [85.158.137.68:4392] by server-13.bemta-3.messagelabs.com id F6/07-26923-9F74AF25; Tue, 11 Feb 2014 15:55:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1392134135!1155570!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18811 invoked from network); 11 Feb 2014 15:55:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:55:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFgN-0001Cy-II for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:55:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFgN-0004WT-GY for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:55:35 +0000 Date: Tue, 11 Feb 2014 15:55:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: remove innaccurate statement about multiboot module path X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit af82a77f3abc600c735e12e14874d64c80fa986f Author: Ian Campbell AuthorDate: Wed Feb 5 09:12:24 2014 +0000 Commit: Ian Campbell CommitDate: Thu Feb 6 11:54:58 2014 +0000 xen: arm: remove innaccurate statement about multiboot module path It is the compatible string which matters, not the absolute path, and in any case /chosen/module@N is more often used than /chosen/modules/module@N. Reported-by: Fu Wei Signed-off-by: Ian Campbell Acked-by: Julien Grall --- docs/misc/arm/device-tree/booting.txt | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-tree/booting.txt index 8da1e0b..07fde27 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -4,8 +4,7 @@ Dom0 kernel and ramdisk modules Xen is passed the dom0 kernel and initrd via a reference in the /chosen node of the device tree. -Each node has the form /chosen/modules/module@ and contains the following -properties: +Each node contains the following properties: - compatible -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:55:49 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:55:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFgb-00039Z-Uj; Tue, 11 Feb 2014 15:55:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFga-00039A-8j for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:55:48 +0000 Received: from [193.109.254.147:59345] by server-14.bemta-14.messagelabs.com id E0/3C-29228-3084AF25; Tue, 11 Feb 2014 15:55:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1392134145!3591555!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32018 invoked from network); 11 Feb 2014 15:55:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:55:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFgX-0001D8-OK for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:55:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFgX-0004X1-Ms for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:55:45 +0000 Date: Tue, 11 Feb 2014 15:55:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: Prevent erroneous success from xc_domain_restore X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 f25599c0c1b8ab4caa062bcdb6acde9f4d0ca09e Author: Andrew Cooper AuthorDate: Tue Feb 4 18:01:10 2014 +0000 Commit: Ian Campbell CommitDate: Thu Feb 6 11:58:51 2014 +0000 tools/libxc: Prevent erroneous success from xc_domain_restore The variable 'rc' is set to 1 at the top of xc_domain_restore, and for the most part is left alone until success, at which point it is set to 0. There is a separate 'frc' which for the most part is used to check function calls, keeping errors separate from 'rc'. For a toolstack which sets callbacks->toolstack_restore(), and the function returns 0, any subsequent error will end up with code flow going to "out;", resulting in the migration being declared a success. For consistency, update the callsites of xc_dom_gnttab{,_hvm}_seed() to use 'frc', even though their use of 'rc' is currently safe. Signed-off-by: Andrew Cooper Acked-by: Ian Campbell CC: Ian Jackson CC: George Dunlap --- tools/libxc/xc_domain_restore.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c index 5ba47d7..1f6ce50 100644 --- a/tools/libxc/xc_domain_restore.c +++ b/tools/libxc/xc_domain_restore.c @@ -2240,9 +2240,9 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, memcpy(ctx->live_p2m, ctx->p2m, dinfo->p2m_size * sizeof(xen_pfn_t)); munmap(ctx->live_p2m, P2M_FL_ENTRIES * PAGE_SIZE); - rc = xc_dom_gnttab_seed(xch, dom, *console_mfn, *store_mfn, - console_domid, store_domid); - if (rc != 0) + frc = xc_dom_gnttab_seed(xch, dom, *console_mfn, *store_mfn, + console_domid, store_domid); + if (frc != 0) { ERROR("error seeding grant table"); goto out; @@ -2257,10 +2257,10 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, { if ( callbacks != NULL && callbacks->toolstack_restore != NULL ) { - rc = callbacks->toolstack_restore(dom, tdata.data, tdata.len, - callbacks->data); + frc = callbacks->toolstack_restore(dom, tdata.data, tdata.len, + callbacks->data); free(tdata.data); - if ( rc < 0 ) + if ( frc < 0 ) { PERROR("error calling toolstack_restore"); goto out; @@ -2326,9 +2326,9 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, goto out; } - rc = xc_dom_gnttab_hvm_seed(xch, dom, *console_mfn, *store_mfn, - console_domid, store_domid); - if (rc != 0) + frc = xc_dom_gnttab_hvm_seed(xch, dom, *console_mfn, *store_mfn, + console_domid, store_domid); + if (frc != 0) { ERROR("error seeding grant table"); goto out; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:55:49 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:55:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFgb-00039Z-Uj; Tue, 11 Feb 2014 15:55:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFga-00039A-8j for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:55:48 +0000 Received: from [193.109.254.147:59345] by server-14.bemta-14.messagelabs.com id E0/3C-29228-3084AF25; Tue, 11 Feb 2014 15:55:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1392134145!3591555!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32018 invoked from network); 11 Feb 2014 15:55:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:55:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFgX-0001D8-OK for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:55:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFgX-0004X1-Ms for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:55:45 +0000 Date: Tue, 11 Feb 2014 15:55:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: Prevent erroneous success from xc_domain_restore X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 f25599c0c1b8ab4caa062bcdb6acde9f4d0ca09e Author: Andrew Cooper AuthorDate: Tue Feb 4 18:01:10 2014 +0000 Commit: Ian Campbell CommitDate: Thu Feb 6 11:58:51 2014 +0000 tools/libxc: Prevent erroneous success from xc_domain_restore The variable 'rc' is set to 1 at the top of xc_domain_restore, and for the most part is left alone until success, at which point it is set to 0. There is a separate 'frc' which for the most part is used to check function calls, keeping errors separate from 'rc'. For a toolstack which sets callbacks->toolstack_restore(), and the function returns 0, any subsequent error will end up with code flow going to "out;", resulting in the migration being declared a success. For consistency, update the callsites of xc_dom_gnttab{,_hvm}_seed() to use 'frc', even though their use of 'rc' is currently safe. Signed-off-by: Andrew Cooper Acked-by: Ian Campbell CC: Ian Jackson CC: George Dunlap --- tools/libxc/xc_domain_restore.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c index 5ba47d7..1f6ce50 100644 --- a/tools/libxc/xc_domain_restore.c +++ b/tools/libxc/xc_domain_restore.c @@ -2240,9 +2240,9 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, memcpy(ctx->live_p2m, ctx->p2m, dinfo->p2m_size * sizeof(xen_pfn_t)); munmap(ctx->live_p2m, P2M_FL_ENTRIES * PAGE_SIZE); - rc = xc_dom_gnttab_seed(xch, dom, *console_mfn, *store_mfn, - console_domid, store_domid); - if (rc != 0) + frc = xc_dom_gnttab_seed(xch, dom, *console_mfn, *store_mfn, + console_domid, store_domid); + if (frc != 0) { ERROR("error seeding grant table"); goto out; @@ -2257,10 +2257,10 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, { if ( callbacks != NULL && callbacks->toolstack_restore != NULL ) { - rc = callbacks->toolstack_restore(dom, tdata.data, tdata.len, - callbacks->data); + frc = callbacks->toolstack_restore(dom, tdata.data, tdata.len, + callbacks->data); free(tdata.data); - if ( rc < 0 ) + if ( frc < 0 ) { PERROR("error calling toolstack_restore"); goto out; @@ -2326,9 +2326,9 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, goto out; } - rc = xc_dom_gnttab_hvm_seed(xch, dom, *console_mfn, *store_mfn, - console_domid, store_domid); - if (rc != 0) + frc = xc_dom_gnttab_hvm_seed(xch, dom, *console_mfn, *store_mfn, + console_domid, store_domid); + if (frc != 0) { ERROR("error seeding grant table"); goto out; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:56:00 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:56:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFgm-0003Bk-2a; Tue, 11 Feb 2014 15:56:00 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFgk-0003BQ-DM for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:55:58 +0000 Received: from [85.158.143.35:42765] by server-1.bemta-4.messagelabs.com id DC/FC-31661-D084AF25; Tue, 11 Feb 2014 15:55:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1392134156!4859923!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17946 invoked from network); 11 Feb 2014 15:55:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:55:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFgh-0001DE-Um for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:55:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFgh-0004XN-RX for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:55:55 +0000 Date: Tue, 11 Feb 2014 15:55:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Fix deadlock in gic_set_guest_irq() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 0ddaefffbfed3512600f67adb2a26523956cb438 Author: Oleksandr Tyshchenko AuthorDate: Mon Feb 3 19:33:48 2014 +0200 Commit: Ian Campbell CommitDate: Thu Feb 6 12:48:12 2014 +0000 xen/arm: Fix deadlock in gic_set_guest_irq() The possible deadlock scenario is explained below: non interrupt context: interrupt contex interrupt context (CPU0): (CPU1): vgic_distr_mmio_write() do_trap_irq() do_softirq() | | | vgic_disable_irqs() ... ... | | | gic_remove_from_queues() vgic_vcpu_inject_irq() vgic_vcpu_inject_irq() | ... | | | spin_lock(...) gic_set_guest_irq() gic_set_guest_irq() | ... ... ... | ... <----------------.---- spin_lock_irqsave(...) ... | ... <----------------.-.---------------------------spin_lock_irqsave(...) | ... . . Oops! The lock has already taken. | spin_unlock(...) . . | ... . . gic_irq_disable() . . ... . . spin_lock(...) . . ... . . ... <----------------. . ... <------------------. ... spin_unlock(...) Since the gic_remove_from_queues() and gic_irq_disable() called from non interrupt context and they acquire the same lock as gic_set_guest_irq() which called from interrupt context we must disable interrupts in these functions to avoid possible deadlocks. Change-Id: Ia354d87bb44418956e30cd7e49cc76616c359cc9 Signed-off-by: Oleksandr Tyshchenko Acked-by: Stefano Stabellini Acked-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/gic.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index e6257a7..13bbf48 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -147,14 +147,15 @@ static void gic_irq_enable(struct irq_desc *desc) static void gic_irq_disable(struct irq_desc *desc) { int irq = desc->irq; + unsigned long flags; - spin_lock(&desc->lock); + spin_lock_irqsave(&desc->lock, flags); spin_lock(&gic.lock); /* Disable routing */ GICD[GICD_ICENABLER + irq / 32] = (1u << (irq % 32)); desc->status |= IRQ_DISABLED; spin_unlock(&gic.lock); - spin_unlock(&desc->lock); + spin_unlock_irqrestore(&desc->lock, flags); } static unsigned int gic_irq_startup(struct irq_desc *desc) @@ -652,11 +653,12 @@ static inline void gic_add_to_lr_pending(struct vcpu *v, unsigned int irq, void gic_remove_from_queues(struct vcpu *v, unsigned int virtual_irq) { struct pending_irq *p = irq_to_pending(v, virtual_irq); + unsigned long flags; - spin_lock(&gic.lock); + spin_lock_irqsave(&gic.lock, flags); if ( !list_empty(&p->lr_queue) ) list_del_init(&p->lr_queue); - spin_unlock(&gic.lock); + spin_unlock_irqrestore(&gic.lock, flags); } void gic_set_guest_irq(struct vcpu *v, unsigned int virtual_irq, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:56:00 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:56:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFgm-0003Bk-2a; Tue, 11 Feb 2014 15:56:00 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFgk-0003BQ-DM for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:55:58 +0000 Received: from [85.158.143.35:42765] by server-1.bemta-4.messagelabs.com id DC/FC-31661-D084AF25; Tue, 11 Feb 2014 15:55:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1392134156!4859923!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17946 invoked from network); 11 Feb 2014 15:55:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:55:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFgh-0001DE-Um for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:55:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFgh-0004XN-RX for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:55:55 +0000 Date: Tue, 11 Feb 2014 15:55:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Fix deadlock in gic_set_guest_irq() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 0ddaefffbfed3512600f67adb2a26523956cb438 Author: Oleksandr Tyshchenko AuthorDate: Mon Feb 3 19:33:48 2014 +0200 Commit: Ian Campbell CommitDate: Thu Feb 6 12:48:12 2014 +0000 xen/arm: Fix deadlock in gic_set_guest_irq() The possible deadlock scenario is explained below: non interrupt context: interrupt contex interrupt context (CPU0): (CPU1): vgic_distr_mmio_write() do_trap_irq() do_softirq() | | | vgic_disable_irqs() ... ... | | | gic_remove_from_queues() vgic_vcpu_inject_irq() vgic_vcpu_inject_irq() | ... | | | spin_lock(...) gic_set_guest_irq() gic_set_guest_irq() | ... ... ... | ... <----------------.---- spin_lock_irqsave(...) ... | ... <----------------.-.---------------------------spin_lock_irqsave(...) | ... . . Oops! The lock has already taken. | spin_unlock(...) . . | ... . . gic_irq_disable() . . ... . . spin_lock(...) . . ... . . ... <----------------. . ... <------------------. ... spin_unlock(...) Since the gic_remove_from_queues() and gic_irq_disable() called from non interrupt context and they acquire the same lock as gic_set_guest_irq() which called from interrupt context we must disable interrupts in these functions to avoid possible deadlocks. Change-Id: Ia354d87bb44418956e30cd7e49cc76616c359cc9 Signed-off-by: Oleksandr Tyshchenko Acked-by: Stefano Stabellini Acked-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/gic.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index e6257a7..13bbf48 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -147,14 +147,15 @@ static void gic_irq_enable(struct irq_desc *desc) static void gic_irq_disable(struct irq_desc *desc) { int irq = desc->irq; + unsigned long flags; - spin_lock(&desc->lock); + spin_lock_irqsave(&desc->lock, flags); spin_lock(&gic.lock); /* Disable routing */ GICD[GICD_ICENABLER + irq / 32] = (1u << (irq % 32)); desc->status |= IRQ_DISABLED; spin_unlock(&gic.lock); - spin_unlock(&desc->lock); + spin_unlock_irqrestore(&desc->lock, flags); } static unsigned int gic_irq_startup(struct irq_desc *desc) @@ -652,11 +653,12 @@ static inline void gic_add_to_lr_pending(struct vcpu *v, unsigned int irq, void gic_remove_from_queues(struct vcpu *v, unsigned int virtual_irq) { struct pending_irq *p = irq_to_pending(v, virtual_irq); + unsigned long flags; - spin_lock(&gic.lock); + spin_lock_irqsave(&gic.lock, flags); if ( !list_empty(&p->lr_queue) ) list_del_init(&p->lr_queue); - spin_unlock(&gic.lock); + spin_unlock_irqrestore(&gic.lock, flags); } void gic_set_guest_irq(struct vcpu *v, unsigned int virtual_irq, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:56:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:56:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFgx-0003Di-5e; Tue, 11 Feb 2014 15:56:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFgu-0003DG-Oh for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:56:09 +0000 Received: from [85.158.139.211:37774] by server-17.bemta-5.messagelabs.com id AA/56-31975-8184AF25; Tue, 11 Feb 2014 15:56:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1392134166!3164650!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11940 invoked from network); 11 Feb 2014 15:56:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:56:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFgs-0001Dn-4F for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:56:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFgs-0004Xt-2X for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:56:06 +0000 Date: Tue, 11 Feb 2014 15:56:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Correctly implement domain_page_map_to_mfn X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 65f3c7ef39e197fe90e2440730292f291a86cf98 Author: Julien Grall AuthorDate: Wed Feb 5 14:16:34 2014 +0000 Commit: Ian Campbell CommitDate: Thu Feb 6 12:50:43 2014 +0000 xen/arm: Correctly implement domain_page_map_to_mfn The function domain_page_map_to_mfn can be used to translate a virtual address mapped by both map_domain_page and map_domain_page_global. The former is using vmap to map the mfn, therefore domain_page_map_to_mfn will always fail because the address is not in DOMHEAP range. Check if the address is in vmap range and use __pa to translate it. This patch fix guest shutdown when the event fifo is used. Signed-off-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell Cc: George Dunlap --- xen/arch/arm/mm.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 127cce0..bdca68a 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -325,11 +325,15 @@ void unmap_domain_page(const void *va) local_irq_restore(flags); } -unsigned long domain_page_map_to_mfn(const void *va) +unsigned long domain_page_map_to_mfn(const void *ptr) { + unsigned long va = (unsigned long)ptr; lpae_t *map = this_cpu(xen_dommap); - int slot = ((unsigned long) va - DOMHEAP_VIRT_START) >> SECOND_SHIFT; - unsigned long offset = ((unsigned long)va>>THIRD_SHIFT) & LPAE_ENTRY_MASK; + int slot = (va - DOMHEAP_VIRT_START) >> SECOND_SHIFT; + unsigned long offset = (va>>THIRD_SHIFT) & LPAE_ENTRY_MASK; + + if ( va >= VMAP_VIRT_START && va < VMAP_VIRT_END ) + return virt_to_mfn(va); ASSERT(slot >= 0 && slot < DOMHEAP_ENTRIES); ASSERT(map[slot].pt.avail != 0); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:56:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:56:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFgx-0003Di-5e; Tue, 11 Feb 2014 15:56:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFgu-0003DG-Oh for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:56:09 +0000 Received: from [85.158.139.211:37774] by server-17.bemta-5.messagelabs.com id AA/56-31975-8184AF25; Tue, 11 Feb 2014 15:56:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1392134166!3164650!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11940 invoked from network); 11 Feb 2014 15:56:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:56:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFgs-0001Dn-4F for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:56:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFgs-0004Xt-2X for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:56:06 +0000 Date: Tue, 11 Feb 2014 15:56:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Correctly implement domain_page_map_to_mfn X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 65f3c7ef39e197fe90e2440730292f291a86cf98 Author: Julien Grall AuthorDate: Wed Feb 5 14:16:34 2014 +0000 Commit: Ian Campbell CommitDate: Thu Feb 6 12:50:43 2014 +0000 xen/arm: Correctly implement domain_page_map_to_mfn The function domain_page_map_to_mfn can be used to translate a virtual address mapped by both map_domain_page and map_domain_page_global. The former is using vmap to map the mfn, therefore domain_page_map_to_mfn will always fail because the address is not in DOMHEAP range. Check if the address is in vmap range and use __pa to translate it. This patch fix guest shutdown when the event fifo is used. Signed-off-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell Cc: George Dunlap --- xen/arch/arm/mm.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 127cce0..bdca68a 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -325,11 +325,15 @@ void unmap_domain_page(const void *va) local_irq_restore(flags); } -unsigned long domain_page_map_to_mfn(const void *va) +unsigned long domain_page_map_to_mfn(const void *ptr) { + unsigned long va = (unsigned long)ptr; lpae_t *map = this_cpu(xen_dommap); - int slot = ((unsigned long) va - DOMHEAP_VIRT_START) >> SECOND_SHIFT; - unsigned long offset = ((unsigned long)va>>THIRD_SHIFT) & LPAE_ENTRY_MASK; + int slot = (va - DOMHEAP_VIRT_START) >> SECOND_SHIFT; + unsigned long offset = (va>>THIRD_SHIFT) & LPAE_ENTRY_MASK; + + if ( va >= VMAP_VIRT_START && va < VMAP_VIRT_END ) + return virt_to_mfn(va); ASSERT(slot >= 0 && slot < DOMHEAP_ENTRIES); ASSERT(map[slot].pt.avail != 0); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:56:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:56: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 1WDFh5-0003GK-OK; Tue, 11 Feb 2014 15:56:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFh4-0003Fh-MM for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:56:18 +0000 Received: from [193.109.254.147:21311] by server-9.bemta-14.messagelabs.com id 85/4B-24895-2284AF25; Tue, 11 Feb 2014 15:56:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1392134176!3599843!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2853 invoked from network); 11 Feb 2014 15:56:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:56:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFh2-0001Du-9Q for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:56:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFh2-0004YH-7t for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:56:16 +0000 Date: Tue, 11 Feb 2014 15:56:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: Bump library SONAMEs for 4.4 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 a06b42584164e21e792dfe66bb8e3585127270b1 Author: Ian Jackson AuthorDate: Wed Feb 5 14:43:38 2014 +0000 Commit: Ian Campbell CommitDate: Thu Feb 6 12:51:52 2014 +0000 tools: Bump library SONAMEs for 4.4 There have been ABI/API changes in libxc. Bump its MAJOR (which affets libxenguest et al too.) There have been ABI changes in libxl. Bump its MAJOR. (The API changes have been dealt with as we go along - there is already a LIBXL_API_VERSION 0x040400.) None of the other libraries have changed their interfaces. I have verified this by building the tools and searching the dist/install tree for files matching *.so.*. For each library that showed up, I did this: git-diff RELEASE-4.3.0..staging -- `find tools/FOO/ -name \*.h` where FOO is the corresponding source directory. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/libxc/Makefile | 2 +- tools/libxl/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index f2d6e56..2cca2b2 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -1,7 +1,7 @@ XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk -MAJOR = 4.3 +MAJOR = 4.4 MINOR = 0 CTRL_SRCS-y := diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index d8495bb..1410c44 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -5,7 +5,7 @@ XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk -MAJOR = 4.3 +MAJOR = 4.4 MINOR = 0 XLUMAJOR = 4.3 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:56:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:56: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 1WDFh5-0003GK-OK; Tue, 11 Feb 2014 15:56:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFh4-0003Fh-MM for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:56:18 +0000 Received: from [193.109.254.147:21311] by server-9.bemta-14.messagelabs.com id 85/4B-24895-2284AF25; Tue, 11 Feb 2014 15:56:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1392134176!3599843!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2853 invoked from network); 11 Feb 2014 15:56:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:56:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFh2-0001Du-9Q for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:56:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFh2-0004YH-7t for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:56:16 +0000 Date: Tue, 11 Feb 2014 15:56:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: Bump library SONAMEs for 4.4 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 a06b42584164e21e792dfe66bb8e3585127270b1 Author: Ian Jackson AuthorDate: Wed Feb 5 14:43:38 2014 +0000 Commit: Ian Campbell CommitDate: Thu Feb 6 12:51:52 2014 +0000 tools: Bump library SONAMEs for 4.4 There have been ABI/API changes in libxc. Bump its MAJOR (which affets libxenguest et al too.) There have been ABI changes in libxl. Bump its MAJOR. (The API changes have been dealt with as we go along - there is already a LIBXL_API_VERSION 0x040400.) None of the other libraries have changed their interfaces. I have verified this by building the tools and searching the dist/install tree for files matching *.so.*. For each library that showed up, I did this: git-diff RELEASE-4.3.0..staging -- `find tools/FOO/ -name \*.h` where FOO is the corresponding source directory. Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- tools/libxc/Makefile | 2 +- tools/libxl/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index f2d6e56..2cca2b2 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -1,7 +1,7 @@ XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk -MAJOR = 4.3 +MAJOR = 4.4 MINOR = 0 CTRL_SRCS-y := diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index d8495bb..1410c44 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -5,7 +5,7 @@ XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk -MAJOR = 4.3 +MAJOR = 4.4 MINOR = 0 XLUMAJOR = 4.3 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:56:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:56:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFhF-0003J0-Ri; Tue, 11 Feb 2014 15:56:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFhE-0003Ic-VZ for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:56:29 +0000 Received: from [85.158.139.211:35565] by server-3.bemta-5.messagelabs.com id 95/AB-13671-C284AF25; Tue, 11 Feb 2014 15:56:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1392134186!3227386!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12952 invoked from network); 11 Feb 2014 15:56:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:56:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFhC-0001E2-En for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:56:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFhC-0004Yd-Ck for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:56:26 +0000 Date: Tue, 11 Feb 2014 15:56:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fork: Break out checked_waitpid X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 8398e64dff171eb6e63238f4c9b4478403a88201 Author: Ian Jackson AuthorDate: Thu Jan 16 16:37:44 2014 +0000 Commit: Ian Jackson CommitDate: Thu Feb 6 14:20:18 2014 +0000 libxl: fork: Break out checked_waitpid This is a simple error-handling wrapper for waitpid. We're going to want to call waitpid somewhere else and this avoids some of the duplication. No functional change in this patch. (Technically, we used to check chldmode_ours again in the EINTR case, and don't now, but that can't have changed because we continuously hold the libxl ctx lock.) Signed-off-by: Ian Jackson Cc: Jim Fehlig Cc: Ian Campbell Acked-by: Ian Campbell --- tools/libxl/libxl_fork.c | 26 ++++++++++++++++++-------- 1 files changed, 18 insertions(+), 8 deletions(-) diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index 4ae9f94..2252370 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -155,6 +155,22 @@ int libxl__carefd_fd(const libxl__carefd *cf) * Actual child process handling */ +/* Like waitpid(,,WNOHANG) but handles all errors except ECHILD. */ +static pid_t checked_waitpid(libxl__egc *egc, pid_t want, int *status) +{ + for (;;) { + pid_t got = waitpid(want, status, WNOHANG); + if (got != -1) + return got; + if (errno == ECHILD) + return got; + if (errno == EINTR) + continue; + LIBXL__EVENT_DISASTER(egc, "waitpid() failed", errno, 0); + return 0; + } +} + static void sigchld_selfpipe_handler(libxl__egc *egc, libxl__ev_fd *ev, int fd, short events, short revents); @@ -331,16 +347,10 @@ static void sigchld_selfpipe_handler(libxl__egc *egc, libxl__ev_fd *ev, while (chldmode_ours(CTX, 0) /* in case the app changes the mode */) { int status; - pid_t pid = waitpid(-1, &status, WNOHANG); - - if (pid == 0) return; + pid_t pid = checked_waitpid(egc, -1, &status); - if (pid == -1) { - if (errno == ECHILD) return; - if (errno == EINTR) continue; - LIBXL__EVENT_DISASTER(egc, "waitpid() failed", errno, 0); + if (pid == 0 || pid == -1 /* ECHILD */) return; - } int rc = childproc_reaped(egc, pid, status); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:56:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:56:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFhF-0003J0-Ri; Tue, 11 Feb 2014 15:56:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFhE-0003Ic-VZ for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:56:29 +0000 Received: from [85.158.139.211:35565] by server-3.bemta-5.messagelabs.com id 95/AB-13671-C284AF25; Tue, 11 Feb 2014 15:56:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1392134186!3227386!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12952 invoked from network); 11 Feb 2014 15:56:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:56:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFhC-0001E2-En for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:56:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFhC-0004Yd-Ck for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:56:26 +0000 Date: Tue, 11 Feb 2014 15:56:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fork: Break out checked_waitpid X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 8398e64dff171eb6e63238f4c9b4478403a88201 Author: Ian Jackson AuthorDate: Thu Jan 16 16:37:44 2014 +0000 Commit: Ian Jackson CommitDate: Thu Feb 6 14:20:18 2014 +0000 libxl: fork: Break out checked_waitpid This is a simple error-handling wrapper for waitpid. We're going to want to call waitpid somewhere else and this avoids some of the duplication. No functional change in this patch. (Technically, we used to check chldmode_ours again in the EINTR case, and don't now, but that can't have changed because we continuously hold the libxl ctx lock.) Signed-off-by: Ian Jackson Cc: Jim Fehlig Cc: Ian Campbell Acked-by: Ian Campbell --- tools/libxl/libxl_fork.c | 26 ++++++++++++++++++-------- 1 files changed, 18 insertions(+), 8 deletions(-) diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index 4ae9f94..2252370 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -155,6 +155,22 @@ int libxl__carefd_fd(const libxl__carefd *cf) * Actual child process handling */ +/* Like waitpid(,,WNOHANG) but handles all errors except ECHILD. */ +static pid_t checked_waitpid(libxl__egc *egc, pid_t want, int *status) +{ + for (;;) { + pid_t got = waitpid(want, status, WNOHANG); + if (got != -1) + return got; + if (errno == ECHILD) + return got; + if (errno == EINTR) + continue; + LIBXL__EVENT_DISASTER(egc, "waitpid() failed", errno, 0); + return 0; + } +} + static void sigchld_selfpipe_handler(libxl__egc *egc, libxl__ev_fd *ev, int fd, short events, short revents); @@ -331,16 +347,10 @@ static void sigchld_selfpipe_handler(libxl__egc *egc, libxl__ev_fd *ev, while (chldmode_ours(CTX, 0) /* in case the app changes the mode */) { int status; - pid_t pid = waitpid(-1, &status, WNOHANG); - - if (pid == 0) return; + pid_t pid = checked_waitpid(egc, -1, &status); - if (pid == -1) { - if (errno == ECHILD) return; - if (errno == EINTR) continue; - LIBXL__EVENT_DISASTER(egc, "waitpid() failed", errno, 0); + if (pid == 0 || pid == -1 /* ECHILD */) return; - } int rc = childproc_reaped(egc, pid, status); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:56:41 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:56:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFhR-0003Lo-Ua; Tue, 11 Feb 2014 15:56:41 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFhP-0003Kz-0w for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:56:40 +0000 Received: from [85.158.143.35:56821] by server-3.bemta-4.messagelabs.com id 83/95-11539-6384AF25; Tue, 11 Feb 2014 15:56:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1392134196!4862189!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8830 invoked from network); 11 Feb 2014 15:56:37 -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; 11 Feb 2014 15:56:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFhM-0001E8-Jv for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:56:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFhM-0004Zm-IM for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:56:36 +0000 Date: Tue, 11 Feb 2014 15:56:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fork: Break out childproc_reaped_ours X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 2231205419d38024f65a8e4066e34d204f5ce13a Author: Ian Jackson AuthorDate: Thu Jan 16 16:40:05 2014 +0000 Commit: Ian Jackson CommitDate: Thu Feb 6 14:20:18 2014 +0000 libxl: fork: Break out childproc_reaped_ours We're going to want to do this again at a new call site. No functional change. Signed-off-by: Ian Jackson Cc: Jim Fehlig Cc: Ian Campbell Acked-by: Ian Campbell --- tools/libxl/libxl_fork.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index 2252370..7b84765 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -290,6 +290,14 @@ static int perhaps_installhandler(libxl__gc *gc, bool creating) return 0; } +static void childproc_reaped_ours(libxl__egc *egc, libxl__ev_child *ch, + int status) +{ + LIBXL_LIST_REMOVE(ch, entry); + ch->pid = -1; + ch->callback(egc, ch, ch->pid, status); +} + static int childproc_reaped(libxl__egc *egc, pid_t pid, int status) { EGC_GC; @@ -303,9 +311,7 @@ static int childproc_reaped(libxl__egc *egc, pid_t pid, int status) return ERROR_UNKNOWN_CHILD; found: - LIBXL_LIST_REMOVE(ch, entry); - ch->pid = -1; - ch->callback(egc, ch, pid, status); + childproc_reaped_ours(egc, ch, status); perhaps_removehandler(gc); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:56:41 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:56:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFhR-0003Lo-Ua; Tue, 11 Feb 2014 15:56:41 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFhP-0003Kz-0w for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:56:40 +0000 Received: from [85.158.143.35:56821] by server-3.bemta-4.messagelabs.com id 83/95-11539-6384AF25; Tue, 11 Feb 2014 15:56:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1392134196!4862189!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8830 invoked from network); 11 Feb 2014 15:56:37 -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; 11 Feb 2014 15:56:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFhM-0001E8-Jv for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:56:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFhM-0004Zm-IM for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:56:36 +0000 Date: Tue, 11 Feb 2014 15:56:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fork: Break out childproc_reaped_ours X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 2231205419d38024f65a8e4066e34d204f5ce13a Author: Ian Jackson AuthorDate: Thu Jan 16 16:40:05 2014 +0000 Commit: Ian Jackson CommitDate: Thu Feb 6 14:20:18 2014 +0000 libxl: fork: Break out childproc_reaped_ours We're going to want to do this again at a new call site. No functional change. Signed-off-by: Ian Jackson Cc: Jim Fehlig Cc: Ian Campbell Acked-by: Ian Campbell --- tools/libxl/libxl_fork.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index 2252370..7b84765 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -290,6 +290,14 @@ static int perhaps_installhandler(libxl__gc *gc, bool creating) return 0; } +static void childproc_reaped_ours(libxl__egc *egc, libxl__ev_child *ch, + int status) +{ + LIBXL_LIST_REMOVE(ch, entry); + ch->pid = -1; + ch->callback(egc, ch, ch->pid, status); +} + static int childproc_reaped(libxl__egc *egc, pid_t pid, int status) { EGC_GC; @@ -303,9 +311,7 @@ static int childproc_reaped(libxl__egc *egc, pid_t pid, int status) return ERROR_UNKNOWN_CHILD; found: - LIBXL_LIST_REMOVE(ch, entry); - ch->pid = -1; - ch->callback(egc, ch, pid, status); + childproc_reaped_ours(egc, ch, status); perhaps_removehandler(gc); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:56:51 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:56:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFhb-0003OG-1P; Tue, 11 Feb 2014 15:56:51 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFhZ-0003Ne-6A for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:56:49 +0000 Received: from [193.109.254.147:19313] by server-15.bemta-14.messagelabs.com id 4C/3F-10839-0484AF25; Tue, 11 Feb 2014 15:56:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1392134206!3559493!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5106 invoked from network); 11 Feb 2014 15:56:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:56:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFhW-0001EE-Q8 for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:56:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFhW-0004a8-O2 for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:56:46 +0000 Date: Tue, 11 Feb 2014 15:56:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fork: Clarify docs for libxl_sigchld_owner X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 f9a8c3374ec2768187337b1597eb7756391f0115 Author: Ian Jackson AuthorDate: Thu Jan 16 16:55:04 2014 +0000 Commit: Ian Jackson CommitDate: Thu Feb 6 14:20:18 2014 +0000 libxl: fork: Clarify docs for libxl_sigchld_owner Clarify that libxl_sigchld_owner_libxl causes libxl to reap all the process's children, and clarify the wording of the description of libxl_sigchld_owner_libxl_always. Signed-off-by: Ian Jackson Cc: Jim Fehlig Cc: Ian Campbell Acked-by: Ian Campbell --- tools/libxl/libxl_event.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_event.h b/tools/libxl/libxl_event.h index 6261f99..ff0b2fa 100644 --- a/tools/libxl/libxl_event.h +++ b/tools/libxl/libxl_event.h @@ -467,7 +467,8 @@ void libxl_osevent_occurred_timeout(libxl_ctx *ctx, void *for_libxl) typedef enum { - /* libxl owns SIGCHLD whenever it has a child. */ + /* libxl owns SIGCHLD whenever it has a child, and reaps + * all children, including those not spawned by libxl. */ libxl_sigchld_owner_libxl, /* Application promises to call libxl_childproc_exited but NOT @@ -476,7 +477,7 @@ typedef enum { libxl_sigchld_owner_mainloop, /* libxl owns SIGCHLD all the time, and the application is - * relying on libxl's event loop for reaping its own children. */ + * relying on libxl's event loop for reaping its children too. */ libxl_sigchld_owner_libxl_always, } libxl_sigchld_owner; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:56:51 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:56:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFhb-0003OG-1P; Tue, 11 Feb 2014 15:56:51 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFhZ-0003Ne-6A for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:56:49 +0000 Received: from [193.109.254.147:19313] by server-15.bemta-14.messagelabs.com id 4C/3F-10839-0484AF25; Tue, 11 Feb 2014 15:56:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1392134206!3559493!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5106 invoked from network); 11 Feb 2014 15:56:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:56:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFhW-0001EE-Q8 for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:56:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFhW-0004a8-O2 for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:56:46 +0000 Date: Tue, 11 Feb 2014 15:56:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fork: Clarify docs for libxl_sigchld_owner X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 f9a8c3374ec2768187337b1597eb7756391f0115 Author: Ian Jackson AuthorDate: Thu Jan 16 16:55:04 2014 +0000 Commit: Ian Jackson CommitDate: Thu Feb 6 14:20:18 2014 +0000 libxl: fork: Clarify docs for libxl_sigchld_owner Clarify that libxl_sigchld_owner_libxl causes libxl to reap all the process's children, and clarify the wording of the description of libxl_sigchld_owner_libxl_always. Signed-off-by: Ian Jackson Cc: Jim Fehlig Cc: Ian Campbell Acked-by: Ian Campbell --- tools/libxl/libxl_event.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_event.h b/tools/libxl/libxl_event.h index 6261f99..ff0b2fa 100644 --- a/tools/libxl/libxl_event.h +++ b/tools/libxl/libxl_event.h @@ -467,7 +467,8 @@ void libxl_osevent_occurred_timeout(libxl_ctx *ctx, void *for_libxl) typedef enum { - /* libxl owns SIGCHLD whenever it has a child. */ + /* libxl owns SIGCHLD whenever it has a child, and reaps + * all children, including those not spawned by libxl. */ libxl_sigchld_owner_libxl, /* Application promises to call libxl_childproc_exited but NOT @@ -476,7 +477,7 @@ typedef enum { libxl_sigchld_owner_mainloop, /* libxl owns SIGCHLD all the time, and the application is - * relying on libxl's event loop for reaping its own children. */ + * relying on libxl's event loop for reaping its children too. */ libxl_sigchld_owner_libxl_always, } libxl_sigchld_owner; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:57:01 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:57:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFhl-0003Qe-4i; Tue, 11 Feb 2014 15:57:01 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFhj-0003Q8-Co for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:56:59 +0000 Received: from [193.109.254.147:55115] by server-7.bemta-14.messagelabs.com id 02/5F-23424-A484AF25; Tue, 11 Feb 2014 15:56:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1392134217!3604713!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15177 invoked from network); 11 Feb 2014 15:56:58 -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; 11 Feb 2014 15:56:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFhg-0001EH-Vn for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:56:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFhg-0004aU-U7 for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:56:56 +0000 Date: Tue, 11 Feb 2014 15:56:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fork: Document libxl_sigchld_owner_libxl better X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 503a01c29212f71487bb6764e095abc099a3cd2d Author: Ian Jackson AuthorDate: Fri Jan 17 12:20:51 2014 +0000 Commit: Ian Jackson CommitDate: Thu Feb 6 14:20:19 2014 +0000 libxl: fork: Document libxl_sigchld_owner_libxl better libxl_sigchld_owner_libxl ought to have been mentioned in the list of options for chldowner. Since it's the default, move the description of the its behaviour into the description of that option. Signed-off-by: Ian Jackson Cc: Jim Fehlig Cc: Ian Campbell Acked-by: Ian Campbell --- tools/libxl/libxl_event.h | 27 +++++++++++++++++++-------- 1 files changed, 19 insertions(+), 8 deletions(-) diff --git a/tools/libxl/libxl_event.h b/tools/libxl/libxl_event.h index ff0b2fa..4f72c4b 100644 --- a/tools/libxl/libxl_event.h +++ b/tools/libxl/libxl_event.h @@ -442,9 +442,26 @@ void libxl_osevent_occurred_timeout(libxl_ctx *ctx, void *for_libxl) * For programs which run their own children alongside libxl's: * * A program which does this must call libxl_childproc_setmode. - * There are two options: + * There are three options: * + * libxl_sigchld_owner_libxl: + * + * While any libxl operation which might use child processes + * is running, works like libxl_sigchld_owner_libxl_always; + * but, deinstalls the handler the rest of the time. + * + * In this mode, the application, while it uses any libxl + * operation which might create or use child processes (see + * above): + * - Must not have any child processes running. + * - Must not install a SIGCHLD handler. + * - Must not reap any children. + * + * This is the default (i.e. if setmode is not called, or 0 is + * passed for hooks). + * * libxl_sigchld_owner_mainloop: + * * The application must install a SIGCHLD handler and reap (at * least) all of libxl's children and pass their exit status to * libxl by calling libxl_childproc_exited. (If the application @@ -452,17 +469,11 @@ void libxl_osevent_occurred_timeout(libxl_ctx *ctx, void *for_libxl) * on each ctx.) * * libxl_sigchld_owner_libxl_always: + * * The application expects libxl to reap all of its children, * and provides a callback to be notified of their exit * statues. The application must have only one libxl_ctx * configured this way. - * - * An application which fails to call setmode, or which passes 0 for - * hooks, while it uses any libxl operation which might - * create or use child processes (see above): - * - Must not have any child processes running. - * - Must not install a SIGCHLD handler. - * - Must not reap any children. */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:57:01 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:57:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFhl-0003Qe-4i; Tue, 11 Feb 2014 15:57:01 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFhj-0003Q8-Co for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:56:59 +0000 Received: from [193.109.254.147:55115] by server-7.bemta-14.messagelabs.com id 02/5F-23424-A484AF25; Tue, 11 Feb 2014 15:56:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1392134217!3604713!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15177 invoked from network); 11 Feb 2014 15:56:58 -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; 11 Feb 2014 15:56:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFhg-0001EH-Vn for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:56:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFhg-0004aU-U7 for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:56:56 +0000 Date: Tue, 11 Feb 2014 15:56:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fork: Document libxl_sigchld_owner_libxl better X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 503a01c29212f71487bb6764e095abc099a3cd2d Author: Ian Jackson AuthorDate: Fri Jan 17 12:20:51 2014 +0000 Commit: Ian Jackson CommitDate: Thu Feb 6 14:20:19 2014 +0000 libxl: fork: Document libxl_sigchld_owner_libxl better libxl_sigchld_owner_libxl ought to have been mentioned in the list of options for chldowner. Since it's the default, move the description of the its behaviour into the description of that option. Signed-off-by: Ian Jackson Cc: Jim Fehlig Cc: Ian Campbell Acked-by: Ian Campbell --- tools/libxl/libxl_event.h | 27 +++++++++++++++++++-------- 1 files changed, 19 insertions(+), 8 deletions(-) diff --git a/tools/libxl/libxl_event.h b/tools/libxl/libxl_event.h index ff0b2fa..4f72c4b 100644 --- a/tools/libxl/libxl_event.h +++ b/tools/libxl/libxl_event.h @@ -442,9 +442,26 @@ void libxl_osevent_occurred_timeout(libxl_ctx *ctx, void *for_libxl) * For programs which run their own children alongside libxl's: * * A program which does this must call libxl_childproc_setmode. - * There are two options: + * There are three options: * + * libxl_sigchld_owner_libxl: + * + * While any libxl operation which might use child processes + * is running, works like libxl_sigchld_owner_libxl_always; + * but, deinstalls the handler the rest of the time. + * + * In this mode, the application, while it uses any libxl + * operation which might create or use child processes (see + * above): + * - Must not have any child processes running. + * - Must not install a SIGCHLD handler. + * - Must not reap any children. + * + * This is the default (i.e. if setmode is not called, or 0 is + * passed for hooks). + * * libxl_sigchld_owner_mainloop: + * * The application must install a SIGCHLD handler and reap (at * least) all of libxl's children and pass their exit status to * libxl by calling libxl_childproc_exited. (If the application @@ -452,17 +469,11 @@ void libxl_osevent_occurred_timeout(libxl_ctx *ctx, void *for_libxl) * on each ctx.) * * libxl_sigchld_owner_libxl_always: + * * The application expects libxl to reap all of its children, * and provides a callback to be notified of their exit * statues. The application must have only one libxl_ctx * configured this way. - * - * An application which fails to call setmode, or which passes 0 for - * hooks, while it uses any libxl operation which might - * create or use child processes (see above): - * - Must not have any child processes running. - * - Must not install a SIGCHLD handler. - * - Must not reap any children. */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:57:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:57:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFhv-0003TT-7m; Tue, 11 Feb 2014 15:57:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFht-0003So-QF for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:57:09 +0000 Received: from [85.158.137.68:20980] by server-15.bemta-3.messagelabs.com id B2/DC-19263-4584AF25; Tue, 11 Feb 2014 15:57:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1392134227!1163688!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19075 invoked from network); 11 Feb 2014 15:57:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:57:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFhr-0001Et-5B for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:57:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFhr-0004b0-43 for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:57:07 +0000 Date: Tue, 11 Feb 2014 15:57:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fork: assert that chldmode is right X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 7916a9023cd8ab159a3d6a870068a35c099d515f Author: Ian Jackson AuthorDate: Thu Jan 16 17:12:31 2014 +0000 Commit: Ian Jackson CommitDate: Thu Feb 6 14:20:19 2014 +0000 libxl: fork: assert that chldmode is right In libxl_childproc_reaped, check that the chldmode is as expected. Signed-off-by: Ian Jackson Cc: Jim Fehlig Cc: Ian Campbell Acked-by: Ian Campbell --- tools/libxl/libxl_fork.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index 7b84765..85db2fb 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -322,6 +322,8 @@ int libxl_childproc_reaped(libxl_ctx *ctx, pid_t pid, int status) { EGC_INIT(ctx); CTX_LOCK; + assert(CTX->childproc_hooks->chldowner + == libxl_sigchld_owner_mainloop); int rc = childproc_reaped(egc, pid, status); CTX_UNLOCK; EGC_FREE; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:57:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:57:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFhv-0003TT-7m; Tue, 11 Feb 2014 15:57:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFht-0003So-QF for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:57:09 +0000 Received: from [85.158.137.68:20980] by server-15.bemta-3.messagelabs.com id B2/DC-19263-4584AF25; Tue, 11 Feb 2014 15:57:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1392134227!1163688!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19075 invoked from network); 11 Feb 2014 15:57:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:57:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFhr-0001Et-5B for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:57:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFhr-0004b0-43 for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:57:07 +0000 Date: Tue, 11 Feb 2014 15:57:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fork: assert that chldmode is right X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 7916a9023cd8ab159a3d6a870068a35c099d515f Author: Ian Jackson AuthorDate: Thu Jan 16 17:12:31 2014 +0000 Commit: Ian Jackson CommitDate: Thu Feb 6 14:20:19 2014 +0000 libxl: fork: assert that chldmode is right In libxl_childproc_reaped, check that the chldmode is as expected. Signed-off-by: Ian Jackson Cc: Jim Fehlig Cc: Ian Campbell Acked-by: Ian Campbell --- tools/libxl/libxl_fork.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index 7b84765..85db2fb 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -322,6 +322,8 @@ int libxl_childproc_reaped(libxl_ctx *ctx, pid_t pid, int status) { EGC_INIT(ctx); CTX_LOCK; + assert(CTX->childproc_hooks->chldowner + == libxl_sigchld_owner_mainloop); int rc = childproc_reaped(egc, pid, status); CTX_UNLOCK; EGC_FREE; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:57:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:57:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFi5-0003X0-Oi; Tue, 11 Feb 2014 15:57:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFi4-0003Wd-E0 for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:57:20 +0000 Received: from [85.158.137.68:16738] by server-10.bemta-3.messagelabs.com id 34/B1-07302-F584AF25; Tue, 11 Feb 2014 15:57:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1392134237!1157981!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19970 invoked from network); 11 Feb 2014 15:57:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:57:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFi1-0001F2-9u for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:57:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFi1-0004bO-7v for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:57:17 +0000 Date: Tue, 11 Feb 2014 15:57:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fork: Provide libxl_childproc_sigchld_occurred X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 ee84b79fbdfc8d00bc37f6659eddc991715e5287 Author: Ian Jackson AuthorDate: Thu Jan 16 16:57:27 2014 +0000 Commit: Ian Jackson CommitDate: Thu Feb 6 14:20:19 2014 +0000 libxl: fork: Provide libxl_childproc_sigchld_occurred Applications exist which don't keep track of all their child processes in a manner suitable for coherent dispatch of their termination. In such a situation, nothing in the whole process may call wait, or waitpid(-1,,). Doing so reaps processes belonging to other parts of the application and there is then no way to deliver the exit status to the right place. To facilitate this, provide a facility for such an application to ask libxl to call waitpid on each of its children individually. Signed-off-by: Ian Jackson Cc: Jim Fehlig Cc: Ian Campbell Acked-by: Ian Campbell --- tools/libxl/libxl_event.h | 29 +++++++++++++++++++++++++---- tools/libxl/libxl_fork.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl_event.h b/tools/libxl/libxl_event.h index 4f72c4b..3c93955 100644 --- a/tools/libxl/libxl_event.h +++ b/tools/libxl/libxl_event.h @@ -482,9 +482,10 @@ typedef enum { * all children, including those not spawned by libxl. */ libxl_sigchld_owner_libxl, - /* Application promises to call libxl_childproc_exited but NOT - * from within a signal handler. libxl will not itself arrange to - * (un)block or catch SIGCHLD. */ + /* Application promises to discover when SIGCHLD occurs and call + * libxl_childproc_exited or libxl_childproc_sigchld_occurred (but + * NOT from within a signal handler). libxl will not itself + * arrange to (un)block or catch SIGCHLD. */ libxl_sigchld_owner_mainloop, /* libxl owns SIGCHLD all the time, and the application is @@ -542,7 +543,8 @@ void libxl_childproc_setmode(libxl_ctx *ctx, const libxl_childproc_hooks *hooks, /* * This function is for an application which owns SIGCHLD and which - * therefore reaps all of the process's children. + * reaps all of the process's children, and dispatches the exit status + * to the correct place inside the application. * * May be called only by an application which has called setmode with * chldowner == libxl_sigchld_owner_mainloop. If pid was a process started @@ -558,6 +560,25 @@ void libxl_childproc_setmode(libxl_ctx *ctx, const libxl_childproc_hooks *hooks, int libxl_childproc_reaped(libxl_ctx *ctx, pid_t, int status) LIBXL_EXTERNAL_CALLERS_ONLY; +/* + * This function is for an application which owns SIGCHLD but which + * doesn't keep track of all of its own children in a manner suitable + * for reaping all of them and then dispatching them. + * + * Such an the application must notify libxl, by calling this + * function, that a SIGCHLD occurred. libxl will then check all its + * children, reap any that are ready, and take any action necessary - + * but it will not reap anything else. + * + * May be called only by an application which has called setmode with + * chldowner == libxl_sigchld_owner_mainloop. + * + * May NOT be called from within a signal handler which might + * interrupt any libxl operation (just like libxl_childproc_reaped). + */ +void libxl_childproc_sigchld_occurred(libxl_ctx *ctx) + LIBXL_EXTERNAL_CALLERS_ONLY; + /* * An application which initialises a libxl_ctx in a parent process diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index 85db2fb..b2325e0 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -330,6 +330,51 @@ int libxl_childproc_reaped(libxl_ctx *ctx, pid_t pid, int status) return rc; } +static void childproc_checkall(libxl__egc *egc) +{ + EGC_GC; + libxl__ev_child *ch; + + for (;;) { + int status; + pid_t got; + + LIBXL_LIST_FOREACH(ch, &CTX->children, entry) { + got = checked_waitpid(egc, ch->pid, &status); + if (got) + goto found; + } + /* not found */ + return; + + found: + if (got == -1) { + LIBXL__EVENT_DISASTER + (egc, "waitpid() gave ECHILD but we have a child", + ECHILD, 0); + /* it must have finished but we don't know its status */ + status = 255<<8; /* no wait.h macro for this! */ + assert(WIFEXITED(status)); + assert(WEXITSTATUS(status)==255); + assert(!WIFSIGNALED(status)); + assert(!WIFSTOPPED(status)); + } + childproc_reaped_ours(egc, ch, status); + /* we need to restart the loop, as children may have been edited */ + } +} + +void libxl_childproc_sigchld_occurred(libxl_ctx *ctx) +{ + EGC_INIT(ctx); + CTX_LOCK; + assert(CTX->childproc_hooks->chldowner + == libxl_sigchld_owner_mainloop); + childproc_checkall(egc); + CTX_UNLOCK; + EGC_FREE; +} + static void sigchld_selfpipe_handler(libxl__egc *egc, libxl__ev_fd *ev, int fd, short events, short revents) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:57:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:57:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFi5-0003X0-Oi; Tue, 11 Feb 2014 15:57:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFi4-0003Wd-E0 for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:57:20 +0000 Received: from [85.158.137.68:16738] by server-10.bemta-3.messagelabs.com id 34/B1-07302-F584AF25; Tue, 11 Feb 2014 15:57:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1392134237!1157981!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19970 invoked from network); 11 Feb 2014 15:57:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:57:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFi1-0001F2-9u for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:57:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFi1-0004bO-7v for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:57:17 +0000 Date: Tue, 11 Feb 2014 15:57:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fork: Provide libxl_childproc_sigchld_occurred X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 ee84b79fbdfc8d00bc37f6659eddc991715e5287 Author: Ian Jackson AuthorDate: Thu Jan 16 16:57:27 2014 +0000 Commit: Ian Jackson CommitDate: Thu Feb 6 14:20:19 2014 +0000 libxl: fork: Provide libxl_childproc_sigchld_occurred Applications exist which don't keep track of all their child processes in a manner suitable for coherent dispatch of their termination. In such a situation, nothing in the whole process may call wait, or waitpid(-1,,). Doing so reaps processes belonging to other parts of the application and there is then no way to deliver the exit status to the right place. To facilitate this, provide a facility for such an application to ask libxl to call waitpid on each of its children individually. Signed-off-by: Ian Jackson Cc: Jim Fehlig Cc: Ian Campbell Acked-by: Ian Campbell --- tools/libxl/libxl_event.h | 29 +++++++++++++++++++++++++---- tools/libxl/libxl_fork.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl_event.h b/tools/libxl/libxl_event.h index 4f72c4b..3c93955 100644 --- a/tools/libxl/libxl_event.h +++ b/tools/libxl/libxl_event.h @@ -482,9 +482,10 @@ typedef enum { * all children, including those not spawned by libxl. */ libxl_sigchld_owner_libxl, - /* Application promises to call libxl_childproc_exited but NOT - * from within a signal handler. libxl will not itself arrange to - * (un)block or catch SIGCHLD. */ + /* Application promises to discover when SIGCHLD occurs and call + * libxl_childproc_exited or libxl_childproc_sigchld_occurred (but + * NOT from within a signal handler). libxl will not itself + * arrange to (un)block or catch SIGCHLD. */ libxl_sigchld_owner_mainloop, /* libxl owns SIGCHLD all the time, and the application is @@ -542,7 +543,8 @@ void libxl_childproc_setmode(libxl_ctx *ctx, const libxl_childproc_hooks *hooks, /* * This function is for an application which owns SIGCHLD and which - * therefore reaps all of the process's children. + * reaps all of the process's children, and dispatches the exit status + * to the correct place inside the application. * * May be called only by an application which has called setmode with * chldowner == libxl_sigchld_owner_mainloop. If pid was a process started @@ -558,6 +560,25 @@ void libxl_childproc_setmode(libxl_ctx *ctx, const libxl_childproc_hooks *hooks, int libxl_childproc_reaped(libxl_ctx *ctx, pid_t, int status) LIBXL_EXTERNAL_CALLERS_ONLY; +/* + * This function is for an application which owns SIGCHLD but which + * doesn't keep track of all of its own children in a manner suitable + * for reaping all of them and then dispatching them. + * + * Such an the application must notify libxl, by calling this + * function, that a SIGCHLD occurred. libxl will then check all its + * children, reap any that are ready, and take any action necessary - + * but it will not reap anything else. + * + * May be called only by an application which has called setmode with + * chldowner == libxl_sigchld_owner_mainloop. + * + * May NOT be called from within a signal handler which might + * interrupt any libxl operation (just like libxl_childproc_reaped). + */ +void libxl_childproc_sigchld_occurred(libxl_ctx *ctx) + LIBXL_EXTERNAL_CALLERS_ONLY; + /* * An application which initialises a libxl_ctx in a parent process diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index 85db2fb..b2325e0 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -330,6 +330,51 @@ int libxl_childproc_reaped(libxl_ctx *ctx, pid_t pid, int status) return rc; } +static void childproc_checkall(libxl__egc *egc) +{ + EGC_GC; + libxl__ev_child *ch; + + for (;;) { + int status; + pid_t got; + + LIBXL_LIST_FOREACH(ch, &CTX->children, entry) { + got = checked_waitpid(egc, ch->pid, &status); + if (got) + goto found; + } + /* not found */ + return; + + found: + if (got == -1) { + LIBXL__EVENT_DISASTER + (egc, "waitpid() gave ECHILD but we have a child", + ECHILD, 0); + /* it must have finished but we don't know its status */ + status = 255<<8; /* no wait.h macro for this! */ + assert(WIFEXITED(status)); + assert(WEXITSTATUS(status)==255); + assert(!WIFSIGNALED(status)); + assert(!WIFSTOPPED(status)); + } + childproc_reaped_ours(egc, ch, status); + /* we need to restart the loop, as children may have been edited */ + } +} + +void libxl_childproc_sigchld_occurred(libxl_ctx *ctx) +{ + EGC_INIT(ctx); + CTX_LOCK; + assert(CTX->childproc_hooks->chldowner + == libxl_sigchld_owner_mainloop); + childproc_checkall(egc); + CTX_UNLOCK; + EGC_FREE; +} + static void sigchld_selfpipe_handler(libxl__egc *egc, libxl__ev_fd *ev, int fd, short events, short revents) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:57:31 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:57:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFiE-0003Zz-WE; Tue, 11 Feb 2014 15:57:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFiE-0003ZU-3C for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:57:30 +0000 Received: from [193.109.254.147:36063] by server-1.bemta-14.messagelabs.com id 4C/FC-15438-9684AF25; Tue, 11 Feb 2014 15:57:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1392134247!3594585!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4397 invoked from network); 11 Feb 2014 15:57:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:57:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFiB-0001F8-F6 for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:57:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFiB-0004bo-Dz for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:57:27 +0000 Date: Tue, 11 Feb 2014 15:57:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fork: Provide ..._always_selective_reap X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 400c0aec59c55e2cfe70091a3a6db326fb41ffa1 Author: Ian Jackson AuthorDate: Thu Jan 16 17:01:50 2014 +0000 Commit: Ian Jackson CommitDate: Thu Feb 6 14:20:19 2014 +0000 libxl: fork: Provide ..._always_selective_reap Applications exist which want to use libxl in an event-driven mode but which do not integrate child termination into their event system, but instead reap all their own children synchronously. In such an application libxl must own SIGCHLD but avoid reaping any children that don't belong to libxl. Provide libxl_sigchld_owner_libxl_always_selective_reap which has this behaviour. Signed-off-by: Ian Jackson Cc: Jim Fehlig Cc: Ian Campbell Acked-by: Ian Campbell --- v2: Document the new mode in the big "Subprocess handling" comment. --- tools/libxl/libxl_event.h | 11 +++++++++++ tools/libxl/libxl_fork.c | 7 +++++++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_event.h b/tools/libxl/libxl_event.h index 3c93955..824ac88 100644 --- a/tools/libxl/libxl_event.h +++ b/tools/libxl/libxl_event.h @@ -474,6 +474,12 @@ void libxl_osevent_occurred_timeout(libxl_ctx *ctx, void *for_libxl) * and provides a callback to be notified of their exit * statues. The application must have only one libxl_ctx * configured this way. + * + * libxl_sigchld_owner_libxl_always_selective_reap: + * + * The application expects to reap all of its own children + * synchronously, and does not use SIGCHLD. libxl is + * to install a SIGCHLD handler. */ @@ -491,6 +497,11 @@ typedef enum { /* libxl owns SIGCHLD all the time, and the application is * relying on libxl's event loop for reaping its children too. */ libxl_sigchld_owner_libxl_always, + + /* libxl owns SIGCHLD all the time, but it must only reap its own + * children. The application will reap its own children + * synchronously with waitpid, without the assistance of SIGCHLD. */ + libxl_sigchld_owner_libxl_always_selective_reap, } libxl_sigchld_owner; typedef struct { diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index b2325e0..16e17f6 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -268,6 +268,7 @@ static bool chldmode_ours(libxl_ctx *ctx, bool creating) case libxl_sigchld_owner_mainloop: return 0; case libxl_sigchld_owner_libxl_always: + case libxl_sigchld_owner_libxl_always_selective_reap: return 1; } abort(); @@ -398,6 +399,12 @@ static void sigchld_selfpipe_handler(libxl__egc *egc, libxl__ev_fd *ev, int e = libxl__self_pipe_eatall(selfpipe); if (e) LIBXL__EVENT_DISASTER(egc, "read sigchld pipe", e, 0); + if (CTX->childproc_hooks->chldowner + == libxl_sigchld_owner_libxl_always_selective_reap) { + childproc_checkall(egc); + return; + } + while (chldmode_ours(CTX, 0) /* in case the app changes the mode */) { int status; pid_t pid = checked_waitpid(egc, -1, &status); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:57:31 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:57:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFiE-0003Zz-WE; Tue, 11 Feb 2014 15:57:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFiE-0003ZU-3C for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:57:30 +0000 Received: from [193.109.254.147:36063] by server-1.bemta-14.messagelabs.com id 4C/FC-15438-9684AF25; Tue, 11 Feb 2014 15:57:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1392134247!3594585!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4397 invoked from network); 11 Feb 2014 15:57:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:57:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFiB-0001F8-F6 for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:57:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFiB-0004bo-Dz for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:57:27 +0000 Date: Tue, 11 Feb 2014 15:57:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fork: Provide ..._always_selective_reap X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 400c0aec59c55e2cfe70091a3a6db326fb41ffa1 Author: Ian Jackson AuthorDate: Thu Jan 16 17:01:50 2014 +0000 Commit: Ian Jackson CommitDate: Thu Feb 6 14:20:19 2014 +0000 libxl: fork: Provide ..._always_selective_reap Applications exist which want to use libxl in an event-driven mode but which do not integrate child termination into their event system, but instead reap all their own children synchronously. In such an application libxl must own SIGCHLD but avoid reaping any children that don't belong to libxl. Provide libxl_sigchld_owner_libxl_always_selective_reap which has this behaviour. Signed-off-by: Ian Jackson Cc: Jim Fehlig Cc: Ian Campbell Acked-by: Ian Campbell --- v2: Document the new mode in the big "Subprocess handling" comment. --- tools/libxl/libxl_event.h | 11 +++++++++++ tools/libxl/libxl_fork.c | 7 +++++++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_event.h b/tools/libxl/libxl_event.h index 3c93955..824ac88 100644 --- a/tools/libxl/libxl_event.h +++ b/tools/libxl/libxl_event.h @@ -474,6 +474,12 @@ void libxl_osevent_occurred_timeout(libxl_ctx *ctx, void *for_libxl) * and provides a callback to be notified of their exit * statues. The application must have only one libxl_ctx * configured this way. + * + * libxl_sigchld_owner_libxl_always_selective_reap: + * + * The application expects to reap all of its own children + * synchronously, and does not use SIGCHLD. libxl is + * to install a SIGCHLD handler. */ @@ -491,6 +497,11 @@ typedef enum { /* libxl owns SIGCHLD all the time, and the application is * relying on libxl's event loop for reaping its children too. */ libxl_sigchld_owner_libxl_always, + + /* libxl owns SIGCHLD all the time, but it must only reap its own + * children. The application will reap its own children + * synchronously with waitpid, without the assistance of SIGCHLD. */ + libxl_sigchld_owner_libxl_always_selective_reap, } libxl_sigchld_owner; typedef struct { diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index b2325e0..16e17f6 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -268,6 +268,7 @@ static bool chldmode_ours(libxl_ctx *ctx, bool creating) case libxl_sigchld_owner_mainloop: return 0; case libxl_sigchld_owner_libxl_always: + case libxl_sigchld_owner_libxl_always_selective_reap: return 1; } abort(); @@ -398,6 +399,12 @@ static void sigchld_selfpipe_handler(libxl__egc *egc, libxl__ev_fd *ev, int e = libxl__self_pipe_eatall(selfpipe); if (e) LIBXL__EVENT_DISASTER(egc, "read sigchld pipe", e, 0); + if (CTX->childproc_hooks->chldowner + == libxl_sigchld_owner_libxl_always_selective_reap) { + childproc_checkall(egc); + return; + } + while (chldmode_ours(CTX, 0) /* in case the app changes the mode */) { int status; pid_t pid = checked_waitpid(egc, -1, &status); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:57:42 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:57:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFiQ-0003d6-4v; Tue, 11 Feb 2014 15:57:42 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFiO-0003ce-D3 for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:57:40 +0000 Received: from [85.158.139.211:60979] by server-12.bemta-5.messagelabs.com id DC/D6-15415-3784AF25; Tue, 11 Feb 2014 15:57:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1392134257!3104610!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15793 invoked from network); 11 Feb 2014 15:57:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:57:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFiL-0001FI-Mr for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:57:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFiL-0004co-IO for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:57:37 +0000 Date: Tue, 11 Feb 2014 15:57:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fork: Provide LIBXL_HAVE_SIGCHLD_SELECTIVE_REAP X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 80c2b7273bd2a86ac267f77a6cfb19c6fe077307 Author: Ian Jackson AuthorDate: Thu Jan 16 17:03:34 2014 +0000 Commit: Ian Jackson CommitDate: Thu Feb 6 14:20:19 2014 +0000 libxl: fork: Provide LIBXL_HAVE_SIGCHLD_SELECTIVE_REAP This is the feature test macro for libxl_childproc_sigchld_occurred and libxl_sigchld_owner_libxl_always_selective_reap. It is split out into this separate patch because: a single feature test is sensible because we do not intend anyone to release or ship libxl versions with one of these but not the other; but, the two features are in separate patches for clarity; and, this just makes reading the actual code easier. Signed-off-by: Ian Jackson Cc: Jim Fehlig Cc: Ian Campbell --- tools/libxl/libxl.h | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 12d6c31..1ac34c3 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -409,6 +409,19 @@ */ #define LIBXL_HAVE_DRIVER_DOMAIN_CREATION 1 +/* + * LIBXL_HAVE_SIGCHLD_SELECTIVE_REAP + * + * If this is defined: + * + * Firstly, the enum libxl_sigchld_owner (in libxl_event.h) has the + * value libxl_sigchld_owner_libxl_always_selective_reap which may be + * passed to libxl_childproc_setmode in hooks->chldmode. + * + * Secondly, the function libxl_childproc_sigchld_occurred exists. + */ +#define LIBXL_HAVE_SIGCHLD_OWNER_SELECTIVE_REAP 1 + /* Functions annotated with LIBXL_EXTERNAL_CALLERS_ONLY may not be * called from within libxl itself. Callers outside libxl, who * do not #include libxl_internal.h, are fine. */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:57:42 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:57:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFiQ-0003d6-4v; Tue, 11 Feb 2014 15:57:42 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFiO-0003ce-D3 for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:57:40 +0000 Received: from [85.158.139.211:60979] by server-12.bemta-5.messagelabs.com id DC/D6-15415-3784AF25; Tue, 11 Feb 2014 15:57:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1392134257!3104610!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15793 invoked from network); 11 Feb 2014 15:57:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:57:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFiL-0001FI-Mr for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:57:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFiL-0004co-IO for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:57:37 +0000 Date: Tue, 11 Feb 2014 15:57:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fork: Provide LIBXL_HAVE_SIGCHLD_SELECTIVE_REAP X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 80c2b7273bd2a86ac267f77a6cfb19c6fe077307 Author: Ian Jackson AuthorDate: Thu Jan 16 17:03:34 2014 +0000 Commit: Ian Jackson CommitDate: Thu Feb 6 14:20:19 2014 +0000 libxl: fork: Provide LIBXL_HAVE_SIGCHLD_SELECTIVE_REAP This is the feature test macro for libxl_childproc_sigchld_occurred and libxl_sigchld_owner_libxl_always_selective_reap. It is split out into this separate patch because: a single feature test is sensible because we do not intend anyone to release or ship libxl versions with one of these but not the other; but, the two features are in separate patches for clarity; and, this just makes reading the actual code easier. Signed-off-by: Ian Jackson Cc: Jim Fehlig Cc: Ian Campbell --- tools/libxl/libxl.h | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 12d6c31..1ac34c3 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -409,6 +409,19 @@ */ #define LIBXL_HAVE_DRIVER_DOMAIN_CREATION 1 +/* + * LIBXL_HAVE_SIGCHLD_SELECTIVE_REAP + * + * If this is defined: + * + * Firstly, the enum libxl_sigchld_owner (in libxl_event.h) has the + * value libxl_sigchld_owner_libxl_always_selective_reap which may be + * passed to libxl_childproc_setmode in hooks->chldmode. + * + * Secondly, the function libxl_childproc_sigchld_occurred exists. + */ +#define LIBXL_HAVE_SIGCHLD_OWNER_SELECTIVE_REAP 1 + /* Functions annotated with LIBXL_EXTERNAL_CALLERS_ONLY may not be * called from within libxl itself. Callers outside libxl, who * do not #include libxl_internal.h, are fine. */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:57:51 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:57:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFiZ-0003fb-8o; Tue, 11 Feb 2014 15:57:51 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFiY-0003fH-EI for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:57:50 +0000 Received: from [85.158.143.35:60476] by server-3.bemta-4.messagelabs.com id BB/E7-11539-D784AF25; Tue, 11 Feb 2014 15:57:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1392134268!4869485!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1809 invoked from network); 11 Feb 2014 15:57:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:57:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFiV-0001FO-SA for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:57:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFiV-0004dF-Qh for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:57:47 +0000 Date: Tue, 11 Feb 2014 15:57:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fork: Rename sigchld handler functions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 c723e84736a4675cffd843bf3def06a6f1664774 Author: Ian Jackson AuthorDate: Fri Jan 17 11:45:57 2014 +0000 Commit: Ian Jackson CommitDate: Thu Feb 6 14:20:19 2014 +0000 libxl: fork: Rename sigchld handler functions We are going to change these functions so that different libxl ctx's can share a single SIGCHLD handler. Rename them now to a new name which doesn't imply unconditional handler installation or removal. Also note in the comments that they are idempotent. No functional change. Signed-off-by: Ian Jackson Cc: Jim Fehlig Cc: Ian Campbell Acked-by: Ian Campbell --- tools/libxl/libxl.c | 2 +- tools/libxl/libxl_fork.c | 22 +++++++++++----------- tools/libxl/libxl_internal.h | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index c4fe6af..6595f15 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -170,7 +170,7 @@ int libxl_ctx_free(libxl_ctx *ctx) /* If we have outstanding children, then the application inherits * them; we wish the application good luck with understanding * this if and when it reaps them. */ - libxl__sigchld_removehandler(gc); + libxl__sigchld_notneeded(gc); if (ctx->sigchld_selfpipe[0] >= 0) { close(ctx->sigchld_selfpipe[0]); diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index 16e17f6..a15af8e 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -194,7 +194,7 @@ static void sigchld_removehandler_core(void) sigchld_owner = 0; } -void libxl__sigchld_removehandler(libxl__gc *gc) /* non-reentrant */ +void libxl__sigchld_notneeded(libxl__gc *gc) /* non-reentrant, idempotent */ { int rc; @@ -210,7 +210,7 @@ void libxl__sigchld_removehandler(libxl__gc *gc) /* non-reentrant */ } } -int libxl__sigchld_installhandler(libxl__gc *gc) /* non-reentrant */ +int libxl__sigchld_needed(libxl__gc *gc) /* non-reentrant, idempotent */ { int r, rc; @@ -274,18 +274,18 @@ static bool chldmode_ours(libxl_ctx *ctx, bool creating) abort(); } -static void perhaps_removehandler(libxl__gc *gc) +static void perhaps_sigchld_notneeded(libxl__gc *gc) { if (!chldmode_ours(CTX, 0)) - libxl__sigchld_removehandler(gc); + libxl__sigchld_notneeded(gc); } -static int perhaps_installhandler(libxl__gc *gc, bool creating) +static int perhaps_sigchld_needed(libxl__gc *gc, bool creating) { int rc; if (chldmode_ours(CTX, creating)) { - rc = libxl__sigchld_installhandler(gc); + rc = libxl__sigchld_needed(gc); if (rc) return rc; } return 0; @@ -314,7 +314,7 @@ static int childproc_reaped(libxl__egc *egc, pid_t pid, int status) found: childproc_reaped_ours(egc, ch, status); - perhaps_removehandler(gc); + perhaps_sigchld_notneeded(gc); return 0; } @@ -445,7 +445,7 @@ pid_t libxl__ev_child_fork(libxl__gc *gc, libxl__ev_child *ch, CTX_LOCK; int rc; - perhaps_installhandler(gc, 1); + perhaps_sigchld_needed(gc, 1); pid_t pid = CTX->childproc_hooks->fork_replacement @@ -473,7 +473,7 @@ pid_t libxl__ev_child_fork(libxl__gc *gc, libxl__ev_child *ch, rc = pid; out: - perhaps_removehandler(gc); + perhaps_sigchld_notneeded(gc); CTX_UNLOCK; return rc; } @@ -492,8 +492,8 @@ void libxl_childproc_setmode(libxl_ctx *ctx, const libxl_childproc_hooks *hooks, ctx->childproc_hooks = hooks; ctx->childproc_user = user; - perhaps_removehandler(gc); - perhaps_installhandler(gc, 0); /* idempotent, ok to ignore errors for now */ + perhaps_sigchld_notneeded(gc); + perhaps_sigchld_needed(gc, 0); /* idempotent, ok to ignore errors for now */ CTX_UNLOCK; GC_FREE; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 1bd23ff..fba681d 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -838,8 +838,8 @@ _hidden void libxl__poller_wakeup(libxl__egc *egc, libxl__poller *p); /* Internal to fork and child reaping machinery */ extern const libxl_childproc_hooks libxl__childproc_default_hooks; -int libxl__sigchld_installhandler(libxl__gc*); /* non-reentrant; logs errs */ -void libxl__sigchld_removehandler(libxl__gc*); /* non-reentrant */ +int libxl__sigchld_needed(libxl__gc*); /* non-reentrant idempotent, logs errs */ +void libxl__sigchld_notneeded(libxl__gc*); /* non-reentrant idempotent */ int libxl__self_pipe_wakeup(int fd); /* returns 0 or -1 setting errno */ int libxl__self_pipe_eatall(int fd); /* returns 0 or -1 setting errno */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:57:51 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:57:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFiZ-0003fb-8o; Tue, 11 Feb 2014 15:57:51 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFiY-0003fH-EI for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:57:50 +0000 Received: from [85.158.143.35:60476] by server-3.bemta-4.messagelabs.com id BB/E7-11539-D784AF25; Tue, 11 Feb 2014 15:57:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1392134268!4869485!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1809 invoked from network); 11 Feb 2014 15:57:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:57:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFiV-0001FO-SA for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:57:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFiV-0004dF-Qh for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:57:47 +0000 Date: Tue, 11 Feb 2014 15:57:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fork: Rename sigchld handler functions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 c723e84736a4675cffd843bf3def06a6f1664774 Author: Ian Jackson AuthorDate: Fri Jan 17 11:45:57 2014 +0000 Commit: Ian Jackson CommitDate: Thu Feb 6 14:20:19 2014 +0000 libxl: fork: Rename sigchld handler functions We are going to change these functions so that different libxl ctx's can share a single SIGCHLD handler. Rename them now to a new name which doesn't imply unconditional handler installation or removal. Also note in the comments that they are idempotent. No functional change. Signed-off-by: Ian Jackson Cc: Jim Fehlig Cc: Ian Campbell Acked-by: Ian Campbell --- tools/libxl/libxl.c | 2 +- tools/libxl/libxl_fork.c | 22 +++++++++++----------- tools/libxl/libxl_internal.h | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index c4fe6af..6595f15 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -170,7 +170,7 @@ int libxl_ctx_free(libxl_ctx *ctx) /* If we have outstanding children, then the application inherits * them; we wish the application good luck with understanding * this if and when it reaps them. */ - libxl__sigchld_removehandler(gc); + libxl__sigchld_notneeded(gc); if (ctx->sigchld_selfpipe[0] >= 0) { close(ctx->sigchld_selfpipe[0]); diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index 16e17f6..a15af8e 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -194,7 +194,7 @@ static void sigchld_removehandler_core(void) sigchld_owner = 0; } -void libxl__sigchld_removehandler(libxl__gc *gc) /* non-reentrant */ +void libxl__sigchld_notneeded(libxl__gc *gc) /* non-reentrant, idempotent */ { int rc; @@ -210,7 +210,7 @@ void libxl__sigchld_removehandler(libxl__gc *gc) /* non-reentrant */ } } -int libxl__sigchld_installhandler(libxl__gc *gc) /* non-reentrant */ +int libxl__sigchld_needed(libxl__gc *gc) /* non-reentrant, idempotent */ { int r, rc; @@ -274,18 +274,18 @@ static bool chldmode_ours(libxl_ctx *ctx, bool creating) abort(); } -static void perhaps_removehandler(libxl__gc *gc) +static void perhaps_sigchld_notneeded(libxl__gc *gc) { if (!chldmode_ours(CTX, 0)) - libxl__sigchld_removehandler(gc); + libxl__sigchld_notneeded(gc); } -static int perhaps_installhandler(libxl__gc *gc, bool creating) +static int perhaps_sigchld_needed(libxl__gc *gc, bool creating) { int rc; if (chldmode_ours(CTX, creating)) { - rc = libxl__sigchld_installhandler(gc); + rc = libxl__sigchld_needed(gc); if (rc) return rc; } return 0; @@ -314,7 +314,7 @@ static int childproc_reaped(libxl__egc *egc, pid_t pid, int status) found: childproc_reaped_ours(egc, ch, status); - perhaps_removehandler(gc); + perhaps_sigchld_notneeded(gc); return 0; } @@ -445,7 +445,7 @@ pid_t libxl__ev_child_fork(libxl__gc *gc, libxl__ev_child *ch, CTX_LOCK; int rc; - perhaps_installhandler(gc, 1); + perhaps_sigchld_needed(gc, 1); pid_t pid = CTX->childproc_hooks->fork_replacement @@ -473,7 +473,7 @@ pid_t libxl__ev_child_fork(libxl__gc *gc, libxl__ev_child *ch, rc = pid; out: - perhaps_removehandler(gc); + perhaps_sigchld_notneeded(gc); CTX_UNLOCK; return rc; } @@ -492,8 +492,8 @@ void libxl_childproc_setmode(libxl_ctx *ctx, const libxl_childproc_hooks *hooks, ctx->childproc_hooks = hooks; ctx->childproc_user = user; - perhaps_removehandler(gc); - perhaps_installhandler(gc, 0); /* idempotent, ok to ignore errors for now */ + perhaps_sigchld_notneeded(gc); + perhaps_sigchld_needed(gc, 0); /* idempotent, ok to ignore errors for now */ CTX_UNLOCK; GC_FREE; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 1bd23ff..fba681d 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -838,8 +838,8 @@ _hidden void libxl__poller_wakeup(libxl__egc *egc, libxl__poller *p); /* Internal to fork and child reaping machinery */ extern const libxl_childproc_hooks libxl__childproc_default_hooks; -int libxl__sigchld_installhandler(libxl__gc*); /* non-reentrant; logs errs */ -void libxl__sigchld_removehandler(libxl__gc*); /* non-reentrant */ +int libxl__sigchld_needed(libxl__gc*); /* non-reentrant idempotent, logs errs */ +void libxl__sigchld_notneeded(libxl__gc*); /* non-reentrant idempotent */ int libxl__self_pipe_wakeup(int fd); /* returns 0 or -1 setting errno */ int libxl__self_pipe_eatall(int fd); /* returns 0 or -1 setting errno */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:58:01 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:58:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFij-0003iA-C9; Tue, 11 Feb 2014 15:58:01 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFii-0003hg-FO for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:58:00 +0000 Received: from [193.109.254.147:49977] by server-6.bemta-14.messagelabs.com id AE/7C-03396-7884AF25; Tue, 11 Feb 2014 15:57:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1392134278!3594754!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8726 invoked from network); 11 Feb 2014 15:57:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:57:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFig-0001FU-2K for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:57:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFig-0004dl-0c for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:57:58 +0000 Date: Tue, 11 Feb 2014 15:57:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fork: Break out sigchld_installhandler_core X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 e6a203b4c1475aff200ae7d085ce0fff561daf91 Author: Ian Jackson AuthorDate: Fri Jan 17 12:01:24 2014 +0000 Commit: Ian Jackson CommitDate: Thu Feb 6 14:20:19 2014 +0000 libxl: fork: Break out sigchld_installhandler_core Pure code motion. This is going to make the final substantive patch easier to read. Signed-off-by: Ian Jackson Cc: Jim Fehlig Cc: Ian Campbell Acked-by: Ian Campbell --- tools/libxl/libxl_fork.c | 38 ++++++++++++++++++++++---------------- 1 files changed, 22 insertions(+), 16 deletions(-) diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index a15af8e..ce8e8eb 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -194,6 +194,27 @@ static void sigchld_removehandler_core(void) sigchld_owner = 0; } +static void sigchld_installhandler_core(libxl__gc *gc) +{ + struct sigaction ours; + int r; + + assert(!sigchld_owner); + sigchld_owner = CTX; + + memset(&ours,0,sizeof(ours)); + ours.sa_handler = sigchld_handler; + sigemptyset(&ours.sa_mask); + ours.sa_flags = SA_NOCLDSTOP | SA_RESTART; + r = sigaction(SIGCHLD, &ours, &sigchld_saved_action); + assert(!r); + + assert(((void)"application must negotiate with libxl about SIGCHLD", + !(sigchld_saved_action.sa_flags & SA_SIGINFO) && + (sigchld_saved_action.sa_handler == SIG_DFL || + sigchld_saved_action.sa_handler == SIG_IGN))); +} + void libxl__sigchld_notneeded(libxl__gc *gc) /* non-reentrant, idempotent */ { int rc; @@ -236,22 +257,7 @@ int libxl__sigchld_needed(libxl__gc *gc) /* non-reentrant, idempotent */ atfork_lock(); if (sigchld_owner != CTX) { - struct sigaction ours; - - assert(!sigchld_owner); - sigchld_owner = CTX; - - memset(&ours,0,sizeof(ours)); - ours.sa_handler = sigchld_handler; - sigemptyset(&ours.sa_mask); - ours.sa_flags = SA_NOCLDSTOP | SA_RESTART; - r = sigaction(SIGCHLD, &ours, &sigchld_saved_action); - assert(!r); - - assert(((void)"application must negotiate with libxl about SIGCHLD", - !(sigchld_saved_action.sa_flags & SA_SIGINFO) && - (sigchld_saved_action.sa_handler == SIG_DFL || - sigchld_saved_action.sa_handler == SIG_IGN))); + sigchld_installhandler_core(gc); } atfork_unlock(); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:58:01 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:58:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFij-0003iA-C9; Tue, 11 Feb 2014 15:58:01 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFii-0003hg-FO for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:58:00 +0000 Received: from [193.109.254.147:49977] by server-6.bemta-14.messagelabs.com id AE/7C-03396-7884AF25; Tue, 11 Feb 2014 15:57:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1392134278!3594754!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8726 invoked from network); 11 Feb 2014 15:57:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:57:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFig-0001FU-2K for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:57:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFig-0004dl-0c for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:57:58 +0000 Date: Tue, 11 Feb 2014 15:57:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fork: Break out sigchld_installhandler_core X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 e6a203b4c1475aff200ae7d085ce0fff561daf91 Author: Ian Jackson AuthorDate: Fri Jan 17 12:01:24 2014 +0000 Commit: Ian Jackson CommitDate: Thu Feb 6 14:20:19 2014 +0000 libxl: fork: Break out sigchld_installhandler_core Pure code motion. This is going to make the final substantive patch easier to read. Signed-off-by: Ian Jackson Cc: Jim Fehlig Cc: Ian Campbell Acked-by: Ian Campbell --- tools/libxl/libxl_fork.c | 38 ++++++++++++++++++++++---------------- 1 files changed, 22 insertions(+), 16 deletions(-) diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index a15af8e..ce8e8eb 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -194,6 +194,27 @@ static void sigchld_removehandler_core(void) sigchld_owner = 0; } +static void sigchld_installhandler_core(libxl__gc *gc) +{ + struct sigaction ours; + int r; + + assert(!sigchld_owner); + sigchld_owner = CTX; + + memset(&ours,0,sizeof(ours)); + ours.sa_handler = sigchld_handler; + sigemptyset(&ours.sa_mask); + ours.sa_flags = SA_NOCLDSTOP | SA_RESTART; + r = sigaction(SIGCHLD, &ours, &sigchld_saved_action); + assert(!r); + + assert(((void)"application must negotiate with libxl about SIGCHLD", + !(sigchld_saved_action.sa_flags & SA_SIGINFO) && + (sigchld_saved_action.sa_handler == SIG_DFL || + sigchld_saved_action.sa_handler == SIG_IGN))); +} + void libxl__sigchld_notneeded(libxl__gc *gc) /* non-reentrant, idempotent */ { int rc; @@ -236,22 +257,7 @@ int libxl__sigchld_needed(libxl__gc *gc) /* non-reentrant, idempotent */ atfork_lock(); if (sigchld_owner != CTX) { - struct sigaction ours; - - assert(!sigchld_owner); - sigchld_owner = CTX; - - memset(&ours,0,sizeof(ours)); - ours.sa_handler = sigchld_handler; - sigemptyset(&ours.sa_mask); - ours.sa_flags = SA_NOCLDSTOP | SA_RESTART; - r = sigaction(SIGCHLD, &ours, &sigchld_saved_action); - assert(!r); - - assert(((void)"application must negotiate with libxl about SIGCHLD", - !(sigchld_saved_action.sa_flags & SA_SIGINFO) && - (sigchld_saved_action.sa_handler == SIG_DFL || - sigchld_saved_action.sa_handler == SIG_IGN))); + sigchld_installhandler_core(gc); } atfork_unlock(); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:58:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:58:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFiu-0003kd-3q; Tue, 11 Feb 2014 15:58:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFis-0003kJ-Lz for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:58:10 +0000 Received: from [193.109.254.147:8586] by server-15.bemta-14.messagelabs.com id 74/81-10839-2984AF25; Tue, 11 Feb 2014 15:58:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1392134288!3605094!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24917 invoked from network); 11 Feb 2014 15:58:09 -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; 11 Feb 2014 15:58:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFiq-0001G3-7u for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:58:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFiq-0004eN-6C for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:58:08 +0000 Date: Tue, 11 Feb 2014 15:58:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fork: Break out sigchld_sethandler_raw X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 b942c569f29e8caab251e36bb1be604697225bde Author: Ian Jackson AuthorDate: Fri Jan 17 15:42:31 2014 +0000 Commit: Ian Jackson CommitDate: Thu Feb 6 14:20:54 2014 +0000 libxl: fork: Break out sigchld_sethandler_raw We are going to want introduce another call site in the final substantive patch. Pure code motion; no functional change. Signed-off-by: Ian Jackson Cc: Jim Fehlig Cc: Ian Campbell Acked-by: Ian Campbell --- v3: Remove now-unused variables from sigchld_installhandler_core --- tools/libxl/libxl_fork.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index ce8e8eb..084d86a 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -182,6 +182,19 @@ static void sigchld_handler(int signo) errno = esave; } +static void sigchld_sethandler_raw(void (*handler)(int), struct sigaction *old) +{ + struct sigaction ours; + int r; + + memset(&ours,0,sizeof(ours)); + ours.sa_handler = handler; + sigemptyset(&ours.sa_mask); + ours.sa_flags = SA_NOCLDSTOP | SA_RESTART; + r = sigaction(SIGCHLD, &ours, old); + assert(!r); +} + static void sigchld_removehandler_core(void) { struct sigaction was; @@ -196,18 +209,10 @@ static void sigchld_removehandler_core(void) static void sigchld_installhandler_core(libxl__gc *gc) { - struct sigaction ours; - int r; - assert(!sigchld_owner); sigchld_owner = CTX; - memset(&ours,0,sizeof(ours)); - ours.sa_handler = sigchld_handler; - sigemptyset(&ours.sa_mask); - ours.sa_flags = SA_NOCLDSTOP | SA_RESTART; - r = sigaction(SIGCHLD, &ours, &sigchld_saved_action); - assert(!r); + sigchld_sethandler_raw(sigchld_handler, &sigchld_saved_action); assert(((void)"application must negotiate with libxl about SIGCHLD", !(sigchld_saved_action.sa_flags & SA_SIGINFO) && -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:58:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:58:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFiu-0003kd-3q; Tue, 11 Feb 2014 15:58:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFis-0003kJ-Lz for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:58:10 +0000 Received: from [193.109.254.147:8586] by server-15.bemta-14.messagelabs.com id 74/81-10839-2984AF25; Tue, 11 Feb 2014 15:58:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1392134288!3605094!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24917 invoked from network); 11 Feb 2014 15:58:09 -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; 11 Feb 2014 15:58:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFiq-0001G3-7u for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:58:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFiq-0004eN-6C for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:58:08 +0000 Date: Tue, 11 Feb 2014 15:58:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fork: Break out sigchld_sethandler_raw X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 b942c569f29e8caab251e36bb1be604697225bde Author: Ian Jackson AuthorDate: Fri Jan 17 15:42:31 2014 +0000 Commit: Ian Jackson CommitDate: Thu Feb 6 14:20:54 2014 +0000 libxl: fork: Break out sigchld_sethandler_raw We are going to want introduce another call site in the final substantive patch. Pure code motion; no functional change. Signed-off-by: Ian Jackson Cc: Jim Fehlig Cc: Ian Campbell Acked-by: Ian Campbell --- v3: Remove now-unused variables from sigchld_installhandler_core --- tools/libxl/libxl_fork.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index ce8e8eb..084d86a 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -182,6 +182,19 @@ static void sigchld_handler(int signo) errno = esave; } +static void sigchld_sethandler_raw(void (*handler)(int), struct sigaction *old) +{ + struct sigaction ours; + int r; + + memset(&ours,0,sizeof(ours)); + ours.sa_handler = handler; + sigemptyset(&ours.sa_mask); + ours.sa_flags = SA_NOCLDSTOP | SA_RESTART; + r = sigaction(SIGCHLD, &ours, old); + assert(!r); +} + static void sigchld_removehandler_core(void) { struct sigaction was; @@ -196,18 +209,10 @@ static void sigchld_removehandler_core(void) static void sigchld_installhandler_core(libxl__gc *gc) { - struct sigaction ours; - int r; - assert(!sigchld_owner); sigchld_owner = CTX; - memset(&ours,0,sizeof(ours)); - ours.sa_handler = sigchld_handler; - sigemptyset(&ours.sa_mask); - ours.sa_flags = SA_NOCLDSTOP | SA_RESTART; - r = sigaction(SIGCHLD, &ours, &sigchld_saved_action); - assert(!r); + sigchld_sethandler_raw(sigchld_handler, &sigchld_saved_action); assert(((void)"application must negotiate with libxl about SIGCHLD", !(sigchld_saved_action.sa_flags & SA_SIGINFO) && -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:58:23 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:58: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 1WDFj5-0003nG-6k; Tue, 11 Feb 2014 15:58:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFj3-0003mp-SG for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:58:22 +0000 Received: from [85.158.137.68:38046] by server-3.bemta-3.messagelabs.com id 5C/73-14520-D984AF25; Tue, 11 Feb 2014 15:58:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1392134298!1153298!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17621 invoked from network); 11 Feb 2014 15:58:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:58:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFj0-0001G9-DM for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:58:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFj0-0004el-Bb for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:58:18 +0000 Date: Tue, 11 Feb 2014 15:58:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fork: Share SIGCHLD handler amongst ctxs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 5f0c4a78100382972b4d2a71a04b90e015e9fe87 Author: Ian Jackson AuthorDate: Fri Jan 17 11:58:55 2014 +0000 Commit: Ian Jackson CommitDate: Thu Feb 6 14:21:03 2014 +0000 libxl: fork: Share SIGCHLD handler amongst ctxs Previously, an application which had multiple libxl ctxs in multiple threads, would have to itself plumb SIGCHLD through to each ctx. Instead, permit multiple libxl ctxs to all share the SIGCHLD handler. We keep a list of all the ctxs which are interested in SIGCHLD and notify all of their self-pipes. In more detail: * sigchld_owner, the ctx* of the SIGCHLD owner, is replaced by sigchld_users, a list of SIGCHLD users. * Each ctx keeps track of whether it is on the users list, so that libxl__sigchld_needed and libxl__sigchld_notneeded now instead of idempotently installing and removing the handler, idempotently add or remove the ctx from the list. We ensure that we always have the SIGCHLD handler installed iff the sigchld_users list is nonempty. To make this a bit easier we make sigchld_installhandler_core and sigchld_removehandler_core idempotent. Specifically, the call sites for sigchld_installhandler_core and sigchld_removehandler_core are updated to manipulate sigchld_users and only call the install or remove functions as applicable. * In the signal handler we walk the list of SIGCHLD users and write to each of their self-pipes. That means that we need to arrange to defer SIGCHLD when we are manipulating the list (to avoid the signal handler interrupting our list manipulation); this is quite tiresome to arrange. The code as written will, on the first installation of the SIGCHLD handler, firstly install the real handler, then immediately replace it with the deferral handler. Doing it this way makes the code clearer as it makes the SIGCHLD deferral machinery much more self-contained (and hence easier to reason about). * The first part of libxl__sigchld_notneeded is broken out into a new function sigchld_user_remove (which is also needed during for postfork). And of course that first part of the function is now rather different, as explained above. * sigchld_installhandler_core no longer takes the gc argument, because it now deals with SIGCHLD for all ctxs. Signed-off-by: Ian Jackson Cc: Jim Fehlig Cc: Ian Campbell Acked-by: Ian Campbell --- v3: Include bugfixes from "Fixup SIGCHLD sharing" patch: * Use a mutex for defer_sigchld, to guard against concurrency between the thread calling defer_sigchld and an instance of the primary signal handler on another thread. * libxl_sigchld_owner_libxl_always is incompatible with SIGCHLD sharing. Document this correctly. Fix "have have" error in comment. Move removal of newly unused variables to previous patch. v2.1: Provide feature test macro LIBXL_HAVE_SIGCHLD_SHARING --- tools/libxl/libxl.h | 9 +++ tools/libxl/libxl_event.h | 14 ++-- tools/libxl/libxl_fork.c | 153 ++++++++++++++++++++++++++++++++++++------ tools/libxl/libxl_internal.h | 3 + 4 files changed, 153 insertions(+), 26 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 1ac34c3..0b992d1 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -422,6 +422,15 @@ */ #define LIBXL_HAVE_SIGCHLD_OWNER_SELECTIVE_REAP 1 +/* + * LIBXL_HAVE_SIGCHLD_SHARING + * + * If this is defined, it is permissible for multiple libxl ctxs + * to simultaneously "own" SIGCHLD. See "Subprocess handling" + * in libxl_event.h. + */ +#define LIBXL_HAVE_SIGCHLD_SHARING 1 + /* Functions annotated with LIBXL_EXTERNAL_CALLERS_ONLY may not be * called from within libxl itself. Callers outside libxl, who * do not #include libxl_internal.h, are fine. */ diff --git a/tools/libxl/libxl_event.h b/tools/libxl/libxl_event.h index 824ac88..ca43cb9 100644 --- a/tools/libxl/libxl_event.h +++ b/tools/libxl/libxl_event.h @@ -470,16 +470,18 @@ void libxl_osevent_occurred_timeout(libxl_ctx *ctx, void *for_libxl) * * libxl_sigchld_owner_libxl_always: * - * The application expects libxl to reap all of its children, - * and provides a callback to be notified of their exit - * statues. The application must have only one libxl_ctx - * configured this way. + * The application expects this libxl ctx to reap all of the + * process's children, and provides a callback to be notified of + * their exit statuses. The application must have only one + * libxl_ctx configured this way. * * libxl_sigchld_owner_libxl_always_selective_reap: * * The application expects to reap all of its own children - * synchronously, and does not use SIGCHLD. libxl is - * to install a SIGCHLD handler. + * synchronously, and does not use SIGCHLD. libxl is to install + * a SIGCHLD handler. The application may have multiple + * libxl_ctxs configured this way; in which case all of its ctxs + * must be so configured. */ diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index 084d86a..2432512 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -46,11 +46,19 @@ static int atfork_registered; static LIBXL_LIST_HEAD(, libxl__carefd) carefds = LIBXL_LIST_HEAD_INITIALIZER(carefds); -/* non-null iff installed, protected by no_forking */ -static libxl_ctx *sigchld_owner; +/* Protected against concurrency by no_forking. sigchld_users is + * protected against being interrupted by SIGCHLD (and thus read + * asynchronously by the signal handler) by sigchld_defer (see + * below). */ +static bool sigchld_installed; /* 0 means not */ +static pthread_mutex_t sigchld_defer_mutex = PTHREAD_MUTEX_INITIALIZER; +static LIBXL_LIST_HEAD(, libxl_ctx) sigchld_users = + LIBXL_LIST_HEAD_INITIALIZER(sigchld_users); static struct sigaction sigchld_saved_action; -static void sigchld_removehandler_core(void); +static void sigchld_removehandler_core(void); /* idempotent */ +static void sigchld_user_remove(libxl_ctx *ctx); /* idempotent */ +static void sigchld_sethandler_raw(void (*handler)(int), struct sigaction *old); static void atfork_lock(void) { @@ -126,8 +134,7 @@ void libxl_postfork_child_noexec(libxl_ctx *ctx) } LIBXL_LIST_INIT(&carefds); - if (sigchld_owner) - sigchld_removehandler_core(); + sigchld_user_remove(ctx); atfork_unlock(); } @@ -152,7 +159,8 @@ int libxl__carefd_fd(const libxl__carefd *cf) } /* - * Actual child process handling + * Low-level functions for child process handling, including + * the main SIGCHLD handler. */ /* Like waitpid(,,WNOHANG) but handles all errors except ECHILD. */ @@ -176,9 +184,22 @@ static void sigchld_selfpipe_handler(libxl__egc *egc, libxl__ev_fd *ev, static void sigchld_handler(int signo) { + /* This function has to be reentrant! Luckily it is. */ + + libxl_ctx *notify; int esave = errno; - int e = libxl__self_pipe_wakeup(sigchld_owner->sigchld_selfpipe[1]); - assert(!e); /* errors are probably EBADF, very bad */ + + int r = pthread_mutex_lock(&sigchld_defer_mutex); + assert(!r); + + LIBXL_LIST_FOREACH(notify, &sigchld_users, sigchld_users_entry) { + int e = libxl__self_pipe_wakeup(notify->sigchld_selfpipe[1]); + assert(!e); /* errors are probably EBADF, very bad */ + } + + r = pthread_mutex_unlock(&sigchld_defer_mutex); + assert(!r); + errno = esave; } @@ -195,22 +216,89 @@ static void sigchld_sethandler_raw(void (*handler)(int), struct sigaction *old) assert(!r); } -static void sigchld_removehandler_core(void) +/* + * SIGCHLD deferral + * + * sigchld_defer and sigchld_release are a bit like using sigprocmask + * to block the signal only they work for the whole process. Sadly + * this has to be done by setting a special handler that records the + * "pendingness" of the signal here in the program. How tedious. + * + * A property of this approach is that the signal handler itself + * must be reentrant (see the comment in release_sigchld). + * + * Callers have the atfork_lock so there is no risk of concurrency + * within these functions, aside from the risk of being interrupted by + * the signal. We use sigchld_defer_mutex to guard against the + * possibility of the real signal handler being still running on + * another thread. + */ + +static volatile sig_atomic_t sigchld_occurred_while_deferred; + +static void sigchld_handler_when_deferred(int signo) +{ + sigchld_occurred_while_deferred = 1; +} + +static void defer_sigchld(void) +{ + assert(sigchld_installed); + + sigchld_sethandler_raw(sigchld_handler_when_deferred, 0); + + /* Now _this thread_ cannot any longer be interrupted by the + * signal, so we can take the mutex without risk of deadlock. If + * another thread is in the signal handler, either it or we will + * block and wait for the other. */ + + int r = pthread_mutex_lock(&sigchld_defer_mutex); + assert(!r); +} + +static void release_sigchld(void) +{ + assert(sigchld_installed); + + int r = pthread_mutex_unlock(&sigchld_defer_mutex); + assert(!r); + + sigchld_sethandler_raw(sigchld_handler, 0); + if (sigchld_occurred_while_deferred) { + sigchld_occurred_while_deferred = 0; + /* We might get another SIGCHLD here, in which case + * sigchld_handler will be interrupted and re-entered. + * This is OK. */ + sigchld_handler(SIGCHLD); + } +} + +/* + * Meat of the child process handling. + */ + +static void sigchld_removehandler_core(void) /* idempotent */ { struct sigaction was; int r; + if (!sigchld_installed) + return; + r = sigaction(SIGCHLD, &sigchld_saved_action, &was); assert(!r); assert(!(was.sa_flags & SA_SIGINFO)); assert(was.sa_handler == sigchld_handler); - sigchld_owner = 0; + + sigchld_installed = 0; } -static void sigchld_installhandler_core(libxl__gc *gc) +static void sigchld_installhandler_core(void) /* idempotent */ { - assert(!sigchld_owner); - sigchld_owner = CTX; + if (sigchld_installed) + return; + + sigchld_installed = 1; sigchld_sethandler_raw(sigchld_handler, &sigchld_saved_action); @@ -220,15 +308,32 @@ static void sigchld_installhandler_core(libxl__gc *gc) sigchld_saved_action.sa_handler == SIG_IGN))); } -void libxl__sigchld_notneeded(libxl__gc *gc) /* non-reentrant, idempotent */ +static void sigchld_user_remove(libxl_ctx *ctx) /* idempotent */ { - int rc; + if (!ctx->sigchld_user_registered) + return; atfork_lock(); - if (sigchld_owner == CTX) + defer_sigchld(); + + LIBXL_LIST_REMOVE(ctx, sigchld_users_entry); + + release_sigchld(); + + if (LIBXL_LIST_EMPTY(&sigchld_users)) sigchld_removehandler_core(); + atfork_unlock(); + ctx->sigchld_user_registered = 0; +} + +void libxl__sigchld_notneeded(libxl__gc *gc) /* non-reentrant, idempotent */ +{ + int rc; + + sigchld_user_remove(CTX); + if (libxl__ev_fd_isregistered(&CTX->sigchld_selfpipe_efd)) { rc = libxl__ev_fd_modify(gc, &CTX->sigchld_selfpipe_efd, 0); if (rc) @@ -259,12 +364,20 @@ int libxl__sigchld_needed(libxl__gc *gc) /* non-reentrant, idempotent */ rc = libxl__ev_fd_modify(gc, &CTX->sigchld_selfpipe_efd, POLLIN); if (rc) goto out; } + if (!CTX->sigchld_user_registered) { + atfork_lock(); - atfork_lock(); - if (sigchld_owner != CTX) { - sigchld_installhandler_core(gc); + sigchld_installhandler_core(); + + defer_sigchld(); + + LIBXL_LIST_INSERT_HEAD(&sigchld_users, CTX, sigchld_users_entry); + + release_sigchld(); + atfork_unlock(); + + CTX->sigchld_user_registered = 1; } - atfork_unlock(); rc = 0; out: diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index fba681d..8429448 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -355,6 +355,8 @@ struct libxl__ctx { int sigchld_selfpipe[2]; /* [0]==-1 means handler not installed */ libxl__ev_fd sigchld_selfpipe_efd; LIBXL_LIST_HEAD(, libxl__ev_child) children; + bool sigchld_user_registered; + LIBXL_LIST_ENTRY(libxl_ctx) sigchld_users_entry; libxl_version_info version_info; }; @@ -840,6 +842,7 @@ _hidden void libxl__poller_wakeup(libxl__egc *egc, libxl__poller *p); extern const libxl_childproc_hooks libxl__childproc_default_hooks; int libxl__sigchld_needed(libxl__gc*); /* non-reentrant idempotent, logs errs */ void libxl__sigchld_notneeded(libxl__gc*); /* non-reentrant idempotent */ +void libxl__sigchld_check_stale_handler(void); int libxl__self_pipe_wakeup(int fd); /* returns 0 or -1 setting errno */ int libxl__self_pipe_eatall(int fd); /* returns 0 or -1 setting errno */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:58:23 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:58: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 1WDFj5-0003nG-6k; Tue, 11 Feb 2014 15:58:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFj3-0003mp-SG for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:58:22 +0000 Received: from [85.158.137.68:38046] by server-3.bemta-3.messagelabs.com id 5C/73-14520-D984AF25; Tue, 11 Feb 2014 15:58:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1392134298!1153298!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17621 invoked from network); 11 Feb 2014 15:58:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:58:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFj0-0001G9-DM for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:58:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFj0-0004el-Bb for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:58:18 +0000 Date: Tue, 11 Feb 2014 15:58:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fork: Share SIGCHLD handler amongst ctxs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 5f0c4a78100382972b4d2a71a04b90e015e9fe87 Author: Ian Jackson AuthorDate: Fri Jan 17 11:58:55 2014 +0000 Commit: Ian Jackson CommitDate: Thu Feb 6 14:21:03 2014 +0000 libxl: fork: Share SIGCHLD handler amongst ctxs Previously, an application which had multiple libxl ctxs in multiple threads, would have to itself plumb SIGCHLD through to each ctx. Instead, permit multiple libxl ctxs to all share the SIGCHLD handler. We keep a list of all the ctxs which are interested in SIGCHLD and notify all of their self-pipes. In more detail: * sigchld_owner, the ctx* of the SIGCHLD owner, is replaced by sigchld_users, a list of SIGCHLD users. * Each ctx keeps track of whether it is on the users list, so that libxl__sigchld_needed and libxl__sigchld_notneeded now instead of idempotently installing and removing the handler, idempotently add or remove the ctx from the list. We ensure that we always have the SIGCHLD handler installed iff the sigchld_users list is nonempty. To make this a bit easier we make sigchld_installhandler_core and sigchld_removehandler_core idempotent. Specifically, the call sites for sigchld_installhandler_core and sigchld_removehandler_core are updated to manipulate sigchld_users and only call the install or remove functions as applicable. * In the signal handler we walk the list of SIGCHLD users and write to each of their self-pipes. That means that we need to arrange to defer SIGCHLD when we are manipulating the list (to avoid the signal handler interrupting our list manipulation); this is quite tiresome to arrange. The code as written will, on the first installation of the SIGCHLD handler, firstly install the real handler, then immediately replace it with the deferral handler. Doing it this way makes the code clearer as it makes the SIGCHLD deferral machinery much more self-contained (and hence easier to reason about). * The first part of libxl__sigchld_notneeded is broken out into a new function sigchld_user_remove (which is also needed during for postfork). And of course that first part of the function is now rather different, as explained above. * sigchld_installhandler_core no longer takes the gc argument, because it now deals with SIGCHLD for all ctxs. Signed-off-by: Ian Jackson Cc: Jim Fehlig Cc: Ian Campbell Acked-by: Ian Campbell --- v3: Include bugfixes from "Fixup SIGCHLD sharing" patch: * Use a mutex for defer_sigchld, to guard against concurrency between the thread calling defer_sigchld and an instance of the primary signal handler on another thread. * libxl_sigchld_owner_libxl_always is incompatible with SIGCHLD sharing. Document this correctly. Fix "have have" error in comment. Move removal of newly unused variables to previous patch. v2.1: Provide feature test macro LIBXL_HAVE_SIGCHLD_SHARING --- tools/libxl/libxl.h | 9 +++ tools/libxl/libxl_event.h | 14 ++-- tools/libxl/libxl_fork.c | 153 ++++++++++++++++++++++++++++++++++++------ tools/libxl/libxl_internal.h | 3 + 4 files changed, 153 insertions(+), 26 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 1ac34c3..0b992d1 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -422,6 +422,15 @@ */ #define LIBXL_HAVE_SIGCHLD_OWNER_SELECTIVE_REAP 1 +/* + * LIBXL_HAVE_SIGCHLD_SHARING + * + * If this is defined, it is permissible for multiple libxl ctxs + * to simultaneously "own" SIGCHLD. See "Subprocess handling" + * in libxl_event.h. + */ +#define LIBXL_HAVE_SIGCHLD_SHARING 1 + /* Functions annotated with LIBXL_EXTERNAL_CALLERS_ONLY may not be * called from within libxl itself. Callers outside libxl, who * do not #include libxl_internal.h, are fine. */ diff --git a/tools/libxl/libxl_event.h b/tools/libxl/libxl_event.h index 824ac88..ca43cb9 100644 --- a/tools/libxl/libxl_event.h +++ b/tools/libxl/libxl_event.h @@ -470,16 +470,18 @@ void libxl_osevent_occurred_timeout(libxl_ctx *ctx, void *for_libxl) * * libxl_sigchld_owner_libxl_always: * - * The application expects libxl to reap all of its children, - * and provides a callback to be notified of their exit - * statues. The application must have only one libxl_ctx - * configured this way. + * The application expects this libxl ctx to reap all of the + * process's children, and provides a callback to be notified of + * their exit statuses. The application must have only one + * libxl_ctx configured this way. * * libxl_sigchld_owner_libxl_always_selective_reap: * * The application expects to reap all of its own children - * synchronously, and does not use SIGCHLD. libxl is - * to install a SIGCHLD handler. + * synchronously, and does not use SIGCHLD. libxl is to install + * a SIGCHLD handler. The application may have multiple + * libxl_ctxs configured this way; in which case all of its ctxs + * must be so configured. */ diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index 084d86a..2432512 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -46,11 +46,19 @@ static int atfork_registered; static LIBXL_LIST_HEAD(, libxl__carefd) carefds = LIBXL_LIST_HEAD_INITIALIZER(carefds); -/* non-null iff installed, protected by no_forking */ -static libxl_ctx *sigchld_owner; +/* Protected against concurrency by no_forking. sigchld_users is + * protected against being interrupted by SIGCHLD (and thus read + * asynchronously by the signal handler) by sigchld_defer (see + * below). */ +static bool sigchld_installed; /* 0 means not */ +static pthread_mutex_t sigchld_defer_mutex = PTHREAD_MUTEX_INITIALIZER; +static LIBXL_LIST_HEAD(, libxl_ctx) sigchld_users = + LIBXL_LIST_HEAD_INITIALIZER(sigchld_users); static struct sigaction sigchld_saved_action; -static void sigchld_removehandler_core(void); +static void sigchld_removehandler_core(void); /* idempotent */ +static void sigchld_user_remove(libxl_ctx *ctx); /* idempotent */ +static void sigchld_sethandler_raw(void (*handler)(int), struct sigaction *old); static void atfork_lock(void) { @@ -126,8 +134,7 @@ void libxl_postfork_child_noexec(libxl_ctx *ctx) } LIBXL_LIST_INIT(&carefds); - if (sigchld_owner) - sigchld_removehandler_core(); + sigchld_user_remove(ctx); atfork_unlock(); } @@ -152,7 +159,8 @@ int libxl__carefd_fd(const libxl__carefd *cf) } /* - * Actual child process handling + * Low-level functions for child process handling, including + * the main SIGCHLD handler. */ /* Like waitpid(,,WNOHANG) but handles all errors except ECHILD. */ @@ -176,9 +184,22 @@ static void sigchld_selfpipe_handler(libxl__egc *egc, libxl__ev_fd *ev, static void sigchld_handler(int signo) { + /* This function has to be reentrant! Luckily it is. */ + + libxl_ctx *notify; int esave = errno; - int e = libxl__self_pipe_wakeup(sigchld_owner->sigchld_selfpipe[1]); - assert(!e); /* errors are probably EBADF, very bad */ + + int r = pthread_mutex_lock(&sigchld_defer_mutex); + assert(!r); + + LIBXL_LIST_FOREACH(notify, &sigchld_users, sigchld_users_entry) { + int e = libxl__self_pipe_wakeup(notify->sigchld_selfpipe[1]); + assert(!e); /* errors are probably EBADF, very bad */ + } + + r = pthread_mutex_unlock(&sigchld_defer_mutex); + assert(!r); + errno = esave; } @@ -195,22 +216,89 @@ static void sigchld_sethandler_raw(void (*handler)(int), struct sigaction *old) assert(!r); } -static void sigchld_removehandler_core(void) +/* + * SIGCHLD deferral + * + * sigchld_defer and sigchld_release are a bit like using sigprocmask + * to block the signal only they work for the whole process. Sadly + * this has to be done by setting a special handler that records the + * "pendingness" of the signal here in the program. How tedious. + * + * A property of this approach is that the signal handler itself + * must be reentrant (see the comment in release_sigchld). + * + * Callers have the atfork_lock so there is no risk of concurrency + * within these functions, aside from the risk of being interrupted by + * the signal. We use sigchld_defer_mutex to guard against the + * possibility of the real signal handler being still running on + * another thread. + */ + +static volatile sig_atomic_t sigchld_occurred_while_deferred; + +static void sigchld_handler_when_deferred(int signo) +{ + sigchld_occurred_while_deferred = 1; +} + +static void defer_sigchld(void) +{ + assert(sigchld_installed); + + sigchld_sethandler_raw(sigchld_handler_when_deferred, 0); + + /* Now _this thread_ cannot any longer be interrupted by the + * signal, so we can take the mutex without risk of deadlock. If + * another thread is in the signal handler, either it or we will + * block and wait for the other. */ + + int r = pthread_mutex_lock(&sigchld_defer_mutex); + assert(!r); +} + +static void release_sigchld(void) +{ + assert(sigchld_installed); + + int r = pthread_mutex_unlock(&sigchld_defer_mutex); + assert(!r); + + sigchld_sethandler_raw(sigchld_handler, 0); + if (sigchld_occurred_while_deferred) { + sigchld_occurred_while_deferred = 0; + /* We might get another SIGCHLD here, in which case + * sigchld_handler will be interrupted and re-entered. + * This is OK. */ + sigchld_handler(SIGCHLD); + } +} + +/* + * Meat of the child process handling. + */ + +static void sigchld_removehandler_core(void) /* idempotent */ { struct sigaction was; int r; + if (!sigchld_installed) + return; + r = sigaction(SIGCHLD, &sigchld_saved_action, &was); assert(!r); assert(!(was.sa_flags & SA_SIGINFO)); assert(was.sa_handler == sigchld_handler); - sigchld_owner = 0; + + sigchld_installed = 0; } -static void sigchld_installhandler_core(libxl__gc *gc) +static void sigchld_installhandler_core(void) /* idempotent */ { - assert(!sigchld_owner); - sigchld_owner = CTX; + if (sigchld_installed) + return; + + sigchld_installed = 1; sigchld_sethandler_raw(sigchld_handler, &sigchld_saved_action); @@ -220,15 +308,32 @@ static void sigchld_installhandler_core(libxl__gc *gc) sigchld_saved_action.sa_handler == SIG_IGN))); } -void libxl__sigchld_notneeded(libxl__gc *gc) /* non-reentrant, idempotent */ +static void sigchld_user_remove(libxl_ctx *ctx) /* idempotent */ { - int rc; + if (!ctx->sigchld_user_registered) + return; atfork_lock(); - if (sigchld_owner == CTX) + defer_sigchld(); + + LIBXL_LIST_REMOVE(ctx, sigchld_users_entry); + + release_sigchld(); + + if (LIBXL_LIST_EMPTY(&sigchld_users)) sigchld_removehandler_core(); + atfork_unlock(); + ctx->sigchld_user_registered = 0; +} + +void libxl__sigchld_notneeded(libxl__gc *gc) /* non-reentrant, idempotent */ +{ + int rc; + + sigchld_user_remove(CTX); + if (libxl__ev_fd_isregistered(&CTX->sigchld_selfpipe_efd)) { rc = libxl__ev_fd_modify(gc, &CTX->sigchld_selfpipe_efd, 0); if (rc) @@ -259,12 +364,20 @@ int libxl__sigchld_needed(libxl__gc *gc) /* non-reentrant, idempotent */ rc = libxl__ev_fd_modify(gc, &CTX->sigchld_selfpipe_efd, POLLIN); if (rc) goto out; } + if (!CTX->sigchld_user_registered) { + atfork_lock(); - atfork_lock(); - if (sigchld_owner != CTX) { - sigchld_installhandler_core(gc); + sigchld_installhandler_core(); + + defer_sigchld(); + + LIBXL_LIST_INSERT_HEAD(&sigchld_users, CTX, sigchld_users_entry); + + release_sigchld(); + atfork_unlock(); + + CTX->sigchld_user_registered = 1; } - atfork_unlock(); rc = 0; out: diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index fba681d..8429448 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -355,6 +355,8 @@ struct libxl__ctx { int sigchld_selfpipe[2]; /* [0]==-1 means handler not installed */ libxl__ev_fd sigchld_selfpipe_efd; LIBXL_LIST_HEAD(, libxl__ev_child) children; + bool sigchld_user_registered; + LIBXL_LIST_ENTRY(libxl_ctx) sigchld_users_entry; libxl_version_info version_info; }; @@ -840,6 +842,7 @@ _hidden void libxl__poller_wakeup(libxl__egc *egc, libxl__poller *p); extern const libxl_childproc_hooks libxl__childproc_default_hooks; int libxl__sigchld_needed(libxl__gc*); /* non-reentrant idempotent, logs errs */ void libxl__sigchld_notneeded(libxl__gc*); /* non-reentrant idempotent */ +void libxl__sigchld_check_stale_handler(void); int libxl__self_pipe_wakeup(int fd); /* returns 0 or -1 setting errno */ int libxl__self_pipe_eatall(int fd); /* returns 0 or -1 setting errno */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:58:32 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:58: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 1WDFjE-0003pj-Bj; Tue, 11 Feb 2014 15:58:32 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFjD-0003pO-7W for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:58:31 +0000 Received: from [193.109.254.147:16583] by server-12.bemta-14.messagelabs.com id 95/8B-17220-6A84AF25; Tue, 11 Feb 2014 15:58:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1392134308!3563141!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11443 invoked from network); 11 Feb 2014 15:58:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:58:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFjA-0001GF-In for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:58:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFjA-0004f9-He for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:58:28 +0000 Date: Tue, 11 Feb 2014 15:58:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: events: Break out libxl__pipe_nonblock, _close X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 d9a20c6040910aeb0910e5c71d45465dccca6923 Author: Ian Jackson AuthorDate: Tue Jan 21 14:58:10 2014 +0000 Commit: Ian Jackson CommitDate: Thu Feb 6 14:21:03 2014 +0000 libxl: events: Break out libxl__pipe_nonblock, _close Break out the pipe creation and destruction from the poller code into two new functions libxl__pipe_nonblock and libxl__pipe_close. Also change direct use of pipe() to libxl_pipe. No overall functional difference other than minor differences in exact log messages. Also move libxl__self_pipe_wakeup and libxl__self_pipe_eatall into the new pipe utilities section in libxl_event.c; this is pure code motion. Signed-off-by: Ian Jackson Cc: Jim Fehlig Cc: Ian Campbell Acked-by: Ian Campbell -- v3: Mention that we switched pipe() -> libxl_pipe() --- tools/libxl/libxl_event.c | 104 ++++++++++++++++++++++++++---------------- tools/libxl/libxl_internal.h | 9 ++++ 2 files changed, 73 insertions(+), 40 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 1c48fee..93f8fdc 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1271,26 +1271,81 @@ int libxl_event_check(libxl_ctx *ctx, libxl_event **event_r, } /* - * Manipulation of pollers + * Utilities for pipes (specifically, useful for self-pipes) */ -int libxl__poller_init(libxl_ctx *ctx, libxl__poller *p) +void libxl__pipe_close(int fds[2]) +{ + if (fds[0] >= 0) close(fds[0]); + if (fds[1] >= 0) close(fds[1]); + fds[0] = fds[1] = -1; +} + +int libxl__pipe_nonblock(libxl_ctx *ctx, int fds[2]) { int r, rc; - p->fd_polls = 0; - p->fd_rindices = 0; - r = pipe(p->wakeup_pipe); + r = libxl_pipe(ctx, fds); if (r) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "cannot create poller pipe"); + fds[0] = fds[1] = -1; rc = ERROR_FAIL; goto out; } - rc = libxl_fd_set_nonblock(ctx, p->wakeup_pipe[0], 1); + rc = libxl_fd_set_nonblock(ctx, fds[0], 1); if (rc) goto out; - rc = libxl_fd_set_nonblock(ctx, p->wakeup_pipe[1], 1); + rc = libxl_fd_set_nonblock(ctx, fds[1], 1); + if (rc) goto out; + + return 0; + + out: + libxl__pipe_close(fds); + return rc; +} + +int libxl__self_pipe_wakeup(int fd) +{ + static const char buf[1] = ""; + + for (;;) { + int r = write(fd, buf, 1); + if (r==1) return 0; + assert(r==-1); + if (errno == EINTR) continue; + if (errno == EWOULDBLOCK) return 0; + assert(errno); + return errno; + } +} + +int libxl__self_pipe_eatall(int fd) +{ + char buf[256]; + for (;;) { + int r = read(fd, buf, sizeof(buf)); + if (r == sizeof(buf)) continue; + if (r >= 0) return 0; + assert(r == -1); + if (errno == EINTR) continue; + if (errno == EWOULDBLOCK) return 0; + assert(errno); + return errno; + } +} + +/* + * Manipulation of pollers + */ + +int libxl__poller_init(libxl_ctx *ctx, libxl__poller *p) +{ + int rc; + p->fd_polls = 0; + p->fd_rindices = 0; + + rc = libxl__pipe_nonblock(ctx, p->wakeup_pipe); if (rc) goto out; return 0; @@ -1302,8 +1357,7 @@ int libxl__poller_init(libxl_ctx *ctx, libxl__poller *p) void libxl__poller_dispose(libxl__poller *p) { - if (p->wakeup_pipe[1] > 0) close(p->wakeup_pipe[1]); - if (p->wakeup_pipe[0] > 0) close(p->wakeup_pipe[0]); + libxl__pipe_close(p->wakeup_pipe); free(p->fd_polls); free(p->fd_rindices); } @@ -1347,36 +1401,6 @@ void libxl__poller_wakeup(libxl__egc *egc, libxl__poller *p) if (e) LIBXL__EVENT_DISASTER(egc, "cannot poke watch pipe", e, 0); } -int libxl__self_pipe_wakeup(int fd) -{ - static const char buf[1] = ""; - - for (;;) { - int r = write(fd, buf, 1); - if (r==1) return 0; - assert(r==-1); - if (errno == EINTR) continue; - if (errno == EWOULDBLOCK) return 0; - assert(errno); - return errno; - } -} - -int libxl__self_pipe_eatall(int fd) -{ - char buf[256]; - for (;;) { - int r = read(fd, buf, sizeof(buf)); - if (r == sizeof(buf)) continue; - if (r >= 0) return 0; - assert(r == -1); - if (errno == EINTR) continue; - if (errno == EWOULDBLOCK) return 0; - assert(errno); - return errno; - } -} - /* * Main event loop iteration */ diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 8429448..9d17586 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -509,6 +509,15 @@ _hidden char *libxl__strndup(libxl__gc *gc_opt, const char *c, size_t n) NN1; * string. (similar to a gc'd dirname(3)). */ _hidden char *libxl__dirname(libxl__gc *gc_opt, const char *s) NN1; +/* Make a pipe and set both ends nonblocking. On error, nothing + * is left open and both fds[]==-1, and a message is logged. + * Useful for self-pipes. */ +_hidden int libxl__pipe_nonblock(libxl_ctx *ctx, int fds[2]); +/* Closes the pipe fd(s). Either or both of fds[] may be -1 meaning + * `not open'. Ignores any errors. Sets fds[] to -1. */ +_hidden void libxl__pipe_close(int fds[2]); + + /* Each of these logs errors and returns a libxl error code. * They do not mind if path is already removed. * For _file, path must not be a directory; for _directory it must be. */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:58:32 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:58: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 1WDFjE-0003pj-Bj; Tue, 11 Feb 2014 15:58:32 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFjD-0003pO-7W for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:58:31 +0000 Received: from [193.109.254.147:16583] by server-12.bemta-14.messagelabs.com id 95/8B-17220-6A84AF25; Tue, 11 Feb 2014 15:58:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1392134308!3563141!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11443 invoked from network); 11 Feb 2014 15:58:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:58:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFjA-0001GF-In for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:58:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFjA-0004f9-He for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:58:28 +0000 Date: Tue, 11 Feb 2014 15:58:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: events: Break out libxl__pipe_nonblock, _close X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 d9a20c6040910aeb0910e5c71d45465dccca6923 Author: Ian Jackson AuthorDate: Tue Jan 21 14:58:10 2014 +0000 Commit: Ian Jackson CommitDate: Thu Feb 6 14:21:03 2014 +0000 libxl: events: Break out libxl__pipe_nonblock, _close Break out the pipe creation and destruction from the poller code into two new functions libxl__pipe_nonblock and libxl__pipe_close. Also change direct use of pipe() to libxl_pipe. No overall functional difference other than minor differences in exact log messages. Also move libxl__self_pipe_wakeup and libxl__self_pipe_eatall into the new pipe utilities section in libxl_event.c; this is pure code motion. Signed-off-by: Ian Jackson Cc: Jim Fehlig Cc: Ian Campbell Acked-by: Ian Campbell -- v3: Mention that we switched pipe() -> libxl_pipe() --- tools/libxl/libxl_event.c | 104 ++++++++++++++++++++++++++---------------- tools/libxl/libxl_internal.h | 9 ++++ 2 files changed, 73 insertions(+), 40 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 1c48fee..93f8fdc 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1271,26 +1271,81 @@ int libxl_event_check(libxl_ctx *ctx, libxl_event **event_r, } /* - * Manipulation of pollers + * Utilities for pipes (specifically, useful for self-pipes) */ -int libxl__poller_init(libxl_ctx *ctx, libxl__poller *p) +void libxl__pipe_close(int fds[2]) +{ + if (fds[0] >= 0) close(fds[0]); + if (fds[1] >= 0) close(fds[1]); + fds[0] = fds[1] = -1; +} + +int libxl__pipe_nonblock(libxl_ctx *ctx, int fds[2]) { int r, rc; - p->fd_polls = 0; - p->fd_rindices = 0; - r = pipe(p->wakeup_pipe); + r = libxl_pipe(ctx, fds); if (r) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "cannot create poller pipe"); + fds[0] = fds[1] = -1; rc = ERROR_FAIL; goto out; } - rc = libxl_fd_set_nonblock(ctx, p->wakeup_pipe[0], 1); + rc = libxl_fd_set_nonblock(ctx, fds[0], 1); if (rc) goto out; - rc = libxl_fd_set_nonblock(ctx, p->wakeup_pipe[1], 1); + rc = libxl_fd_set_nonblock(ctx, fds[1], 1); + if (rc) goto out; + + return 0; + + out: + libxl__pipe_close(fds); + return rc; +} + +int libxl__self_pipe_wakeup(int fd) +{ + static const char buf[1] = ""; + + for (;;) { + int r = write(fd, buf, 1); + if (r==1) return 0; + assert(r==-1); + if (errno == EINTR) continue; + if (errno == EWOULDBLOCK) return 0; + assert(errno); + return errno; + } +} + +int libxl__self_pipe_eatall(int fd) +{ + char buf[256]; + for (;;) { + int r = read(fd, buf, sizeof(buf)); + if (r == sizeof(buf)) continue; + if (r >= 0) return 0; + assert(r == -1); + if (errno == EINTR) continue; + if (errno == EWOULDBLOCK) return 0; + assert(errno); + return errno; + } +} + +/* + * Manipulation of pollers + */ + +int libxl__poller_init(libxl_ctx *ctx, libxl__poller *p) +{ + int rc; + p->fd_polls = 0; + p->fd_rindices = 0; + + rc = libxl__pipe_nonblock(ctx, p->wakeup_pipe); if (rc) goto out; return 0; @@ -1302,8 +1357,7 @@ int libxl__poller_init(libxl_ctx *ctx, libxl__poller *p) void libxl__poller_dispose(libxl__poller *p) { - if (p->wakeup_pipe[1] > 0) close(p->wakeup_pipe[1]); - if (p->wakeup_pipe[0] > 0) close(p->wakeup_pipe[0]); + libxl__pipe_close(p->wakeup_pipe); free(p->fd_polls); free(p->fd_rindices); } @@ -1347,36 +1401,6 @@ void libxl__poller_wakeup(libxl__egc *egc, libxl__poller *p) if (e) LIBXL__EVENT_DISASTER(egc, "cannot poke watch pipe", e, 0); } -int libxl__self_pipe_wakeup(int fd) -{ - static const char buf[1] = ""; - - for (;;) { - int r = write(fd, buf, 1); - if (r==1) return 0; - assert(r==-1); - if (errno == EINTR) continue; - if (errno == EWOULDBLOCK) return 0; - assert(errno); - return errno; - } -} - -int libxl__self_pipe_eatall(int fd) -{ - char buf[256]; - for (;;) { - int r = read(fd, buf, sizeof(buf)); - if (r == sizeof(buf)) continue; - if (r >= 0) return 0; - assert(r == -1); - if (errno == EINTR) continue; - if (errno == EWOULDBLOCK) return 0; - assert(errno); - return errno; - } -} - /* * Main event loop iteration */ diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 8429448..9d17586 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -509,6 +509,15 @@ _hidden char *libxl__strndup(libxl__gc *gc_opt, const char *c, size_t n) NN1; * string. (similar to a gc'd dirname(3)). */ _hidden char *libxl__dirname(libxl__gc *gc_opt, const char *s) NN1; +/* Make a pipe and set both ends nonblocking. On error, nothing + * is left open and both fds[]==-1, and a message is logged. + * Useful for self-pipes. */ +_hidden int libxl__pipe_nonblock(libxl_ctx *ctx, int fds[2]); +/* Closes the pipe fd(s). Either or both of fds[] may be -1 meaning + * `not open'. Ignores any errors. Sets fds[] to -1. */ +_hidden void libxl__pipe_close(int fds[2]); + + /* Each of these logs errors and returns a libxl error code. * They do not mind if path is already removed. * For _file, path must not be a directory; for _directory it must be. */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:58:42 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:58:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFjO-0003rn-Ei; Tue, 11 Feb 2014 15:58:42 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFjN-0003rT-6n for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:58:41 +0000 Received: from [85.158.143.35:10086] by server-2.bemta-4.messagelabs.com id E1/82-10891-0B84AF25; Tue, 11 Feb 2014 15:58:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1392134318!4860686!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2378 invoked from network); 11 Feb 2014 15:58:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:58:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFjK-0001GL-P4 for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:58:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFjK-0004gQ-Ne for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:58:38 +0000 Date: Tue, 11 Feb 2014 15:58:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fork: Make SIGCHLD self-pipe nonblocking X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 4727e87352f59150eece4f1deb94495589898cf6 Author: Ian Jackson AuthorDate: Tue Jan 21 15:05:37 2014 +0000 Commit: Ian Jackson CommitDate: Thu Feb 6 14:21:04 2014 +0000 libxl: fork: Make SIGCHLD self-pipe nonblocking Use the new libxl__pipe_nonblock and _close functions, rather than open coding the same logic. Now the pipe is nonblocking, which avoids a race which could result in libxl deadlocking in a multithreaded program. Reported-by: Jim Fehlig Signed-off-by: Ian Jackson Cc: Jim Fehlig Cc: Ian Campbell Acked-by: Ian Campbell --- tools/libxl/libxl.c | 6 +----- tools/libxl/libxl_fork.c | 12 +++--------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 6595f15..730f6e1 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -171,11 +171,7 @@ int libxl_ctx_free(libxl_ctx *ctx) * them; we wish the application good luck with understanding * this if and when it reaps them. */ libxl__sigchld_notneeded(gc); - - if (ctx->sigchld_selfpipe[0] >= 0) { - close(ctx->sigchld_selfpipe[0]); - close(ctx->sigchld_selfpipe[1]); - } + libxl__pipe_close(ctx->sigchld_selfpipe); pthread_mutex_destroy(&ctx->lock); diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index 2432512..1d0017b 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -343,17 +343,11 @@ void libxl__sigchld_notneeded(libxl__gc *gc) /* non-reentrant, idempotent */ int libxl__sigchld_needed(libxl__gc *gc) /* non-reentrant, idempotent */ { - int r, rc; + int rc; if (CTX->sigchld_selfpipe[0] < 0) { - r = pipe(CTX->sigchld_selfpipe); - if (r) { - CTX->sigchld_selfpipe[0] = -1; - LIBXL__LOG_ERRNO(CTX, LIBXL__LOG_ERROR, - "failed to create sigchld pipe"); - rc = ERROR_FAIL; - goto out; - } + rc = libxl__pipe_nonblock(CTX, CTX->sigchld_selfpipe); + if (rc) goto out; } if (!libxl__ev_fd_isregistered(&CTX->sigchld_selfpipe_efd)) { rc = libxl__ev_fd_register(gc, &CTX->sigchld_selfpipe_efd, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:58:42 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:58:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFjO-0003rn-Ei; Tue, 11 Feb 2014 15:58:42 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFjN-0003rT-6n for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:58:41 +0000 Received: from [85.158.143.35:10086] by server-2.bemta-4.messagelabs.com id E1/82-10891-0B84AF25; Tue, 11 Feb 2014 15:58:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1392134318!4860686!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2378 invoked from network); 11 Feb 2014 15:58:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:58:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFjK-0001GL-P4 for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:58:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFjK-0004gQ-Ne for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:58:38 +0000 Date: Tue, 11 Feb 2014 15:58:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fork: Make SIGCHLD self-pipe nonblocking X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 4727e87352f59150eece4f1deb94495589898cf6 Author: Ian Jackson AuthorDate: Tue Jan 21 15:05:37 2014 +0000 Commit: Ian Jackson CommitDate: Thu Feb 6 14:21:04 2014 +0000 libxl: fork: Make SIGCHLD self-pipe nonblocking Use the new libxl__pipe_nonblock and _close functions, rather than open coding the same logic. Now the pipe is nonblocking, which avoids a race which could result in libxl deadlocking in a multithreaded program. Reported-by: Jim Fehlig Signed-off-by: Ian Jackson Cc: Jim Fehlig Cc: Ian Campbell Acked-by: Ian Campbell --- tools/libxl/libxl.c | 6 +----- tools/libxl/libxl_fork.c | 12 +++--------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 6595f15..730f6e1 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -171,11 +171,7 @@ int libxl_ctx_free(libxl_ctx *ctx) * them; we wish the application good luck with understanding * this if and when it reaps them. */ libxl__sigchld_notneeded(gc); - - if (ctx->sigchld_selfpipe[0] >= 0) { - close(ctx->sigchld_selfpipe[0]); - close(ctx->sigchld_selfpipe[1]); - } + libxl__pipe_close(ctx->sigchld_selfpipe); pthread_mutex_destroy(&ctx->lock); diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index 2432512..1d0017b 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -343,17 +343,11 @@ void libxl__sigchld_notneeded(libxl__gc *gc) /* non-reentrant, idempotent */ int libxl__sigchld_needed(libxl__gc *gc) /* non-reentrant, idempotent */ { - int r, rc; + int rc; if (CTX->sigchld_selfpipe[0] < 0) { - r = pipe(CTX->sigchld_selfpipe); - if (r) { - CTX->sigchld_selfpipe[0] = -1; - LIBXL__LOG_ERRNO(CTX, LIBXL__LOG_ERROR, - "failed to create sigchld pipe"); - rc = ERROR_FAIL; - goto out; - } + rc = libxl__pipe_nonblock(CTX, CTX->sigchld_selfpipe); + if (rc) goto out; } if (!libxl__ev_fd_isregistered(&CTX->sigchld_selfpipe_efd)) { rc = libxl__ev_fd_register(gc, &CTX->sigchld_selfpipe_efd, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:58:52 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:58:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFjY-0003uA-JO; Tue, 11 Feb 2014 15:58:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFjX-0003tl-Ib for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:58:51 +0000 Received: from [85.158.143.35:11113] by server-2.bemta-4.messagelabs.com id A7/C2-10891-AB84AF25; Tue, 11 Feb 2014 15:58:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1392134329!4872312!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19719 invoked from network); 11 Feb 2014 15:58:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:58:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFjU-0001GR-U1 for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:58:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFjU-0004gs-SY for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:58:48 +0000 Date: Tue, 11 Feb 2014 15:58:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: events: Makefile builds internal unit tests X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 eb5cdc52756eb892c7da6b27c5a80d86d9df278a Author: Ian Jackson AuthorDate: Mon Feb 3 14:17:46 2014 +0000 Commit: Ian Jackson CommitDate: Thu Feb 6 14:21:04 2014 +0000 libxl: events: Makefile builds internal unit tests We provide a new LIBXL_TESTS facility in the Makefile. Also provide some helpful common routines for unit tests to use. We don't want to put the weird test case entrypoints and the weird test case code in the main libxl.so library. Symbol hiding prevents us from simply directly linking the libxl_test_FOO.o in later. So instead we provide a special library libxenlight_test.so which is used only locally. There are not yet any test cases defined; that will come in the next patch. Signed-off-by: Ian Jackson Cc: Jim Fehlig Cc: Ian Campbell Acked-by: Ian Campbell --- tools/libxl/Makefile | 32 ++++++++++++++++++++++++++++---- tools/libxl/test_common.c | 15 +++++++++++++++ tools/libxl/test_common.h | 14 ++++++++++++++ 3 files changed, 57 insertions(+), 4 deletions(-) diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 1410c44..cc21247 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -79,7 +79,23 @@ LIBXL_OBJS = flexarray.o libxl.o libxl_create.o libxl_dm.o libxl_pci.o \ libxl_qmp.o libxl_event.o libxl_fork.o $(LIBXL_OBJS-y) LIBXL_OBJS += _libxl_types.o libxl_flask.o _libxl_types_internal.o -$(LIBXL_OBJS): CFLAGS += $(CFLAGS_LIBXL) -include $(XEN_ROOT)/tools/config.h +LIBXL_TESTS += +# Each entry FOO in LIBXL_TESTS has two main .c files: +# libxl_test_FOO.c "inside libxl" code to support the test case +# test_FOO.c "outside libxl" code to exercise the test case +# Conventionally there will also be: +# libxl_test_FOO.h interface between the "inside" and "outside" parts +# The "inside libxl" file is compiled exactly like a piece of libxl, and the +# "outside libxl" file is compiled exactly like a piece of application +# code. They must share information via explicit libxl entrypoints. +# Unlike proper parts of libxl, it is permissible for libxl_test_FOO.c +# to use private global variables for its state. + +LIBXL_TEST_OBJS += $(foreach t, $(LIBXL_TESTS),libxl_test_$t.o) +TEST_PROG_OBJS += $(foreach t, $(LIBXL_TESTS),test_$t.o) test_common.o +TEST_PROGS += $(foreach t, $(LIBXL_TESTS),test_$t) + +$(LIBXL_OBJS) $(LIBXL_TEST_OBJS): CFLAGS += $(CFLAGS_LIBXL) -include $(XEN_ROOT)/tools/config.h AUTOINCS= libxlu_cfg_y.h libxlu_cfg_l.h _libxl_list.h _paths.h \ _libxl_save_msgs_callout.h _libxl_save_msgs_helper.h @@ -95,7 +111,7 @@ CFLAGS_XL += $(CFLAGS_libxenlight) CFLAGS_XL += -Wshadow XL_OBJS = xl.o xl_cmdimpl.o xl_cmdtable.o xl_sxp.o -$(XL_OBJS) _libxl.api-for-check: \ +$(XL_OBJS) $(TEST_PROG_OBJS) _libxl.api-for-check: \ CFLAGS += $(CFLAGS_libxenctrl) # For xentoollog.h $(XL_OBJS): CFLAGS += $(CFLAGS_XL) $(XL_OBJS): CFLAGS += -include $(XEN_ROOT)/tools/config.h # libxl_json.h needs it. @@ -109,10 +125,12 @@ testidl.c: libxl_types.idl gentest.py libxl.h $(AUTOINCS) mv testidl.c.new testidl.c .PHONY: all -all: $(CLIENTS) libxenlight.so libxenlight.a libxlutil.so libxlutil.a \ +all: $(CLIENTS) $(TEST_PROGS) \ + libxenlight.so libxenlight.a libxlutil.so libxlutil.a \ $(AUTOSRCS) $(AUTOINCS) -$(LIBXL_OBJS) $(LIBXLU_OBJS) $(XL_OBJS) $(SAVE_HELPER_OBJS): \ +$(LIBXL_OBJS) $(LIBXLU_OBJS) $(XL_OBJS) $(SAVE_HELPER_OBJS) \ + $(LIBXL_TEST_OBJS): \ $(AUTOINCS) libxl.api-ok %.c %.h:: %.y @@ -175,6 +193,9 @@ libxenlight.so.$(MAJOR): libxenlight.so.$(MAJOR).$(MINOR) libxenlight.so.$(MAJOR).$(MINOR): $(LIBXL_OBJS) $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS) +libxenlight_test.so: $(LIBXL_OBJS) $(LIBXL_TEST_OBJS) + $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight_test.so $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS) + libxenlight.a: $(LIBXL_OBJS) $(AR) rcs libxenlight.a $^ @@ -193,6 +214,9 @@ libxlutil.a: $(LIBXLU_OBJS) xl: $(XL_OBJS) libxlutil.so libxenlight.so $(CC) $(LDFLAGS) -o $@ $(XL_OBJS) libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS) +test_%: test_%.o test_common.o libxlutil.so libxenlight_test.so + $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS) + libxl-save-helper: $(SAVE_HELPER_OBJS) libxenlight.so $(CC) $(LDFLAGS) -o $@ $(SAVE_HELPER_OBJS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(APPEND_LDFLAGS) diff --git a/tools/libxl/test_common.c b/tools/libxl/test_common.c new file mode 100644 index 0000000..83b94eb --- /dev/null +++ b/tools/libxl/test_common.c @@ -0,0 +1,15 @@ +#include "test_common.h" + +libxl_ctx *ctx; + +void test_common_setup(int level) +{ + xentoollog_logger_stdiostream *logger_s + = xtl_createlogger_stdiostream(stderr, level, 0); + assert(logger_s); + + xentoollog_logger *logger = (xentoollog_logger*)logger_s; + + int rc = libxl_ctx_alloc(&ctx, LIBXL_VERSION, 0, logger); + assert(!rc); +} diff --git a/tools/libxl/test_common.h b/tools/libxl/test_common.h new file mode 100644 index 0000000..8b2471e --- /dev/null +++ b/tools/libxl/test_common.h @@ -0,0 +1,14 @@ +#ifndef TEST_COMMON_H +#define TEST_COMMON_H + +#include "libxl.h" + +#include +#include +#include + +void test_common_setup(int level); + +extern libxl_ctx *ctx; + +#endif /*TEST_COMMON_H*/ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:58:52 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:58:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFjY-0003uA-JO; Tue, 11 Feb 2014 15:58:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFjX-0003tl-Ib for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:58:51 +0000 Received: from [85.158.143.35:11113] by server-2.bemta-4.messagelabs.com id A7/C2-10891-AB84AF25; Tue, 11 Feb 2014 15:58:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1392134329!4872312!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19719 invoked from network); 11 Feb 2014 15:58:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:58:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFjU-0001GR-U1 for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:58:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFjU-0004gs-SY for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:58:48 +0000 Date: Tue, 11 Feb 2014 15:58:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: events: Makefile builds internal unit tests X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 eb5cdc52756eb892c7da6b27c5a80d86d9df278a Author: Ian Jackson AuthorDate: Mon Feb 3 14:17:46 2014 +0000 Commit: Ian Jackson CommitDate: Thu Feb 6 14:21:04 2014 +0000 libxl: events: Makefile builds internal unit tests We provide a new LIBXL_TESTS facility in the Makefile. Also provide some helpful common routines for unit tests to use. We don't want to put the weird test case entrypoints and the weird test case code in the main libxl.so library. Symbol hiding prevents us from simply directly linking the libxl_test_FOO.o in later. So instead we provide a special library libxenlight_test.so which is used only locally. There are not yet any test cases defined; that will come in the next patch. Signed-off-by: Ian Jackson Cc: Jim Fehlig Cc: Ian Campbell Acked-by: Ian Campbell --- tools/libxl/Makefile | 32 ++++++++++++++++++++++++++++---- tools/libxl/test_common.c | 15 +++++++++++++++ tools/libxl/test_common.h | 14 ++++++++++++++ 3 files changed, 57 insertions(+), 4 deletions(-) diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 1410c44..cc21247 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -79,7 +79,23 @@ LIBXL_OBJS = flexarray.o libxl.o libxl_create.o libxl_dm.o libxl_pci.o \ libxl_qmp.o libxl_event.o libxl_fork.o $(LIBXL_OBJS-y) LIBXL_OBJS += _libxl_types.o libxl_flask.o _libxl_types_internal.o -$(LIBXL_OBJS): CFLAGS += $(CFLAGS_LIBXL) -include $(XEN_ROOT)/tools/config.h +LIBXL_TESTS += +# Each entry FOO in LIBXL_TESTS has two main .c files: +# libxl_test_FOO.c "inside libxl" code to support the test case +# test_FOO.c "outside libxl" code to exercise the test case +# Conventionally there will also be: +# libxl_test_FOO.h interface between the "inside" and "outside" parts +# The "inside libxl" file is compiled exactly like a piece of libxl, and the +# "outside libxl" file is compiled exactly like a piece of application +# code. They must share information via explicit libxl entrypoints. +# Unlike proper parts of libxl, it is permissible for libxl_test_FOO.c +# to use private global variables for its state. + +LIBXL_TEST_OBJS += $(foreach t, $(LIBXL_TESTS),libxl_test_$t.o) +TEST_PROG_OBJS += $(foreach t, $(LIBXL_TESTS),test_$t.o) test_common.o +TEST_PROGS += $(foreach t, $(LIBXL_TESTS),test_$t) + +$(LIBXL_OBJS) $(LIBXL_TEST_OBJS): CFLAGS += $(CFLAGS_LIBXL) -include $(XEN_ROOT)/tools/config.h AUTOINCS= libxlu_cfg_y.h libxlu_cfg_l.h _libxl_list.h _paths.h \ _libxl_save_msgs_callout.h _libxl_save_msgs_helper.h @@ -95,7 +111,7 @@ CFLAGS_XL += $(CFLAGS_libxenlight) CFLAGS_XL += -Wshadow XL_OBJS = xl.o xl_cmdimpl.o xl_cmdtable.o xl_sxp.o -$(XL_OBJS) _libxl.api-for-check: \ +$(XL_OBJS) $(TEST_PROG_OBJS) _libxl.api-for-check: \ CFLAGS += $(CFLAGS_libxenctrl) # For xentoollog.h $(XL_OBJS): CFLAGS += $(CFLAGS_XL) $(XL_OBJS): CFLAGS += -include $(XEN_ROOT)/tools/config.h # libxl_json.h needs it. @@ -109,10 +125,12 @@ testidl.c: libxl_types.idl gentest.py libxl.h $(AUTOINCS) mv testidl.c.new testidl.c .PHONY: all -all: $(CLIENTS) libxenlight.so libxenlight.a libxlutil.so libxlutil.a \ +all: $(CLIENTS) $(TEST_PROGS) \ + libxenlight.so libxenlight.a libxlutil.so libxlutil.a \ $(AUTOSRCS) $(AUTOINCS) -$(LIBXL_OBJS) $(LIBXLU_OBJS) $(XL_OBJS) $(SAVE_HELPER_OBJS): \ +$(LIBXL_OBJS) $(LIBXLU_OBJS) $(XL_OBJS) $(SAVE_HELPER_OBJS) \ + $(LIBXL_TEST_OBJS): \ $(AUTOINCS) libxl.api-ok %.c %.h:: %.y @@ -175,6 +193,9 @@ libxenlight.so.$(MAJOR): libxenlight.so.$(MAJOR).$(MINOR) libxenlight.so.$(MAJOR).$(MINOR): $(LIBXL_OBJS) $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS) +libxenlight_test.so: $(LIBXL_OBJS) $(LIBXL_TEST_OBJS) + $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight_test.so $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS) + libxenlight.a: $(LIBXL_OBJS) $(AR) rcs libxenlight.a $^ @@ -193,6 +214,9 @@ libxlutil.a: $(LIBXLU_OBJS) xl: $(XL_OBJS) libxlutil.so libxenlight.so $(CC) $(LDFLAGS) -o $@ $(XL_OBJS) libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS) +test_%: test_%.o test_common.o libxlutil.so libxenlight_test.so + $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS) + libxl-save-helper: $(SAVE_HELPER_OBJS) libxenlight.so $(CC) $(LDFLAGS) -o $@ $(SAVE_HELPER_OBJS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(APPEND_LDFLAGS) diff --git a/tools/libxl/test_common.c b/tools/libxl/test_common.c new file mode 100644 index 0000000..83b94eb --- /dev/null +++ b/tools/libxl/test_common.c @@ -0,0 +1,15 @@ +#include "test_common.h" + +libxl_ctx *ctx; + +void test_common_setup(int level) +{ + xentoollog_logger_stdiostream *logger_s + = xtl_createlogger_stdiostream(stderr, level, 0); + assert(logger_s); + + xentoollog_logger *logger = (xentoollog_logger*)logger_s; + + int rc = libxl_ctx_alloc(&ctx, LIBXL_VERSION, 0, logger); + assert(!rc); +} diff --git a/tools/libxl/test_common.h b/tools/libxl/test_common.h new file mode 100644 index 0000000..8b2471e --- /dev/null +++ b/tools/libxl/test_common.h @@ -0,0 +1,14 @@ +#ifndef TEST_COMMON_H +#define TEST_COMMON_H + +#include "libxl.h" + +#include +#include +#include + +void test_common_setup(int level); + +extern libxl_ctx *ctx; + +#endif /*TEST_COMMON_H*/ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:59:03 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:59:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFjj-0003wn-MQ; Tue, 11 Feb 2014 15:59:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFji-0003wR-6F for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:59:02 +0000 Received: from [85.158.137.68:58657] by server-9.bemta-3.messagelabs.com id A5/E2-10184-5C84AF25; Tue, 11 Feb 2014 15:59:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1392134339!1153500!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22730 invoked from network); 11 Feb 2014 15:59:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:59:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFjf-0001GX-2u for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:58:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFjf-0004hL-10 for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:58:59 +0000 Date: Tue, 11 Feb 2014 15:58:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: events: timedereg internal unit test X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 2920d6655a351e028591389a040a71039730788f Author: Ian Jackson AuthorDate: Mon Feb 3 14:25:13 2014 +0000 Commit: Ian Jackson CommitDate: Thu Feb 6 14:21:30 2014 +0000 libxl: events: timedereg internal unit test Test timeout deregistration idempotency. In the current tree this test fails because ev->func is not cleared, meaning that a timeout can be removed from the list more than once, corrupting the list. It is necessary to use multiple timeouts to demonstrate this bug, because removing the very same entry twice from a list in quick succession, without modifying the list in other ways in between, doesn't actually corrupt the list. (Since removing an entry from a doubly-linked list just copies next and back from the disappearing entry into its neighbours.) Signed-off-by: Ian Jackson Cc: Jim Fehlig Cc: Ian Campbell Acked-by: Ian Campbell --- .gitignore | 1 + tools/libxl/Makefile | 2 +- tools/libxl/libxl_test_timedereg.c | 97 ++++++++++++++++++++++++++++++++++++ tools/libxl/libxl_test_timedereg.h | 9 +++ tools/libxl/test_timedereg.c | 11 ++++ 5 files changed, 119 insertions(+), 1 deletions(-) diff --git a/.gitignore b/.gitignore index 3504584..db3b083 100644 --- a/.gitignore +++ b/.gitignore @@ -361,6 +361,7 @@ tools/libxl/testidl tools/libxl/testidl.c tools/libxl/*.pyc tools/libxl/libxl-save-helper +tools/libxl/test_timedereg tools/blktap2/control/tap-ctl tools/firmware/etherboot/eb-roms.h tools/firmware/etherboot/gpxe-git-snapshot.tar.gz diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index cc21247..66f3f3f 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -79,7 +79,7 @@ LIBXL_OBJS = flexarray.o libxl.o libxl_create.o libxl_dm.o libxl_pci.o \ libxl_qmp.o libxl_event.o libxl_fork.o $(LIBXL_OBJS-y) LIBXL_OBJS += _libxl_types.o libxl_flask.o _libxl_types_internal.o -LIBXL_TESTS += +LIBXL_TESTS += timedereg # Each entry FOO in LIBXL_TESTS has two main .c files: # libxl_test_FOO.c "inside libxl" code to support the test case # test_FOO.c "outside libxl" code to exercise the test case diff --git a/tools/libxl/libxl_test_timedereg.c b/tools/libxl/libxl_test_timedereg.c new file mode 100644 index 0000000..a44639f --- /dev/null +++ b/tools/libxl/libxl_test_timedereg.c @@ -0,0 +1,97 @@ +/* + * timedereg test case for the libxl event system + * + * To run this test: + * ./test_timedereg + * Success: + * program takes a few seconds, prints some debugging output and exits 0 + * Failure: + * crash + * + * set up [0]-group timeouts 0 1 2 + * wait for timeout 1 to occur + * deregister 0 and 2. 1 is supposed to be deregistered already + * register [1]-group 0 1 2 + * deregister 1 (should be a no-op) + * wait for [1]-group 0 1 2 in turn + * on final callback assert that all have been deregistered + */ + +#include "libxl_internal.h" + +#include "libxl_test_timedereg.h" + +#define NTIMES 3 +static const int ms[2][NTIMES] = { { 2000,1000,2000 }, { 1000,2000,3000 } }; +static libxl__ev_time et[2][NTIMES]; +static libxl__ao *tao; +static int seq; + +static void occurs(libxl__egc *egc, libxl__ev_time *ev, + const struct timeval *requested_abs); + +static void regs(libxl__gc *gc, int j) +{ + int rc, i; + LOG(DEBUG,"regs(%d)", j); + for (i=0; i + +int libxl_test_timedereg(libxl_ctx *ctx, libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; + +#endif /*TEST_TIMEDEREG_H*/ diff --git a/tools/libxl/test_timedereg.c b/tools/libxl/test_timedereg.c new file mode 100644 index 0000000..0081ce3 --- /dev/null +++ b/tools/libxl/test_timedereg.c @@ -0,0 +1,11 @@ +#include "test_common.h" +#include "libxl_test_timedereg.h" + +int main(int argc, char **argv) { + int rc; + + test_common_setup(XTL_DEBUG); + + rc = libxl_test_timedereg(ctx, 0); + assert(!rc); +} -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:59:03 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:59:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFjj-0003wn-MQ; Tue, 11 Feb 2014 15:59:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFji-0003wR-6F for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:59:02 +0000 Received: from [85.158.137.68:58657] by server-9.bemta-3.messagelabs.com id A5/E2-10184-5C84AF25; Tue, 11 Feb 2014 15:59:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1392134339!1153500!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22730 invoked from network); 11 Feb 2014 15:59:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:59:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFjf-0001GX-2u for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:58:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFjf-0004hL-10 for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:58:59 +0000 Date: Tue, 11 Feb 2014 15:58:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: events: timedereg internal unit test X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 2920d6655a351e028591389a040a71039730788f Author: Ian Jackson AuthorDate: Mon Feb 3 14:25:13 2014 +0000 Commit: Ian Jackson CommitDate: Thu Feb 6 14:21:30 2014 +0000 libxl: events: timedereg internal unit test Test timeout deregistration idempotency. In the current tree this test fails because ev->func is not cleared, meaning that a timeout can be removed from the list more than once, corrupting the list. It is necessary to use multiple timeouts to demonstrate this bug, because removing the very same entry twice from a list in quick succession, without modifying the list in other ways in between, doesn't actually corrupt the list. (Since removing an entry from a doubly-linked list just copies next and back from the disappearing entry into its neighbours.) Signed-off-by: Ian Jackson Cc: Jim Fehlig Cc: Ian Campbell Acked-by: Ian Campbell --- .gitignore | 1 + tools/libxl/Makefile | 2 +- tools/libxl/libxl_test_timedereg.c | 97 ++++++++++++++++++++++++++++++++++++ tools/libxl/libxl_test_timedereg.h | 9 +++ tools/libxl/test_timedereg.c | 11 ++++ 5 files changed, 119 insertions(+), 1 deletions(-) diff --git a/.gitignore b/.gitignore index 3504584..db3b083 100644 --- a/.gitignore +++ b/.gitignore @@ -361,6 +361,7 @@ tools/libxl/testidl tools/libxl/testidl.c tools/libxl/*.pyc tools/libxl/libxl-save-helper +tools/libxl/test_timedereg tools/blktap2/control/tap-ctl tools/firmware/etherboot/eb-roms.h tools/firmware/etherboot/gpxe-git-snapshot.tar.gz diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index cc21247..66f3f3f 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -79,7 +79,7 @@ LIBXL_OBJS = flexarray.o libxl.o libxl_create.o libxl_dm.o libxl_pci.o \ libxl_qmp.o libxl_event.o libxl_fork.o $(LIBXL_OBJS-y) LIBXL_OBJS += _libxl_types.o libxl_flask.o _libxl_types_internal.o -LIBXL_TESTS += +LIBXL_TESTS += timedereg # Each entry FOO in LIBXL_TESTS has two main .c files: # libxl_test_FOO.c "inside libxl" code to support the test case # test_FOO.c "outside libxl" code to exercise the test case diff --git a/tools/libxl/libxl_test_timedereg.c b/tools/libxl/libxl_test_timedereg.c new file mode 100644 index 0000000..a44639f --- /dev/null +++ b/tools/libxl/libxl_test_timedereg.c @@ -0,0 +1,97 @@ +/* + * timedereg test case for the libxl event system + * + * To run this test: + * ./test_timedereg + * Success: + * program takes a few seconds, prints some debugging output and exits 0 + * Failure: + * crash + * + * set up [0]-group timeouts 0 1 2 + * wait for timeout 1 to occur + * deregister 0 and 2. 1 is supposed to be deregistered already + * register [1]-group 0 1 2 + * deregister 1 (should be a no-op) + * wait for [1]-group 0 1 2 in turn + * on final callback assert that all have been deregistered + */ + +#include "libxl_internal.h" + +#include "libxl_test_timedereg.h" + +#define NTIMES 3 +static const int ms[2][NTIMES] = { { 2000,1000,2000 }, { 1000,2000,3000 } }; +static libxl__ev_time et[2][NTIMES]; +static libxl__ao *tao; +static int seq; + +static void occurs(libxl__egc *egc, libxl__ev_time *ev, + const struct timeval *requested_abs); + +static void regs(libxl__gc *gc, int j) +{ + int rc, i; + LOG(DEBUG,"regs(%d)", j); + for (i=0; i + +int libxl_test_timedereg(libxl_ctx *ctx, libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; + +#endif /*TEST_TIMEDEREG_H*/ diff --git a/tools/libxl/test_timedereg.c b/tools/libxl/test_timedereg.c new file mode 100644 index 0000000..0081ce3 --- /dev/null +++ b/tools/libxl/test_timedereg.c @@ -0,0 +1,11 @@ +#include "test_common.h" +#include "libxl_test_timedereg.h" + +int main(int argc, char **argv) { + int rc; + + test_common_setup(XTL_DEBUG); + + rc = libxl_test_timedereg(ctx, 0); + assert(!rc); +} -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:59:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:59:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFjs-0003ye-P8; Tue, 11 Feb 2014 15:59:12 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFjr-0003yG-Ja for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:59:11 +0000 Received: from [85.158.143.35:32066] by server-1.bemta-4.messagelabs.com id C5/B2-31661-EC84AF25; Tue, 11 Feb 2014 15:59:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1392134349!4869890!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12768 invoked from network); 11 Feb 2014 15:59:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:59:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFjp-0001H3-74 for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:59:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFjp-0004hr-5r for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:59:09 +0000 Date: Tue, 11 Feb 2014 15:59:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: timeouts: Break out time_occurs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 54f3f3850a8a34823d30591d13e658bbaa50232b Author: Ian Jackson AuthorDate: Fri Jan 31 15:04:37 2014 +0000 Commit: Ian Jackson CommitDate: Thu Feb 6 14:21:41 2014 +0000 libxl: timeouts: Break out time_occurs Bring together the two places where etime->func() is called into a new function time_occurs. For one call site this is pure code motion. For the other the only semantic change is the introduction of a new debugging message. Signed-off-by: Ian Jackson Cc: Jim Fehlig Cc: Ian Campbell Acked-by: Ian Campbell --- tools/libxl/libxl_event.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 93f8fdc..5a99932 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -381,6 +381,15 @@ void libxl__ev_time_deregister(libxl__gc *gc, libxl__ev_time *ev) return; } +static void time_occurs(libxl__egc *egc, libxl__ev_time *etime) +{ + DBG("ev_time=%p occurs abs=%lu.%06lu", + etime, (unsigned long)etime->abs.tv_sec, + (unsigned long)etime->abs.tv_usec); + + etime->func(egc, etime, &etime->abs); +} + /* * xenstore watches @@ -1007,11 +1016,7 @@ static void afterpoll_internal(libxl__egc *egc, libxl__poller *poller, time_deregister(gc, etime); - DBG("ev_time=%p occurs abs=%lu.%06lu", - etime, (unsigned long)etime->abs.tv_sec, - (unsigned long)etime->abs.tv_usec); - - etime->func(egc, etime, &etime->abs); + time_occurs(egc, etime); } } @@ -1092,7 +1097,8 @@ void libxl_osevent_occurred_timeout(libxl_ctx *ctx, void *for_libxl) assert(!ev->infinite); LIBXL_TAILQ_REMOVE(&CTX->etimes, ev, entry); - ev->func(egc, ev, &ev->abs); + + time_occurs(egc, ev); out: CTX_UNLOCK; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:59:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:59:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFjs-0003ye-P8; Tue, 11 Feb 2014 15:59:12 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFjr-0003yG-Ja for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:59:11 +0000 Received: from [85.158.143.35:32066] by server-1.bemta-4.messagelabs.com id C5/B2-31661-EC84AF25; Tue, 11 Feb 2014 15:59:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1392134349!4869890!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12768 invoked from network); 11 Feb 2014 15:59:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:59:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFjp-0001H3-74 for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:59:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFjp-0004hr-5r for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:59:09 +0000 Date: Tue, 11 Feb 2014 15:59:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: timeouts: Break out time_occurs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 54f3f3850a8a34823d30591d13e658bbaa50232b Author: Ian Jackson AuthorDate: Fri Jan 31 15:04:37 2014 +0000 Commit: Ian Jackson CommitDate: Thu Feb 6 14:21:41 2014 +0000 libxl: timeouts: Break out time_occurs Bring together the two places where etime->func() is called into a new function time_occurs. For one call site this is pure code motion. For the other the only semantic change is the introduction of a new debugging message. Signed-off-by: Ian Jackson Cc: Jim Fehlig Cc: Ian Campbell Acked-by: Ian Campbell --- tools/libxl/libxl_event.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 93f8fdc..5a99932 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -381,6 +381,15 @@ void libxl__ev_time_deregister(libxl__gc *gc, libxl__ev_time *ev) return; } +static void time_occurs(libxl__egc *egc, libxl__ev_time *etime) +{ + DBG("ev_time=%p occurs abs=%lu.%06lu", + etime, (unsigned long)etime->abs.tv_sec, + (unsigned long)etime->abs.tv_usec); + + etime->func(egc, etime, &etime->abs); +} + /* * xenstore watches @@ -1007,11 +1016,7 @@ static void afterpoll_internal(libxl__egc *egc, libxl__poller *poller, time_deregister(gc, etime); - DBG("ev_time=%p occurs abs=%lu.%06lu", - etime, (unsigned long)etime->abs.tv_sec, - (unsigned long)etime->abs.tv_usec); - - etime->func(egc, etime, &etime->abs); + time_occurs(egc, etime); } } @@ -1092,7 +1097,8 @@ void libxl_osevent_occurred_timeout(libxl_ctx *ctx, void *for_libxl) assert(!ev->infinite); LIBXL_TAILQ_REMOVE(&CTX->etimes, ev, entry); - ev->func(egc, ev, &ev->abs); + + time_occurs(egc, ev); out: CTX_UNLOCK; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:59:24 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:59: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 1WDFk3-00041Q-V3; Tue, 11 Feb 2014 15:59:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFk2-00040t-5L for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:59:22 +0000 Received: from [85.158.137.68:2901] by server-17.bemta-3.messagelabs.com id 1F/E9-22569-9D84AF25; Tue, 11 Feb 2014 15:59:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1392134359!1156654!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10335 invoked from network); 11 Feb 2014 15:59:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:59:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFjz-0001H9-GU for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:59:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFjz-0004iI-BE for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:59:19 +0000 Date: Tue, 11 Feb 2014 15:59:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: timeouts: Record deregistration when one occurs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 15347ebb357fe587c2f9e55bdeb5ef6af36b7958 Author: Ian Jackson AuthorDate: Fri Jan 31 15:07:55 2014 +0000 Commit: Ian Jackson CommitDate: Thu Feb 6 14:24:16 2014 +0000 libxl: timeouts: Record deregistration when one occurs When a timeout has occurred, it is deregistered. However, we failed to record this fact by updating etime->func. As a result, libxl__ev_time_isregistered would say `true' for a timeout which has already happened. It is necessary to clear etime->func before the callback, because the callback might want to reinstate the timeout, or might free the etime (or its containing struct) entirely. The results are that we might try to have the timeout occur again (causing problems for the call site), and/or corrupt the timeout list. This fixes the timedereg event system unit test. Signed-off-by: Ian Jackson Cc: Jim Fehlig Cc: Ian Campbell Acked-by: Ian Campbell --- tools/libxl/libxl_event.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 5a99932..ea8c744 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -387,7 +387,9 @@ static void time_occurs(libxl__egc *egc, libxl__ev_time *etime) etime, (unsigned long)etime->abs.tv_sec, (unsigned long)etime->abs.tv_usec); - etime->func(egc, etime, &etime->abs); + libxl__ev_time_callback *func = etime->func; + etime->func = 0; + func(egc, etime, &etime->abs); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:59:24 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:59: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 1WDFk3-00041Q-V3; Tue, 11 Feb 2014 15:59:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFk2-00040t-5L for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:59:22 +0000 Received: from [85.158.137.68:2901] by server-17.bemta-3.messagelabs.com id 1F/E9-22569-9D84AF25; Tue, 11 Feb 2014 15:59:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1392134359!1156654!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10335 invoked from network); 11 Feb 2014 15:59:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:59:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFjz-0001H9-GU for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:59:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFjz-0004iI-BE for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:59:19 +0000 Date: Tue, 11 Feb 2014 15:59:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: timeouts: Record deregistration when one occurs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 15347ebb357fe587c2f9e55bdeb5ef6af36b7958 Author: Ian Jackson AuthorDate: Fri Jan 31 15:07:55 2014 +0000 Commit: Ian Jackson CommitDate: Thu Feb 6 14:24:16 2014 +0000 libxl: timeouts: Record deregistration when one occurs When a timeout has occurred, it is deregistered. However, we failed to record this fact by updating etime->func. As a result, libxl__ev_time_isregistered would say `true' for a timeout which has already happened. It is necessary to clear etime->func before the callback, because the callback might want to reinstate the timeout, or might free the etime (or its containing struct) entirely. The results are that we might try to have the timeout occur again (causing problems for the call site), and/or corrupt the timeout list. This fixes the timedereg event system unit test. Signed-off-by: Ian Jackson Cc: Jim Fehlig Cc: Ian Campbell Acked-by: Ian Campbell --- tools/libxl/libxl_event.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 5a99932..ea8c744 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -387,7 +387,9 @@ static void time_occurs(libxl__egc *egc, libxl__ev_time *etime) etime, (unsigned long)etime->abs.tv_sec, (unsigned long)etime->abs.tv_usec); - etime->func(egc, etime, &etime->abs); + libxl__ev_time_callback *func = etime->func; + etime->func = 0; + func(egc, etime, &etime->abs); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:59:34 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:59:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFkE-00043M-1h; Tue, 11 Feb 2014 15:59:34 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFkC-000430-Ap for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:59:32 +0000 Received: from [193.109.254.147:10593] by server-13.bemta-14.messagelabs.com id 08/36-01226-3E84AF25; Tue, 11 Feb 2014 15:59:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1392134369!3600334!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16923 invoked from network); 11 Feb 2014 15:59:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:59:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFk9-0001HF-Mq for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:59:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFk9-0004ie-KS for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:59:29 +0000 Date: Tue, 11 Feb 2014 15:59:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] flask: fix reading strings from guest memory X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 6c79e0ab9ac6042e60434c02e1d99b0cf0cc3470 Author: Jan Beulich AuthorDate: Thu Feb 6 16:33:50 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 6 16:33:50 2014 +0100 flask: fix reading strings from guest memory Since the string size is being specified by the guest, we must range check it properly before doing allocations based on it. While for the two cases that are exposed only to trusted guests (via policy restriction) this just uses an arbitrary upper limit (PAGE_SIZE), for the FLASK_[GS]ETBOOL case (which any guest can use) the upper limit gets enforced based on the longest name across all boolean settings. This is XSA-84. Reported-by: Matthew Daley Signed-off-by: Jan Beulich Acked-by: Daniel De Graaf --- xen/xsm/flask/flask_op.c | 21 ++++++++++++++------- xen/xsm/flask/include/conditional.h | 4 +++- xen/xsm/flask/ss/services.c | 17 ++++++++++------- 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index 4426ab9..f8deb37 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -53,6 +53,7 @@ static DEFINE_SPINLOCK(sel_sem); /* global data for booleans */ static int bool_num = 0; static int *bool_pending_values = NULL; +static size_t bool_maxstr; static int flask_security_make_bools(void); extern int ss_initialized; @@ -71,9 +72,15 @@ static int domain_has_security(struct domain *d, u32 perms) perms, NULL); } -static int flask_copyin_string(XEN_GUEST_HANDLE_PARAM(char) u_buf, char **buf, uint32_t size) +static int flask_copyin_string(XEN_GUEST_HANDLE_PARAM(char) u_buf, char **buf, + size_t size, size_t max_size) { - char *tmp = xmalloc_bytes(size + 1); + char *tmp; + + if ( size > max_size ) + return -ENOENT; + + tmp = xmalloc_array(char, size + 1); if ( !tmp ) return -ENOMEM; @@ -99,7 +106,7 @@ static int flask_security_user(struct xen_flask_userlist *arg) if ( rv ) return rv; - rv = flask_copyin_string(arg->u.user, &user, arg->size); + rv = flask_copyin_string(arg->u.user, &user, arg->size, PAGE_SIZE); if ( rv ) return rv; @@ -210,7 +217,7 @@ static int flask_security_context(struct xen_flask_sid_context *arg) if ( rv ) return rv; - rv = flask_copyin_string(arg->context, &buf, arg->size); + rv = flask_copyin_string(arg->context, &buf, arg->size, PAGE_SIZE); if ( rv ) return rv; @@ -303,7 +310,7 @@ static int flask_security_resolve_bool(struct xen_flask_boolean *arg) if ( arg->bool_id != -1 ) return 0; - rv = flask_copyin_string(arg->name, &name, arg->size); + rv = flask_copyin_string(arg->name, &name, arg->size, bool_maxstr); if ( rv ) return rv; @@ -334,7 +341,7 @@ static int flask_security_set_bool(struct xen_flask_boolean *arg) int num; int *values; - rv = security_get_bools(&num, NULL, &values); + rv = security_get_bools(&num, NULL, &values, NULL); if ( rv != 0 ) goto out; @@ -440,7 +447,7 @@ static int flask_security_make_bools(void) xfree(bool_pending_values); - ret = security_get_bools(&num, NULL, &values); + ret = security_get_bools(&num, NULL, &values, &bool_maxstr); if ( ret != 0 ) goto out; diff --git a/xen/xsm/flask/include/conditional.h b/xen/xsm/flask/include/conditional.h index 2fa0a30..043cfd8 100644 --- a/xen/xsm/flask/include/conditional.h +++ b/xen/xsm/flask/include/conditional.h @@ -13,7 +13,9 @@ #ifndef _FLASK_CONDITIONAL_H_ #define _FLASK_CONDITIONAL_H_ -int security_get_bools(int *len, char ***names, int **values); +#include + +int security_get_bools(int *len, char ***names, int **values, size_t *maxstr); int security_set_bools(int len, int *values); diff --git a/xen/xsm/flask/ss/services.c b/xen/xsm/flask/ss/services.c index 1bf3b0c..5cb9537 100644 --- a/xen/xsm/flask/ss/services.c +++ b/xen/xsm/flask/ss/services.c @@ -1850,7 +1850,7 @@ int security_find_bool(const char *name) return rv; } -int security_get_bools(int *len, char ***names, int **values) +int security_get_bools(int *len, char ***names, int **values, size_t *maxstr) { int i, rc = -ENOMEM; @@ -1858,6 +1858,8 @@ int security_get_bools(int *len, char ***names, int **values) if ( names ) *names = NULL; *values = NULL; + if ( maxstr ) + *maxstr = 0; *len = policydb.p_bools.nprim; if ( !*len ) @@ -1879,16 +1881,17 @@ int security_get_bools(int *len, char ***names, int **values) for ( i = 0; i < *len; i++ ) { - size_t name_len; + size_t name_len = strlen(policydb.p_bool_val_to_name[i]); + (*values)[i] = policydb.bool_val_to_struct[i]->state; if ( names ) { - name_len = strlen(policydb.p_bool_val_to_name[i]) + 1; - (*names)[i] = (char*)xmalloc_array(char, name_len); + (*names)[i] = xmalloc_array(char, name_len + 1); if ( !(*names)[i] ) goto err; - strlcpy((*names)[i], policydb.p_bool_val_to_name[i], name_len); - (*names)[i][name_len - 1] = 0; + strlcpy((*names)[i], policydb.p_bool_val_to_name[i], name_len + 1); } + if ( maxstr && name_len > *maxstr ) + *maxstr = name_len; } rc = 0; out: @@ -2006,7 +2009,7 @@ static int security_preserve_bools(struct policydb *p) struct cond_bool_datum *booldatum; struct cond_node *cur; - rc = security_get_bools(&nbools, &bnames, &bvalues); + rc = security_get_bools(&nbools, &bnames, &bvalues, NULL); if ( rc ) goto out; for ( i = 0; i < nbools; i++ ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:59:34 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:59:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFkE-00043M-1h; Tue, 11 Feb 2014 15:59:34 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFkC-000430-Ap for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:59:32 +0000 Received: from [193.109.254.147:10593] by server-13.bemta-14.messagelabs.com id 08/36-01226-3E84AF25; Tue, 11 Feb 2014 15:59:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1392134369!3600334!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16923 invoked from network); 11 Feb 2014 15:59:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:59:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFk9-0001HF-Mq for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:59:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFk9-0004ie-KS for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:59:29 +0000 Date: Tue, 11 Feb 2014 15:59:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] flask: fix reading strings from guest memory X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 6c79e0ab9ac6042e60434c02e1d99b0cf0cc3470 Author: Jan Beulich AuthorDate: Thu Feb 6 16:33:50 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 6 16:33:50 2014 +0100 flask: fix reading strings from guest memory Since the string size is being specified by the guest, we must range check it properly before doing allocations based on it. While for the two cases that are exposed only to trusted guests (via policy restriction) this just uses an arbitrary upper limit (PAGE_SIZE), for the FLASK_[GS]ETBOOL case (which any guest can use) the upper limit gets enforced based on the longest name across all boolean settings. This is XSA-84. Reported-by: Matthew Daley Signed-off-by: Jan Beulich Acked-by: Daniel De Graaf --- xen/xsm/flask/flask_op.c | 21 ++++++++++++++------- xen/xsm/flask/include/conditional.h | 4 +++- xen/xsm/flask/ss/services.c | 17 ++++++++++------- 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index 4426ab9..f8deb37 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -53,6 +53,7 @@ static DEFINE_SPINLOCK(sel_sem); /* global data for booleans */ static int bool_num = 0; static int *bool_pending_values = NULL; +static size_t bool_maxstr; static int flask_security_make_bools(void); extern int ss_initialized; @@ -71,9 +72,15 @@ static int domain_has_security(struct domain *d, u32 perms) perms, NULL); } -static int flask_copyin_string(XEN_GUEST_HANDLE_PARAM(char) u_buf, char **buf, uint32_t size) +static int flask_copyin_string(XEN_GUEST_HANDLE_PARAM(char) u_buf, char **buf, + size_t size, size_t max_size) { - char *tmp = xmalloc_bytes(size + 1); + char *tmp; + + if ( size > max_size ) + return -ENOENT; + + tmp = xmalloc_array(char, size + 1); if ( !tmp ) return -ENOMEM; @@ -99,7 +106,7 @@ static int flask_security_user(struct xen_flask_userlist *arg) if ( rv ) return rv; - rv = flask_copyin_string(arg->u.user, &user, arg->size); + rv = flask_copyin_string(arg->u.user, &user, arg->size, PAGE_SIZE); if ( rv ) return rv; @@ -210,7 +217,7 @@ static int flask_security_context(struct xen_flask_sid_context *arg) if ( rv ) return rv; - rv = flask_copyin_string(arg->context, &buf, arg->size); + rv = flask_copyin_string(arg->context, &buf, arg->size, PAGE_SIZE); if ( rv ) return rv; @@ -303,7 +310,7 @@ static int flask_security_resolve_bool(struct xen_flask_boolean *arg) if ( arg->bool_id != -1 ) return 0; - rv = flask_copyin_string(arg->name, &name, arg->size); + rv = flask_copyin_string(arg->name, &name, arg->size, bool_maxstr); if ( rv ) return rv; @@ -334,7 +341,7 @@ static int flask_security_set_bool(struct xen_flask_boolean *arg) int num; int *values; - rv = security_get_bools(&num, NULL, &values); + rv = security_get_bools(&num, NULL, &values, NULL); if ( rv != 0 ) goto out; @@ -440,7 +447,7 @@ static int flask_security_make_bools(void) xfree(bool_pending_values); - ret = security_get_bools(&num, NULL, &values); + ret = security_get_bools(&num, NULL, &values, &bool_maxstr); if ( ret != 0 ) goto out; diff --git a/xen/xsm/flask/include/conditional.h b/xen/xsm/flask/include/conditional.h index 2fa0a30..043cfd8 100644 --- a/xen/xsm/flask/include/conditional.h +++ b/xen/xsm/flask/include/conditional.h @@ -13,7 +13,9 @@ #ifndef _FLASK_CONDITIONAL_H_ #define _FLASK_CONDITIONAL_H_ -int security_get_bools(int *len, char ***names, int **values); +#include + +int security_get_bools(int *len, char ***names, int **values, size_t *maxstr); int security_set_bools(int len, int *values); diff --git a/xen/xsm/flask/ss/services.c b/xen/xsm/flask/ss/services.c index 1bf3b0c..5cb9537 100644 --- a/xen/xsm/flask/ss/services.c +++ b/xen/xsm/flask/ss/services.c @@ -1850,7 +1850,7 @@ int security_find_bool(const char *name) return rv; } -int security_get_bools(int *len, char ***names, int **values) +int security_get_bools(int *len, char ***names, int **values, size_t *maxstr) { int i, rc = -ENOMEM; @@ -1858,6 +1858,8 @@ int security_get_bools(int *len, char ***names, int **values) if ( names ) *names = NULL; *values = NULL; + if ( maxstr ) + *maxstr = 0; *len = policydb.p_bools.nprim; if ( !*len ) @@ -1879,16 +1881,17 @@ int security_get_bools(int *len, char ***names, int **values) for ( i = 0; i < *len; i++ ) { - size_t name_len; + size_t name_len = strlen(policydb.p_bool_val_to_name[i]); + (*values)[i] = policydb.bool_val_to_struct[i]->state; if ( names ) { - name_len = strlen(policydb.p_bool_val_to_name[i]) + 1; - (*names)[i] = (char*)xmalloc_array(char, name_len); + (*names)[i] = xmalloc_array(char, name_len + 1); if ( !(*names)[i] ) goto err; - strlcpy((*names)[i], policydb.p_bool_val_to_name[i], name_len); - (*names)[i][name_len - 1] = 0; + strlcpy((*names)[i], policydb.p_bool_val_to_name[i], name_len + 1); } + if ( maxstr && name_len > *maxstr ) + *maxstr = name_len; } rc = 0; out: @@ -2006,7 +2009,7 @@ static int security_preserve_bools(struct policydb *p) struct cond_bool_datum *booldatum; struct cond_node *cur; - rc = security_get_bools(&nbools, &bnames, &bvalues); + rc = security_get_bools(&nbools, &bnames, &bvalues, NULL); if ( rc ) goto out; for ( i = 0; i < nbools; i++ ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:59:45 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:59:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFkP-00045R-4d; Tue, 11 Feb 2014 15:59:45 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFkN-00045D-Cf for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:59:43 +0000 Received: from [85.158.137.68:10669] by server-16.bemta-3.messagelabs.com id A3/8F-29917-EE84AF25; Tue, 11 Feb 2014 15:59:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1392134380!1158792!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9621 invoked from network); 11 Feb 2014 15:59:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:59:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFkK-0001HP-JC for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:59:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFkJ-0004ji-QT for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:59:40 +0000 Date: Tue, 11 Feb 2014 15:59:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xsm/flask: correct off-by-one in flask_security_avc_cachestats cpu id check X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 2e1cba2da4631c5cd7218a8f30d521dce0f41370 Author: Matthew Daley AuthorDate: Thu Feb 6 16:42:36 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 6 16:42:36 2014 +0100 xsm/flask: correct off-by-one in flask_security_avc_cachestats cpu id check This is XSA-85. Signed-off-by: Matthew Daley Reviewed-by: Jan Beulich Reviewed-by: Ian Campbell --- xen/xsm/flask/flask_op.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index f8deb37..4b93e71 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -464,7 +464,7 @@ static int flask_security_avc_cachestats(struct xen_flask_cache_stats *arg) { struct avc_cache_stats *st; - if ( arg->cpu > nr_cpu_ids ) + if ( arg->cpu >= nr_cpu_ids ) return -ENOENT; if ( !cpu_online(arg->cpu) ) return -ENOENT; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:59:45 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:59:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFkP-00045R-4d; Tue, 11 Feb 2014 15:59:45 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFkN-00045D-Cf for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:59:43 +0000 Received: from [85.158.137.68:10669] by server-16.bemta-3.messagelabs.com id A3/8F-29917-EE84AF25; Tue, 11 Feb 2014 15:59:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1392134380!1158792!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9621 invoked from network); 11 Feb 2014 15:59:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:59:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFkK-0001HP-JC for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:59:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFkJ-0004ji-QT for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:59:40 +0000 Date: Tue, 11 Feb 2014 15:59:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xsm/flask: correct off-by-one in flask_security_avc_cachestats cpu id check X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 2e1cba2da4631c5cd7218a8f30d521dce0f41370 Author: Matthew Daley AuthorDate: Thu Feb 6 16:42:36 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 6 16:42:36 2014 +0100 xsm/flask: correct off-by-one in flask_security_avc_cachestats cpu id check This is XSA-85. Signed-off-by: Matthew Daley Reviewed-by: Jan Beulich Reviewed-by: Ian Campbell --- xen/xsm/flask/flask_op.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index f8deb37..4b93e71 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -464,7 +464,7 @@ static int flask_security_avc_cachestats(struct xen_flask_cache_stats *arg) { struct avc_cache_stats *st; - if ( arg->cpu > nr_cpu_ids ) + if ( arg->cpu >= nr_cpu_ids ) return -ENOENT; if ( !cpu_online(arg->cpu) ) return -ENOENT; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:59:55 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:59:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFkZ-00047S-7V; Tue, 11 Feb 2014 15:59:55 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFkX-000476-If for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:59:53 +0000 Received: from [85.158.137.68:11577] by server-17.bemta-3.messagelabs.com id F7/DA-22569-8F84AF25; Tue, 11 Feb 2014 15:59:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1392134390!1127321!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17887 invoked from network); 11 Feb 2014 15:59:51 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:59:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFkU-0001HY-On for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:59:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFkU-0004k4-Mt for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:59:50 +0000 Date: Tue, 11 Feb 2014 15:59:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libvchan: Fix handling of invalid ring buffer indices X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4023660549232660835==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============4023660549232660835== Content-Type: text/plain commit 2efcb0193bf3916c8ce34882e845f5ceb1e511f7 Author: Marek Marczykowski-Górecki AuthorDate: Thu Feb 6 16:44:41 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 6 16:44:41 2014 +0100 libvchan: Fix handling of invalid ring buffer indices The remote (hostile) process can set ring buffer indices to any value at any time. If that happens, it is possible to get "buffer space" (either for writing data, or ready for reading) negative or greater than buffer size. This will end up with buffer overflow in the second memcpy inside of do_send/do_recv. Fix this by introducing new available bytes accessor functions raw_get_data_ready and raw_get_buffer_space which are robust against mad ring states, and only return sanitised values. Proof sketch of correctness: Now {rd,wr}_{cons,prod} are only ever used in the raw available bytes functions, and in do_send and do_recv. The raw available bytes functions do unsigned arithmetic on the returned values. If the result is "negative" or too big it will be >ring_size (since we used unsigned arithmetic). Otherwise the result is a positive in-range value representing a reasonable ring state, in which case we can safely convert it to int (as the rest of the code expects). do_send and do_recv immediately mask the ring index value with the ring size. The result is always going to be plausible. If the ring state has become mad, the worst case is that our behaviour is inconsistent with the peer's ring pointer. I.e. we read or write to arguably-incorrect parts of the ring - but always parts of the ring. And of course if a peer misoperates the ring they can achieve this effect anyway. So the security problem is fixed. This is XSA-86. (The patch is essentially Ian Jackson's work, although parts of the commit message are by Marek.) Signed-off-by: Marek Marczykowski-Górecki Signed-off-by: Ian Jackson --- tools/libvchan/io.c | 47 +++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 41 insertions(+), 6 deletions(-) diff --git a/tools/libvchan/io.c b/tools/libvchan/io.c index 2383364..804c63c 100644 --- a/tools/libvchan/io.c +++ b/tools/libvchan/io.c @@ -111,12 +111,26 @@ static inline int send_notify(struct libxenvchan *ctrl, uint8_t bit) return 0; } +/* + * Get the amount of buffer space available, and do nothing about + * notifications. + */ +static inline int raw_get_data_ready(struct libxenvchan *ctrl) +{ + uint32_t ready = rd_prod(ctrl) - rd_cons(ctrl); + if (ready >= rd_ring_size(ctrl)) + /* We have no way to return errors. Locking up the ring is + * better than the alternatives. */ + return 0; + return ready; +} + /** * Get the amount of buffer space available and enable notifications if needed. */ static inline int fast_get_data_ready(struct libxenvchan *ctrl, size_t request) { - int ready = rd_prod(ctrl) - rd_cons(ctrl); + int ready = raw_get_data_ready(ctrl); if (ready >= request) return ready; /* We plan to consume all data; please tell us if you send more */ @@ -126,7 +140,7 @@ static inline int fast_get_data_ready(struct libxenvchan *ctrl, size_t request) * will not get notified even though the actual amount of data ready is * above request. Reread rd_prod to cover this case. */ - return rd_prod(ctrl) - rd_cons(ctrl); + return raw_get_data_ready(ctrl); } int libxenvchan_data_ready(struct libxenvchan *ctrl) @@ -135,7 +149,21 @@ int libxenvchan_data_ready(struct libxenvchan *ctrl) * when it changes */ request_notify(ctrl, VCHAN_NOTIFY_WRITE); - return rd_prod(ctrl) - rd_cons(ctrl); + return raw_get_data_ready(ctrl); +} + +/** + * Get the amount of buffer space available, and do nothing + * about notifications + */ +static inline int raw_get_buffer_space(struct libxenvchan *ctrl) +{ + uint32_t ready = wr_ring_size(ctrl) - (wr_prod(ctrl) - wr_cons(ctrl)); + if (ready > wr_ring_size(ctrl)) + /* We have no way to return errors. Locking up the ring is + * better than the alternatives. */ + return 0; + return ready; } /** @@ -143,7 +171,7 @@ int libxenvchan_data_ready(struct libxenvchan *ctrl) */ static inline int fast_get_buffer_space(struct libxenvchan *ctrl, size_t request) { - int ready = wr_ring_size(ctrl) - (wr_prod(ctrl) - wr_cons(ctrl)); + int ready = raw_get_buffer_space(ctrl); if (ready >= request) return ready; /* We plan to fill the buffer; please tell us when you've read it */ @@ -153,7 +181,7 @@ static inline int fast_get_buffer_space(struct libxenvchan *ctrl, size_t request * will not get notified even though the actual amount of buffer space * is above request. Reread wr_cons to cover this case. */ - return wr_ring_size(ctrl) - (wr_prod(ctrl) - wr_cons(ctrl)); + return raw_get_buffer_space(ctrl); } int libxenvchan_buffer_space(struct libxenvchan *ctrl) @@ -162,7 +190,7 @@ int libxenvchan_buffer_space(struct libxenvchan *ctrl) * when it changes */ request_notify(ctrl, VCHAN_NOTIFY_READ); - return wr_ring_size(ctrl) - (wr_prod(ctrl) - wr_cons(ctrl)); + return raw_get_buffer_space(ctrl); } int libxenvchan_wait(struct libxenvchan *ctrl) @@ -176,6 +204,8 @@ int libxenvchan_wait(struct libxenvchan *ctrl) /** * returns -1 on error, or size on success + * + * caller must have checked that enough space is available */ static int do_send(struct libxenvchan *ctrl, const void *data, size_t size) { @@ -248,6 +278,11 @@ int libxenvchan_write(struct libxenvchan *ctrl, const void *data, size_t size) } } +/** + * returns -1 on error, or size on success + * + * caller must have checked that enough data is available + */ static int do_recv(struct libxenvchan *ctrl, void *data, size_t size) { int real_idx = rd_cons(ctrl) & (rd_ring_size(ctrl) - 1); -- generated by git-patchbot for /home/xen/git/xen.git#master --===============4023660549232660835== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============4023660549232660835==-- From xen-changelog-bounces@lists.xen.org Tue Feb 11 15:59:55 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 15:59:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFkZ-00047S-7V; Tue, 11 Feb 2014 15:59:55 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFkX-000476-If for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:59:53 +0000 Received: from [85.158.137.68:11577] by server-17.bemta-3.messagelabs.com id F7/DA-22569-8F84AF25; Tue, 11 Feb 2014 15:59:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1392134390!1127321!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17887 invoked from network); 11 Feb 2014 15:59:51 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 15:59:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFkU-0001HY-On for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:59:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFkU-0004k4-Mt for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 15:59:50 +0000 Date: Tue, 11 Feb 2014 15:59:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libvchan: Fix handling of invalid ring buffer indices X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4023660549232660835==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============4023660549232660835== Content-Type: text/plain commit 2efcb0193bf3916c8ce34882e845f5ceb1e511f7 Author: Marek Marczykowski-Górecki AuthorDate: Thu Feb 6 16:44:41 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 6 16:44:41 2014 +0100 libvchan: Fix handling of invalid ring buffer indices The remote (hostile) process can set ring buffer indices to any value at any time. If that happens, it is possible to get "buffer space" (either for writing data, or ready for reading) negative or greater than buffer size. This will end up with buffer overflow in the second memcpy inside of do_send/do_recv. Fix this by introducing new available bytes accessor functions raw_get_data_ready and raw_get_buffer_space which are robust against mad ring states, and only return sanitised values. Proof sketch of correctness: Now {rd,wr}_{cons,prod} are only ever used in the raw available bytes functions, and in do_send and do_recv. The raw available bytes functions do unsigned arithmetic on the returned values. If the result is "negative" or too big it will be >ring_size (since we used unsigned arithmetic). Otherwise the result is a positive in-range value representing a reasonable ring state, in which case we can safely convert it to int (as the rest of the code expects). do_send and do_recv immediately mask the ring index value with the ring size. The result is always going to be plausible. If the ring state has become mad, the worst case is that our behaviour is inconsistent with the peer's ring pointer. I.e. we read or write to arguably-incorrect parts of the ring - but always parts of the ring. And of course if a peer misoperates the ring they can achieve this effect anyway. So the security problem is fixed. This is XSA-86. (The patch is essentially Ian Jackson's work, although parts of the commit message are by Marek.) Signed-off-by: Marek Marczykowski-Górecki Signed-off-by: Ian Jackson --- tools/libvchan/io.c | 47 +++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 41 insertions(+), 6 deletions(-) diff --git a/tools/libvchan/io.c b/tools/libvchan/io.c index 2383364..804c63c 100644 --- a/tools/libvchan/io.c +++ b/tools/libvchan/io.c @@ -111,12 +111,26 @@ static inline int send_notify(struct libxenvchan *ctrl, uint8_t bit) return 0; } +/* + * Get the amount of buffer space available, and do nothing about + * notifications. + */ +static inline int raw_get_data_ready(struct libxenvchan *ctrl) +{ + uint32_t ready = rd_prod(ctrl) - rd_cons(ctrl); + if (ready >= rd_ring_size(ctrl)) + /* We have no way to return errors. Locking up the ring is + * better than the alternatives. */ + return 0; + return ready; +} + /** * Get the amount of buffer space available and enable notifications if needed. */ static inline int fast_get_data_ready(struct libxenvchan *ctrl, size_t request) { - int ready = rd_prod(ctrl) - rd_cons(ctrl); + int ready = raw_get_data_ready(ctrl); if (ready >= request) return ready; /* We plan to consume all data; please tell us if you send more */ @@ -126,7 +140,7 @@ static inline int fast_get_data_ready(struct libxenvchan *ctrl, size_t request) * will not get notified even though the actual amount of data ready is * above request. Reread rd_prod to cover this case. */ - return rd_prod(ctrl) - rd_cons(ctrl); + return raw_get_data_ready(ctrl); } int libxenvchan_data_ready(struct libxenvchan *ctrl) @@ -135,7 +149,21 @@ int libxenvchan_data_ready(struct libxenvchan *ctrl) * when it changes */ request_notify(ctrl, VCHAN_NOTIFY_WRITE); - return rd_prod(ctrl) - rd_cons(ctrl); + return raw_get_data_ready(ctrl); +} + +/** + * Get the amount of buffer space available, and do nothing + * about notifications + */ +static inline int raw_get_buffer_space(struct libxenvchan *ctrl) +{ + uint32_t ready = wr_ring_size(ctrl) - (wr_prod(ctrl) - wr_cons(ctrl)); + if (ready > wr_ring_size(ctrl)) + /* We have no way to return errors. Locking up the ring is + * better than the alternatives. */ + return 0; + return ready; } /** @@ -143,7 +171,7 @@ int libxenvchan_data_ready(struct libxenvchan *ctrl) */ static inline int fast_get_buffer_space(struct libxenvchan *ctrl, size_t request) { - int ready = wr_ring_size(ctrl) - (wr_prod(ctrl) - wr_cons(ctrl)); + int ready = raw_get_buffer_space(ctrl); if (ready >= request) return ready; /* We plan to fill the buffer; please tell us when you've read it */ @@ -153,7 +181,7 @@ static inline int fast_get_buffer_space(struct libxenvchan *ctrl, size_t request * will not get notified even though the actual amount of buffer space * is above request. Reread wr_cons to cover this case. */ - return wr_ring_size(ctrl) - (wr_prod(ctrl) - wr_cons(ctrl)); + return raw_get_buffer_space(ctrl); } int libxenvchan_buffer_space(struct libxenvchan *ctrl) @@ -162,7 +190,7 @@ int libxenvchan_buffer_space(struct libxenvchan *ctrl) * when it changes */ request_notify(ctrl, VCHAN_NOTIFY_READ); - return wr_ring_size(ctrl) - (wr_prod(ctrl) - wr_cons(ctrl)); + return raw_get_buffer_space(ctrl); } int libxenvchan_wait(struct libxenvchan *ctrl) @@ -176,6 +204,8 @@ int libxenvchan_wait(struct libxenvchan *ctrl) /** * returns -1 on error, or size on success + * + * caller must have checked that enough space is available */ static int do_send(struct libxenvchan *ctrl, const void *data, size_t size) { @@ -248,6 +278,11 @@ int libxenvchan_write(struct libxenvchan *ctrl, const void *data, size_t size) } } +/** + * returns -1 on error, or size on success + * + * caller must have checked that enough data is available + */ static int do_recv(struct libxenvchan *ctrl, void *data, size_t size) { int real_idx = rd_cons(ctrl) & (rd_ring_size(ctrl) - 1); -- generated by git-patchbot for /home/xen/git/xen.git#master --===============4023660549232660835== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============4023660549232660835==-- From xen-changelog-bounces@lists.xen.org Tue Feb 11 16:00:06 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 16:00:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFkk-0004F8-Eh; Tue, 11 Feb 2014 16:00:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFki-00049K-Mt for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 16:00:05 +0000 Received: from [85.158.137.68:5623] by server-5.bemta-3.messagelabs.com id B1/51-04712-2094AF25; Tue, 11 Feb 2014 16:00:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1392134401!1140522!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6361 invoked from network); 11 Feb 2014 16:00:02 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 16:00:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFkf-0001He-0A for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 16:00:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFke-0004kR-Sw for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 16:00:00 +0000 Date: Tue, 11 Feb 2014 16:00:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: test programs: Fix Makefile race re headers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4950037bf276921171652a8e8f21ab34a27dfe97 Author: Ian Jackson AuthorDate: Thu Feb 6 18:41:24 2014 +0000 Commit: Ian Jackson CommitDate: Thu Feb 6 19:18:34 2014 +0000 libxl: test programs: Fix Makefile race re headers We need to include the new TEST_PROG_OBJS and LIBXL_TEST_OBJS in the appropriate dependencies. Otherwise we risk trying to build the test program before gentypes is run. Reported-by: Olaf Hering Signed-off-by: Ian Jackson Cc: Olaf Hering Cc: Ian Campbell --- tools/libxl/Makefile | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 66f3f3f..4af9033 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -130,7 +130,7 @@ all: $(CLIENTS) $(TEST_PROGS) \ $(AUTOSRCS) $(AUTOINCS) $(LIBXL_OBJS) $(LIBXLU_OBJS) $(XL_OBJS) $(SAVE_HELPER_OBJS) \ - $(LIBXL_TEST_OBJS): \ + $(LIBXL_TEST_OBJS) $(TEST_PROG_OBJS): \ $(AUTOINCS) libxl.api-ok %.c %.h:: %.y @@ -175,8 +175,9 @@ libxl_internal.h: _libxl_types_internal.h _paths.h libxl_internal_json.h: _libxl_types_internal_json.h xl.h: _paths.h -$(LIBXL_OBJS) $(LIBXLU_OBJS) $(XL_OBJS) $(SAVE_HELPER_OBJS): libxl.h -$(LIBXL_OBJS): libxl_internal.h +$(LIBXL_OBJS) $(LIBXL_TEST_OBJS) $(LIBXLU_OBJS) \ + $(XL_OBJS) $(TEST_PROG_OBJS) $(SAVE_HELPER_OBJS): libxl.h +$(LIBXL_OBJS) $(LIBXL_TEST_OBJS): libxl_internal.h _libxl_type%.h _libxl_type%_json.h _libxl_type%.c: libxl_type%.idl gentypes.py idl.py $(PYTHON) gentypes.py libxl_type$*.idl __libxl_type$*.h __libxl_type$*_json.h __libxl_type$*.c -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 16:00:06 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 16:00:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFkk-0004F8-Eh; Tue, 11 Feb 2014 16:00:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFki-00049K-Mt for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 16:00:05 +0000 Received: from [85.158.137.68:5623] by server-5.bemta-3.messagelabs.com id B1/51-04712-2094AF25; Tue, 11 Feb 2014 16:00:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1392134401!1140522!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6361 invoked from network); 11 Feb 2014 16:00:02 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 16:00:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFkf-0001He-0A for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 16:00:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFke-0004kR-Sw for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 16:00:00 +0000 Date: Tue, 11 Feb 2014 16:00:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: test programs: Fix Makefile race re headers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4950037bf276921171652a8e8f21ab34a27dfe97 Author: Ian Jackson AuthorDate: Thu Feb 6 18:41:24 2014 +0000 Commit: Ian Jackson CommitDate: Thu Feb 6 19:18:34 2014 +0000 libxl: test programs: Fix Makefile race re headers We need to include the new TEST_PROG_OBJS and LIBXL_TEST_OBJS in the appropriate dependencies. Otherwise we risk trying to build the test program before gentypes is run. Reported-by: Olaf Hering Signed-off-by: Ian Jackson Cc: Olaf Hering Cc: Ian Campbell --- tools/libxl/Makefile | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 66f3f3f..4af9033 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -130,7 +130,7 @@ all: $(CLIENTS) $(TEST_PROGS) \ $(AUTOSRCS) $(AUTOINCS) $(LIBXL_OBJS) $(LIBXLU_OBJS) $(XL_OBJS) $(SAVE_HELPER_OBJS) \ - $(LIBXL_TEST_OBJS): \ + $(LIBXL_TEST_OBJS) $(TEST_PROG_OBJS): \ $(AUTOINCS) libxl.api-ok %.c %.h:: %.y @@ -175,8 +175,9 @@ libxl_internal.h: _libxl_types_internal.h _paths.h libxl_internal_json.h: _libxl_types_internal_json.h xl.h: _paths.h -$(LIBXL_OBJS) $(LIBXLU_OBJS) $(XL_OBJS) $(SAVE_HELPER_OBJS): libxl.h -$(LIBXL_OBJS): libxl_internal.h +$(LIBXL_OBJS) $(LIBXL_TEST_OBJS) $(LIBXLU_OBJS) \ + $(XL_OBJS) $(TEST_PROG_OBJS) $(SAVE_HELPER_OBJS): libxl.h +$(LIBXL_OBJS) $(LIBXL_TEST_OBJS): libxl_internal.h _libxl_type%.h _libxl_type%_json.h _libxl_type%.c: libxl_type%.idl gentypes.py idl.py $(PYTHON) gentypes.py libxl_type$*.idl __libxl_type$*.h __libxl_type$*_json.h __libxl_type$*.c -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 16:00:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 16:00: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 1WDFks-0004SJ-Ur; Tue, 11 Feb 2014 16:00:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFkr-0004S7-N2 for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 16:00:13 +0000 Received: from [85.158.143.35:23091] by server-2.bemta-4.messagelabs.com id 7C/15-10891-D094AF25; Tue, 11 Feb 2014 16:00:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1392134411!4857588!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3875 invoked from network); 11 Feb 2014 16:00:12 -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; 11 Feb 2014 16:00:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFkp-0001hz-9d for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 16:00:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFkp-0004lU-3g for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 16:00:11 +0000 Date: Tue, 11 Feb 2014 16:00:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: test programs: Fix make race re libxenlight.so X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 cde17c6a62d97239c76aace92f3fdbad09931ca4 Author: Ian Jackson AuthorDate: Thu Feb 6 19:17:26 2014 +0000 Commit: Ian Jackson CommitDate: Thu Feb 6 19:19:20 2014 +0000 libxl: test programs: Fix make race re libxenlight.so The test programs were getting the proper libxenlight.so on their link line. Filter it out. Also change the soname of the test library to match the real one, so that libxutil is satisfied with it. Reported-by: Olaf Hering Signed-off-by: Ian Jackson Cc: Olaf Hering Cc: Ian Campbell --- tools/libxl/Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 4af9033..dab2929 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -195,7 +195,7 @@ libxenlight.so.$(MAJOR).$(MINOR): $(LIBXL_OBJS) $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS) libxenlight_test.so: $(LIBXL_OBJS) $(LIBXL_TEST_OBJS) - $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight_test.so $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS) libxenlight.a: $(LIBXL_OBJS) $(AR) rcs libxenlight.a $^ @@ -216,7 +216,7 @@ xl: $(XL_OBJS) libxlutil.so libxenlight.so $(CC) $(LDFLAGS) -o $@ $(XL_OBJS) libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS) test_%: test_%.o test_common.o libxlutil.so libxenlight_test.so - $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) -o $@ $^ $(filter-out %libxenlight.so, $(LDLIBS_libxenlight)) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS) libxl-save-helper: $(SAVE_HELPER_OBJS) libxenlight.so $(CC) $(LDFLAGS) -o $@ $(SAVE_HELPER_OBJS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(APPEND_LDFLAGS) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 16:00:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 16:00: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 1WDFks-0004SJ-Ur; Tue, 11 Feb 2014 16:00:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFkr-0004S7-N2 for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 16:00:13 +0000 Received: from [85.158.143.35:23091] by server-2.bemta-4.messagelabs.com id 7C/15-10891-D094AF25; Tue, 11 Feb 2014 16:00:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1392134411!4857588!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3875 invoked from network); 11 Feb 2014 16:00:12 -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; 11 Feb 2014 16:00:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFkp-0001hz-9d for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 16:00:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFkp-0004lU-3g for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 16:00:11 +0000 Date: Tue, 11 Feb 2014 16:00:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: test programs: Fix make race re libxenlight.so X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 cde17c6a62d97239c76aace92f3fdbad09931ca4 Author: Ian Jackson AuthorDate: Thu Feb 6 19:17:26 2014 +0000 Commit: Ian Jackson CommitDate: Thu Feb 6 19:19:20 2014 +0000 libxl: test programs: Fix make race re libxenlight.so The test programs were getting the proper libxenlight.so on their link line. Filter it out. Also change the soname of the test library to match the real one, so that libxutil is satisfied with it. Reported-by: Olaf Hering Signed-off-by: Ian Jackson Cc: Olaf Hering Cc: Ian Campbell --- tools/libxl/Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 4af9033..dab2929 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -195,7 +195,7 @@ libxenlight.so.$(MAJOR).$(MINOR): $(LIBXL_OBJS) $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS) libxenlight_test.so: $(LIBXL_OBJS) $(LIBXL_TEST_OBJS) - $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight_test.so $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS) libxenlight.a: $(LIBXL_OBJS) $(AR) rcs libxenlight.a $^ @@ -216,7 +216,7 @@ xl: $(XL_OBJS) libxlutil.so libxenlight.so $(CC) $(LDFLAGS) -o $@ $(XL_OBJS) libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS) test_%: test_%.o test_common.o libxlutil.so libxenlight_test.so - $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) -o $@ $^ $(filter-out %libxenlight.so, $(LDLIBS_libxenlight)) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS) libxl-save-helper: $(SAVE_HELPER_OBJS) libxenlight.so $(CC) $(LDFLAGS) -o $@ $(SAVE_HELPER_OBJS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(APPEND_LDFLAGS) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 16:00:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 16:00:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFl5-0004Ui-4E; Tue, 11 Feb 2014 16:00:27 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFl2-0004U1-KF for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 16:00:24 +0000 Received: from [85.158.143.35:55765] by server-2.bemta-4.messagelabs.com id FA/A5-10891-7194AF25; Tue, 11 Feb 2014 16:00:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1392134422!4863311!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2483 invoked from network); 11 Feb 2014 16:00:23 -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; 11 Feb 2014 16:00:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFkz-0001i7-Sh for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 16:00:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFkz-0004lt-OH for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 16:00:21 +0000 Date: Tue, 11 Feb 2014 16:00:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/AMD: apply workaround for AMD F16h erratum 792 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 4d3ebb84df43d90db4cc25a48f4658709bd11678 Author: Aravind Gopalakrishnan AuthorDate: Fri Feb 7 11:12:22 2014 +0100 Commit: Jan Beulich CommitDate: Fri Feb 7 11:12:22 2014 +0100 x86/AMD: apply workaround for AMD F16h erratum 792 Workaround for the Erratum will be in BIOSes spun only after Jan 2014 onwards. But initial production parts shipped in 2013 itself. Since there is a coverage hole, we should carry this fix in software in case BIOS does not do the right thing or someone is using old BIOS. Description: Processor does not ensure DRAM scrub read/write sequence is atomic wrt accesses to CC6 save state area. Therefore if a concurrent scrub read/write access is to same address the entry may appear as if it is not written. This quirk applies to Fam16h models 00h-0Fh See "Revision Guide" for AMD F16h models 00h-0fh, document 51810 rev. 3.04, Nov 2013. Equivalent Linux patch link: http://marc.info/?l=linux-kernel&m=139066012217149&w=2 Tested the patch on Fam16h server platform and it works fine. Signed-off-by: Aravind Gopalakrishnan Reviewed-by: Suravee Suthikulpanit Reviewed-by: Andrew Cooper Corrected checking for boot CPU. Made warning message conditional. Compacted warning message text. Moved comment to commit message. Signed-off-by: Jan Beulich --- xen/arch/x86/cpu/amd.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 3307141..44087fa 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -477,6 +477,25 @@ static void __devinit init_amd(struct cpuinfo_x86 *c) " all your (PV) guest kernels. ***\n"); if (c->x86 == 0x16 && c->x86_model <= 0xf) { + if (c == &boot_cpu_data) { + l = pci_conf_read32(0, 0, 0x18, 0x3, 0x58); + h = pci_conf_read32(0, 0, 0x18, 0x3, 0x5c); + if ((l & 0x1f) | (h & 0x1)) + printk(KERN_WARNING + "Applying workaround for erratum 792: %s%s%s\n", + (l & 0x1f) ? "clearing D18F3x58[4:0]" : "", + ((l & 0x1f) && (h & 0x1)) ? " and " : "", + (h & 0x1) ? "clearing D18F3x5C[0]" : ""); + + if (l & 0x1f) + pci_conf_write32(0, 0, 0x18, 0x3, 0x58, + l & ~0x1f); + + if (h & 0x1) + pci_conf_write32(0, 0, 0x18, 0x3, 0x5c, + h & ~0x1); + } + rdmsrl(MSR_AMD64_LS_CFG, value); if (!(value & (1 << 15))) { static bool_t warned; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 16:00:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 16:00:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFl5-0004Ui-4E; Tue, 11 Feb 2014 16:00:27 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFl2-0004U1-KF for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 16:00:24 +0000 Received: from [85.158.143.35:55765] by server-2.bemta-4.messagelabs.com id FA/A5-10891-7194AF25; Tue, 11 Feb 2014 16:00:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1392134422!4863311!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2483 invoked from network); 11 Feb 2014 16:00:23 -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; 11 Feb 2014 16:00:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFkz-0001i7-Sh for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 16:00:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFkz-0004lt-OH for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 16:00:21 +0000 Date: Tue, 11 Feb 2014 16:00:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/AMD: apply workaround for AMD F16h erratum 792 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 4d3ebb84df43d90db4cc25a48f4658709bd11678 Author: Aravind Gopalakrishnan AuthorDate: Fri Feb 7 11:12:22 2014 +0100 Commit: Jan Beulich CommitDate: Fri Feb 7 11:12:22 2014 +0100 x86/AMD: apply workaround for AMD F16h erratum 792 Workaround for the Erratum will be in BIOSes spun only after Jan 2014 onwards. But initial production parts shipped in 2013 itself. Since there is a coverage hole, we should carry this fix in software in case BIOS does not do the right thing or someone is using old BIOS. Description: Processor does not ensure DRAM scrub read/write sequence is atomic wrt accesses to CC6 save state area. Therefore if a concurrent scrub read/write access is to same address the entry may appear as if it is not written. This quirk applies to Fam16h models 00h-0Fh See "Revision Guide" for AMD F16h models 00h-0fh, document 51810 rev. 3.04, Nov 2013. Equivalent Linux patch link: http://marc.info/?l=linux-kernel&m=139066012217149&w=2 Tested the patch on Fam16h server platform and it works fine. Signed-off-by: Aravind Gopalakrishnan Reviewed-by: Suravee Suthikulpanit Reviewed-by: Andrew Cooper Corrected checking for boot CPU. Made warning message conditional. Compacted warning message text. Moved comment to commit message. Signed-off-by: Jan Beulich --- xen/arch/x86/cpu/amd.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 3307141..44087fa 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -477,6 +477,25 @@ static void __devinit init_amd(struct cpuinfo_x86 *c) " all your (PV) guest kernels. ***\n"); if (c->x86 == 0x16 && c->x86_model <= 0xf) { + if (c == &boot_cpu_data) { + l = pci_conf_read32(0, 0, 0x18, 0x3, 0x58); + h = pci_conf_read32(0, 0, 0x18, 0x3, 0x5c); + if ((l & 0x1f) | (h & 0x1)) + printk(KERN_WARNING + "Applying workaround for erratum 792: %s%s%s\n", + (l & 0x1f) ? "clearing D18F3x58[4:0]" : "", + ((l & 0x1f) && (h & 0x1)) ? " and " : "", + (h & 0x1) ? "clearing D18F3x5C[0]" : ""); + + if (l & 0x1f) + pci_conf_write32(0, 0, 0x18, 0x3, 0x58, + l & ~0x1f); + + if (h & 0x1) + pci_conf_write32(0, 0, 0x18, 0x3, 0x5c, + h & ~0x1); + } + rdmsrl(MSR_AMD64_LS_CFG, value); if (!(value & (1 << 15))) { static bool_t warned; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 16:00:36 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 16:00:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFlE-0004X7-HR; Tue, 11 Feb 2014 16:00:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFlD-0004Wd-1z for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 16:00:35 +0000 Received: from [85.158.137.68:13215] by server-13.bemta-3.messagelabs.com id A2/F1-26923-2294AF25; Tue, 11 Feb 2014 16:00:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1392134432!1127546!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24112 invoked from network); 11 Feb 2014 16:00:33 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 16:00:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFlA-0001iD-8f for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 16:00:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFlA-0004nS-2x for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 16:00:32 +0000 Date: Tue, 11 Feb 2014 16:00:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] AMD IOMMU: fail if there is no southbridge IO-APIC X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 06bbcaf48d09c18a41c482866941ddd5d2846b44 Author: Jan Beulich AuthorDate: Mon Feb 10 10:05:24 2014 +0100 Commit: Jan Beulich CommitDate: Mon Feb 10 10:05:24 2014 +0100 AMD IOMMU: fail if there is no southbridge IO-APIC ... but interrupt remapping is requested (with per-device remapping tables). Without it, the timer interrupt is usually not working. Inspired by Linux'es "iommu/amd: Work around wrong IOAPIC device-id in IVRS table" (commit c2ff5cf5294bcbd7fa50f7d860e90a66db7e5059) by Joerg Roedel . Reported-by: Eric Houby Signed-off-by: Jan Beulich Tested-by: Eric Houby Reviewed-by: Andrew Cooper Acked-by: Suravee Suthikulpanit --- xen/drivers/passthrough/amd/iommu_acpi.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index 9d05f7b..5634eac 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -984,6 +984,7 @@ static int __init parse_ivrs_table(struct acpi_table_header *table) const struct acpi_ivrs_header *ivrs_block; unsigned long length; unsigned int apic; + bool_t sb_ioapic = !iommu_intremap; int error = 0; BUG_ON(!table); @@ -1017,8 +1018,15 @@ static int __init parse_ivrs_table(struct acpi_table_header *table) /* Each IO-APIC must have been mentioned in the table. */ for ( apic = 0; !error && iommu_intremap && apic < nr_ioapics; ++apic ) { - if ( !nr_ioapic_entries[apic] || - ioapic_sbdf[IO_APIC_ID(apic)].pin_2_idx ) + if ( !nr_ioapic_entries[apic] ) + continue; + + if ( !ioapic_sbdf[IO_APIC_ID(apic)].seg && + /* SB IO-APIC is always on this device in AMD systems. */ + ioapic_sbdf[IO_APIC_ID(apic)].bdf == PCI_BDF(0, 0x14, 0) ) + sb_ioapic = 1; + + if ( ioapic_sbdf[IO_APIC_ID(apic)].pin_2_idx ) continue; if ( !test_bit(IO_APIC_ID(apic), ioapic_cmdline) ) @@ -1041,6 +1049,14 @@ static int __init parse_ivrs_table(struct acpi_table_header *table) } } + if ( !error && !sb_ioapic ) + { + if ( amd_iommu_perdev_intremap ) + error = -ENXIO; + printk("%sNo southbridge IO-APIC found in IVRS table\n", + amd_iommu_perdev_intremap ? XENLOG_ERR : XENLOG_WARNING); + } + return error; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Feb 11 16:00:36 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Feb 2014 16:00:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFlE-0004X7-HR; Tue, 11 Feb 2014 16:00:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFlD-0004Wd-1z for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 16:00:35 +0000 Received: from [85.158.137.68:13215] by server-13.bemta-3.messagelabs.com id A2/F1-26923-2294AF25; Tue, 11 Feb 2014 16:00:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1392134432!1127546!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24112 invoked from network); 11 Feb 2014 16:00:33 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Feb 2014 16:00:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDFlA-0001iD-8f for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 16:00:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDFlA-0004nS-2x for xen-changelog@lists.xensource.com; Tue, 11 Feb 2014 16:00:32 +0000 Date: Tue, 11 Feb 2014 16:00:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] AMD IOMMU: fail if there is no southbridge IO-APIC X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 06bbcaf48d09c18a41c482866941ddd5d2846b44 Author: Jan Beulich AuthorDate: Mon Feb 10 10:05:24 2014 +0100 Commit: Jan Beulich CommitDate: Mon Feb 10 10:05:24 2014 +0100 AMD IOMMU: fail if there is no southbridge IO-APIC ... but interrupt remapping is requested (with per-device remapping tables). Without it, the timer interrupt is usually not working. Inspired by Linux'es "iommu/amd: Work around wrong IOAPIC device-id in IVRS table" (commit c2ff5cf5294bcbd7fa50f7d860e90a66db7e5059) by Joerg Roedel . Reported-by: Eric Houby Signed-off-by: Jan Beulich Tested-by: Eric Houby Reviewed-by: Andrew Cooper Acked-by: Suravee Suthikulpanit --- xen/drivers/passthrough/amd/iommu_acpi.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index 9d05f7b..5634eac 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -984,6 +984,7 @@ static int __init parse_ivrs_table(struct acpi_table_header *table) const struct acpi_ivrs_header *ivrs_block; unsigned long length; unsigned int apic; + bool_t sb_ioapic = !iommu_intremap; int error = 0; BUG_ON(!table); @@ -1017,8 +1018,15 @@ static int __init parse_ivrs_table(struct acpi_table_header *table) /* Each IO-APIC must have been mentioned in the table. */ for ( apic = 0; !error && iommu_intremap && apic < nr_ioapics; ++apic ) { - if ( !nr_ioapic_entries[apic] || - ioapic_sbdf[IO_APIC_ID(apic)].pin_2_idx ) + if ( !nr_ioapic_entries[apic] ) + continue; + + if ( !ioapic_sbdf[IO_APIC_ID(apic)].seg && + /* SB IO-APIC is always on this device in AMD systems. */ + ioapic_sbdf[IO_APIC_ID(apic)].bdf == PCI_BDF(0, 0x14, 0) ) + sb_ioapic = 1; + + if ( ioapic_sbdf[IO_APIC_ID(apic)].pin_2_idx ) continue; if ( !test_bit(IO_APIC_ID(apic), ioapic_cmdline) ) @@ -1041,6 +1049,14 @@ static int __init parse_ivrs_table(struct acpi_table_header *table) } } + if ( !error && !sb_ioapic ) + { + if ( amd_iommu_perdev_intremap ) + error = -ENXIO; + printk("%sNo southbridge IO-APIC found in IVRS table\n", + amd_iommu_perdev_intremap ? XENLOG_ERR : XENLOG_WARNING); + } + return error; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Feb 12 04:33:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 12 Feb 2014 04:33:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDRVU-0004yD-4Y; Wed, 12 Feb 2014 04:33:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDRVS-0004y3-5y for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 04:33:06 +0000 Received: from [85.158.137.68:44272] by server-3.bemta-3.messagelabs.com id 07/00-14520-189FAF25; Wed, 12 Feb 2014 04:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1392179583!1242268!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29801 invoked from network); 12 Feb 2014 04:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Feb 2014 04:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDRVP-0007fr-GF for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 04:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDRVP-0001T5-3F for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 04:33:03 +0000 Date: Wed, 12 Feb 2014 04:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] flask: fix memory leaks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 57c9f2caf05de41913b3e4eb48c0c3ad6c18dd3f Author: Jan Beulich AuthorDate: Tue Feb 11 11:11:48 2014 +0100 Commit: Jan Beulich CommitDate: Tue Feb 11 11:11:48 2014 +0100 flask: fix memory leaks Plus, in the case of security_preserve_bools(), prevent double freeing in the case of security_get_bools() failing. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Daniel De Graaf --- xen/xsm/flask/flask_op.c | 1 + xen/xsm/flask/ss/services.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index 4b93e71..e4b07eb 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -347,6 +347,7 @@ static int flask_security_set_bool(struct xen_flask_boolean *arg) if ( arg->bool_id >= num ) { + xfree(values); rv = -ENOENT; goto out; } diff --git a/xen/xsm/flask/ss/services.c b/xen/xsm/flask/ss/services.c index 5cb9537..6067317 100644 --- a/xen/xsm/flask/ss/services.c +++ b/xen/xsm/flask/ss/services.c @@ -1902,6 +1902,7 @@ err: { for ( i = 0; i < *len; i++ ) xfree((*names)[i]); + xfree(*names); } xfree(*values); goto out; @@ -2011,7 +2012,7 @@ static int security_preserve_bools(struct policydb *p) rc = security_get_bools(&nbools, &bnames, &bvalues, NULL); if ( rc ) - goto out; + return rc; for ( i = 0; i < nbools; i++ ) { booldatum = hashtab_search(p->p_bools.table, bnames[i]); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Feb 12 04:33:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 12 Feb 2014 04:33:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDRVU-0004yD-4Y; Wed, 12 Feb 2014 04:33:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDRVS-0004y3-5y for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 04:33:06 +0000 Received: from [85.158.137.68:44272] by server-3.bemta-3.messagelabs.com id 07/00-14520-189FAF25; Wed, 12 Feb 2014 04:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1392179583!1242268!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29801 invoked from network); 12 Feb 2014 04:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Feb 2014 04:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDRVP-0007fr-GF for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 04:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDRVP-0001T5-3F for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 04:33:03 +0000 Date: Wed, 12 Feb 2014 04:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] flask: fix memory leaks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 57c9f2caf05de41913b3e4eb48c0c3ad6c18dd3f Author: Jan Beulich AuthorDate: Tue Feb 11 11:11:48 2014 +0100 Commit: Jan Beulich CommitDate: Tue Feb 11 11:11:48 2014 +0100 flask: fix memory leaks Plus, in the case of security_preserve_bools(), prevent double freeing in the case of security_get_bools() failing. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Daniel De Graaf --- xen/xsm/flask/flask_op.c | 1 + xen/xsm/flask/ss/services.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index 4b93e71..e4b07eb 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -347,6 +347,7 @@ static int flask_security_set_bool(struct xen_flask_boolean *arg) if ( arg->bool_id >= num ) { + xfree(values); rv = -ENOENT; goto out; } diff --git a/xen/xsm/flask/ss/services.c b/xen/xsm/flask/ss/services.c index 5cb9537..6067317 100644 --- a/xen/xsm/flask/ss/services.c +++ b/xen/xsm/flask/ss/services.c @@ -1902,6 +1902,7 @@ err: { for ( i = 0; i < *len; i++ ) xfree((*names)[i]); + xfree(*names); } xfree(*values); goto out; @@ -2011,7 +2012,7 @@ static int security_preserve_bools(struct policydb *p) rc = security_get_bools(&nbools, &bnames, &bvalues, NULL); if ( rc ) - goto out; + return rc; for ( i = 0; i < nbools; i++ ) { booldatum = hashtab_search(p->p_bools.table, bnames[i]); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Feb 12 04:33:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 12 Feb 2014 04:33: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 1WDRVe-0004z1-7I; Wed, 12 Feb 2014 04:33:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDRVc-0004yj-Ca for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 04:33:16 +0000 Received: from [193.109.254.147:15412] by server-5.bemta-14.messagelabs.com id 69/14-16688-B89FAF25; Wed, 12 Feb 2014 04:33:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1392179594!3707922!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28117 invoked from network); 12 Feb 2014 04:33:15 -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; 12 Feb 2014 04:33:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDRVZ-0007fu-Pz for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 04:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDRVZ-0001Td-Jk for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 04:33:13 +0000 Date: Wed, 12 Feb 2014 04:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] flask: fix error propagation from flask_security_set_bool() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 31f3620be0e3158c205a3669135f9c4bfa40b1c7 Author: Jan Beulich AuthorDate: Tue Feb 11 11:13:22 2014 +0100 Commit: Jan Beulich CommitDate: Tue Feb 11 11:13:22 2014 +0100 flask: fix error propagation from flask_security_set_bool() The function should return an error when flask_security_make_bools() fails as well as when the input ID is out of range. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Daniel De Graaf --- xen/xsm/flask/flask_op.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index e4b07eb..cde9308 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -364,9 +364,10 @@ static int flask_security_set_bool(struct xen_flask_boolean *arg) else { if ( !bool_pending_values ) - flask_security_make_bools(); - - if ( arg->bool_id >= bool_num ) + rv = flask_security_make_bools(); + if ( !rv && arg->bool_id >= bool_num ) + rv = -ENOENT; + if ( rv ) goto out; bool_pending_values[arg->bool_id] = !!(arg->new_value); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Feb 12 04:33:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 12 Feb 2014 04:33: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 1WDRVe-0004z1-7I; Wed, 12 Feb 2014 04:33:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDRVc-0004yj-Ca for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 04:33:16 +0000 Received: from [193.109.254.147:15412] by server-5.bemta-14.messagelabs.com id 69/14-16688-B89FAF25; Wed, 12 Feb 2014 04:33:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1392179594!3707922!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28117 invoked from network); 12 Feb 2014 04:33:15 -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; 12 Feb 2014 04:33:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDRVZ-0007fu-Pz for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 04:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDRVZ-0001Td-Jk for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 04:33:13 +0000 Date: Wed, 12 Feb 2014 04:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] flask: fix error propagation from flask_security_set_bool() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 31f3620be0e3158c205a3669135f9c4bfa40b1c7 Author: Jan Beulich AuthorDate: Tue Feb 11 11:13:22 2014 +0100 Commit: Jan Beulich CommitDate: Tue Feb 11 11:13:22 2014 +0100 flask: fix error propagation from flask_security_set_bool() The function should return an error when flask_security_make_bools() fails as well as when the input ID is out of range. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Daniel De Graaf --- xen/xsm/flask/flask_op.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index e4b07eb..cde9308 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -364,9 +364,10 @@ static int flask_security_set_bool(struct xen_flask_boolean *arg) else { if ( !bool_pending_values ) - flask_security_make_bools(); - - if ( arg->bool_id >= bool_num ) + rv = flask_security_make_bools(); + if ( !rv && arg->bool_id >= bool_num ) + rv = -ENOENT; + if ( rv ) goto out; bool_pending_values[arg->bool_id] = !!(arg->new_value); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Feb 12 04:33:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 12 Feb 2014 04:33:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDRVo-00050D-AC; Wed, 12 Feb 2014 04:33:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDRVm-000505-Vo for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 04:33:27 +0000 Received: from [85.158.139.211:16266] by server-6.bemta-5.messagelabs.com id 76/C5-14342-699FAF25; Wed, 12 Feb 2014 04:33:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1392179604!3294780!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24169 invoked from network); 12 Feb 2014 04:33:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Feb 2014 04:33:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDRVj-0007g3-W7 for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 04:33:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDRVj-0001U2-U0 for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 04:33:23 +0000 Date: Wed, 12 Feb 2014 04:33:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] flask: check permissions first thing in flask_security_set_bool() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 ebe867052e0f782139147015c4e91b37aa5e68f1 Author: Jan Beulich AuthorDate: Tue Feb 11 11:14:10 2014 +0100 Commit: Jan Beulich CommitDate: Tue Feb 11 11:14:10 2014 +0100 flask: check permissions first thing in flask_security_set_bool() Nothing else should be done if the caller isn't permitted to set boolean values. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Daniel De Graaf --- xen/xsm/flask/flask_op.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index cde9308..dddef29 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -326,11 +326,11 @@ static int flask_security_set_bool(struct xen_flask_boolean *arg) { int rv; - rv = flask_security_resolve_bool(arg); + rv = domain_has_security(current->domain, SECURITY__SETBOOL); if ( rv ) return rv; - rv = domain_has_security(current->domain, SECURITY__SETBOOL); + rv = flask_security_resolve_bool(arg); if ( rv ) return rv; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Feb 12 04:33:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 12 Feb 2014 04:33:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDRVo-00050D-AC; Wed, 12 Feb 2014 04:33:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDRVm-000505-Vo for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 04:33:27 +0000 Received: from [85.158.139.211:16266] by server-6.bemta-5.messagelabs.com id 76/C5-14342-699FAF25; Wed, 12 Feb 2014 04:33:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1392179604!3294780!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24169 invoked from network); 12 Feb 2014 04:33:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Feb 2014 04:33:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDRVj-0007g3-W7 for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 04:33:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDRVj-0001U2-U0 for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 04:33:23 +0000 Date: Wed, 12 Feb 2014 04:33:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] flask: check permissions first thing in flask_security_set_bool() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 ebe867052e0f782139147015c4e91b37aa5e68f1 Author: Jan Beulich AuthorDate: Tue Feb 11 11:14:10 2014 +0100 Commit: Jan Beulich CommitDate: Tue Feb 11 11:14:10 2014 +0100 flask: check permissions first thing in flask_security_set_bool() Nothing else should be done if the caller isn't permitted to set boolean values. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Daniel De Graaf --- xen/xsm/flask/flask_op.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index cde9308..dddef29 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -326,11 +326,11 @@ static int flask_security_set_bool(struct xen_flask_boolean *arg) { int rv; - rv = flask_security_resolve_bool(arg); + rv = domain_has_security(current->domain, SECURITY__SETBOOL); if ( rv ) return rv; - rv = domain_has_security(current->domain, SECURITY__SETBOOL); + rv = flask_security_resolve_bool(arg); if ( rv ) return rv; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Feb 12 04:33:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 12 Feb 2014 04:33:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDRVz-00051a-D5; Wed, 12 Feb 2014 04:33:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDRVx-00051I-4E for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 04:33:37 +0000 Received: from [85.158.139.211:44516] by server-1.bemta-5.messagelabs.com id 14/97-12859-0A9FAF25; Wed, 12 Feb 2014 04:33:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1392179614!3309926!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5815 invoked from network); 12 Feb 2014 04:33:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Feb 2014 04:33:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDRVu-0007g9-4z for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 04:33:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDRVu-0001VB-3P for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 04:33:34 +0000 Date: Wed, 12 Feb 2014 04:33:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: arm64: Fix memory cloberring issues during VFP save restore. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 117501c67ac00ad7850eedf25f870fe36579f71c Author: Pranavkumar Sawargaonkar AuthorDate: Fri Feb 7 18:27:16 2014 +0530 Commit: Ian Campbell CommitDate: Tue Feb 11 12:43:06 2014 +0000 xen: arm: arm64: Fix memory cloberring issues during VFP save restore. This patch addresses memory cloberring issue mentioed by Julien Grall with my earlier patch - Commit Id: 712eb2e04da2cbcd9908f74ebd47c6df60d6d12f Discussion related to this fix - http://www.gossamer-threads.com/lists/xen/devel/316247 Signed-off-by: Pranavkumar Sawargaonkar Signed-off-by: Anup Patel Acked-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/arm64/vfp.c | 68 +++++++++++++++++++++++----------------------- 1 files changed, 34 insertions(+), 34 deletions(-) diff --git a/xen/arch/arm/arm64/vfp.c b/xen/arch/arm/arm64/vfp.c index c09cf0c..3cd2b1b 100644 --- a/xen/arch/arm/arm64/vfp.c +++ b/xen/arch/arm/arm64/vfp.c @@ -8,23 +8,23 @@ void vfp_save_state(struct vcpu *v) if ( !cpu_has_fp ) return; - asm volatile("stp q0, q1, [%0, #16 * 0]\n\t" - "stp q2, q3, [%0, #16 * 2]\n\t" - "stp q4, q5, [%0, #16 * 4]\n\t" - "stp q6, q7, [%0, #16 * 6]\n\t" - "stp q8, q9, [%0, #16 * 8]\n\t" - "stp q10, q11, [%0, #16 * 10]\n\t" - "stp q12, q13, [%0, #16 * 12]\n\t" - "stp q14, q15, [%0, #16 * 14]\n\t" - "stp q16, q17, [%0, #16 * 16]\n\t" - "stp q18, q19, [%0, #16 * 18]\n\t" - "stp q20, q21, [%0, #16 * 20]\n\t" - "stp q22, q23, [%0, #16 * 22]\n\t" - "stp q24, q25, [%0, #16 * 24]\n\t" - "stp q26, q27, [%0, #16 * 26]\n\t" - "stp q28, q29, [%0, #16 * 28]\n\t" - "stp q30, q31, [%0, #16 * 30]\n\t" - :: "r" ((char *)(&v->arch.vfp.fpregs)): "memory"); + asm volatile("stp q0, q1, [%1, #16 * 0]\n\t" + "stp q2, q3, [%1, #16 * 2]\n\t" + "stp q4, q5, [%1, #16 * 4]\n\t" + "stp q6, q7, [%1, #16 * 6]\n\t" + "stp q8, q9, [%1, #16 * 8]\n\t" + "stp q10, q11, [%1, #16 * 10]\n\t" + "stp q12, q13, [%1, #16 * 12]\n\t" + "stp q14, q15, [%1, #16 * 14]\n\t" + "stp q16, q17, [%1, #16 * 16]\n\t" + "stp q18, q19, [%1, #16 * 18]\n\t" + "stp q20, q21, [%1, #16 * 20]\n\t" + "stp q22, q23, [%1, #16 * 22]\n\t" + "stp q24, q25, [%1, #16 * 24]\n\t" + "stp q26, q27, [%1, #16 * 26]\n\t" + "stp q28, q29, [%1, #16 * 28]\n\t" + "stp q30, q31, [%1, #16 * 30]\n\t" + : "=Q" (*v->arch.vfp.fpregs) : "r" (v->arch.vfp.fpregs)); v->arch.vfp.fpsr = READ_SYSREG32(FPSR); v->arch.vfp.fpcr = READ_SYSREG32(FPCR); @@ -36,23 +36,23 @@ void vfp_restore_state(struct vcpu *v) if ( !cpu_has_fp ) return; - asm volatile("ldp q0, q1, [%0, #16 * 0]\n\t" - "ldp q2, q3, [%0, #16 * 2]\n\t" - "ldp q4, q5, [%0, #16 * 4]\n\t" - "ldp q6, q7, [%0, #16 * 6]\n\t" - "ldp q8, q9, [%0, #16 * 8]\n\t" - "ldp q10, q11, [%0, #16 * 10]\n\t" - "ldp q12, q13, [%0, #16 * 12]\n\t" - "ldp q14, q15, [%0, #16 * 14]\n\t" - "ldp q16, q17, [%0, #16 * 16]\n\t" - "ldp q18, q19, [%0, #16 * 18]\n\t" - "ldp q20, q21, [%0, #16 * 20]\n\t" - "ldp q22, q23, [%0, #16 * 22]\n\t" - "ldp q24, q25, [%0, #16 * 24]\n\t" - "ldp q26, q27, [%0, #16 * 26]\n\t" - "ldp q28, q29, [%0, #16 * 28]\n\t" - "ldp q30, q31, [%0, #16 * 30]\n\t" - :: "r" ((char *)(&v->arch.vfp.fpregs)): "memory"); + asm volatile("ldp q0, q1, [%1, #16 * 0]\n\t" + "ldp q2, q3, [%1, #16 * 2]\n\t" + "ldp q4, q5, [%1, #16 * 4]\n\t" + "ldp q6, q7, [%1, #16 * 6]\n\t" + "ldp q8, q9, [%1, #16 * 8]\n\t" + "ldp q10, q11, [%1, #16 * 10]\n\t" + "ldp q12, q13, [%1, #16 * 12]\n\t" + "ldp q14, q15, [%1, #16 * 14]\n\t" + "ldp q16, q17, [%1, #16 * 16]\n\t" + "ldp q18, q19, [%1, #16 * 18]\n\t" + "ldp q20, q21, [%1, #16 * 20]\n\t" + "ldp q22, q23, [%1, #16 * 22]\n\t" + "ldp q24, q25, [%1, #16 * 24]\n\t" + "ldp q26, q27, [%1, #16 * 26]\n\t" + "ldp q28, q29, [%1, #16 * 28]\n\t" + "ldp q30, q31, [%1, #16 * 30]\n\t" + : : "Q" (*v->arch.vfp.fpregs), "r" (v->arch.vfp.fpregs)); WRITE_SYSREG32(v->arch.vfp.fpsr, FPSR); WRITE_SYSREG32(v->arch.vfp.fpcr, FPCR); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Feb 12 04:33:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 12 Feb 2014 04:33:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDRVz-00051a-D5; Wed, 12 Feb 2014 04:33:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDRVx-00051I-4E for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 04:33:37 +0000 Received: from [85.158.139.211:44516] by server-1.bemta-5.messagelabs.com id 14/97-12859-0A9FAF25; Wed, 12 Feb 2014 04:33:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1392179614!3309926!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5815 invoked from network); 12 Feb 2014 04:33:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Feb 2014 04:33:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDRVu-0007g9-4z for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 04:33:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDRVu-0001VB-3P for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 04:33:34 +0000 Date: Wed, 12 Feb 2014 04:33:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: arm64: Fix memory cloberring issues during VFP save restore. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 117501c67ac00ad7850eedf25f870fe36579f71c Author: Pranavkumar Sawargaonkar AuthorDate: Fri Feb 7 18:27:16 2014 +0530 Commit: Ian Campbell CommitDate: Tue Feb 11 12:43:06 2014 +0000 xen: arm: arm64: Fix memory cloberring issues during VFP save restore. This patch addresses memory cloberring issue mentioed by Julien Grall with my earlier patch - Commit Id: 712eb2e04da2cbcd9908f74ebd47c6df60d6d12f Discussion related to this fix - http://www.gossamer-threads.com/lists/xen/devel/316247 Signed-off-by: Pranavkumar Sawargaonkar Signed-off-by: Anup Patel Acked-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/arm64/vfp.c | 68 +++++++++++++++++++++++----------------------- 1 files changed, 34 insertions(+), 34 deletions(-) diff --git a/xen/arch/arm/arm64/vfp.c b/xen/arch/arm/arm64/vfp.c index c09cf0c..3cd2b1b 100644 --- a/xen/arch/arm/arm64/vfp.c +++ b/xen/arch/arm/arm64/vfp.c @@ -8,23 +8,23 @@ void vfp_save_state(struct vcpu *v) if ( !cpu_has_fp ) return; - asm volatile("stp q0, q1, [%0, #16 * 0]\n\t" - "stp q2, q3, [%0, #16 * 2]\n\t" - "stp q4, q5, [%0, #16 * 4]\n\t" - "stp q6, q7, [%0, #16 * 6]\n\t" - "stp q8, q9, [%0, #16 * 8]\n\t" - "stp q10, q11, [%0, #16 * 10]\n\t" - "stp q12, q13, [%0, #16 * 12]\n\t" - "stp q14, q15, [%0, #16 * 14]\n\t" - "stp q16, q17, [%0, #16 * 16]\n\t" - "stp q18, q19, [%0, #16 * 18]\n\t" - "stp q20, q21, [%0, #16 * 20]\n\t" - "stp q22, q23, [%0, #16 * 22]\n\t" - "stp q24, q25, [%0, #16 * 24]\n\t" - "stp q26, q27, [%0, #16 * 26]\n\t" - "stp q28, q29, [%0, #16 * 28]\n\t" - "stp q30, q31, [%0, #16 * 30]\n\t" - :: "r" ((char *)(&v->arch.vfp.fpregs)): "memory"); + asm volatile("stp q0, q1, [%1, #16 * 0]\n\t" + "stp q2, q3, [%1, #16 * 2]\n\t" + "stp q4, q5, [%1, #16 * 4]\n\t" + "stp q6, q7, [%1, #16 * 6]\n\t" + "stp q8, q9, [%1, #16 * 8]\n\t" + "stp q10, q11, [%1, #16 * 10]\n\t" + "stp q12, q13, [%1, #16 * 12]\n\t" + "stp q14, q15, [%1, #16 * 14]\n\t" + "stp q16, q17, [%1, #16 * 16]\n\t" + "stp q18, q19, [%1, #16 * 18]\n\t" + "stp q20, q21, [%1, #16 * 20]\n\t" + "stp q22, q23, [%1, #16 * 22]\n\t" + "stp q24, q25, [%1, #16 * 24]\n\t" + "stp q26, q27, [%1, #16 * 26]\n\t" + "stp q28, q29, [%1, #16 * 28]\n\t" + "stp q30, q31, [%1, #16 * 30]\n\t" + : "=Q" (*v->arch.vfp.fpregs) : "r" (v->arch.vfp.fpregs)); v->arch.vfp.fpsr = READ_SYSREG32(FPSR); v->arch.vfp.fpcr = READ_SYSREG32(FPCR); @@ -36,23 +36,23 @@ void vfp_restore_state(struct vcpu *v) if ( !cpu_has_fp ) return; - asm volatile("ldp q0, q1, [%0, #16 * 0]\n\t" - "ldp q2, q3, [%0, #16 * 2]\n\t" - "ldp q4, q5, [%0, #16 * 4]\n\t" - "ldp q6, q7, [%0, #16 * 6]\n\t" - "ldp q8, q9, [%0, #16 * 8]\n\t" - "ldp q10, q11, [%0, #16 * 10]\n\t" - "ldp q12, q13, [%0, #16 * 12]\n\t" - "ldp q14, q15, [%0, #16 * 14]\n\t" - "ldp q16, q17, [%0, #16 * 16]\n\t" - "ldp q18, q19, [%0, #16 * 18]\n\t" - "ldp q20, q21, [%0, #16 * 20]\n\t" - "ldp q22, q23, [%0, #16 * 22]\n\t" - "ldp q24, q25, [%0, #16 * 24]\n\t" - "ldp q26, q27, [%0, #16 * 26]\n\t" - "ldp q28, q29, [%0, #16 * 28]\n\t" - "ldp q30, q31, [%0, #16 * 30]\n\t" - :: "r" ((char *)(&v->arch.vfp.fpregs)): "memory"); + asm volatile("ldp q0, q1, [%1, #16 * 0]\n\t" + "ldp q2, q3, [%1, #16 * 2]\n\t" + "ldp q4, q5, [%1, #16 * 4]\n\t" + "ldp q6, q7, [%1, #16 * 6]\n\t" + "ldp q8, q9, [%1, #16 * 8]\n\t" + "ldp q10, q11, [%1, #16 * 10]\n\t" + "ldp q12, q13, [%1, #16 * 12]\n\t" + "ldp q14, q15, [%1, #16 * 14]\n\t" + "ldp q16, q17, [%1, #16 * 16]\n\t" + "ldp q18, q19, [%1, #16 * 18]\n\t" + "ldp q20, q21, [%1, #16 * 20]\n\t" + "ldp q22, q23, [%1, #16 * 22]\n\t" + "ldp q24, q25, [%1, #16 * 24]\n\t" + "ldp q26, q27, [%1, #16 * 26]\n\t" + "ldp q28, q29, [%1, #16 * 28]\n\t" + "ldp q30, q31, [%1, #16 * 30]\n\t" + : : "Q" (*v->arch.vfp.fpregs), "r" (v->arch.vfp.fpregs)); WRITE_SYSREG32(v->arch.vfp.fpsr, FPSR); WRITE_SYSREG32(v->arch.vfp.fpcr, FPCR); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Feb 12 04:33:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 12 Feb 2014 04:33:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDRW8-000530-H4; Wed, 12 Feb 2014 04:33:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDRW7-00052n-4X for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 04:33:47 +0000 Received: from [85.158.139.211:44827] by server-3.bemta-5.messagelabs.com id F4/C2-13671-AA9FAF25; Wed, 12 Feb 2014 04:33:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1392179624!3281988!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9105 invoked from network); 12 Feb 2014 04:33:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Feb 2014 04:33:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDRW4-0007gF-9o for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 04:33:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDRW4-0001VX-80 for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 04:33:44 +0000 Date: Wed, 12 Feb 2014 04:33:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenlight_stubs.c: Allow it to build with ocaml 3.09.3 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 3413b6a923839446c51a7612b19c5dc33b8aa6bc Author: Don Slutz AuthorDate: Fri Feb 7 16:51:51 2014 -0500 Commit: Ian Campbell CommitDate: Tue Feb 11 12:44:46 2014 +0000 xenlight_stubs.c: Allow it to build with ocaml 3.09.3 This code was copied from: http://docs.camlcity.org/docs/godisrc/oasis-ocaml-fd-1.1.1.tar.gz/ocaml-fd-1.1.1/lib/fd_stubs.c Signed-off-by: Don Slutz Acked-by: David Scott Acked-by: Ian Campbell --- tools/ocaml/libs/xl/xenlight_stubs.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c b/tools/ocaml/libs/xl/xenlight_stubs.c index 23f253a..8e825ae 100644 --- a/tools/ocaml/libs/xl/xenlight_stubs.c +++ b/tools/ocaml/libs/xl/xenlight_stubs.c @@ -35,6 +35,19 @@ #include "caml_xentoollog.h" +/* + * Starting with ocaml-3.09.3, CAMLreturn can only be used for ``value'' + * types. CAMLreturnT was only added in 3.09.4, so we define our own + * version here if needed. + */ +#ifndef CAMLreturnT +#define CAMLreturnT(type, result) do { \ + type caml__temp_result = (result); \ + caml_local_roots = caml__frame; \ + return (caml__temp_result); \ +} while (0) +#endif + /* The following is equal to the CAMLreturn macro, but without the return */ #define CAMLdone do{ \ caml_local_roots = caml__frame; \ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Feb 12 04:33:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 12 Feb 2014 04:33:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDRW8-000530-H4; Wed, 12 Feb 2014 04:33:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDRW7-00052n-4X for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 04:33:47 +0000 Received: from [85.158.139.211:44827] by server-3.bemta-5.messagelabs.com id F4/C2-13671-AA9FAF25; Wed, 12 Feb 2014 04:33:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1392179624!3281988!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9105 invoked from network); 12 Feb 2014 04:33:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Feb 2014 04:33:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDRW4-0007gF-9o for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 04:33:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDRW4-0001VX-80 for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 04:33:44 +0000 Date: Wed, 12 Feb 2014 04:33:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenlight_stubs.c: Allow it to build with ocaml 3.09.3 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 3413b6a923839446c51a7612b19c5dc33b8aa6bc Author: Don Slutz AuthorDate: Fri Feb 7 16:51:51 2014 -0500 Commit: Ian Campbell CommitDate: Tue Feb 11 12:44:46 2014 +0000 xenlight_stubs.c: Allow it to build with ocaml 3.09.3 This code was copied from: http://docs.camlcity.org/docs/godisrc/oasis-ocaml-fd-1.1.1.tar.gz/ocaml-fd-1.1.1/lib/fd_stubs.c Signed-off-by: Don Slutz Acked-by: David Scott Acked-by: Ian Campbell --- tools/ocaml/libs/xl/xenlight_stubs.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/tools/ocaml/libs/xl/xenlight_stubs.c b/tools/ocaml/libs/xl/xenlight_stubs.c index 23f253a..8e825ae 100644 --- a/tools/ocaml/libs/xl/xenlight_stubs.c +++ b/tools/ocaml/libs/xl/xenlight_stubs.c @@ -35,6 +35,19 @@ #include "caml_xentoollog.h" +/* + * Starting with ocaml-3.09.3, CAMLreturn can only be used for ``value'' + * types. CAMLreturnT was only added in 3.09.4, so we define our own + * version here if needed. + */ +#ifndef CAMLreturnT +#define CAMLreturnT(type, result) do { \ + type caml__temp_result = (result); \ + caml_local_roots = caml__frame; \ + return (caml__temp_result); \ +} while (0) +#endif + /* The following is equal to the CAMLreturn macro, but without the return */ #define CAMLdone do{ \ caml_local_roots = caml__frame; \ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Feb 12 04:33:58 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 12 Feb 2014 04:33:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDRWI-00054p-Lp; Wed, 12 Feb 2014 04:33:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDRWH-00054Y-BE for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 04:33:57 +0000 Received: from [85.158.137.68:51863] by server-10.bemta-3.messagelabs.com id 2F/09-07302-4B9FAF25; Wed, 12 Feb 2014 04:33:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1392179634!1247692!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11915 invoked from network); 12 Feb 2014 04:33:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Feb 2014 04:33:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDRWE-0007gL-FE for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 04:33:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDRWE-0001Vt-Df for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 04:33:54 +0000 Date: Wed, 12 Feb 2014 04:33:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Correctly boot with an initrd and no linux command 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 commit 3b2f92c1f8567461562fac9922fbad223dc8c6cf Author: Julien Grall AuthorDate: Mon Feb 10 17:34:46 2014 +0000 Commit: Ian Campbell CommitDate: Tue Feb 11 12:46:54 2014 +0000 xen/arm: Correctly boot with an initrd and no linux command line When DOM0 device tree is building, the properties for initrd will only be added if there is a linux command line. This will result to a panic later: (XEN) *** LOADING DOMAIN 0 *** (XEN) Populate P2M 0x20000000->0x40000000 (1:1 mapping for dom0) (XEN) Loading kernel from boot module 2 (XEN) Loading zImage from 0000000001000000 to 0000000027c00000-0000000027eafb48 (XEN) Loading dom0 initrd from 0000000002000000 to 0x0000000028200000-0x0000000028c00000 (XEN) (XEN) **************************************** (XEN) Panic on CPU 0: (XEN) Cannot fix up "linux,initrd-start" property (XEN) **************************************** (XEN) Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/domain_build.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 47b781b..5ca2f15 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -209,12 +209,15 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, return res; } - if ( dt_node_path_is_equal(node, "/chosen") && bootargs ) + if ( dt_node_path_is_equal(node, "/chosen") ) { - res = fdt_property(kinfo->fdt, "bootargs", bootargs, - strlen(bootargs) + 1); - if ( res ) - return res; + if ( bootargs ) + { + res = fdt_property(kinfo->fdt, "bootargs", bootargs, + strlen(bootargs) + 1); + if ( res ) + return res; + } /* * If the bootloader provides an initrd, we must create a placeholder -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Feb 12 04:33:58 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 12 Feb 2014 04:33:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDRWI-00054p-Lp; Wed, 12 Feb 2014 04:33:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDRWH-00054Y-BE for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 04:33:57 +0000 Received: from [85.158.137.68:51863] by server-10.bemta-3.messagelabs.com id 2F/09-07302-4B9FAF25; Wed, 12 Feb 2014 04:33:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1392179634!1247692!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11915 invoked from network); 12 Feb 2014 04:33:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Feb 2014 04:33:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDRWE-0007gL-FE for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 04:33:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDRWE-0001Vt-Df for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 04:33:54 +0000 Date: Wed, 12 Feb 2014 04:33:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Correctly boot with an initrd and no linux command 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 commit 3b2f92c1f8567461562fac9922fbad223dc8c6cf Author: Julien Grall AuthorDate: Mon Feb 10 17:34:46 2014 +0000 Commit: Ian Campbell CommitDate: Tue Feb 11 12:46:54 2014 +0000 xen/arm: Correctly boot with an initrd and no linux command line When DOM0 device tree is building, the properties for initrd will only be added if there is a linux command line. This will result to a panic later: (XEN) *** LOADING DOMAIN 0 *** (XEN) Populate P2M 0x20000000->0x40000000 (1:1 mapping for dom0) (XEN) Loading kernel from boot module 2 (XEN) Loading zImage from 0000000001000000 to 0000000027c00000-0000000027eafb48 (XEN) Loading dom0 initrd from 0000000002000000 to 0x0000000028200000-0x0000000028c00000 (XEN) (XEN) **************************************** (XEN) Panic on CPU 0: (XEN) Cannot fix up "linux,initrd-start" property (XEN) **************************************** (XEN) Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/domain_build.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 47b781b..5ca2f15 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -209,12 +209,15 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, return res; } - if ( dt_node_path_is_equal(node, "/chosen") && bootargs ) + if ( dt_node_path_is_equal(node, "/chosen") ) { - res = fdt_property(kinfo->fdt, "bootargs", bootargs, - strlen(bootargs) + 1); - if ( res ) - return res; + if ( bootargs ) + { + res = fdt_property(kinfo->fdt, "bootargs", bootargs, + strlen(bootargs) + 1); + if ( res ) + return res; + } /* * If the bootloader provides an initrd, we must create a placeholder -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Feb 12 20:33:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 12 Feb 2014 20:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDgUV-0000Ug-Sk; Wed, 12 Feb 2014 20:33:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDgUU-0000UW-0B for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 20:33:06 +0000 Received: from [85.158.139.211:20759] by server-15.bemta-5.messagelabs.com id 1E/A8-24395-18ADBF25; Wed, 12 Feb 2014 20:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1392237183!3516505!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3572 invoked from network); 12 Feb 2014 20:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Feb 2014 20:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDgUR-0000w5-36 for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 20:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDgUQ-0004Ut-Vy for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 20:33:03 +0000 Date: Wed, 12 Feb 2014 20:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] blkif: drop struct blkif_request_segment_aligned X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7977124626381591825==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============7977124626381591825== Content-Type: text/plain commit 5819ec7bc0f86c9dff755d85df289332742c05c3 Author: Jan Beulich AuthorDate: Wed Feb 12 13:49:11 2014 +0100 Commit: Jan Beulich CommitDate: Wed Feb 12 13:49:11 2014 +0100 blkif: drop struct blkif_request_segment_aligned Commit 5148b7b5 ("blkif: add indirect descriptors interface to public headers") added this without really explaining why it is needed: The structure is identical to struct blkif_request_segment apart from the padding field not being given a name in the pre-existing type. Their size and alignment - which are what is relevant - are identical as long as __alignof__(uint32_t) == 4 (which I think we rely upon in various other places, so we can take as given). Also correct a few minor glitches in the description, including for it to no longer assume PAGE_SIZE == 4096. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/include/public/io/blkif.h | 22 +++++++--------------- 1 files changed, 7 insertions(+), 15 deletions(-) diff --git a/xen/include/public/io/blkif.h b/xen/include/public/io/blkif.h index 542f123..c3e169c 100644 --- a/xen/include/public/io/blkif.h +++ b/xen/include/public/io/blkif.h @@ -487,13 +487,13 @@ * it's less than the number provided by the backend. The indirect_grefs field * in blkif_request_indirect should be filled by the frontend with the * grant references of the pages that are holding the indirect segments. - * This pages are filled with an array of blkif_request_segment_aligned - * that hold the information about the segments. The number of indirect - * pages to use is determined by the maximum number of segments - * an indirect request contains. Every indirect page can contain a maximum - * of 512 segments (PAGE_SIZE/sizeof(blkif_request_segment_aligned)), - * so to calculate the number of indirect pages to use we have to do - * ceil(indirect_segments/512). + * These pages are filled with an array of blkif_request_segment that hold the + * information about the segments. The number of indirect pages to use is + * determined by the number of segments an indirect request contains. Every + * indirect page can contain a maximum of + * (PAGE_SIZE / sizeof(struct blkif_request_segment)) segments, so to + * calculate the number of indirect pages to use we have to do + * ceil(indirect_segments / (PAGE_SIZE / sizeof(struct blkif_request_segment))). * * If a backend does not recognize BLKIF_OP_INDIRECT, it should *not* * create the "feature-max-indirect-segments" node! @@ -569,14 +569,6 @@ struct blkif_request_indirect { }; typedef struct blkif_request_indirect blkif_request_indirect_t; -struct blkif_request_segment_aligned { - grant_ref_t gref; /* reference to I/O buffer frame */ - /* @first_sect: first sector in frame to transfer (inclusive). */ - /* @last_sect: last sector in frame to transfer (inclusive). */ - uint8_t first_sect, last_sect; - uint16_t _pad; /* padding to make it 8 bytes, so it's cache-aligned */ -}; - struct blkif_response { uint64_t id; /* copied from request */ uint8_t operation; /* copied from request */ -- generated by git-patchbot for /home/xen/git/xen.git#master --===============7977124626381591825== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============7977124626381591825==-- From xen-changelog-bounces@lists.xen.org Wed Feb 12 20:33:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 12 Feb 2014 20:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDgUV-0000Ug-Sk; Wed, 12 Feb 2014 20:33:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDgUU-0000UW-0B for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 20:33:06 +0000 Received: from [85.158.139.211:20759] by server-15.bemta-5.messagelabs.com id 1E/A8-24395-18ADBF25; Wed, 12 Feb 2014 20:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1392237183!3516505!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3572 invoked from network); 12 Feb 2014 20:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Feb 2014 20:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDgUR-0000w5-36 for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 20:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDgUQ-0004Ut-Vy for xen-changelog@lists.xensource.com; Wed, 12 Feb 2014 20:33:03 +0000 Date: Wed, 12 Feb 2014 20:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] blkif: drop struct blkif_request_segment_aligned X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7977124626381591825==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============7977124626381591825== Content-Type: text/plain commit 5819ec7bc0f86c9dff755d85df289332742c05c3 Author: Jan Beulich AuthorDate: Wed Feb 12 13:49:11 2014 +0100 Commit: Jan Beulich CommitDate: Wed Feb 12 13:49:11 2014 +0100 blkif: drop struct blkif_request_segment_aligned Commit 5148b7b5 ("blkif: add indirect descriptors interface to public headers") added this without really explaining why it is needed: The structure is identical to struct blkif_request_segment apart from the padding field not being given a name in the pre-existing type. Their size and alignment - which are what is relevant - are identical as long as __alignof__(uint32_t) == 4 (which I think we rely upon in various other places, so we can take as given). Also correct a few minor glitches in the description, including for it to no longer assume PAGE_SIZE == 4096. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné --- xen/include/public/io/blkif.h | 22 +++++++--------------- 1 files changed, 7 insertions(+), 15 deletions(-) diff --git a/xen/include/public/io/blkif.h b/xen/include/public/io/blkif.h index 542f123..c3e169c 100644 --- a/xen/include/public/io/blkif.h +++ b/xen/include/public/io/blkif.h @@ -487,13 +487,13 @@ * it's less than the number provided by the backend. The indirect_grefs field * in blkif_request_indirect should be filled by the frontend with the * grant references of the pages that are holding the indirect segments. - * This pages are filled with an array of blkif_request_segment_aligned - * that hold the information about the segments. The number of indirect - * pages to use is determined by the maximum number of segments - * an indirect request contains. Every indirect page can contain a maximum - * of 512 segments (PAGE_SIZE/sizeof(blkif_request_segment_aligned)), - * so to calculate the number of indirect pages to use we have to do - * ceil(indirect_segments/512). + * These pages are filled with an array of blkif_request_segment that hold the + * information about the segments. The number of indirect pages to use is + * determined by the number of segments an indirect request contains. Every + * indirect page can contain a maximum of + * (PAGE_SIZE / sizeof(struct blkif_request_segment)) segments, so to + * calculate the number of indirect pages to use we have to do + * ceil(indirect_segments / (PAGE_SIZE / sizeof(struct blkif_request_segment))). * * If a backend does not recognize BLKIF_OP_INDIRECT, it should *not* * create the "feature-max-indirect-segments" node! @@ -569,14 +569,6 @@ struct blkif_request_indirect { }; typedef struct blkif_request_indirect blkif_request_indirect_t; -struct blkif_request_segment_aligned { - grant_ref_t gref; /* reference to I/O buffer frame */ - /* @first_sect: first sector in frame to transfer (inclusive). */ - /* @last_sect: last sector in frame to transfer (inclusive). */ - uint8_t first_sect, last_sect; - uint16_t _pad; /* padding to make it 8 bytes, so it's cache-aligned */ -}; - struct blkif_response { uint64_t id; /* copied from request */ uint8_t operation; /* copied from request */ -- generated by git-patchbot for /home/xen/git/xen.git#master --===============7977124626381591825== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============7977124626381591825==-- From xen-changelog-bounces@lists.xen.org Thu Feb 13 02:00:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 02:00: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 1WDlb8-0005MK-9F; Thu, 13 Feb 2014 02:00:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDlb6-0005M4-Ni for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 02:00:16 +0000 Received: from [85.158.137.68:21408] by server-7.bemta-3.messagelabs.com id AD/FA-13775-F272CF25; Thu, 13 Feb 2014 02:00:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1392256813!1512850!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12072 invoked from network); 13 Feb 2014 02:00:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 13 Feb 2014 02:00:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDlay-0002YP-Ku for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 02:00:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDlat-0006ML-0l for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 02:00:03 +0000 Date: Thu, 13 Feb 2014 02:00:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] libxc: Fix out-of-memory error handling in xc_cpupool_getinfo() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 e21b2fa19946806ea27873a8808bc1ace48b7c69 Author: Andrew Cooper AuthorDate: Wed Jan 22 17:47:21 2014 +0000 Commit: Ian Jackson CommitDate: Wed Feb 12 16:53:57 2014 +0000 libxc: Fix out-of-memory error handling in xc_cpupool_getinfo() Avoid freeing info then returning it to the caller. This is XSA-88. Coverity-ID: 1056192 Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit d883c179a74111a6804baf8cb8224235242a88fc) --- tools/libxc/xc_cpupool.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xc_cpupool.c b/tools/libxc/xc_cpupool.c index 54c76b4..10d8751 100644 --- a/tools/libxc/xc_cpupool.c +++ b/tools/libxc/xc_cpupool.c @@ -104,6 +104,7 @@ xc_cpupoolinfo_t *xc_cpupool_getinfo(xc_interface *xch, info->cpumap = xc_cpumap_alloc(xch); if (!info->cpumap) { free(info); + info = NULL; goto out; } info->cpupool_id = sysctl.u.cpupool_op.cpupool_id; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 02:00:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 02:00: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 1WDlb8-0005MK-9F; Thu, 13 Feb 2014 02:00:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDlb6-0005M4-Ni for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 02:00:16 +0000 Received: from [85.158.137.68:21408] by server-7.bemta-3.messagelabs.com id AD/FA-13775-F272CF25; Thu, 13 Feb 2014 02:00:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1392256813!1512850!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12072 invoked from network); 13 Feb 2014 02:00:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 13 Feb 2014 02:00:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDlay-0002YP-Ku for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 02:00:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDlat-0006ML-0l for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 02:00:03 +0000 Date: Thu, 13 Feb 2014 02:00:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.1] libxc: Fix out-of-memory error handling in xc_cpupool_getinfo() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 e21b2fa19946806ea27873a8808bc1ace48b7c69 Author: Andrew Cooper AuthorDate: Wed Jan 22 17:47:21 2014 +0000 Commit: Ian Jackson CommitDate: Wed Feb 12 16:53:57 2014 +0000 libxc: Fix out-of-memory error handling in xc_cpupool_getinfo() Avoid freeing info then returning it to the caller. This is XSA-88. Coverity-ID: 1056192 Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit d883c179a74111a6804baf8cb8224235242a88fc) --- tools/libxc/xc_cpupool.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xc_cpupool.c b/tools/libxc/xc_cpupool.c index 54c76b4..10d8751 100644 --- a/tools/libxc/xc_cpupool.c +++ b/tools/libxc/xc_cpupool.c @@ -104,6 +104,7 @@ xc_cpupoolinfo_t *xc_cpupool_getinfo(xc_interface *xch, info->cpumap = xc_cpumap_alloc(xch); if (!info->cpumap) { free(info); + info = NULL; goto out; } info->cpupool_id = sysctl.u.cpupool_op.cpupool_id; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.1 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 02:11:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 02:11:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDlle-00065n-Np; Thu, 13 Feb 2014 02:11:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDllZ-00065f-D1 for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 02:11:09 +0000 Received: from [85.158.139.211:46242] by server-9.bemta-5.messagelabs.com id 53/D1-11237-8B92CF25; Thu, 13 Feb 2014 02:11:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1392257462!3562841!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14442 invoked from network); 13 Feb 2014 02:11:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 13 Feb 2014 02:11:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDllW-0002p3-Nc for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 02:11:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDllW-0006fE-Jw for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 02:11:02 +0000 Date: Thu, 13 Feb 2014 02:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxc: Fix out-of-memory error handling in xc_cpupool_getinfo() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 2778b572abf9dde4b38e60c4dd422283cf4bbde5 Author: Andrew Cooper AuthorDate: Wed Jan 22 17:47:21 2014 +0000 Commit: Ian Jackson CommitDate: Wed Feb 12 16:54:18 2014 +0000 libxc: Fix out-of-memory error handling in xc_cpupool_getinfo() Avoid freeing info then returning it to the caller. This is XSA-88. Coverity-ID: 1056192 Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit d883c179a74111a6804baf8cb8224235242a88fc) --- tools/libxc/xc_cpupool.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xc_cpupool.c b/tools/libxc/xc_cpupool.c index b5e0c46..40ed00a 100644 --- a/tools/libxc/xc_cpupool.c +++ b/tools/libxc/xc_cpupool.c @@ -104,6 +104,7 @@ xc_cpupoolinfo_t *xc_cpupool_getinfo(xc_interface *xch, info->cpumap = xc_cpumap_alloc(xch); if (!info->cpumap) { free(info); + info = NULL; goto out; } info->cpupool_id = sysctl.u.cpupool_op.cpupool_id; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 02:11:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 02:11:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDlle-00065n-Np; Thu, 13 Feb 2014 02:11:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDllZ-00065f-D1 for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 02:11:09 +0000 Received: from [85.158.139.211:46242] by server-9.bemta-5.messagelabs.com id 53/D1-11237-8B92CF25; Thu, 13 Feb 2014 02:11:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1392257462!3562841!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14442 invoked from network); 13 Feb 2014 02:11:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 13 Feb 2014 02:11:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDllW-0002p3-Nc for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 02:11:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDllW-0006fE-Jw for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 02:11:02 +0000 Date: Thu, 13 Feb 2014 02:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxc: Fix out-of-memory error handling in xc_cpupool_getinfo() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 2778b572abf9dde4b38e60c4dd422283cf4bbde5 Author: Andrew Cooper AuthorDate: Wed Jan 22 17:47:21 2014 +0000 Commit: Ian Jackson CommitDate: Wed Feb 12 16:54:18 2014 +0000 libxc: Fix out-of-memory error handling in xc_cpupool_getinfo() Avoid freeing info then returning it to the caller. This is XSA-88. Coverity-ID: 1056192 Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit d883c179a74111a6804baf8cb8224235242a88fc) --- tools/libxc/xc_cpupool.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xc_cpupool.c b/tools/libxc/xc_cpupool.c index b5e0c46..40ed00a 100644 --- a/tools/libxc/xc_cpupool.c +++ b/tools/libxc/xc_cpupool.c @@ -104,6 +104,7 @@ xc_cpupoolinfo_t *xc_cpupool_getinfo(xc_interface *xch, info->cpumap = xc_cpumap_alloc(xch); if (!info->cpumap) { free(info); + info = NULL; goto out; } info->cpupool_id = sysctl.u.cpupool_op.cpupool_id; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 05:44:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 05:44:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp5k-0003e0-Tv; Thu, 13 Feb 2014 05:44:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp5j-0003ds-QY for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:44:08 +0000 Received: from [85.158.139.211:9014] by server-7.bemta-5.messagelabs.com id 60/D0-14867-6AB5CF25; Thu, 13 Feb 2014 05:44:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1392270244!3594387!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9256 invoked from network); 13 Feb 2014 05:44:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 13 Feb 2014 05:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp5g-0004v8-Ez for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:44:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDp5f-0003y1-V1 for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:44:03 +0000 Date: Thu, 13 Feb 2014 05:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: rename create_p2m_entries to apply_p2m_changes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 788686a76efac56284d23e53f99026a9c72b44f5 Author: Ian Campbell AuthorDate: Tue Feb 11 14:11:00 2014 +0000 Commit: Ian Campbell CommitDate: Wed Feb 12 12:48:34 2014 +0000 xen: arm: rename create_p2m_entries to apply_p2m_changes This function hasn't been only about creating for quite a while. This is purely a rename. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/p2m.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 85ca330..ace3c54 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -230,7 +230,7 @@ enum p2m_operation { RELINQUISH, }; -static int create_p2m_entries(struct domain *d, +static int apply_p2m_changes(struct domain *d, enum p2m_operation op, paddr_t start_gpaddr, paddr_t end_gpaddr, @@ -438,8 +438,8 @@ int p2m_populate_ram(struct domain *d, paddr_t start, paddr_t end) { - return create_p2m_entries(d, ALLOCATE, start, end, - 0, MATTR_MEM, p2m_ram_rw); + return apply_p2m_changes(d, ALLOCATE, start, end, + 0, MATTR_MEM, p2m_ram_rw); } int map_mmio_regions(struct domain *d, @@ -447,8 +447,8 @@ int map_mmio_regions(struct domain *d, paddr_t end_gaddr, paddr_t maddr) { - return create_p2m_entries(d, INSERT, start_gaddr, end_gaddr, - maddr, MATTR_DEV, p2m_mmio_direct); + return apply_p2m_changes(d, INSERT, start_gaddr, end_gaddr, + maddr, MATTR_DEV, p2m_mmio_direct); } int guest_physmap_add_entry(struct domain *d, @@ -457,20 +457,20 @@ int guest_physmap_add_entry(struct domain *d, unsigned long page_order, p2m_type_t t) { - return create_p2m_entries(d, INSERT, - pfn_to_paddr(gpfn), - pfn_to_paddr(gpfn + (1 << page_order)), - pfn_to_paddr(mfn), MATTR_MEM, t); + return apply_p2m_changes(d, INSERT, + pfn_to_paddr(gpfn), + pfn_to_paddr(gpfn + (1 << page_order)), + pfn_to_paddr(mfn), MATTR_MEM, t); } void guest_physmap_remove_page(struct domain *d, unsigned long gpfn, unsigned long mfn, unsigned int page_order) { - create_p2m_entries(d, REMOVE, - pfn_to_paddr(gpfn), - pfn_to_paddr(gpfn + (1<arch.p2m; - return create_p2m_entries(d, RELINQUISH, + return apply_p2m_changes(d, RELINQUISH, pfn_to_paddr(p2m->next_gfn_to_relinquish), pfn_to_paddr(p2m->max_mapped_gfn), pfn_to_paddr(INVALID_MFN), -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 05:44:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 05:44:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp5k-0003e0-Tv; Thu, 13 Feb 2014 05:44:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp5j-0003ds-QY for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:44:08 +0000 Received: from [85.158.139.211:9014] by server-7.bemta-5.messagelabs.com id 60/D0-14867-6AB5CF25; Thu, 13 Feb 2014 05:44:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1392270244!3594387!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9256 invoked from network); 13 Feb 2014 05:44:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 13 Feb 2014 05:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp5g-0004v8-Ez for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:44:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDp5f-0003y1-V1 for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:44:03 +0000 Date: Thu, 13 Feb 2014 05:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: rename create_p2m_entries to apply_p2m_changes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 788686a76efac56284d23e53f99026a9c72b44f5 Author: Ian Campbell AuthorDate: Tue Feb 11 14:11:00 2014 +0000 Commit: Ian Campbell CommitDate: Wed Feb 12 12:48:34 2014 +0000 xen: arm: rename create_p2m_entries to apply_p2m_changes This function hasn't been only about creating for quite a while. This is purely a rename. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/p2m.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 85ca330..ace3c54 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -230,7 +230,7 @@ enum p2m_operation { RELINQUISH, }; -static int create_p2m_entries(struct domain *d, +static int apply_p2m_changes(struct domain *d, enum p2m_operation op, paddr_t start_gpaddr, paddr_t end_gpaddr, @@ -438,8 +438,8 @@ int p2m_populate_ram(struct domain *d, paddr_t start, paddr_t end) { - return create_p2m_entries(d, ALLOCATE, start, end, - 0, MATTR_MEM, p2m_ram_rw); + return apply_p2m_changes(d, ALLOCATE, start, end, + 0, MATTR_MEM, p2m_ram_rw); } int map_mmio_regions(struct domain *d, @@ -447,8 +447,8 @@ int map_mmio_regions(struct domain *d, paddr_t end_gaddr, paddr_t maddr) { - return create_p2m_entries(d, INSERT, start_gaddr, end_gaddr, - maddr, MATTR_DEV, p2m_mmio_direct); + return apply_p2m_changes(d, INSERT, start_gaddr, end_gaddr, + maddr, MATTR_DEV, p2m_mmio_direct); } int guest_physmap_add_entry(struct domain *d, @@ -457,20 +457,20 @@ int guest_physmap_add_entry(struct domain *d, unsigned long page_order, p2m_type_t t) { - return create_p2m_entries(d, INSERT, - pfn_to_paddr(gpfn), - pfn_to_paddr(gpfn + (1 << page_order)), - pfn_to_paddr(mfn), MATTR_MEM, t); + return apply_p2m_changes(d, INSERT, + pfn_to_paddr(gpfn), + pfn_to_paddr(gpfn + (1 << page_order)), + pfn_to_paddr(mfn), MATTR_MEM, t); } void guest_physmap_remove_page(struct domain *d, unsigned long gpfn, unsigned long mfn, unsigned int page_order) { - create_p2m_entries(d, REMOVE, - pfn_to_paddr(gpfn), - pfn_to_paddr(gpfn + (1<arch.p2m; - return create_p2m_entries(d, RELINQUISH, + return apply_p2m_changes(d, RELINQUISH, pfn_to_paddr(p2m->next_gfn_to_relinquish), pfn_to_paddr(p2m->max_mapped_gfn), pfn_to_paddr(INVALID_MFN), -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 05:44:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 05: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 1WDp5v-0003f1-Db; Thu, 13 Feb 2014 05:44:19 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp5t-0003ej-HT for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:44:17 +0000 Received: from [85.158.143.35:2517] by server-3.bemta-4.messagelabs.com id 99/60-11539-0BB5CF25; Thu, 13 Feb 2014 05:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1392270254!5242259!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14837 invoked from network); 13 Feb 2014 05:44:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 13 Feb 2014 05:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp5q-0004vB-LQ for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDp5q-0003yP-Ja for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:44:14 +0000 Date: Thu, 13 Feb 2014 05:44:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: rename p2m next_gfn_to_relinquish to lowest_mapped_gfn X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 6172853047d49d2a031d4426268df3cbd30cb57a Author: Ian Campbell AuthorDate: Tue Feb 11 14:11:01 2014 +0000 Commit: Ian Campbell CommitDate: Wed Feb 12 12:48:34 2014 +0000 xen: arm: rename p2m next_gfn_to_relinquish to lowest_mapped_gfn This has other uses other than during relinquish, so rename it for clarity. This is a pure rename. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/p2m.c | 9 ++++----- xen/include/asm-arm/p2m.h | 8 +++++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index ace3c54..a61edeb 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -388,7 +388,7 @@ static int apply_p2m_changes(struct domain *d, { if ( hypercall_preempt_check() ) { - p2m->next_gfn_to_relinquish = addr >> PAGE_SHIFT; + p2m->lowest_mapped_gfn = addr >> PAGE_SHIFT; rc = -EAGAIN; goto out; } @@ -415,8 +415,7 @@ static int apply_p2m_changes(struct domain *d, unsigned long egfn = paddr_to_pfn(end_gpaddr); p2m->max_mapped_gfn = MAX(p2m->max_mapped_gfn, egfn); - /* Use next_gfn_to_relinquish to store the lowest gfn mapped */ - p2m->next_gfn_to_relinquish = MIN(p2m->next_gfn_to_relinquish, sgfn); + p2m->lowest_mapped_gfn = MIN(p2m->lowest_mapped_gfn, sgfn); } rc = 0; @@ -606,7 +605,7 @@ int p2m_init(struct domain *d) p2m->first_level = NULL; p2m->max_mapped_gfn = 0; - p2m->next_gfn_to_relinquish = ULONG_MAX; + p2m->lowest_mapped_gfn = ULONG_MAX; err: spin_unlock(&p2m->lock); @@ -619,7 +618,7 @@ int relinquish_p2m_mapping(struct domain *d) struct p2m_domain *p2m = &d->arch.p2m; return apply_p2m_changes(d, RELINQUISH, - pfn_to_paddr(p2m->next_gfn_to_relinquish), + pfn_to_paddr(p2m->lowest_mapped_gfn), pfn_to_paddr(p2m->max_mapped_gfn), pfn_to_paddr(INVALID_MFN), MATTR_MEM, p2m_invalid); diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index 53b3266..e9c884a 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -24,9 +24,11 @@ struct p2m_domain { */ unsigned long max_mapped_gfn; - /* When releasing mapped gfn's in a preemptible manner, recall where - * to resume the search */ - unsigned long next_gfn_to_relinquish; + /* Lowest mapped gfn in the p2m. When releasing mapped gfn's in a + * preemptible manner this is update to track recall where to + * resume the search. Apart from during teardown this can only + * decrease. */ + unsigned long lowest_mapped_gfn; }; /* List of possible type for each page in the p2m entry. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 05:44:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 05: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 1WDp5v-0003f1-Db; Thu, 13 Feb 2014 05:44:19 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp5t-0003ej-HT for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:44:17 +0000 Received: from [85.158.143.35:2517] by server-3.bemta-4.messagelabs.com id 99/60-11539-0BB5CF25; Thu, 13 Feb 2014 05:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1392270254!5242259!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14837 invoked from network); 13 Feb 2014 05:44:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 13 Feb 2014 05:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp5q-0004vB-LQ for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDp5q-0003yP-Ja for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:44:14 +0000 Date: Thu, 13 Feb 2014 05:44:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: rename p2m next_gfn_to_relinquish to lowest_mapped_gfn X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 6172853047d49d2a031d4426268df3cbd30cb57a Author: Ian Campbell AuthorDate: Tue Feb 11 14:11:01 2014 +0000 Commit: Ian Campbell CommitDate: Wed Feb 12 12:48:34 2014 +0000 xen: arm: rename p2m next_gfn_to_relinquish to lowest_mapped_gfn This has other uses other than during relinquish, so rename it for clarity. This is a pure rename. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/p2m.c | 9 ++++----- xen/include/asm-arm/p2m.h | 8 +++++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index ace3c54..a61edeb 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -388,7 +388,7 @@ static int apply_p2m_changes(struct domain *d, { if ( hypercall_preempt_check() ) { - p2m->next_gfn_to_relinquish = addr >> PAGE_SHIFT; + p2m->lowest_mapped_gfn = addr >> PAGE_SHIFT; rc = -EAGAIN; goto out; } @@ -415,8 +415,7 @@ static int apply_p2m_changes(struct domain *d, unsigned long egfn = paddr_to_pfn(end_gpaddr); p2m->max_mapped_gfn = MAX(p2m->max_mapped_gfn, egfn); - /* Use next_gfn_to_relinquish to store the lowest gfn mapped */ - p2m->next_gfn_to_relinquish = MIN(p2m->next_gfn_to_relinquish, sgfn); + p2m->lowest_mapped_gfn = MIN(p2m->lowest_mapped_gfn, sgfn); } rc = 0; @@ -606,7 +605,7 @@ int p2m_init(struct domain *d) p2m->first_level = NULL; p2m->max_mapped_gfn = 0; - p2m->next_gfn_to_relinquish = ULONG_MAX; + p2m->lowest_mapped_gfn = ULONG_MAX; err: spin_unlock(&p2m->lock); @@ -619,7 +618,7 @@ int relinquish_p2m_mapping(struct domain *d) struct p2m_domain *p2m = &d->arch.p2m; return apply_p2m_changes(d, RELINQUISH, - pfn_to_paddr(p2m->next_gfn_to_relinquish), + pfn_to_paddr(p2m->lowest_mapped_gfn), pfn_to_paddr(p2m->max_mapped_gfn), pfn_to_paddr(INVALID_MFN), MATTR_MEM, p2m_invalid); diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index 53b3266..e9c884a 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -24,9 +24,11 @@ struct p2m_domain { */ unsigned long max_mapped_gfn; - /* When releasing mapped gfn's in a preemptible manner, recall where - * to resume the search */ - unsigned long next_gfn_to_relinquish; + /* Lowest mapped gfn in the p2m. When releasing mapped gfn's in a + * preemptible manner this is update to track recall where to + * resume the search. Apart from during teardown this can only + * decrease. */ + unsigned long lowest_mapped_gfn; }; /* List of possible type for each page in the p2m entry. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 05:44:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 05:44:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp66-0003gP-GV; Thu, 13 Feb 2014 05:44:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp64-0003gC-JQ for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:44:28 +0000 Received: from [193.109.254.147:14996] by server-15.bemta-14.messagelabs.com id E2/0A-10839-BBB5CF25; Thu, 13 Feb 2014 05:44:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1392270265!230627!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8284 invoked from network); 13 Feb 2014 05:44:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 13 Feb 2014 05:44:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp60-0004vK-VL for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:44:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDp60-0003zH-TY for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:44:24 +0000 Date: Thu, 13 Feb 2014 05:44:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: clean and invalidate all guest caches by VMID after domain 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 commit ed250c269831f01e92ea93bc7be3f3fdaa69e280 Author: Ian Campbell AuthorDate: Tue Feb 11 14:11:02 2014 +0000 Commit: Ian Campbell CommitDate: Wed Feb 12 12:48:45 2014 +0000 xen/arm: clean and invalidate all guest caches by VMID after domain build. Guests are initially started with caches disabled and so we need to make sure they see consistent data in RAM (requiring a cache clean) but also that they do not have old stale data suddenly appear in the caches when they enable their caches (requiring the invalidate). This can be split into two halves. First we must flush each page as it is allocated to the guest. It is not sufficient to do the flush at scrub time since this will miss pages which are ballooned out by the guest (where the guest must scrub if it cares about not leaking the pagecontent). We need to clean as well as invalidate to make sure that any scrubbing which has occured gets committed to real RAM. To achieve this add a new cacheflush_page function, which is a stub on x86. Secondly we need to flush anything which the domain builder touches, which we do via a new domctl. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Acked-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Jan Beulich Cc: keir@xen.org --- tools/libxc/xc_dom_boot.c | 4 ++++ tools/libxc/xc_dom_core.c | 2 ++ tools/libxc/xc_domain.c | 10 ++++++++++ tools/libxc/xc_private.c | 2 ++ tools/libxc/xc_private.h | 3 +++ xen/arch/arm/domctl.c | 14 ++++++++++++++ xen/arch/arm/mm.c | 12 ++++++++++++ xen/arch/arm/p2m.c | 25 +++++++++++++++++++++++++ xen/common/page_alloc.c | 5 +++++ xen/include/asm-arm/arm32/page.h | 4 ++++ xen/include/asm-arm/arm64/page.h | 4 ++++ xen/include/asm-arm/p2m.h | 3 +++ xen/include/asm-arm/page.h | 3 +++ xen/include/asm-x86/page.h | 3 +++ xen/include/public/domctl.h | 13 +++++++++++++ xen/xsm/flask/hooks.c | 13 +++++++++++++ xen/xsm/flask/policy/access_vectors | 2 ++ 17 files changed, 122 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xc_dom_boot.c b/tools/libxc/xc_dom_boot.c index fdfeaf8..f0a1c64 100644 --- a/tools/libxc/xc_dom_boot.c +++ b/tools/libxc/xc_dom_boot.c @@ -351,6 +351,10 @@ int xc_dom_gnttab_seed(xc_interface *xch, domid_t domid, return -1; } + /* Guest shouldn't really touch its grant table until it has + * enabled its caches. But lets be nice. */ + xc_domain_cacheflush(xch, domid, gnttab_gmfn, 1); + return 0; } diff --git a/tools/libxc/xc_dom_core.c b/tools/libxc/xc_dom_core.c index 77a4e64..b9d1015 100644 --- a/tools/libxc/xc_dom_core.c +++ b/tools/libxc/xc_dom_core.c @@ -603,6 +603,8 @@ void xc_dom_unmap_one(struct xc_dom_image *dom, xen_pfn_t pfn) prev->next = phys->next; else dom->phys_pages = phys->next; + + xc_domain_cacheflush(dom->xch, dom->guest_domid, phys->first, phys->count); } void xc_dom_unmap_all(struct xc_dom_image *dom) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index e1d1bec..369c3f3 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -48,6 +48,16 @@ int xc_domain_create(xc_interface *xch, return 0; } +int xc_domain_cacheflush(xc_interface *xch, uint32_t domid, + xen_pfn_t start_pfn, xen_pfn_t nr_pfns) +{ + DECLARE_DOMCTL; + domctl.cmd = XEN_DOMCTL_cacheflush; + domctl.domain = (domid_t)domid; + domctl.u.cacheflush.start_pfn = start_pfn; + domctl.u.cacheflush.nr_pfns = nr_pfns; + return do_domctl(xch, &domctl); +} int xc_domain_pause(xc_interface *xch, uint32_t domid) diff --git a/tools/libxc/xc_private.c b/tools/libxc/xc_private.c index 838fd21..33ed15b 100644 --- a/tools/libxc/xc_private.c +++ b/tools/libxc/xc_private.c @@ -628,6 +628,7 @@ int xc_copy_to_domain_page(xc_interface *xch, return -1; memcpy(vaddr, src_page, PAGE_SIZE); munmap(vaddr, PAGE_SIZE); + xc_domain_cacheflush(xch, domid, dst_pfn, 1); return 0; } @@ -641,6 +642,7 @@ int xc_clear_domain_page(xc_interface *xch, return -1; memset(vaddr, 0, PAGE_SIZE); munmap(vaddr, PAGE_SIZE); + xc_domain_cacheflush(xch, domid, dst_pfn, 1); return 0; } diff --git a/tools/libxc/xc_private.h b/tools/libxc/xc_private.h index 92271c9..a610f0c 100644 --- a/tools/libxc/xc_private.h +++ b/tools/libxc/xc_private.h @@ -304,6 +304,9 @@ void bitmap_byte_to_64(uint64_t *lp, const uint8_t *bp, int nbits); /* Optionally flush file to disk and discard page cache */ void discard_file_cache(xc_interface *xch, int fd, int flush); +int xc_domain_cacheflush(xc_interface *xch, uint32_t domid, + xen_pfn_t start_pfn, xen_pfn_t nr_pfns); + #define MAX_MMU_UPDATES 1024 struct xc_mmu { mmu_update_t updates[MAX_MMU_UPDATES]; diff --git a/xen/arch/arm/domctl.c b/xen/arch/arm/domctl.c index 546e86b..45974e7 100644 --- a/xen/arch/arm/domctl.c +++ b/xen/arch/arm/domctl.c @@ -17,6 +17,20 @@ long arch_do_domctl(struct xen_domctl *domctl, struct domain *d, { switch ( domctl->cmd ) { + case XEN_DOMCTL_cacheflush: + { + unsigned long s = domctl->u.cacheflush.start_pfn; + unsigned long e = s + domctl->u.cacheflush.nr_pfns; + + if ( domctl->u.cacheflush.nr_pfns > (1U< #include #include +#include /* First level P2M is 2 consecutive pages */ #define P2M_FIRST_ORDER 1 @@ -228,6 +229,7 @@ enum p2m_operation { ALLOCATE, REMOVE, RELINQUISH, + CACHEFLUSH, }; static int apply_p2m_changes(struct domain *d, @@ -381,6 +383,15 @@ static int apply_p2m_changes(struct domain *d, count++; } break; + + case CACHEFLUSH: + { + if ( !pte.p2m.valid || !p2m_is_ram(pte.p2m.type) ) + break; + + flush_page_to_ram(pte.p2m.base); + } + break; } /* Preempt every 2MiB (mapped) or 32 MiB (unmapped) - arbitrary */ @@ -624,6 +635,20 @@ int relinquish_p2m_mapping(struct domain *d) MATTR_MEM, p2m_invalid); } +int p2m_cache_flush(struct domain *d, xen_pfn_t start_mfn, xen_pfn_t end_mfn) +{ + struct p2m_domain *p2m = &d->arch.p2m; + + start_mfn = MAX(start_mfn, p2m->lowest_mapped_gfn); + end_mfn = MIN(end_mfn, p2m->max_mapped_gfn); + + return apply_p2m_changes(d, CACHEFLUSH, + pfn_to_paddr(start_mfn), + pfn_to_paddr(end_mfn), + pfn_to_paddr(INVALID_MFN), + MATTR_MEM, p2m_invalid); +} + unsigned long gmfn_to_mfn(struct domain *d, unsigned long gpfn) { paddr_t p = p2m_lookup(d, pfn_to_paddr(gpfn), NULL); diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 5f484a2..601319c 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -710,6 +710,11 @@ static struct page_info *alloc_heap_pages( /* Initialise fields which have other uses for free pages. */ pg[i].u.inuse.type_info = 0; page_set_owner(&pg[i], NULL); + + /* Ensure cache and RAM are consistent for platforms where the + * guest can control its own visibility of/through the cache. + */ + flush_page_to_ram(page_to_mfn(&pg[i])); } spin_unlock(&heap_lock); diff --git a/xen/include/asm-arm/arm32/page.h b/xen/include/asm-arm/arm32/page.h index cf12a89..cb6add4 100644 --- a/xen/include/asm-arm/arm32/page.h +++ b/xen/include/asm-arm/arm32/page.h @@ -22,6 +22,10 @@ static inline void write_pte(lpae_t *p, lpae_t pte) /* Inline ASM to flush dcache on register R (may be an inline asm operand) */ #define __flush_xen_dcache_one(R) STORE_CP32(R, DCCMVAC) +/* Inline ASM to clean and invalidate dcache on register R (may be an + * inline asm operand) */ +#define __clean_and_invalidate_xen_dcache_one(R) STORE_CP32(R, DCCIMVAC) + /* * Flush all hypervisor mappings from the TLB and branch predictor. * This is needed after changing Xen code mappings. diff --git a/xen/include/asm-arm/arm64/page.h b/xen/include/asm-arm/arm64/page.h index 9551f90..baf8903 100644 --- a/xen/include/asm-arm/arm64/page.h +++ b/xen/include/asm-arm/arm64/page.h @@ -17,6 +17,10 @@ static inline void write_pte(lpae_t *p, lpae_t pte) /* Inline ASM to flush dcache on register R (may be an inline asm operand) */ #define __flush_xen_dcache_one(R) "dc cvac, %" #R ";" +/* Inline ASM to clean and invalidate dcache on register R (may be an + * inline asm operand) */ +#define __clean_and_invalidate_xen_dcache_one(R) "dc civac, %" #R ";" + /* * Flush all hypervisor mappings from the TLB * This is needed after changing Xen code mappings. diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index e9c884a..3b39c45 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -78,6 +78,9 @@ void p2m_load_VTTBR(struct domain *d); /* Look up the MFN corresponding to a domain's PFN. */ paddr_t p2m_lookup(struct domain *d, paddr_t gpfn, p2m_type_t *t); +/* Clean & invalidate caches corresponding to a region of guest address space */ +int p2m_cache_flush(struct domain *d, xen_pfn_t start_mfn, xen_pfn_t end_mfn); + /* Setup p2m RAM mapping for domain d from start-end. */ int p2m_populate_ram(struct domain *d, paddr_t start, paddr_t end); /* Map MMIO regions in the p2m: start_gaddr and end_gaddr is the range diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index 670d4e7..5a371da 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -253,6 +253,9 @@ static inline void flush_xen_dcache_va_range(void *p, unsigned long size) : : "r" (_p), "m" (*_p)); \ } while (0) +/* Flush the dcache for an entire page. */ +void flush_page_to_ram(unsigned long mfn); + /* Print a walk of an arbitrary page table */ void dump_pt_walk(lpae_t *table, paddr_t addr); diff --git a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h index 7a46af5..ccc268d 100644 --- a/xen/include/asm-x86/page.h +++ b/xen/include/asm-x86/page.h @@ -346,6 +346,9 @@ static inline uint32_t cacheattr_to_pte_flags(uint32_t cacheattr) return ((cacheattr & 4) << 5) | ((cacheattr & 3) << 3); } +/* No cache maintenance required on x86 architecture. */ +static inline void flush_page_to_ram(unsigned long mfn) {} + /* return true if permission increased */ static inline bool_t perms_strictly_increased(uint32_t old_flags, uint32_t new_flags) diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 91f01fa..f22fe2e 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -885,6 +885,17 @@ struct xen_domctl_set_max_evtchn { typedef struct xen_domctl_set_max_evtchn xen_domctl_set_max_evtchn_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_set_max_evtchn_t); +/* + * ARM: Clean and invalidate caches associated with given region of + * guest memory. + */ +struct xen_domctl_cacheflush { + /* IN: page range to flush. */ + xen_pfn_t start_pfn, nr_pfns; +}; +typedef struct xen_domctl_cacheflush xen_domctl_cacheflush_t; +DEFINE_XEN_GUEST_HANDLE(xen_domctl_cacheflush_t); + struct xen_domctl { uint32_t cmd; #define XEN_DOMCTL_createdomain 1 @@ -954,6 +965,7 @@ struct xen_domctl { #define XEN_DOMCTL_setnodeaffinity 68 #define XEN_DOMCTL_getnodeaffinity 69 #define XEN_DOMCTL_set_max_evtchn 70 +#define XEN_DOMCTL_cacheflush 71 #define XEN_DOMCTL_gdbsx_guestmemio 1000 #define XEN_DOMCTL_gdbsx_pausevcpu 1001 #define XEN_DOMCTL_gdbsx_unpausevcpu 1002 @@ -1012,6 +1024,7 @@ struct xen_domctl { struct xen_domctl_set_max_evtchn set_max_evtchn; struct xen_domctl_gdbsx_memio gdbsx_guest_memio; struct xen_domctl_set_broken_page_p2m set_broken_page_p2m; + struct xen_domctl_cacheflush cacheflush; struct xen_domctl_gdbsx_pauseunp_vcpu gdbsx_pauseunp_vcpu; struct xen_domctl_gdbsx_domstatus gdbsx_domstatus; uint8_t pad[128]; diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 7cdef04..d94ab77 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -730,6 +730,9 @@ static int flask_domctl(struct domain *d, int cmd) case XEN_DOMCTL_set_max_evtchn: return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__SET_MAX_EVTCHN); + case XEN_DOMCTL_cacheflush: + return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__CACHEFLUSH); + default: printk("flask_domctl: Unknown op %d\n", cmd); return -EPERM; @@ -1599,3 +1602,13 @@ static __init int flask_init(void) } xsm_initcall(flask_init); + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/xsm/flask/policy/access_vectors b/xen/xsm/flask/policy/access_vectors index 1fbe241..a0ed13d 100644 --- a/xen/xsm/flask/policy/access_vectors +++ b/xen/xsm/flask/policy/access_vectors @@ -196,6 +196,8 @@ class domain2 setclaim # XEN_DOMCTL_set_max_evtchn set_max_evtchn +# XEN_DOMCTL_cacheflush + cacheflush } # Similar to class domain, but primarily contains domctls related to HVM domains -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 05:44:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 05:44:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp66-0003gP-GV; Thu, 13 Feb 2014 05:44:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp64-0003gC-JQ for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:44:28 +0000 Received: from [193.109.254.147:14996] by server-15.bemta-14.messagelabs.com id E2/0A-10839-BBB5CF25; Thu, 13 Feb 2014 05:44:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1392270265!230627!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8284 invoked from network); 13 Feb 2014 05:44:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 13 Feb 2014 05:44:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp60-0004vK-VL for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:44:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDp60-0003zH-TY for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:44:24 +0000 Date: Thu, 13 Feb 2014 05:44:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: clean and invalidate all guest caches by VMID after domain 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 commit ed250c269831f01e92ea93bc7be3f3fdaa69e280 Author: Ian Campbell AuthorDate: Tue Feb 11 14:11:02 2014 +0000 Commit: Ian Campbell CommitDate: Wed Feb 12 12:48:45 2014 +0000 xen/arm: clean and invalidate all guest caches by VMID after domain build. Guests are initially started with caches disabled and so we need to make sure they see consistent data in RAM (requiring a cache clean) but also that they do not have old stale data suddenly appear in the caches when they enable their caches (requiring the invalidate). This can be split into two halves. First we must flush each page as it is allocated to the guest. It is not sufficient to do the flush at scrub time since this will miss pages which are ballooned out by the guest (where the guest must scrub if it cares about not leaking the pagecontent). We need to clean as well as invalidate to make sure that any scrubbing which has occured gets committed to real RAM. To achieve this add a new cacheflush_page function, which is a stub on x86. Secondly we need to flush anything which the domain builder touches, which we do via a new domctl. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Acked-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Jan Beulich Cc: keir@xen.org --- tools/libxc/xc_dom_boot.c | 4 ++++ tools/libxc/xc_dom_core.c | 2 ++ tools/libxc/xc_domain.c | 10 ++++++++++ tools/libxc/xc_private.c | 2 ++ tools/libxc/xc_private.h | 3 +++ xen/arch/arm/domctl.c | 14 ++++++++++++++ xen/arch/arm/mm.c | 12 ++++++++++++ xen/arch/arm/p2m.c | 25 +++++++++++++++++++++++++ xen/common/page_alloc.c | 5 +++++ xen/include/asm-arm/arm32/page.h | 4 ++++ xen/include/asm-arm/arm64/page.h | 4 ++++ xen/include/asm-arm/p2m.h | 3 +++ xen/include/asm-arm/page.h | 3 +++ xen/include/asm-x86/page.h | 3 +++ xen/include/public/domctl.h | 13 +++++++++++++ xen/xsm/flask/hooks.c | 13 +++++++++++++ xen/xsm/flask/policy/access_vectors | 2 ++ 17 files changed, 122 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xc_dom_boot.c b/tools/libxc/xc_dom_boot.c index fdfeaf8..f0a1c64 100644 --- a/tools/libxc/xc_dom_boot.c +++ b/tools/libxc/xc_dom_boot.c @@ -351,6 +351,10 @@ int xc_dom_gnttab_seed(xc_interface *xch, domid_t domid, return -1; } + /* Guest shouldn't really touch its grant table until it has + * enabled its caches. But lets be nice. */ + xc_domain_cacheflush(xch, domid, gnttab_gmfn, 1); + return 0; } diff --git a/tools/libxc/xc_dom_core.c b/tools/libxc/xc_dom_core.c index 77a4e64..b9d1015 100644 --- a/tools/libxc/xc_dom_core.c +++ b/tools/libxc/xc_dom_core.c @@ -603,6 +603,8 @@ void xc_dom_unmap_one(struct xc_dom_image *dom, xen_pfn_t pfn) prev->next = phys->next; else dom->phys_pages = phys->next; + + xc_domain_cacheflush(dom->xch, dom->guest_domid, phys->first, phys->count); } void xc_dom_unmap_all(struct xc_dom_image *dom) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index e1d1bec..369c3f3 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -48,6 +48,16 @@ int xc_domain_create(xc_interface *xch, return 0; } +int xc_domain_cacheflush(xc_interface *xch, uint32_t domid, + xen_pfn_t start_pfn, xen_pfn_t nr_pfns) +{ + DECLARE_DOMCTL; + domctl.cmd = XEN_DOMCTL_cacheflush; + domctl.domain = (domid_t)domid; + domctl.u.cacheflush.start_pfn = start_pfn; + domctl.u.cacheflush.nr_pfns = nr_pfns; + return do_domctl(xch, &domctl); +} int xc_domain_pause(xc_interface *xch, uint32_t domid) diff --git a/tools/libxc/xc_private.c b/tools/libxc/xc_private.c index 838fd21..33ed15b 100644 --- a/tools/libxc/xc_private.c +++ b/tools/libxc/xc_private.c @@ -628,6 +628,7 @@ int xc_copy_to_domain_page(xc_interface *xch, return -1; memcpy(vaddr, src_page, PAGE_SIZE); munmap(vaddr, PAGE_SIZE); + xc_domain_cacheflush(xch, domid, dst_pfn, 1); return 0; } @@ -641,6 +642,7 @@ int xc_clear_domain_page(xc_interface *xch, return -1; memset(vaddr, 0, PAGE_SIZE); munmap(vaddr, PAGE_SIZE); + xc_domain_cacheflush(xch, domid, dst_pfn, 1); return 0; } diff --git a/tools/libxc/xc_private.h b/tools/libxc/xc_private.h index 92271c9..a610f0c 100644 --- a/tools/libxc/xc_private.h +++ b/tools/libxc/xc_private.h @@ -304,6 +304,9 @@ void bitmap_byte_to_64(uint64_t *lp, const uint8_t *bp, int nbits); /* Optionally flush file to disk and discard page cache */ void discard_file_cache(xc_interface *xch, int fd, int flush); +int xc_domain_cacheflush(xc_interface *xch, uint32_t domid, + xen_pfn_t start_pfn, xen_pfn_t nr_pfns); + #define MAX_MMU_UPDATES 1024 struct xc_mmu { mmu_update_t updates[MAX_MMU_UPDATES]; diff --git a/xen/arch/arm/domctl.c b/xen/arch/arm/domctl.c index 546e86b..45974e7 100644 --- a/xen/arch/arm/domctl.c +++ b/xen/arch/arm/domctl.c @@ -17,6 +17,20 @@ long arch_do_domctl(struct xen_domctl *domctl, struct domain *d, { switch ( domctl->cmd ) { + case XEN_DOMCTL_cacheflush: + { + unsigned long s = domctl->u.cacheflush.start_pfn; + unsigned long e = s + domctl->u.cacheflush.nr_pfns; + + if ( domctl->u.cacheflush.nr_pfns > (1U< #include #include +#include /* First level P2M is 2 consecutive pages */ #define P2M_FIRST_ORDER 1 @@ -228,6 +229,7 @@ enum p2m_operation { ALLOCATE, REMOVE, RELINQUISH, + CACHEFLUSH, }; static int apply_p2m_changes(struct domain *d, @@ -381,6 +383,15 @@ static int apply_p2m_changes(struct domain *d, count++; } break; + + case CACHEFLUSH: + { + if ( !pte.p2m.valid || !p2m_is_ram(pte.p2m.type) ) + break; + + flush_page_to_ram(pte.p2m.base); + } + break; } /* Preempt every 2MiB (mapped) or 32 MiB (unmapped) - arbitrary */ @@ -624,6 +635,20 @@ int relinquish_p2m_mapping(struct domain *d) MATTR_MEM, p2m_invalid); } +int p2m_cache_flush(struct domain *d, xen_pfn_t start_mfn, xen_pfn_t end_mfn) +{ + struct p2m_domain *p2m = &d->arch.p2m; + + start_mfn = MAX(start_mfn, p2m->lowest_mapped_gfn); + end_mfn = MIN(end_mfn, p2m->max_mapped_gfn); + + return apply_p2m_changes(d, CACHEFLUSH, + pfn_to_paddr(start_mfn), + pfn_to_paddr(end_mfn), + pfn_to_paddr(INVALID_MFN), + MATTR_MEM, p2m_invalid); +} + unsigned long gmfn_to_mfn(struct domain *d, unsigned long gpfn) { paddr_t p = p2m_lookup(d, pfn_to_paddr(gpfn), NULL); diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 5f484a2..601319c 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -710,6 +710,11 @@ static struct page_info *alloc_heap_pages( /* Initialise fields which have other uses for free pages. */ pg[i].u.inuse.type_info = 0; page_set_owner(&pg[i], NULL); + + /* Ensure cache and RAM are consistent for platforms where the + * guest can control its own visibility of/through the cache. + */ + flush_page_to_ram(page_to_mfn(&pg[i])); } spin_unlock(&heap_lock); diff --git a/xen/include/asm-arm/arm32/page.h b/xen/include/asm-arm/arm32/page.h index cf12a89..cb6add4 100644 --- a/xen/include/asm-arm/arm32/page.h +++ b/xen/include/asm-arm/arm32/page.h @@ -22,6 +22,10 @@ static inline void write_pte(lpae_t *p, lpae_t pte) /* Inline ASM to flush dcache on register R (may be an inline asm operand) */ #define __flush_xen_dcache_one(R) STORE_CP32(R, DCCMVAC) +/* Inline ASM to clean and invalidate dcache on register R (may be an + * inline asm operand) */ +#define __clean_and_invalidate_xen_dcache_one(R) STORE_CP32(R, DCCIMVAC) + /* * Flush all hypervisor mappings from the TLB and branch predictor. * This is needed after changing Xen code mappings. diff --git a/xen/include/asm-arm/arm64/page.h b/xen/include/asm-arm/arm64/page.h index 9551f90..baf8903 100644 --- a/xen/include/asm-arm/arm64/page.h +++ b/xen/include/asm-arm/arm64/page.h @@ -17,6 +17,10 @@ static inline void write_pte(lpae_t *p, lpae_t pte) /* Inline ASM to flush dcache on register R (may be an inline asm operand) */ #define __flush_xen_dcache_one(R) "dc cvac, %" #R ";" +/* Inline ASM to clean and invalidate dcache on register R (may be an + * inline asm operand) */ +#define __clean_and_invalidate_xen_dcache_one(R) "dc civac, %" #R ";" + /* * Flush all hypervisor mappings from the TLB * This is needed after changing Xen code mappings. diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index e9c884a..3b39c45 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -78,6 +78,9 @@ void p2m_load_VTTBR(struct domain *d); /* Look up the MFN corresponding to a domain's PFN. */ paddr_t p2m_lookup(struct domain *d, paddr_t gpfn, p2m_type_t *t); +/* Clean & invalidate caches corresponding to a region of guest address space */ +int p2m_cache_flush(struct domain *d, xen_pfn_t start_mfn, xen_pfn_t end_mfn); + /* Setup p2m RAM mapping for domain d from start-end. */ int p2m_populate_ram(struct domain *d, paddr_t start, paddr_t end); /* Map MMIO regions in the p2m: start_gaddr and end_gaddr is the range diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index 670d4e7..5a371da 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -253,6 +253,9 @@ static inline void flush_xen_dcache_va_range(void *p, unsigned long size) : : "r" (_p), "m" (*_p)); \ } while (0) +/* Flush the dcache for an entire page. */ +void flush_page_to_ram(unsigned long mfn); + /* Print a walk of an arbitrary page table */ void dump_pt_walk(lpae_t *table, paddr_t addr); diff --git a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h index 7a46af5..ccc268d 100644 --- a/xen/include/asm-x86/page.h +++ b/xen/include/asm-x86/page.h @@ -346,6 +346,9 @@ static inline uint32_t cacheattr_to_pte_flags(uint32_t cacheattr) return ((cacheattr & 4) << 5) | ((cacheattr & 3) << 3); } +/* No cache maintenance required on x86 architecture. */ +static inline void flush_page_to_ram(unsigned long mfn) {} + /* return true if permission increased */ static inline bool_t perms_strictly_increased(uint32_t old_flags, uint32_t new_flags) diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 91f01fa..f22fe2e 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -885,6 +885,17 @@ struct xen_domctl_set_max_evtchn { typedef struct xen_domctl_set_max_evtchn xen_domctl_set_max_evtchn_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_set_max_evtchn_t); +/* + * ARM: Clean and invalidate caches associated with given region of + * guest memory. + */ +struct xen_domctl_cacheflush { + /* IN: page range to flush. */ + xen_pfn_t start_pfn, nr_pfns; +}; +typedef struct xen_domctl_cacheflush xen_domctl_cacheflush_t; +DEFINE_XEN_GUEST_HANDLE(xen_domctl_cacheflush_t); + struct xen_domctl { uint32_t cmd; #define XEN_DOMCTL_createdomain 1 @@ -954,6 +965,7 @@ struct xen_domctl { #define XEN_DOMCTL_setnodeaffinity 68 #define XEN_DOMCTL_getnodeaffinity 69 #define XEN_DOMCTL_set_max_evtchn 70 +#define XEN_DOMCTL_cacheflush 71 #define XEN_DOMCTL_gdbsx_guestmemio 1000 #define XEN_DOMCTL_gdbsx_pausevcpu 1001 #define XEN_DOMCTL_gdbsx_unpausevcpu 1002 @@ -1012,6 +1024,7 @@ struct xen_domctl { struct xen_domctl_set_max_evtchn set_max_evtchn; struct xen_domctl_gdbsx_memio gdbsx_guest_memio; struct xen_domctl_set_broken_page_p2m set_broken_page_p2m; + struct xen_domctl_cacheflush cacheflush; struct xen_domctl_gdbsx_pauseunp_vcpu gdbsx_pauseunp_vcpu; struct xen_domctl_gdbsx_domstatus gdbsx_domstatus; uint8_t pad[128]; diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 7cdef04..d94ab77 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -730,6 +730,9 @@ static int flask_domctl(struct domain *d, int cmd) case XEN_DOMCTL_set_max_evtchn: return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__SET_MAX_EVTCHN); + case XEN_DOMCTL_cacheflush: + return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__CACHEFLUSH); + default: printk("flask_domctl: Unknown op %d\n", cmd); return -EPERM; @@ -1599,3 +1602,13 @@ static __init int flask_init(void) } xsm_initcall(flask_init); + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/xsm/flask/policy/access_vectors b/xen/xsm/flask/policy/access_vectors index 1fbe241..a0ed13d 100644 --- a/xen/xsm/flask/policy/access_vectors +++ b/xen/xsm/flask/policy/access_vectors @@ -196,6 +196,8 @@ class domain2 setclaim # XEN_DOMCTL_set_max_evtchn set_max_evtchn +# XEN_DOMCTL_cacheflush + cacheflush } # Similar to class domain, but primarily contains domctls related to HVM domains -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 05:44:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 05:44:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp6E-0003iJ-M0; Thu, 13 Feb 2014 05:44:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp6D-0003i5-V0 for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:44:38 +0000 Received: from [85.158.143.35:52093] by server-3.bemta-4.messagelabs.com id 0E/B0-11539-5CB5CF25; Thu, 13 Feb 2014 05:44:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1392270275!5296846!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6095 invoked from network); 13 Feb 2014 05:44:36 -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; 13 Feb 2014 05:44:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp6B-0004vQ-3J for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:44:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDp6B-0003zt-2J for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:44:35 +0000 Date: Thu, 13 Feb 2014 05:44:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "xen: arm: force guest memory accesses to cacheable when MMU is disabled" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 878ff4fe1816d7f808f11254b555b9e9c2f121fa Author: Ian Campbell AuthorDate: Tue Feb 11 14:11:03 2014 +0000 Commit: Ian Campbell CommitDate: Wed Feb 12 12:49:10 2014 +0000 Revert "xen: arm: force guest memory accesses to cacheable when MMU is disabled" This reverts commit 89eb02c2204a0b42a0aa169f107bc346a3fef802. This approach has a short coming in that it breaks when a guest enables its MMU (SCTLR.M, disabling HCR.DC) without enabling caches (SCTLR.C) first/at the same time. It turns out that FreeBSD does this. This has now been fixed (yet) another way (third time is the charm!) so remove this support. The original commit contained some fixes which are still relevant even with the revert of the bulk of the patch: - Correction to HSR_SYSREG_CRN_MASK - Rename of HSR_SYSCTL macros to avoid naming clash - Definition of some additional cp reg specifications Since these are still useful they are not reverted. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/domain.c | 7 -- xen/arch/arm/traps.c | 158 ------------------------------------------ xen/include/asm-arm/domain.h | 2 - 3 files changed, 0 insertions(+), 167 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index c279a27..8f20fdf 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include @@ -220,11 +219,6 @@ static void ctxt_switch_to(struct vcpu *n) else hcr |= HCR_RW; - if ( n->arch.default_cache ) - hcr |= (HCR_TVM|HCR_DC); - else - hcr &= ~(HCR_TVM|HCR_DC); - WRITE_SYSREG(hcr, HCR_EL2); isb(); @@ -477,7 +471,6 @@ int vcpu_initialise(struct vcpu *v) return rc; v->arch.sctlr = SCTLR_GUEST_INIT; - v->arch.default_cache = true; /* * By default exposes an SMP system with AFF0 set to the VCPU ID diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index ea77cb8..21c7b26 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -29,14 +29,12 @@ #include #include #include -#include #include #include #include #include #include #include -#include #include "decode.h" #include "io.h" @@ -1292,29 +1290,6 @@ static void advance_pc(struct cpu_user_regs *regs, union hsr hsr) regs->pc += hsr.len ? 4 : 2; } -static void update_sctlr(struct vcpu *v, uint32_t val) -{ - /* - * If MMU (SCTLR_M) is now enabled then we must disable HCR.DC - * because they are incompatible. - * - * Once HCR.DC is disabled then we do not need HCR_TVM either, - * since it's only purpose was to catch the MMU being enabled. - * - * Both are set appropriately on context switch but we need to - * clear them now since we may not context switch on return to - * guest. - */ - if ( val & SCTLR_M ) - { - WRITE_SYSREG(READ_SYSREG(HCR_EL2) & ~(HCR_DC|HCR_TVM), HCR_EL2); - /* ARM ARM 0406C.b B3.2.1: Disabling HCR.DC without changing - * VMID requires us to flush the TLB for that VMID. */ - flush_tlb(); - v->arch.default_cache = false; - } -} - static void do_cp15_32(struct cpu_user_regs *regs, union hsr hsr) { @@ -1374,89 +1349,6 @@ static void do_cp15_32(struct cpu_user_regs *regs, if ( cp32.read ) *r = v->arch.actlr; break; - -/* Passthru a 32-bit AArch32 register which is also 32-bit under AArch64 */ -#define CP32_PASSTHRU32(R...) do { \ - if ( cp32.read ) \ - *r = READ_SYSREG32(R); \ - else \ - WRITE_SYSREG32(*r, R); \ -} while(0) - -/* - * Passthru a 32-bit AArch32 register which is 64-bit under AArch64. - * Updates the lower 32-bits and clears the upper bits. - */ -#define CP32_PASSTHRU64(R...) do { \ - if ( cp32.read ) \ - *r = (uint32_t)READ_SYSREG64(R); \ - else \ - WRITE_SYSREG64((uint64_t)*r, R); \ -} while(0) - -/* - * Passthru a 32-bit AArch32 register which is 64-bit under AArch64. - * Updates either the HI ([63:32]) or LO ([31:0]) 32-bits preserving - * the other half. - */ -#ifdef CONFIG_ARM_64 -#define CP32_PASSTHRU64_HI(R...) do { \ - if ( cp32.read ) \ - *r = (uint32_t)(READ_SYSREG64(R) >> 32); \ - else \ - { \ - uint64_t t = READ_SYSREG64(R) & 0xffffffffUL; \ - t |= ((uint64_t)(*r)) << 32; \ - WRITE_SYSREG64(t, R); \ - } \ -} while(0) -#define CP32_PASSTHRU64_LO(R...) do { \ - if ( cp32.read ) \ - *r = (uint32_t)(READ_SYSREG64(R) & 0xffffffff); \ - else \ - { \ - uint64_t t = READ_SYSREG64(R) & 0xffffffff00000000UL; \ - t |= *r; \ - WRITE_SYSREG64(t, R); \ - } \ -} while(0) -#endif - - /* HCR.TVM */ - case HSR_CPREG32(SCTLR): - CP32_PASSTHRU32(SCTLR_EL1); - update_sctlr(v, *r); - break; - case HSR_CPREG32(TTBR0_32): CP32_PASSTHRU64(TTBR0_EL1); break; - case HSR_CPREG32(TTBR1_32): CP32_PASSTHRU64(TTBR1_EL1); break; - case HSR_CPREG32(TTBCR): CP32_PASSTHRU32(TCR_EL1); break; - case HSR_CPREG32(DACR): CP32_PASSTHRU32(DACR32_EL2); break; - case HSR_CPREG32(DFSR): CP32_PASSTHRU32(ESR_EL1); break; - case HSR_CPREG32(IFSR): CP32_PASSTHRU32(IFSR32_EL2); break; - case HSR_CPREG32(ADFSR): CP32_PASSTHRU32(AFSR0_EL1); break; - case HSR_CPREG32(AIFSR): CP32_PASSTHRU32(AFSR1_EL1); break; - case HSR_CPREG32(CONTEXTIDR): CP32_PASSTHRU32(CONTEXTIDR_EL1); break; - -#ifdef CONFIG_ARM_64 - case HSR_CPREG32(DFAR): CP32_PASSTHRU64_LO(FAR_EL1); break; - case HSR_CPREG32(IFAR): CP32_PASSTHRU64_HI(FAR_EL1); break; - case HSR_CPREG32(MAIR0): CP32_PASSTHRU64_LO(MAIR_EL1); break; - case HSR_CPREG32(MAIR1): CP32_PASSTHRU64_HI(MAIR_EL1); break; - case HSR_CPREG32(AMAIR0): CP32_PASSTHRU64_LO(AMAIR_EL1); break; - case HSR_CPREG32(AMAIR1): CP32_PASSTHRU64_HI(AMAIR_EL1); break; -#else - case HSR_CPREG32(DFAR): CP32_PASSTHRU32(DFAR); break; - case HSR_CPREG32(IFAR): CP32_PASSTHRU32(IFAR); break; - case HSR_CPREG32(MAIR0): CP32_PASSTHRU32(MAIR0); break; - case HSR_CPREG32(MAIR1): CP32_PASSTHRU32(MAIR1); break; - case HSR_CPREG32(AMAIR0): CP32_PASSTHRU32(AMAIR0); break; - case HSR_CPREG32(AMAIR1): CP32_PASSTHRU32(AMAIR1); break; -#endif - -#undef CP32_PASSTHRU32 -#undef CP32_PASSTHRU64 -#undef CP32_PASSTHRU64_LO -#undef CP32_PASSTHRU64_HI default: printk("%s p15, %d, r%d, cr%d, cr%d, %d @ 0x%"PRIregister"\n", cp32.read ? "mrc" : "mcr", @@ -1470,9 +1362,6 @@ static void do_cp15_64(struct cpu_user_regs *regs, union hsr hsr) { struct hsr_cp64 cp64 = hsr.cp64; - uint32_t *r1 = (uint32_t *)select_user_reg(regs, cp64.reg1); - uint32_t *r2 = (uint32_t *)select_user_reg(regs, cp64.reg2); - uint64_t r; if ( !check_conditional_instr(regs, hsr) ) { @@ -1490,26 +1379,6 @@ static void do_cp15_64(struct cpu_user_regs *regs, domain_crash_synchronous(); } break; - -#define CP64_PASSTHRU(R...) do { \ - if ( cp64.read ) \ - { \ - r = READ_SYSREG64(R); \ - *r1 = r & 0xffffffffUL; \ - *r2 = r >> 32; \ - } \ - else \ - { \ - r = (*r1) | (((uint64_t)(*r2))<<32); \ - WRITE_SYSREG64(r, R); \ - } \ -} while(0) - - case HSR_CPREG64(TTBR0): CP64_PASSTHRU(TTBR0_EL1); break; - case HSR_CPREG64(TTBR1): CP64_PASSTHRU(TTBR1_EL1); break; - -#undef CP64_PASSTHRU - default: printk("%s p15, %d, r%d, r%d, cr%d @ 0x%"PRIregister"\n", cp64.read ? "mrrc" : "mcrr", @@ -1524,8 +1393,6 @@ static void do_sysreg(struct cpu_user_regs *regs, union hsr hsr) { struct hsr_sysreg sysreg = hsr.sysreg; - register_t *x = select_user_reg(regs, sysreg.reg); - struct vcpu *v = current; switch ( hsr.bits & HSR_SYSREG_REGS_MASK ) { @@ -1538,31 +1405,6 @@ static void do_sysreg(struct cpu_user_regs *regs, domain_crash_synchronous(); } break; - -#define SYSREG_PASSTHRU(R...) do { \ - if ( sysreg.read ) \ - *x = READ_SYSREG(R); \ - else \ - WRITE_SYSREG(*x, R); \ -} while(0) - - case HSR_SYSREG_SCTLR_EL1: - SYSREG_PASSTHRU(SCTLR_EL1); - update_sctlr(v, *x); - break; - case HSR_SYSREG_TTBR0_EL1: SYSREG_PASSTHRU(TTBR0_EL1); break; - case HSR_SYSREG_TTBR1_EL1: SYSREG_PASSTHRU(TTBR1_EL1); break; - case HSR_SYSREG_TCR_EL1: SYSREG_PASSTHRU(TCR_EL1); break; - case HSR_SYSREG_ESR_EL1: SYSREG_PASSTHRU(ESR_EL1); break; - case HSR_SYSREG_FAR_EL1: SYSREG_PASSTHRU(FAR_EL1); break; - case HSR_SYSREG_AFSR0_EL1: SYSREG_PASSTHRU(AFSR0_EL1); break; - case HSR_SYSREG_AFSR1_EL1: SYSREG_PASSTHRU(AFSR1_EL1); break; - case HSR_SYSREG_MAIR_EL1: SYSREG_PASSTHRU(MAIR_EL1); break; - case HSR_SYSREG_AMAIR_EL1: SYSREG_PASSTHRU(AMAIR_EL1); break; - case HSR_SYSREG_CONTEXTIDR_EL1: SYSREG_PASSTHRU(CONTEXTIDR_EL1); break; - -#undef SYSREG_PASSTHRU - default: printk("%s %d, %d, c%d, c%d, %d %s x%d @ 0x%"PRIregister"\n", sysreg.read ? "mrs" : "msr", diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index af8c64b..bc20a15 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -257,8 +257,6 @@ struct arch_vcpu uint64_t event_mask; uint64_t lr_mask; - bool_t default_cache; - struct { /* * SGIs and PPIs are per-VCPU, SPIs are domain global and in -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 05:44:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 05:44:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp6E-0003iJ-M0; Thu, 13 Feb 2014 05:44:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp6D-0003i5-V0 for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:44:38 +0000 Received: from [85.158.143.35:52093] by server-3.bemta-4.messagelabs.com id 0E/B0-11539-5CB5CF25; Thu, 13 Feb 2014 05:44:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1392270275!5296846!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6095 invoked from network); 13 Feb 2014 05:44:36 -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; 13 Feb 2014 05:44:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp6B-0004vQ-3J for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:44:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDp6B-0003zt-2J for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:44:35 +0000 Date: Thu, 13 Feb 2014 05:44:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "xen: arm: force guest memory accesses to cacheable when MMU is disabled" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 878ff4fe1816d7f808f11254b555b9e9c2f121fa Author: Ian Campbell AuthorDate: Tue Feb 11 14:11:03 2014 +0000 Commit: Ian Campbell CommitDate: Wed Feb 12 12:49:10 2014 +0000 Revert "xen: arm: force guest memory accesses to cacheable when MMU is disabled" This reverts commit 89eb02c2204a0b42a0aa169f107bc346a3fef802. This approach has a short coming in that it breaks when a guest enables its MMU (SCTLR.M, disabling HCR.DC) without enabling caches (SCTLR.C) first/at the same time. It turns out that FreeBSD does this. This has now been fixed (yet) another way (third time is the charm!) so remove this support. The original commit contained some fixes which are still relevant even with the revert of the bulk of the patch: - Correction to HSR_SYSREG_CRN_MASK - Rename of HSR_SYSCTL macros to avoid naming clash - Definition of some additional cp reg specifications Since these are still useful they are not reverted. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/domain.c | 7 -- xen/arch/arm/traps.c | 158 ------------------------------------------ xen/include/asm-arm/domain.h | 2 - 3 files changed, 0 insertions(+), 167 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index c279a27..8f20fdf 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include @@ -220,11 +219,6 @@ static void ctxt_switch_to(struct vcpu *n) else hcr |= HCR_RW; - if ( n->arch.default_cache ) - hcr |= (HCR_TVM|HCR_DC); - else - hcr &= ~(HCR_TVM|HCR_DC); - WRITE_SYSREG(hcr, HCR_EL2); isb(); @@ -477,7 +471,6 @@ int vcpu_initialise(struct vcpu *v) return rc; v->arch.sctlr = SCTLR_GUEST_INIT; - v->arch.default_cache = true; /* * By default exposes an SMP system with AFF0 set to the VCPU ID diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index ea77cb8..21c7b26 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -29,14 +29,12 @@ #include #include #include -#include #include #include #include #include #include #include -#include #include "decode.h" #include "io.h" @@ -1292,29 +1290,6 @@ static void advance_pc(struct cpu_user_regs *regs, union hsr hsr) regs->pc += hsr.len ? 4 : 2; } -static void update_sctlr(struct vcpu *v, uint32_t val) -{ - /* - * If MMU (SCTLR_M) is now enabled then we must disable HCR.DC - * because they are incompatible. - * - * Once HCR.DC is disabled then we do not need HCR_TVM either, - * since it's only purpose was to catch the MMU being enabled. - * - * Both are set appropriately on context switch but we need to - * clear them now since we may not context switch on return to - * guest. - */ - if ( val & SCTLR_M ) - { - WRITE_SYSREG(READ_SYSREG(HCR_EL2) & ~(HCR_DC|HCR_TVM), HCR_EL2); - /* ARM ARM 0406C.b B3.2.1: Disabling HCR.DC without changing - * VMID requires us to flush the TLB for that VMID. */ - flush_tlb(); - v->arch.default_cache = false; - } -} - static void do_cp15_32(struct cpu_user_regs *regs, union hsr hsr) { @@ -1374,89 +1349,6 @@ static void do_cp15_32(struct cpu_user_regs *regs, if ( cp32.read ) *r = v->arch.actlr; break; - -/* Passthru a 32-bit AArch32 register which is also 32-bit under AArch64 */ -#define CP32_PASSTHRU32(R...) do { \ - if ( cp32.read ) \ - *r = READ_SYSREG32(R); \ - else \ - WRITE_SYSREG32(*r, R); \ -} while(0) - -/* - * Passthru a 32-bit AArch32 register which is 64-bit under AArch64. - * Updates the lower 32-bits and clears the upper bits. - */ -#define CP32_PASSTHRU64(R...) do { \ - if ( cp32.read ) \ - *r = (uint32_t)READ_SYSREG64(R); \ - else \ - WRITE_SYSREG64((uint64_t)*r, R); \ -} while(0) - -/* - * Passthru a 32-bit AArch32 register which is 64-bit under AArch64. - * Updates either the HI ([63:32]) or LO ([31:0]) 32-bits preserving - * the other half. - */ -#ifdef CONFIG_ARM_64 -#define CP32_PASSTHRU64_HI(R...) do { \ - if ( cp32.read ) \ - *r = (uint32_t)(READ_SYSREG64(R) >> 32); \ - else \ - { \ - uint64_t t = READ_SYSREG64(R) & 0xffffffffUL; \ - t |= ((uint64_t)(*r)) << 32; \ - WRITE_SYSREG64(t, R); \ - } \ -} while(0) -#define CP32_PASSTHRU64_LO(R...) do { \ - if ( cp32.read ) \ - *r = (uint32_t)(READ_SYSREG64(R) & 0xffffffff); \ - else \ - { \ - uint64_t t = READ_SYSREG64(R) & 0xffffffff00000000UL; \ - t |= *r; \ - WRITE_SYSREG64(t, R); \ - } \ -} while(0) -#endif - - /* HCR.TVM */ - case HSR_CPREG32(SCTLR): - CP32_PASSTHRU32(SCTLR_EL1); - update_sctlr(v, *r); - break; - case HSR_CPREG32(TTBR0_32): CP32_PASSTHRU64(TTBR0_EL1); break; - case HSR_CPREG32(TTBR1_32): CP32_PASSTHRU64(TTBR1_EL1); break; - case HSR_CPREG32(TTBCR): CP32_PASSTHRU32(TCR_EL1); break; - case HSR_CPREG32(DACR): CP32_PASSTHRU32(DACR32_EL2); break; - case HSR_CPREG32(DFSR): CP32_PASSTHRU32(ESR_EL1); break; - case HSR_CPREG32(IFSR): CP32_PASSTHRU32(IFSR32_EL2); break; - case HSR_CPREG32(ADFSR): CP32_PASSTHRU32(AFSR0_EL1); break; - case HSR_CPREG32(AIFSR): CP32_PASSTHRU32(AFSR1_EL1); break; - case HSR_CPREG32(CONTEXTIDR): CP32_PASSTHRU32(CONTEXTIDR_EL1); break; - -#ifdef CONFIG_ARM_64 - case HSR_CPREG32(DFAR): CP32_PASSTHRU64_LO(FAR_EL1); break; - case HSR_CPREG32(IFAR): CP32_PASSTHRU64_HI(FAR_EL1); break; - case HSR_CPREG32(MAIR0): CP32_PASSTHRU64_LO(MAIR_EL1); break; - case HSR_CPREG32(MAIR1): CP32_PASSTHRU64_HI(MAIR_EL1); break; - case HSR_CPREG32(AMAIR0): CP32_PASSTHRU64_LO(AMAIR_EL1); break; - case HSR_CPREG32(AMAIR1): CP32_PASSTHRU64_HI(AMAIR_EL1); break; -#else - case HSR_CPREG32(DFAR): CP32_PASSTHRU32(DFAR); break; - case HSR_CPREG32(IFAR): CP32_PASSTHRU32(IFAR); break; - case HSR_CPREG32(MAIR0): CP32_PASSTHRU32(MAIR0); break; - case HSR_CPREG32(MAIR1): CP32_PASSTHRU32(MAIR1); break; - case HSR_CPREG32(AMAIR0): CP32_PASSTHRU32(AMAIR0); break; - case HSR_CPREG32(AMAIR1): CP32_PASSTHRU32(AMAIR1); break; -#endif - -#undef CP32_PASSTHRU32 -#undef CP32_PASSTHRU64 -#undef CP32_PASSTHRU64_LO -#undef CP32_PASSTHRU64_HI default: printk("%s p15, %d, r%d, cr%d, cr%d, %d @ 0x%"PRIregister"\n", cp32.read ? "mrc" : "mcr", @@ -1470,9 +1362,6 @@ static void do_cp15_64(struct cpu_user_regs *regs, union hsr hsr) { struct hsr_cp64 cp64 = hsr.cp64; - uint32_t *r1 = (uint32_t *)select_user_reg(regs, cp64.reg1); - uint32_t *r2 = (uint32_t *)select_user_reg(regs, cp64.reg2); - uint64_t r; if ( !check_conditional_instr(regs, hsr) ) { @@ -1490,26 +1379,6 @@ static void do_cp15_64(struct cpu_user_regs *regs, domain_crash_synchronous(); } break; - -#define CP64_PASSTHRU(R...) do { \ - if ( cp64.read ) \ - { \ - r = READ_SYSREG64(R); \ - *r1 = r & 0xffffffffUL; \ - *r2 = r >> 32; \ - } \ - else \ - { \ - r = (*r1) | (((uint64_t)(*r2))<<32); \ - WRITE_SYSREG64(r, R); \ - } \ -} while(0) - - case HSR_CPREG64(TTBR0): CP64_PASSTHRU(TTBR0_EL1); break; - case HSR_CPREG64(TTBR1): CP64_PASSTHRU(TTBR1_EL1); break; - -#undef CP64_PASSTHRU - default: printk("%s p15, %d, r%d, r%d, cr%d @ 0x%"PRIregister"\n", cp64.read ? "mrrc" : "mcrr", @@ -1524,8 +1393,6 @@ static void do_sysreg(struct cpu_user_regs *regs, union hsr hsr) { struct hsr_sysreg sysreg = hsr.sysreg; - register_t *x = select_user_reg(regs, sysreg.reg); - struct vcpu *v = current; switch ( hsr.bits & HSR_SYSREG_REGS_MASK ) { @@ -1538,31 +1405,6 @@ static void do_sysreg(struct cpu_user_regs *regs, domain_crash_synchronous(); } break; - -#define SYSREG_PASSTHRU(R...) do { \ - if ( sysreg.read ) \ - *x = READ_SYSREG(R); \ - else \ - WRITE_SYSREG(*x, R); \ -} while(0) - - case HSR_SYSREG_SCTLR_EL1: - SYSREG_PASSTHRU(SCTLR_EL1); - update_sctlr(v, *x); - break; - case HSR_SYSREG_TTBR0_EL1: SYSREG_PASSTHRU(TTBR0_EL1); break; - case HSR_SYSREG_TTBR1_EL1: SYSREG_PASSTHRU(TTBR1_EL1); break; - case HSR_SYSREG_TCR_EL1: SYSREG_PASSTHRU(TCR_EL1); break; - case HSR_SYSREG_ESR_EL1: SYSREG_PASSTHRU(ESR_EL1); break; - case HSR_SYSREG_FAR_EL1: SYSREG_PASSTHRU(FAR_EL1); break; - case HSR_SYSREG_AFSR0_EL1: SYSREG_PASSTHRU(AFSR0_EL1); break; - case HSR_SYSREG_AFSR1_EL1: SYSREG_PASSTHRU(AFSR1_EL1); break; - case HSR_SYSREG_MAIR_EL1: SYSREG_PASSTHRU(MAIR_EL1); break; - case HSR_SYSREG_AMAIR_EL1: SYSREG_PASSTHRU(AMAIR_EL1); break; - case HSR_SYSREG_CONTEXTIDR_EL1: SYSREG_PASSTHRU(CONTEXTIDR_EL1); break; - -#undef SYSREG_PASSTHRU - default: printk("%s %d, %d, c%d, c%d, %d %s x%d @ 0x%"PRIregister"\n", sysreg.read ? "mrs" : "msr", diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index af8c64b..bc20a15 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -257,8 +257,6 @@ struct arch_vcpu uint64_t event_mask; uint64_t lr_mask; - bool_t default_cache; - struct { /* * SGIs and PPIs are per-VCPU, SPIs are domain global and in -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 05:44:49 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 05:44:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp6P-0003kc-RT; Thu, 13 Feb 2014 05:44:49 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp6O-0003kF-3J for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:44:48 +0000 Received: from [85.158.143.35:52590] by server-1.bemta-4.messagelabs.com id FA/98-31661-FCB5CF25; Thu, 13 Feb 2014 05:44:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1392270285!5288859!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22258 invoked from network); 13 Feb 2014 05:44:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 13 Feb 2014 05:44:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp6L-0004vW-9L for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:44:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDp6L-00040K-7Q for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:44:45 +0000 Date: Thu, 13 Feb 2014 05:44:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: correct terminology for cache flush macros X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 890f16edb44a7ea856cc02263a27d2ba10348127 Author: Ian Campbell AuthorDate: Tue Feb 11 14:11:04 2014 +0000 Commit: Ian Campbell CommitDate: Wed Feb 12 12:49:10 2014 +0000 xen: arm: correct terminology for cache flush macros The term "flush" is slightly ambiguous. The correct ARM term for for this operaton is clean, as opposed to clean+invalidate for which we also now have a function. This is a pure rename, no functional change. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/guestcopy.c | 2 +- xen/arch/arm/kernel.c | 2 +- xen/arch/arm/mm.c | 16 ++++++++-------- xen/arch/arm/smpboot.c | 2 +- xen/include/asm-arm/arm32/page.h | 2 +- xen/include/asm-arm/arm64/page.h | 2 +- xen/include/asm-arm/page.h | 10 +++++----- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/xen/arch/arm/guestcopy.c b/xen/arch/arm/guestcopy.c index bd0a355..af0af6b 100644 --- a/xen/arch/arm/guestcopy.c +++ b/xen/arch/arm/guestcopy.c @@ -24,7 +24,7 @@ static unsigned long raw_copy_to_guest_helper(void *to, const void *from, p += offset; memcpy(p, from, size); if ( flush_dcache ) - flush_xen_dcache_va_range(p, size); + clean_xen_dcache_va_range(p, size); unmap_domain_page(p - offset); len -= size; diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index 6a5772b..1e3107d 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -58,7 +58,7 @@ void copy_from_paddr(void *dst, paddr_t paddr, unsigned long len, int attrindx) set_fixmap(FIXMAP_MISC, p, attrindx); memcpy(dst, src + s, l); - flush_xen_dcache_va_range(dst, l); + clean_xen_dcache_va_range(dst, l); paddr += l; dst += l; diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 146b2fb..308a798 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -484,13 +484,13 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) /* Clear the copy of the boot pagetables. Each secondary CPU * rebuilds these itself (see head.S) */ memset(boot_pgtable, 0x0, PAGE_SIZE); - flush_xen_dcache(boot_pgtable); + clean_xen_dcache(boot_pgtable); #ifdef CONFIG_ARM_64 memset(boot_first, 0x0, PAGE_SIZE); - flush_xen_dcache(boot_first); + clean_xen_dcache(boot_first); #endif memset(boot_second, 0x0, PAGE_SIZE); - flush_xen_dcache(boot_second); + clean_xen_dcache(boot_second); /* Break up the Xen mapping into 4k pages and protect them separately. */ for ( i = 0; i < LPAE_ENTRIES; i++ ) @@ -528,7 +528,7 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) /* Make sure it is clear */ memset(this_cpu(xen_dommap), 0, DOMHEAP_SECOND_PAGES*PAGE_SIZE); - flush_xen_dcache_va_range(this_cpu(xen_dommap), + clean_xen_dcache_va_range(this_cpu(xen_dommap), DOMHEAP_SECOND_PAGES*PAGE_SIZE); #endif } @@ -539,7 +539,7 @@ int init_secondary_pagetables(int cpu) /* Set init_ttbr for this CPU coming up. All CPus share a single setof * pagetables, but rewrite it each time for consistency with 32 bit. */ init_ttbr = (uintptr_t) xen_pgtable + phys_offset; - flush_xen_dcache(init_ttbr); + clean_xen_dcache(init_ttbr); return 0; } #else @@ -574,15 +574,15 @@ int init_secondary_pagetables(int cpu) write_pte(&first[first_table_offset(DOMHEAP_VIRT_START+i*FIRST_SIZE)], pte); } - flush_xen_dcache_va_range(first, PAGE_SIZE); - flush_xen_dcache_va_range(domheap, DOMHEAP_SECOND_PAGES*PAGE_SIZE); + clean_xen_dcache_va_range(first, PAGE_SIZE); + clean_xen_dcache_va_range(domheap, DOMHEAP_SECOND_PAGES*PAGE_SIZE); per_cpu(xen_pgtable, cpu) = first; per_cpu(xen_dommap, cpu) = domheap; /* Set init_ttbr for this CPU coming up */ init_ttbr = __pa(first); - flush_xen_dcache(init_ttbr); + clean_xen_dcache(init_ttbr); return 0; } diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index c53c765..a829957 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -378,7 +378,7 @@ int __cpu_up(unsigned int cpu) /* Open the gate for this CPU */ smp_up_cpu = cpu_logical_map(cpu); - flush_xen_dcache(smp_up_cpu); + clean_xen_dcache(smp_up_cpu); rc = arch_cpu_up(cpu); diff --git a/xen/include/asm-arm/arm32/page.h b/xen/include/asm-arm/arm32/page.h index cb6add4..b8221ca 100644 --- a/xen/include/asm-arm/arm32/page.h +++ b/xen/include/asm-arm/arm32/page.h @@ -20,7 +20,7 @@ static inline void write_pte(lpae_t *p, lpae_t pte) } /* Inline ASM to flush dcache on register R (may be an inline asm operand) */ -#define __flush_xen_dcache_one(R) STORE_CP32(R, DCCMVAC) +#define __clean_xen_dcache_one(R) STORE_CP32(R, DCCMVAC) /* Inline ASM to clean and invalidate dcache on register R (may be an * inline asm operand) */ diff --git a/xen/include/asm-arm/arm64/page.h b/xen/include/asm-arm/arm64/page.h index baf8903..3352821 100644 --- a/xen/include/asm-arm/arm64/page.h +++ b/xen/include/asm-arm/arm64/page.h @@ -15,7 +15,7 @@ static inline void write_pte(lpae_t *p, lpae_t pte) } /* Inline ASM to flush dcache on register R (may be an inline asm operand) */ -#define __flush_xen_dcache_one(R) "dc cvac, %" #R ";" +#define __clean_xen_dcache_one(R) "dc cvac, %" #R ";" /* Inline ASM to clean and invalidate dcache on register R (may be an * inline asm operand) */ diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index 5a371da..e00be9e 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -229,26 +229,26 @@ extern size_t cacheline_bytes; /* Function for flushing medium-sized areas. * if 'range' is large enough we might want to use model-specific * full-cache flushes. */ -static inline void flush_xen_dcache_va_range(void *p, unsigned long size) +static inline void clean_xen_dcache_va_range(void *p, unsigned long size) { void *end; dsb(); /* So the CPU issues all writes to the range */ for ( end = p + size; p < end; p += cacheline_bytes ) - asm volatile (__flush_xen_dcache_one(0) : : "r" (p)); + asm volatile (__clean_xen_dcache_one(0) : : "r" (p)); dsb(); /* So we know the flushes happen before continuing */ } /* Macro for flushing a single small item. The predicate is always * compile-time constant so this will compile down to 3 instructions in * the common case. */ -#define flush_xen_dcache(x) do { \ +#define clean_xen_dcache(x) do { \ typeof(x) *_p = &(x); \ if ( sizeof(x) > MIN_CACHELINE_BYTES || sizeof(x) > alignof(x) ) \ - flush_xen_dcache_va_range(_p, sizeof(x)); \ + clean_xen_dcache_va_range(_p, sizeof(x)); \ else \ asm volatile ( \ "dsb sy;" /* Finish all earlier writes */ \ - __flush_xen_dcache_one(0) \ + __clean_xen_dcache_one(0) \ "dsb sy;" /* Finish flush before continuing */ \ : : "r" (_p), "m" (*_p)); \ } while (0) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 05:44:49 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 05:44:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp6P-0003kc-RT; Thu, 13 Feb 2014 05:44:49 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp6O-0003kF-3J for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:44:48 +0000 Received: from [85.158.143.35:52590] by server-1.bemta-4.messagelabs.com id FA/98-31661-FCB5CF25; Thu, 13 Feb 2014 05:44:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1392270285!5288859!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22258 invoked from network); 13 Feb 2014 05:44:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 13 Feb 2014 05:44:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp6L-0004vW-9L for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:44:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDp6L-00040K-7Q for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:44:45 +0000 Date: Thu, 13 Feb 2014 05:44:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: correct terminology for cache flush macros X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 890f16edb44a7ea856cc02263a27d2ba10348127 Author: Ian Campbell AuthorDate: Tue Feb 11 14:11:04 2014 +0000 Commit: Ian Campbell CommitDate: Wed Feb 12 12:49:10 2014 +0000 xen: arm: correct terminology for cache flush macros The term "flush" is slightly ambiguous. The correct ARM term for for this operaton is clean, as opposed to clean+invalidate for which we also now have a function. This is a pure rename, no functional change. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/guestcopy.c | 2 +- xen/arch/arm/kernel.c | 2 +- xen/arch/arm/mm.c | 16 ++++++++-------- xen/arch/arm/smpboot.c | 2 +- xen/include/asm-arm/arm32/page.h | 2 +- xen/include/asm-arm/arm64/page.h | 2 +- xen/include/asm-arm/page.h | 10 +++++----- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/xen/arch/arm/guestcopy.c b/xen/arch/arm/guestcopy.c index bd0a355..af0af6b 100644 --- a/xen/arch/arm/guestcopy.c +++ b/xen/arch/arm/guestcopy.c @@ -24,7 +24,7 @@ static unsigned long raw_copy_to_guest_helper(void *to, const void *from, p += offset; memcpy(p, from, size); if ( flush_dcache ) - flush_xen_dcache_va_range(p, size); + clean_xen_dcache_va_range(p, size); unmap_domain_page(p - offset); len -= size; diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index 6a5772b..1e3107d 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -58,7 +58,7 @@ void copy_from_paddr(void *dst, paddr_t paddr, unsigned long len, int attrindx) set_fixmap(FIXMAP_MISC, p, attrindx); memcpy(dst, src + s, l); - flush_xen_dcache_va_range(dst, l); + clean_xen_dcache_va_range(dst, l); paddr += l; dst += l; diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 146b2fb..308a798 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -484,13 +484,13 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) /* Clear the copy of the boot pagetables. Each secondary CPU * rebuilds these itself (see head.S) */ memset(boot_pgtable, 0x0, PAGE_SIZE); - flush_xen_dcache(boot_pgtable); + clean_xen_dcache(boot_pgtable); #ifdef CONFIG_ARM_64 memset(boot_first, 0x0, PAGE_SIZE); - flush_xen_dcache(boot_first); + clean_xen_dcache(boot_first); #endif memset(boot_second, 0x0, PAGE_SIZE); - flush_xen_dcache(boot_second); + clean_xen_dcache(boot_second); /* Break up the Xen mapping into 4k pages and protect them separately. */ for ( i = 0; i < LPAE_ENTRIES; i++ ) @@ -528,7 +528,7 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) /* Make sure it is clear */ memset(this_cpu(xen_dommap), 0, DOMHEAP_SECOND_PAGES*PAGE_SIZE); - flush_xen_dcache_va_range(this_cpu(xen_dommap), + clean_xen_dcache_va_range(this_cpu(xen_dommap), DOMHEAP_SECOND_PAGES*PAGE_SIZE); #endif } @@ -539,7 +539,7 @@ int init_secondary_pagetables(int cpu) /* Set init_ttbr for this CPU coming up. All CPus share a single setof * pagetables, but rewrite it each time for consistency with 32 bit. */ init_ttbr = (uintptr_t) xen_pgtable + phys_offset; - flush_xen_dcache(init_ttbr); + clean_xen_dcache(init_ttbr); return 0; } #else @@ -574,15 +574,15 @@ int init_secondary_pagetables(int cpu) write_pte(&first[first_table_offset(DOMHEAP_VIRT_START+i*FIRST_SIZE)], pte); } - flush_xen_dcache_va_range(first, PAGE_SIZE); - flush_xen_dcache_va_range(domheap, DOMHEAP_SECOND_PAGES*PAGE_SIZE); + clean_xen_dcache_va_range(first, PAGE_SIZE); + clean_xen_dcache_va_range(domheap, DOMHEAP_SECOND_PAGES*PAGE_SIZE); per_cpu(xen_pgtable, cpu) = first; per_cpu(xen_dommap, cpu) = domheap; /* Set init_ttbr for this CPU coming up */ init_ttbr = __pa(first); - flush_xen_dcache(init_ttbr); + clean_xen_dcache(init_ttbr); return 0; } diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index c53c765..a829957 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -378,7 +378,7 @@ int __cpu_up(unsigned int cpu) /* Open the gate for this CPU */ smp_up_cpu = cpu_logical_map(cpu); - flush_xen_dcache(smp_up_cpu); + clean_xen_dcache(smp_up_cpu); rc = arch_cpu_up(cpu); diff --git a/xen/include/asm-arm/arm32/page.h b/xen/include/asm-arm/arm32/page.h index cb6add4..b8221ca 100644 --- a/xen/include/asm-arm/arm32/page.h +++ b/xen/include/asm-arm/arm32/page.h @@ -20,7 +20,7 @@ static inline void write_pte(lpae_t *p, lpae_t pte) } /* Inline ASM to flush dcache on register R (may be an inline asm operand) */ -#define __flush_xen_dcache_one(R) STORE_CP32(R, DCCMVAC) +#define __clean_xen_dcache_one(R) STORE_CP32(R, DCCMVAC) /* Inline ASM to clean and invalidate dcache on register R (may be an * inline asm operand) */ diff --git a/xen/include/asm-arm/arm64/page.h b/xen/include/asm-arm/arm64/page.h index baf8903..3352821 100644 --- a/xen/include/asm-arm/arm64/page.h +++ b/xen/include/asm-arm/arm64/page.h @@ -15,7 +15,7 @@ static inline void write_pte(lpae_t *p, lpae_t pte) } /* Inline ASM to flush dcache on register R (may be an inline asm operand) */ -#define __flush_xen_dcache_one(R) "dc cvac, %" #R ";" +#define __clean_xen_dcache_one(R) "dc cvac, %" #R ";" /* Inline ASM to clean and invalidate dcache on register R (may be an * inline asm operand) */ diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index 5a371da..e00be9e 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -229,26 +229,26 @@ extern size_t cacheline_bytes; /* Function for flushing medium-sized areas. * if 'range' is large enough we might want to use model-specific * full-cache flushes. */ -static inline void flush_xen_dcache_va_range(void *p, unsigned long size) +static inline void clean_xen_dcache_va_range(void *p, unsigned long size) { void *end; dsb(); /* So the CPU issues all writes to the range */ for ( end = p + size; p < end; p += cacheline_bytes ) - asm volatile (__flush_xen_dcache_one(0) : : "r" (p)); + asm volatile (__clean_xen_dcache_one(0) : : "r" (p)); dsb(); /* So we know the flushes happen before continuing */ } /* Macro for flushing a single small item. The predicate is always * compile-time constant so this will compile down to 3 instructions in * the common case. */ -#define flush_xen_dcache(x) do { \ +#define clean_xen_dcache(x) do { \ typeof(x) *_p = &(x); \ if ( sizeof(x) > MIN_CACHELINE_BYTES || sizeof(x) > alignof(x) ) \ - flush_xen_dcache_va_range(_p, sizeof(x)); \ + clean_xen_dcache_va_range(_p, sizeof(x)); \ else \ asm volatile ( \ "dsb sy;" /* Finish all earlier writes */ \ - __flush_xen_dcache_one(0) \ + __clean_xen_dcache_one(0) \ "dsb sy;" /* Finish flush before continuing */ \ : : "r" (_p), "m" (*_p)); \ } while (0) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 05:44:58 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 05:44:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp6Y-0003mb-UM; Thu, 13 Feb 2014 05:44:58 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp6Y-0003mI-0i for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:44:58 +0000 Received: from [85.158.143.35:4161] by server-3.bemta-4.messagelabs.com id CF/E0-11539-9DB5CF25; Thu, 13 Feb 2014 05:44:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1392270295!5293743!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20482 invoked from network); 13 Feb 2014 05:44:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 13 Feb 2014 05:44:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp6V-0004vc-Dr for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:44:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDp6V-00040h-Ct for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:44:55 +0000 Date: Thu, 13 Feb 2014 05:44:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7ebb8f02de7e6ca7df3d795fd33065ad7a43443b Merge: 890f16edb44a7ea856cc02263a27d2ba10348127 5819ec7bc0f86c9dff755d85df289332742c05c3 Author: Ian Campbell AuthorDate: Wed Feb 12 12:59:14 2014 +0000 Commit: Ian Campbell CommitDate: Wed Feb 12 12:59:14 2014 +0000 Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging xen/include/public/io/blkif.h | 22 +++++++--------------- 1 files changed, 7 insertions(+), 15 deletions(-) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 05:44:58 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 05:44:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp6Y-0003mb-UM; Thu, 13 Feb 2014 05:44:58 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp6Y-0003mI-0i for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:44:58 +0000 Received: from [85.158.143.35:4161] by server-3.bemta-4.messagelabs.com id CF/E0-11539-9DB5CF25; Thu, 13 Feb 2014 05:44:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1392270295!5293743!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20482 invoked from network); 13 Feb 2014 05:44:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 13 Feb 2014 05:44:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp6V-0004vc-Dr for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:44:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDp6V-00040h-Ct for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:44:55 +0000 Date: Thu, 13 Feb 2014 05:44:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7ebb8f02de7e6ca7df3d795fd33065ad7a43443b Merge: 890f16edb44a7ea856cc02263a27d2ba10348127 5819ec7bc0f86c9dff755d85df289332742c05c3 Author: Ian Campbell AuthorDate: Wed Feb 12 12:59:14 2014 +0000 Commit: Ian Campbell CommitDate: Wed Feb 12 12:59:14 2014 +0000 Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging xen/include/public/io/blkif.h | 22 +++++++--------------- 1 files changed, 7 insertions(+), 15 deletions(-) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 05:45:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 05:45:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp6k-0003od-1D; Thu, 13 Feb 2014 05:45:10 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp6i-0003oK-Fg for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:45:08 +0000 Received: from [85.158.143.35:4629] by server-3.bemta-4.messagelabs.com id BA/01-11539-3EB5CF25; Thu, 13 Feb 2014 05:45:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1392270306!5286358!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27595 invoked from network); 13 Feb 2014 05:45:07 -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; 13 Feb 2014 05:45:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp6f-0004wd-NB for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:45:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDp6f-00041H-IG for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:45:05 +0000 Date: Thu, 13 Feb 2014 05:45:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: Drop N from rcN in XEN_EXTRAVERSION X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 b64151d5dd6aeea1f8b37468f91330b128869a9b Author: Ian Jackson AuthorDate: Wed Feb 12 16:52:26 2014 +0000 Commit: Ian Jackson CommitDate: Wed Feb 12 16:52:26 2014 +0000 xen: Drop N from rcN in XEN_EXTRAVERSION Having this here means we have to wait for a push gate pass, or fart about which explicit pushes to master, to make an RC. The boot messages for git builds already contain the git revision (as a shorthash). I will change the tarball creation checklist to seddery the -rc back to -rcN, along with the other release-management-related changes (like using an embedded copy of qemu). If this patch meets with approval it should be thrown into the push gate today, along with the patch for XSA-88, and then hopefully nothing much else, so that we can get something suitable for making an RC from by Friday. Signed-off-by: Ian Jackson Acked-by: Jan Beulich Acked-by: George Dunlap Release-Acked-by: George Dunlap --- xen/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index 7258504..576d239 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 4 -export XEN_EXTRAVERSION ?= -rc2$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= -rc$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 05:45:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 05:45:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp6k-0003od-1D; Thu, 13 Feb 2014 05:45:10 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp6i-0003oK-Fg for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:45:08 +0000 Received: from [85.158.143.35:4629] by server-3.bemta-4.messagelabs.com id BA/01-11539-3EB5CF25; Thu, 13 Feb 2014 05:45:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1392270306!5286358!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27595 invoked from network); 13 Feb 2014 05:45:07 -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; 13 Feb 2014 05:45:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp6f-0004wd-NB for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:45:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDp6f-00041H-IG for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:45:05 +0000 Date: Thu, 13 Feb 2014 05:45:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: Drop N from rcN in XEN_EXTRAVERSION X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 b64151d5dd6aeea1f8b37468f91330b128869a9b Author: Ian Jackson AuthorDate: Wed Feb 12 16:52:26 2014 +0000 Commit: Ian Jackson CommitDate: Wed Feb 12 16:52:26 2014 +0000 xen: Drop N from rcN in XEN_EXTRAVERSION Having this here means we have to wait for a push gate pass, or fart about which explicit pushes to master, to make an RC. The boot messages for git builds already contain the git revision (as a shorthash). I will change the tarball creation checklist to seddery the -rc back to -rcN, along with the other release-management-related changes (like using an embedded copy of qemu). If this patch meets with approval it should be thrown into the push gate today, along with the patch for XSA-88, and then hopefully nothing much else, so that we can get something suitable for making an RC from by Friday. Signed-off-by: Ian Jackson Acked-by: Jan Beulich Acked-by: George Dunlap Release-Acked-by: George Dunlap --- xen/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index 7258504..576d239 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 4 -export XEN_EXTRAVERSION ?= -rc2$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= -rc$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 05:45:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 05:45:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp6u-0003qq-Qj; Thu, 13 Feb 2014 05:45:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp6s-0003qa-Fx for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:45:18 +0000 Received: from [85.158.143.35:5004] by server-2.bemta-4.messagelabs.com id 09/A9-10891-DEB5CF25; Thu, 13 Feb 2014 05:45:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1392270316!5288918!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23682 invoked from network); 13 Feb 2014 05:45:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 13 Feb 2014 05:45:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp6p-0004wj-UC for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:45:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDp6p-00041f-Rv for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:45:15 +0000 Date: Thu, 13 Feb 2014 05:45:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: Fix out-of-memory error handling in xc_cpupool_getinfo() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 d883c179a74111a6804baf8cb8224235242a88fc Author: Andrew Cooper AuthorDate: Wed Jan 22 17:47:21 2014 +0000 Commit: Ian Jackson CommitDate: Wed Feb 12 16:53:23 2014 +0000 libxc: Fix out-of-memory error handling in xc_cpupool_getinfo() Avoid freeing info then returning it to the caller. This is XSA-88. Coverity-ID: 1056192 Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- tools/libxc/xc_cpupool.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xc_cpupool.c b/tools/libxc/xc_cpupool.c index c8c2a33..6393cfb 100644 --- a/tools/libxc/xc_cpupool.c +++ b/tools/libxc/xc_cpupool.c @@ -104,6 +104,7 @@ xc_cpupoolinfo_t *xc_cpupool_getinfo(xc_interface *xch, info->cpumap = xc_cpumap_alloc(xch); if (!info->cpumap) { free(info); + info = NULL; goto out; } info->cpupool_id = sysctl.u.cpupool_op.cpupool_id; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 05:45:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 05:45:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp6u-0003qq-Qj; Thu, 13 Feb 2014 05:45:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp6s-0003qa-Fx for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:45:18 +0000 Received: from [85.158.143.35:5004] by server-2.bemta-4.messagelabs.com id 09/A9-10891-DEB5CF25; Thu, 13 Feb 2014 05:45:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1392270316!5288918!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23682 invoked from network); 13 Feb 2014 05:45:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 13 Feb 2014 05:45:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDp6p-0004wj-UC for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:45:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDp6p-00041f-Rv for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 05:45:15 +0000 Date: Thu, 13 Feb 2014 05:45:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: Fix out-of-memory error handling in xc_cpupool_getinfo() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 d883c179a74111a6804baf8cb8224235242a88fc Author: Andrew Cooper AuthorDate: Wed Jan 22 17:47:21 2014 +0000 Commit: Ian Jackson CommitDate: Wed Feb 12 16:53:23 2014 +0000 libxc: Fix out-of-memory error handling in xc_cpupool_getinfo() Avoid freeing info then returning it to the caller. This is XSA-88. Coverity-ID: 1056192 Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- tools/libxc/xc_cpupool.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xc_cpupool.c b/tools/libxc/xc_cpupool.c index c8c2a33..6393cfb 100644 --- a/tools/libxc/xc_cpupool.c +++ b/tools/libxc/xc_cpupool.c @@ -104,6 +104,7 @@ xc_cpupoolinfo_t *xc_cpupool_getinfo(xc_interface *xch, info->cpumap = xc_cpumap_alloc(xch); if (!info->cpumap) { free(info); + info = NULL; goto out; } info->cpupool_id = sysctl.u.cpupool_op.cpupool_id; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 10:22:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 10:22:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDtQk-00050X-QW; Thu, 13 Feb 2014 10:22:06 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDtQj-00050P-Dn for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 10:22:05 +0000 Received: from [193.109.254.147:45739] by server-15.bemta-14.messagelabs.com id 6B/FD-10839-CCC9CF25; Thu, 13 Feb 2014 10:22:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1392286922!4040497!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11295 invoked from network); 13 Feb 2014 10:22:03 -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; 13 Feb 2014 10:22:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDtQg-0007yh-4s for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 10:22:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDtQg-0004Rr-1N for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 10:22:02 +0000 Date: Thu, 13 Feb 2014 10:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] libxc: Fix out-of-memory error handling in xc_cpupool_getinfo() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 eba76e4112339b2bb9dcac66835c04fd5ba7b5d2 Author: Andrew Cooper AuthorDate: Wed Jan 22 17:47:21 2014 +0000 Commit: Ian Jackson CommitDate: Wed Feb 12 16:54:31 2014 +0000 libxc: Fix out-of-memory error handling in xc_cpupool_getinfo() Avoid freeing info then returning it to the caller. This is XSA-88. Coverity-ID: 1056192 Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit d883c179a74111a6804baf8cb8224235242a88fc) --- tools/libxc/xc_cpupool.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xc_cpupool.c b/tools/libxc/xc_cpupool.c index 54c76b4..10d8751 100644 --- a/tools/libxc/xc_cpupool.c +++ b/tools/libxc/xc_cpupool.c @@ -104,6 +104,7 @@ xc_cpupoolinfo_t *xc_cpupool_getinfo(xc_interface *xch, info->cpumap = xc_cpumap_alloc(xch); if (!info->cpumap) { free(info); + info = NULL; goto out; } info->cpupool_id = sysctl.u.cpupool_op.cpupool_id; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 10:22:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 10:22:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDtQk-00050X-QW; Thu, 13 Feb 2014 10:22:06 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDtQj-00050P-Dn for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 10:22:05 +0000 Received: from [193.109.254.147:45739] by server-15.bemta-14.messagelabs.com id 6B/FD-10839-CCC9CF25; Thu, 13 Feb 2014 10:22:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1392286922!4040497!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11295 invoked from network); 13 Feb 2014 10:22:03 -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; 13 Feb 2014 10:22:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDtQg-0007yh-4s for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 10:22:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDtQg-0004Rr-1N for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 10:22:02 +0000 Date: Thu, 13 Feb 2014 10:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] libxc: Fix out-of-memory error handling in xc_cpupool_getinfo() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 eba76e4112339b2bb9dcac66835c04fd5ba7b5d2 Author: Andrew Cooper AuthorDate: Wed Jan 22 17:47:21 2014 +0000 Commit: Ian Jackson CommitDate: Wed Feb 12 16:54:31 2014 +0000 libxc: Fix out-of-memory error handling in xc_cpupool_getinfo() Avoid freeing info then returning it to the caller. This is XSA-88. Coverity-ID: 1056192 Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich (cherry picked from commit d883c179a74111a6804baf8cb8224235242a88fc) --- tools/libxc/xc_cpupool.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xc_cpupool.c b/tools/libxc/xc_cpupool.c index 54c76b4..10d8751 100644 --- a/tools/libxc/xc_cpupool.c +++ b/tools/libxc/xc_cpupool.c @@ -104,6 +104,7 @@ xc_cpupoolinfo_t *xc_cpupool_getinfo(xc_interface *xch, info->cpumap = xc_cpumap_alloc(xch); if (!info->cpumap) { free(info); + info = NULL; goto out; } info->cpupool_id = sysctl.u.cpupool_op.cpupool_id; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 14:55:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 14:55:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDxgz-0008Nj-JV; Thu, 13 Feb 2014 14:55:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDxgy-0008Ne-L5 for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 14:55:08 +0000 Received: from [85.158.137.68:56207] by server-7.bemta-3.messagelabs.com id CA/17-13775-BCCDCF25; Thu, 13 Feb 2014 14:55:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1392303305!353743!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32548 invoked from network); 13 Feb 2014 14:55:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 13 Feb 2014 14:55:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDxgu-000267-VI for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 14:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDxgu-0004Ey-KQ for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 14:55:04 +0000 Date: Thu, 13 Feb 2014 14:55:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/domctl: don't ignore errors from vmce_restore_vcpu() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 2428aa8cdeb9293f00c71cfc2330e2f46ee9248d Author: Jan Beulich AuthorDate: Thu Feb 13 10:01:11 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 13 10:01:11 2014 +0100 x86/domctl: don't ignore errors from vmce_restore_vcpu() What started out as a simple cleanup patch (eliminating the redundant check of domctl->cmd before setting "copyback", which as a result turned the "ext_vcpucontext_out" label useless) revealed a bug in the handling of XEN_DOMCTL_set_ext_vcpucontext. Fix this, retaining the cleanup, and at once dropping a stale comment and an accompanying formatting issue. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: af172d655c3900822d1f710ac13ee38ee9d482d2 master date: 2014-02-04 09:22:12 +0100 --- xen/arch/x86/domctl.c | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 9a92a69..89df657 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -815,7 +815,7 @@ long arch_do_domctl( ret = -ESRCH; if ( (evc->vcpu >= d->max_vcpus) || ((v = d->vcpu[evc->vcpu]) == NULL) ) - goto ext_vcpucontext_out; + break; if ( domctl->cmd == XEN_DOMCTL_get_ext_vcpucontext ) { @@ -847,17 +847,20 @@ long arch_do_domctl( evc->vmce.caps = v->arch.vmce.mcg_cap; evc->vmce.mci_ctl2_bank0 = v->arch.vmce.bank[0].mci_ctl2; evc->vmce.mci_ctl2_bank1 = v->arch.vmce.bank[1].mci_ctl2; + + ret = 0; + copyback = 1; } else { ret = -EINVAL; if ( evc->size < offsetof(typeof(*evc), vmce) ) - goto ext_vcpucontext_out; + break; if ( !is_hvm_domain(d) ) { if ( !is_canonical_address(evc->sysenter_callback_eip) || !is_canonical_address(evc->syscall32_callback_eip) ) - goto ext_vcpucontext_out; + break; fixup_guest_code_selector(d, evc->sysenter_callback_cs); v->arch.pv_vcpu.sysenter_callback_cs = evc->sysenter_callback_cs; @@ -873,13 +876,11 @@ long arch_do_domctl( v->arch.pv_vcpu.syscall32_disables_events = evc->syscall32_disables_events; } - else - /* We do not support syscall/syscall32/sysenter on 32-bit Xen. */ - if ( (evc->sysenter_callback_cs & ~3) || - evc->sysenter_callback_eip || - (evc->syscall32_callback_cs & ~3) || - evc->syscall32_callback_eip ) - goto ext_vcpucontext_out; + else if ( (evc->sysenter_callback_cs & ~3) || + evc->sysenter_callback_eip || + (evc->syscall32_callback_cs & ~3) || + evc->syscall32_callback_eip ) + break; BUILD_BUG_ON(offsetof(struct xen_domctl_ext_vcpucontext, mcg_cap) != @@ -896,13 +897,9 @@ long arch_do_domctl( ret = vmce_restore_vcpu(v, &vmce); } + else + ret = 0; } - - ret = 0; - - ext_vcpucontext_out: - if ( domctl->cmd == XEN_DOMCTL_get_ext_vcpucontext ) - copyback = 1; } break; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 14:55:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 14:55:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDxgz-0008Nj-JV; Thu, 13 Feb 2014 14:55:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDxgy-0008Ne-L5 for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 14:55:08 +0000 Received: from [85.158.137.68:56207] by server-7.bemta-3.messagelabs.com id CA/17-13775-BCCDCF25; Thu, 13 Feb 2014 14:55:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1392303305!353743!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32548 invoked from network); 13 Feb 2014 14:55:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 13 Feb 2014 14:55:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDxgu-000267-VI for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 14:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDxgu-0004Ey-KQ for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 14:55:04 +0000 Date: Thu, 13 Feb 2014 14:55:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/domctl: don't ignore errors from vmce_restore_vcpu() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 2428aa8cdeb9293f00c71cfc2330e2f46ee9248d Author: Jan Beulich AuthorDate: Thu Feb 13 10:01:11 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 13 10:01:11 2014 +0100 x86/domctl: don't ignore errors from vmce_restore_vcpu() What started out as a simple cleanup patch (eliminating the redundant check of domctl->cmd before setting "copyback", which as a result turned the "ext_vcpucontext_out" label useless) revealed a bug in the handling of XEN_DOMCTL_set_ext_vcpucontext. Fix this, retaining the cleanup, and at once dropping a stale comment and an accompanying formatting issue. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: af172d655c3900822d1f710ac13ee38ee9d482d2 master date: 2014-02-04 09:22:12 +0100 --- xen/arch/x86/domctl.c | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 9a92a69..89df657 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -815,7 +815,7 @@ long arch_do_domctl( ret = -ESRCH; if ( (evc->vcpu >= d->max_vcpus) || ((v = d->vcpu[evc->vcpu]) == NULL) ) - goto ext_vcpucontext_out; + break; if ( domctl->cmd == XEN_DOMCTL_get_ext_vcpucontext ) { @@ -847,17 +847,20 @@ long arch_do_domctl( evc->vmce.caps = v->arch.vmce.mcg_cap; evc->vmce.mci_ctl2_bank0 = v->arch.vmce.bank[0].mci_ctl2; evc->vmce.mci_ctl2_bank1 = v->arch.vmce.bank[1].mci_ctl2; + + ret = 0; + copyback = 1; } else { ret = -EINVAL; if ( evc->size < offsetof(typeof(*evc), vmce) ) - goto ext_vcpucontext_out; + break; if ( !is_hvm_domain(d) ) { if ( !is_canonical_address(evc->sysenter_callback_eip) || !is_canonical_address(evc->syscall32_callback_eip) ) - goto ext_vcpucontext_out; + break; fixup_guest_code_selector(d, evc->sysenter_callback_cs); v->arch.pv_vcpu.sysenter_callback_cs = evc->sysenter_callback_cs; @@ -873,13 +876,11 @@ long arch_do_domctl( v->arch.pv_vcpu.syscall32_disables_events = evc->syscall32_disables_events; } - else - /* We do not support syscall/syscall32/sysenter on 32-bit Xen. */ - if ( (evc->sysenter_callback_cs & ~3) || - evc->sysenter_callback_eip || - (evc->syscall32_callback_cs & ~3) || - evc->syscall32_callback_eip ) - goto ext_vcpucontext_out; + else if ( (evc->sysenter_callback_cs & ~3) || + evc->sysenter_callback_eip || + (evc->syscall32_callback_cs & ~3) || + evc->syscall32_callback_eip ) + break; BUILD_BUG_ON(offsetof(struct xen_domctl_ext_vcpucontext, mcg_cap) != @@ -896,13 +897,9 @@ long arch_do_domctl( ret = vmce_restore_vcpu(v, &vmce); } + else + ret = 0; } - - ret = 0; - - ext_vcpucontext_out: - if ( domctl->cmd == XEN_DOMCTL_get_ext_vcpucontext ) - copyback = 1; } break; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 14:55:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 14:55: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 1WDxh9-0008P0-MN; Thu, 13 Feb 2014 14: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 1WDxh8-0008Oo-9m for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 14:55:18 +0000 Received: from [85.158.143.35:26864] by server-2.bemta-4.messagelabs.com id 8B/12-10891-5DCDCF25; Thu, 13 Feb 2014 14:55:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1392303315!5407481!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5812 invoked from network); 13 Feb 2014 14:55:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 13 Feb 2014 14:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDxh5-00026D-B2 for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 14:55:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDxh5-0004FM-30 for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 14:55:15 +0000 Date: Thu, 13 Feb 2014 14:55:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/AMD: apply workaround for AMD F16h erratum 792 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 9a24bbfd3b62fec21a914f6718750f241a38ff6a Author: Aravind Gopalakrishnan AuthorDate: Thu Feb 13 10:03:07 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 13 10:03:07 2014 +0100 x86/AMD: apply workaround for AMD F16h erratum 792 Workaround for the Erratum will be in BIOSes spun only after Jan 2014 onwards. But initial production parts shipped in 2013 itself. Since there is a coverage hole, we should carry this fix in software in case BIOS does not do the right thing or someone is using old BIOS. Description: Processor does not ensure DRAM scrub read/write sequence is atomic wrt accesses to CC6 save state area. Therefore if a concurrent scrub read/write access is to same address the entry may appear as if it is not written. This quirk applies to Fam16h models 00h-0Fh See "Revision Guide" for AMD F16h models 00h-0fh, document 51810 rev. 3.04, Nov 2013. Equivalent Linux patch link: http://marc.info/?l=linux-kernel&m=139066012217149&w=2 Tested the patch on Fam16h server platform and it works fine. Signed-off-by: Aravind Gopalakrishnan Reviewed-by: Suravee Suthikulpanit Reviewed-by: Andrew Cooper Corrected checking for boot CPU. Made warning message conditional. Compacted warning message text. Moved comment to commit message. Signed-off-by: Jan Beulich master commit: 4d3ebb84df43d90db4cc25a48f4658709bd11678 master date: 2014-02-07 11:12:22 +0100 --- xen/arch/x86/cpu/amd.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index dbe7398..67fa49c 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -477,6 +477,25 @@ static void __devinit init_amd(struct cpuinfo_x86 *c) " all your (PV) guest kernels. ***\n"); if (c->x86 == 0x16 && c->x86_model <= 0xf) { + if (c == &boot_cpu_data) { + l = pci_conf_read32(0, 0, 0x18, 0x3, 0x58); + h = pci_conf_read32(0, 0, 0x18, 0x3, 0x5c); + if ((l & 0x1f) | (h & 0x1)) + printk(KERN_WARNING + "Applying workaround for erratum 792: %s%s%s\n", + (l & 0x1f) ? "clearing D18F3x58[4:0]" : "", + ((l & 0x1f) && (h & 0x1)) ? " and " : "", + (h & 0x1) ? "clearing D18F3x5C[0]" : ""); + + if (l & 0x1f) + pci_conf_write32(0, 0, 0x18, 0x3, 0x58, + l & ~0x1f); + + if (h & 0x1) + pci_conf_write32(0, 0, 0x18, 0x3, 0x5c, + h & ~0x1); + } + rdmsrl(MSR_AMD64_LS_CFG, value); if (!(value & (1 << 15))) { static bool_t warned; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 14:55:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 14:55: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 1WDxh9-0008P0-MN; Thu, 13 Feb 2014 14: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 1WDxh8-0008Oo-9m for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 14:55:18 +0000 Received: from [85.158.143.35:26864] by server-2.bemta-4.messagelabs.com id 8B/12-10891-5DCDCF25; Thu, 13 Feb 2014 14:55:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1392303315!5407481!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5812 invoked from network); 13 Feb 2014 14:55:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 13 Feb 2014 14:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDxh5-00026D-B2 for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 14:55:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDxh5-0004FM-30 for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 14:55:15 +0000 Date: Thu, 13 Feb 2014 14:55:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/AMD: apply workaround for AMD F16h erratum 792 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 9a24bbfd3b62fec21a914f6718750f241a38ff6a Author: Aravind Gopalakrishnan AuthorDate: Thu Feb 13 10:03:07 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 13 10:03:07 2014 +0100 x86/AMD: apply workaround for AMD F16h erratum 792 Workaround for the Erratum will be in BIOSes spun only after Jan 2014 onwards. But initial production parts shipped in 2013 itself. Since there is a coverage hole, we should carry this fix in software in case BIOS does not do the right thing or someone is using old BIOS. Description: Processor does not ensure DRAM scrub read/write sequence is atomic wrt accesses to CC6 save state area. Therefore if a concurrent scrub read/write access is to same address the entry may appear as if it is not written. This quirk applies to Fam16h models 00h-0Fh See "Revision Guide" for AMD F16h models 00h-0fh, document 51810 rev. 3.04, Nov 2013. Equivalent Linux patch link: http://marc.info/?l=linux-kernel&m=139066012217149&w=2 Tested the patch on Fam16h server platform and it works fine. Signed-off-by: Aravind Gopalakrishnan Reviewed-by: Suravee Suthikulpanit Reviewed-by: Andrew Cooper Corrected checking for boot CPU. Made warning message conditional. Compacted warning message text. Moved comment to commit message. Signed-off-by: Jan Beulich master commit: 4d3ebb84df43d90db4cc25a48f4658709bd11678 master date: 2014-02-07 11:12:22 +0100 --- xen/arch/x86/cpu/amd.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index dbe7398..67fa49c 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -477,6 +477,25 @@ static void __devinit init_amd(struct cpuinfo_x86 *c) " all your (PV) guest kernels. ***\n"); if (c->x86 == 0x16 && c->x86_model <= 0xf) { + if (c == &boot_cpu_data) { + l = pci_conf_read32(0, 0, 0x18, 0x3, 0x58); + h = pci_conf_read32(0, 0, 0x18, 0x3, 0x5c); + if ((l & 0x1f) | (h & 0x1)) + printk(KERN_WARNING + "Applying workaround for erratum 792: %s%s%s\n", + (l & 0x1f) ? "clearing D18F3x58[4:0]" : "", + ((l & 0x1f) && (h & 0x1)) ? " and " : "", + (h & 0x1) ? "clearing D18F3x5C[0]" : ""); + + if (l & 0x1f) + pci_conf_write32(0, 0, 0x18, 0x3, 0x58, + l & ~0x1f); + + if (h & 0x1) + pci_conf_write32(0, 0, 0x18, 0x3, 0x5c, + h & ~0x1); + } + rdmsrl(MSR_AMD64_LS_CFG, value); if (!(value & (1 << 15))) { static bool_t warned; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 14:55:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 14:55:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDxhI-0008Qf-S3; Thu, 13 Feb 2014 14:55:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDxhI-0008QT-3a for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 14:55:28 +0000 Received: from [85.158.137.68:58217] by server-10.bemta-3.messagelabs.com id 31/68-07302-FDCDCF25; Thu, 13 Feb 2014 14:55:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1392303325!1669727!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9642 invoked from network); 13 Feb 2014 14:55:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 13 Feb 2014 14:55:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDxhF-00026J-Fl for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 14:55:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDxhF-0004Fi-EC for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 14:55:25 +0000 Date: Thu, 13 Feb 2014 14:55:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] AMD IOMMU: fail if there is no southbridge IO-APIC X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 5e87340cad27dd198386b43da66a0a30c33ba3db Author: Jan Beulich AuthorDate: Thu Feb 13 10:05:54 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 13 10:05:54 2014 +0100 AMD IOMMU: fail if there is no southbridge IO-APIC ... but interrupt remapping is requested (with per-device remapping tables). Without it, the timer interrupt is usually not working. Inspired by Linux'es "iommu/amd: Work around wrong IOAPIC device-id in IVRS table" (commit c2ff5cf5294bcbd7fa50f7d860e90a66db7e5059) by Joerg Roedel . Reported-by: Eric Houby Signed-off-by: Jan Beulich Tested-by: Eric Houby Reviewed-by: Andrew Cooper Acked-by: Suravee Suthikulpanit master commit: 06bbcaf48d09c18a41c482866941ddd5d2846b44 master date: 2014-02-10 10:05:24 +0100 --- xen/drivers/passthrough/amd/iommu_acpi.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index a88d223..e7c8499 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -900,6 +900,7 @@ static int __init parse_ivrs_table(struct acpi_table_header *table) const struct acpi_ivrs_header *ivrs_block; unsigned long length; unsigned int apic; + bool_t sb_ioapic = !iommu_intremap; int error = 0; BUG_ON(!table); @@ -933,8 +934,15 @@ static int __init parse_ivrs_table(struct acpi_table_header *table) /* Each IO-APIC must have been mentioned in the table. */ for ( apic = 0; !error && iommu_intremap && apic < nr_ioapics; ++apic ) { - if ( !nr_ioapic_entries[apic] || - ioapic_sbdf[IO_APIC_ID(apic)].pin_setup ) + if ( !nr_ioapic_entries[apic] ) + continue; + + if ( !ioapic_sbdf[IO_APIC_ID(apic)].seg && + /* SB IO-APIC is always on this device in AMD systems. */ + ioapic_sbdf[IO_APIC_ID(apic)].bdf == PCI_BDF(0, 0x14, 0) ) + sb_ioapic = 1; + + if ( ioapic_sbdf[IO_APIC_ID(apic)].pin_setup ) continue; printk(XENLOG_ERR "IVHD Error: no information for IO-APIC %#x\n", @@ -953,6 +961,14 @@ static int __init parse_ivrs_table(struct acpi_table_header *table) } } + if ( !error && !sb_ioapic ) + { + if ( amd_iommu_perdev_intremap ) + error = -ENXIO; + printk("%sNo southbridge IO-APIC found in IVRS table\n", + amd_iommu_perdev_intremap ? XENLOG_ERR : XENLOG_WARNING); + } + return error; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 14:55:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 14:55:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDxhI-0008Qf-S3; Thu, 13 Feb 2014 14:55:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDxhI-0008QT-3a for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 14:55:28 +0000 Received: from [85.158.137.68:58217] by server-10.bemta-3.messagelabs.com id 31/68-07302-FDCDCF25; Thu, 13 Feb 2014 14:55:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1392303325!1669727!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9642 invoked from network); 13 Feb 2014 14:55:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 13 Feb 2014 14:55:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDxhF-00026J-Fl for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 14:55:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDxhF-0004Fi-EC for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 14:55:25 +0000 Date: Thu, 13 Feb 2014 14:55:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] AMD IOMMU: fail if there is no southbridge IO-APIC X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 5e87340cad27dd198386b43da66a0a30c33ba3db Author: Jan Beulich AuthorDate: Thu Feb 13 10:05:54 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 13 10:05:54 2014 +0100 AMD IOMMU: fail if there is no southbridge IO-APIC ... but interrupt remapping is requested (with per-device remapping tables). Without it, the timer interrupt is usually not working. Inspired by Linux'es "iommu/amd: Work around wrong IOAPIC device-id in IVRS table" (commit c2ff5cf5294bcbd7fa50f7d860e90a66db7e5059) by Joerg Roedel . Reported-by: Eric Houby Signed-off-by: Jan Beulich Tested-by: Eric Houby Reviewed-by: Andrew Cooper Acked-by: Suravee Suthikulpanit master commit: 06bbcaf48d09c18a41c482866941ddd5d2846b44 master date: 2014-02-10 10:05:24 +0100 --- xen/drivers/passthrough/amd/iommu_acpi.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index a88d223..e7c8499 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -900,6 +900,7 @@ static int __init parse_ivrs_table(struct acpi_table_header *table) const struct acpi_ivrs_header *ivrs_block; unsigned long length; unsigned int apic; + bool_t sb_ioapic = !iommu_intremap; int error = 0; BUG_ON(!table); @@ -933,8 +934,15 @@ static int __init parse_ivrs_table(struct acpi_table_header *table) /* Each IO-APIC must have been mentioned in the table. */ for ( apic = 0; !error && iommu_intremap && apic < nr_ioapics; ++apic ) { - if ( !nr_ioapic_entries[apic] || - ioapic_sbdf[IO_APIC_ID(apic)].pin_setup ) + if ( !nr_ioapic_entries[apic] ) + continue; + + if ( !ioapic_sbdf[IO_APIC_ID(apic)].seg && + /* SB IO-APIC is always on this device in AMD systems. */ + ioapic_sbdf[IO_APIC_ID(apic)].bdf == PCI_BDF(0, 0x14, 0) ) + sb_ioapic = 1; + + if ( ioapic_sbdf[IO_APIC_ID(apic)].pin_setup ) continue; printk(XENLOG_ERR "IVHD Error: no information for IO-APIC %#x\n", @@ -953,6 +961,14 @@ static int __init parse_ivrs_table(struct acpi_table_header *table) } } + if ( !error && !sb_ioapic ) + { + if ( amd_iommu_perdev_intremap ) + error = -ENXIO; + printk("%sNo southbridge IO-APIC found in IVRS table\n", + amd_iommu_perdev_intremap ? XENLOG_ERR : XENLOG_WARNING); + } + return error; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 14:55:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 14:55:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDxhT-0008Si-IZ; Thu, 13 Feb 2014 14:55:39 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDxhS-0008SS-2w for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 14:55:38 +0000 Received: from [85.158.143.35:33112] by server-2.bemta-4.messagelabs.com id 7A/C2-10891-9ECDCF25; Thu, 13 Feb 2014 14:55:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1392303335!5449700!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12544 invoked from network); 13 Feb 2014 14:55:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 13 Feb 2014 14:55:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDxhP-00026P-LZ for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 14:55:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDxhP-0004G8-Js for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 14:55:35 +0000 Date: Thu, 13 Feb 2014 14:55:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] flask: fix memory leaks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 aa32bc5b4186619958c3dd9a1a60883dec7f150f Author: Jan Beulich AuthorDate: Thu Feb 13 10:08:11 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 13 10:08:11 2014 +0100 flask: fix memory leaks Plus, in the case of security_preserve_bools(), prevent double freeing in the case of security_get_bools() failing. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Daniel De Graaf master commit: 57c9f2caf05de41913b3e4eb48c0c3ad6c18dd3f master date: 2014-02-11 11:11:48 +0100 --- xen/xsm/flask/flask_op.c | 1 + xen/xsm/flask/ss/services.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index 4b93e71..e4b07eb 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -347,6 +347,7 @@ static int flask_security_set_bool(struct xen_flask_boolean *arg) if ( arg->bool_id >= num ) { + xfree(values); rv = -ENOENT; goto out; } diff --git a/xen/xsm/flask/ss/services.c b/xen/xsm/flask/ss/services.c index 5cb9537..6067317 100644 --- a/xen/xsm/flask/ss/services.c +++ b/xen/xsm/flask/ss/services.c @@ -1902,6 +1902,7 @@ err: { for ( i = 0; i < *len; i++ ) xfree((*names)[i]); + xfree(*names); } xfree(*values); goto out; @@ -2011,7 +2012,7 @@ static int security_preserve_bools(struct policydb *p) rc = security_get_bools(&nbools, &bnames, &bvalues, NULL); if ( rc ) - goto out; + return rc; for ( i = 0; i < nbools; i++ ) { booldatum = hashtab_search(p->p_bools.table, bnames[i]); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 14:55:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 14:55:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDxhT-0008Si-IZ; Thu, 13 Feb 2014 14:55:39 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDxhS-0008SS-2w for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 14:55:38 +0000 Received: from [85.158.143.35:33112] by server-2.bemta-4.messagelabs.com id 7A/C2-10891-9ECDCF25; Thu, 13 Feb 2014 14:55:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1392303335!5449700!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12544 invoked from network); 13 Feb 2014 14:55:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 13 Feb 2014 14:55:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDxhP-00026P-LZ for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 14:55:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDxhP-0004G8-Js for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 14:55:35 +0000 Date: Thu, 13 Feb 2014 14:55:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] flask: fix memory leaks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 aa32bc5b4186619958c3dd9a1a60883dec7f150f Author: Jan Beulich AuthorDate: Thu Feb 13 10:08:11 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 13 10:08:11 2014 +0100 flask: fix memory leaks Plus, in the case of security_preserve_bools(), prevent double freeing in the case of security_get_bools() failing. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Daniel De Graaf master commit: 57c9f2caf05de41913b3e4eb48c0c3ad6c18dd3f master date: 2014-02-11 11:11:48 +0100 --- xen/xsm/flask/flask_op.c | 1 + xen/xsm/flask/ss/services.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index 4b93e71..e4b07eb 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -347,6 +347,7 @@ static int flask_security_set_bool(struct xen_flask_boolean *arg) if ( arg->bool_id >= num ) { + xfree(values); rv = -ENOENT; goto out; } diff --git a/xen/xsm/flask/ss/services.c b/xen/xsm/flask/ss/services.c index 5cb9537..6067317 100644 --- a/xen/xsm/flask/ss/services.c +++ b/xen/xsm/flask/ss/services.c @@ -1902,6 +1902,7 @@ err: { for ( i = 0; i < *len; i++ ) xfree((*names)[i]); + xfree(*names); } xfree(*values); goto out; @@ -2011,7 +2012,7 @@ static int security_preserve_bools(struct policydb *p) rc = security_get_bools(&nbools, &bnames, &bvalues, NULL); if ( rc ) - goto out; + return rc; for ( i = 0; i < nbools; i++ ) { booldatum = hashtab_search(p->p_bools.table, bnames[i]); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 14:55:49 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 14:55:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDxhd-0008V8-Lr; Thu, 13 Feb 2014 14:55:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDxhd-0008Ur-1w for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 14:55:49 +0000 Received: from [85.158.137.68:28055] by server-1.bemta-3.messagelabs.com id 25/F0-17293-4FCDCF25; Thu, 13 Feb 2014 14:55:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1392303346!133497!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1778 invoked from network); 13 Feb 2014 14:55:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 13 Feb 2014 14:55:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDxhZ-00026V-R0 for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 14:55:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDxhZ-0004GU-Ps for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 14:55:45 +0000 Date: Thu, 13 Feb 2014 14:55:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] flask: fix error propagation from flask_security_set_bool() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 a6969931cff65012c408d86ced3e06ae3db652a4 Author: Jan Beulich AuthorDate: Thu Feb 13 10:11:54 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 13 10:11:54 2014 +0100 flask: fix error propagation from flask_security_set_bool() The function should return an error when flask_security_make_bools() fails as well as when the input ID is out of range. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Daniel De Graaf master commit: 31f3620be0e3158c205a3669135f9c4bfa40b1c7 master date: 2014-02-11 11:13:22 +0100 --- xen/xsm/flask/flask_op.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index e4b07eb..cde9308 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -364,9 +364,10 @@ static int flask_security_set_bool(struct xen_flask_boolean *arg) else { if ( !bool_pending_values ) - flask_security_make_bools(); - - if ( arg->bool_id >= bool_num ) + rv = flask_security_make_bools(); + if ( !rv && arg->bool_id >= bool_num ) + rv = -ENOENT; + if ( rv ) goto out; bool_pending_values[arg->bool_id] = !!(arg->new_value); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 14:55:49 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 14:55:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDxhd-0008V8-Lr; Thu, 13 Feb 2014 14:55:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDxhd-0008Ur-1w for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 14:55:49 +0000 Received: from [85.158.137.68:28055] by server-1.bemta-3.messagelabs.com id 25/F0-17293-4FCDCF25; Thu, 13 Feb 2014 14:55:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1392303346!133497!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1778 invoked from network); 13 Feb 2014 14:55:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 13 Feb 2014 14:55:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDxhZ-00026V-R0 for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 14:55:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDxhZ-0004GU-Ps for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 14:55:45 +0000 Date: Thu, 13 Feb 2014 14:55:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] flask: fix error propagation from flask_security_set_bool() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 a6969931cff65012c408d86ced3e06ae3db652a4 Author: Jan Beulich AuthorDate: Thu Feb 13 10:11:54 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 13 10:11:54 2014 +0100 flask: fix error propagation from flask_security_set_bool() The function should return an error when flask_security_make_bools() fails as well as when the input ID is out of range. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Daniel De Graaf master commit: 31f3620be0e3158c205a3669135f9c4bfa40b1c7 master date: 2014-02-11 11:13:22 +0100 --- xen/xsm/flask/flask_op.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index e4b07eb..cde9308 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -364,9 +364,10 @@ static int flask_security_set_bool(struct xen_flask_boolean *arg) else { if ( !bool_pending_values ) - flask_security_make_bools(); - - if ( arg->bool_id >= bool_num ) + rv = flask_security_make_bools(); + if ( !rv && arg->bool_id >= bool_num ) + rv = -ENOENT; + if ( rv ) goto out; bool_pending_values[arg->bool_id] = !!(arg->new_value); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 14:55:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 14:55:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDxhn-00005Z-Oh; Thu, 13 Feb 2014 14:55:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDxhm-00005F-QS for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 14:55:59 +0000 Received: from [85.158.137.68:29040] by server-17.bemta-3.messagelabs.com id CD/EA-22569-EFCDCF25; Thu, 13 Feb 2014 14:55:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1392303356!1678727!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25782 invoked from network); 13 Feb 2014 14:55:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 13 Feb 2014 14:55:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDxhk-00026b-0J for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 14:55:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDxhj-0004Gy-UX for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 14:55:55 +0000 Date: Thu, 13 Feb 2014 14:55:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] flask: check permissions first thing in flask_security_set_bool() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 bf236637c2417376693cd72a748cc6208fd0202b Author: Jan Beulich AuthorDate: Thu Feb 13 10:12:47 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 13 10:12:47 2014 +0100 flask: check permissions first thing in flask_security_set_bool() Nothing else should be done if the caller isn't permitted to set boolean values. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Daniel De Graaf master commit: ebe867052e0f782139147015c4e91b37aa5e68f1 master date: 2014-02-11 11:14:10 +0100 --- xen/xsm/flask/flask_op.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index cde9308..dddef29 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -326,11 +326,11 @@ static int flask_security_set_bool(struct xen_flask_boolean *arg) { int rv; - rv = flask_security_resolve_bool(arg); + rv = domain_has_security(current->domain, SECURITY__SETBOOL); if ( rv ) return rv; - rv = domain_has_security(current->domain, SECURITY__SETBOOL); + rv = flask_security_resolve_bool(arg); if ( rv ) return rv; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 14:55:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 14:55:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDxhn-00005Z-Oh; Thu, 13 Feb 2014 14:55:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDxhm-00005F-QS for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 14:55:59 +0000 Received: from [85.158.137.68:29040] by server-17.bemta-3.messagelabs.com id CD/EA-22569-EFCDCF25; Thu, 13 Feb 2014 14:55:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1392303356!1678727!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25782 invoked from network); 13 Feb 2014 14:55:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 13 Feb 2014 14:55:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDxhk-00026b-0J for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 14:55:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WDxhj-0004Gy-UX for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 14:55:55 +0000 Date: Thu, 13 Feb 2014 14:55:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] flask: check permissions first thing in flask_security_set_bool() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 bf236637c2417376693cd72a748cc6208fd0202b Author: Jan Beulich AuthorDate: Thu Feb 13 10:12:47 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 13 10:12:47 2014 +0100 flask: check permissions first thing in flask_security_set_bool() Nothing else should be done if the caller isn't permitted to set boolean values. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Daniel De Graaf master commit: ebe867052e0f782139147015c4e91b37aa5e68f1 master date: 2014-02-11 11:14:10 +0100 --- xen/xsm/flask/flask_op.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index cde9308..dddef29 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -326,11 +326,11 @@ static int flask_security_set_bool(struct xen_flask_boolean *arg) { int rv; - rv = flask_security_resolve_bool(arg); + rv = domain_has_security(current->domain, SECURITY__SETBOOL); if ( rv ) return rv; - rv = domain_has_security(current->domain, SECURITY__SETBOOL); + rv = flask_security_resolve_bool(arg); if ( rv ) return rv; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 21:22:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 21:22:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WE3jU-0000df-HB; Thu, 13 Feb 2014 21:22:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WE3jS-0000dX-Rb for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 21:22:07 +0000 Received: from [85.158.137.68:20479] by server-13.bemta-3.messagelabs.com id CE/EA-26923-E773DF25; Thu, 13 Feb 2014 21:22:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1392326523!1753822!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1926 invoked from network); 13 Feb 2014 21:22:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 13 Feb 2014 21:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WE3jO-0006Iu-S0 for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 21:22:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WE3jO-0006hS-Mw for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 21:22:02 +0000 Date: Thu, 13 Feb 2014 21:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/domctl: don't ignore errors from vmce_restore_vcpu() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 d927bc7136accb7fa59928a6872131a84dbadcb9 Author: Jan Beulich AuthorDate: Thu Feb 13 10:16:13 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 13 10:16:13 2014 +0100 x86/domctl: don't ignore errors from vmce_restore_vcpu() What started out as a simple cleanup patch (eliminating the redundant check of domctl->cmd before copying back the output data) revealed a bug in the handling of XEN_DOMCTL_set_ext_vcpucontext. Fix this, retaining the cleanup. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: af172d655c3900822d1f710ac13ee38ee9d482d2 master date: 2014-02-04 09:22:12 +0100 --- xen/arch/x86/domctl.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 0592b6e..63e1987 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1101,6 +1101,8 @@ long arch_do_domctl( evc->syscall32_disables_events = 0; } evc->mcg_cap = v->arch.mcg_cap; + + ret = copy_to_guest(u_domctl, domctl, 1) ? -EFAULT : 0; } else { @@ -1140,15 +1142,11 @@ long arch_do_domctl( if ( evc->size >= offsetof(typeof(*evc), mcg_cap) + sizeof(evc->mcg_cap) ) ret = vmce_restore_vcpu(v, evc->mcg_cap); + else if ( evc->size <= offsetof(typeof(*evc), mcg_cap) ) + ret = 0; } - - ret = 0; - ext_vcpucontext_out: rcu_unlock_domain(d); - if ( (domctl->cmd == XEN_DOMCTL_get_ext_vcpucontext) && - copy_to_guest(u_domctl, domctl, 1) ) - ret = -EFAULT; } break; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 21:22:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 21:22:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WE3jU-0000df-HB; Thu, 13 Feb 2014 21:22:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WE3jS-0000dX-Rb for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 21:22:07 +0000 Received: from [85.158.137.68:20479] by server-13.bemta-3.messagelabs.com id CE/EA-26923-E773DF25; Thu, 13 Feb 2014 21:22:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1392326523!1753822!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1926 invoked from network); 13 Feb 2014 21:22:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 13 Feb 2014 21:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WE3jO-0006Iu-S0 for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 21:22:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WE3jO-0006hS-Mw for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 21:22:02 +0000 Date: Thu, 13 Feb 2014 21:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/domctl: don't ignore errors from vmce_restore_vcpu() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 d927bc7136accb7fa59928a6872131a84dbadcb9 Author: Jan Beulich AuthorDate: Thu Feb 13 10:16:13 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 13 10:16:13 2014 +0100 x86/domctl: don't ignore errors from vmce_restore_vcpu() What started out as a simple cleanup patch (eliminating the redundant check of domctl->cmd before copying back the output data) revealed a bug in the handling of XEN_DOMCTL_set_ext_vcpucontext. Fix this, retaining the cleanup. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: af172d655c3900822d1f710ac13ee38ee9d482d2 master date: 2014-02-04 09:22:12 +0100 --- xen/arch/x86/domctl.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 0592b6e..63e1987 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1101,6 +1101,8 @@ long arch_do_domctl( evc->syscall32_disables_events = 0; } evc->mcg_cap = v->arch.mcg_cap; + + ret = copy_to_guest(u_domctl, domctl, 1) ? -EFAULT : 0; } else { @@ -1140,15 +1142,11 @@ long arch_do_domctl( if ( evc->size >= offsetof(typeof(*evc), mcg_cap) + sizeof(evc->mcg_cap) ) ret = vmce_restore_vcpu(v, evc->mcg_cap); + else if ( evc->size <= offsetof(typeof(*evc), mcg_cap) ) + ret = 0; } - - ret = 0; - ext_vcpucontext_out: rcu_unlock_domain(d); - if ( (domctl->cmd == XEN_DOMCTL_get_ext_vcpucontext) && - copy_to_guest(u_domctl, domctl, 1) ) - ret = -EFAULT; } break; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 21:22:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 21:22: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 1WE3jd-0000eZ-Lc; Thu, 13 Feb 2014 21:22:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WE3jc-0000eQ-31 for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 21:22:16 +0000 Received: from [85.158.139.211:62734] by server-6.bemta-5.messagelabs.com id 9A/51-14342-7873DF25; Thu, 13 Feb 2014 21:22:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1392326533!3809060!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17425 invoked from network); 13 Feb 2014 21:22:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 13 Feb 2014 21:22:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WE3jZ-0006Ix-6u for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 21:22:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WE3jZ-0006hr-05 for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 21:22:13 +0000 Date: Thu, 13 Feb 2014 21:22:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/AMD: apply workaround for AMD F16h erratum 792 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 9bd0e75a2f31613e11455ea9cd4171741aecda68 Author: Aravind Gopalakrishnan AuthorDate: Thu Feb 13 10:17:40 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 13 10:17:40 2014 +0100 x86/AMD: apply workaround for AMD F16h erratum 792 Workaround for the Erratum will be in BIOSes spun only after Jan 2014 onwards. But initial production parts shipped in 2013 itself. Since there is a coverage hole, we should carry this fix in software in case BIOS does not do the right thing or someone is using old BIOS. Description: Processor does not ensure DRAM scrub read/write sequence is atomic wrt accesses to CC6 save state area. Therefore if a concurrent scrub read/write access is to same address the entry may appear as if it is not written. This quirk applies to Fam16h models 00h-0Fh See "Revision Guide" for AMD F16h models 00h-0fh, document 51810 rev. 3.04, Nov 2013. Equivalent Linux patch link: http://marc.info/?l=linux-kernel&m=139066012217149&w=2 Tested the patch on Fam16h server platform and it works fine. Signed-off-by: Aravind Gopalakrishnan Reviewed-by: Suravee Suthikulpanit Reviewed-by: Andrew Cooper Corrected checking for boot CPU. Made warning message conditional. Compacted warning message text. Moved comment to commit message. Signed-off-by: Jan Beulich master commit: 4d3ebb84df43d90db4cc25a48f4658709bd11678 master date: 2014-02-07 11:12:22 +0100 --- xen/arch/x86/cpu/amd.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index e20771b..3bb2dbd 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -523,6 +523,25 @@ static void __devinit init_amd(struct cpuinfo_x86 *c) " all your (PV) guest kernels. ***\n"); if (c->x86 == 0x16 && c->x86_model <= 0xf) { + if (c == &boot_cpu_data) { + l = pci_conf_read32(0, 0, 0x18, 0x3, 0x58); + h = pci_conf_read32(0, 0, 0x18, 0x3, 0x5c); + if ((l & 0x1f) | (h & 0x1)) + printk(KERN_WARNING + "Applying workaround for erratum 792: %s%s%s\n", + (l & 0x1f) ? "clearing D18F3x58[4:0]" : "", + ((l & 0x1f) && (h & 0x1)) ? " and " : "", + (h & 0x1) ? "clearing D18F3x5C[0]" : ""); + + if (l & 0x1f) + pci_conf_write32(0, 0, 0x18, 0x3, 0x58, + l & ~0x1f); + + if (h & 0x1) + pci_conf_write32(0, 0, 0x18, 0x3, 0x5c, + h & ~0x1); + } + rdmsrl(MSR_AMD64_LS_CFG, value); if (!(value & (1 << 15))) { static bool_t warned; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 21:22:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 21:22: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 1WE3jd-0000eZ-Lc; Thu, 13 Feb 2014 21:22:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WE3jc-0000eQ-31 for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 21:22:16 +0000 Received: from [85.158.139.211:62734] by server-6.bemta-5.messagelabs.com id 9A/51-14342-7873DF25; Thu, 13 Feb 2014 21:22:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1392326533!3809060!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17425 invoked from network); 13 Feb 2014 21:22:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 13 Feb 2014 21:22:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WE3jZ-0006Ix-6u for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 21:22:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WE3jZ-0006hr-05 for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 21:22:13 +0000 Date: Thu, 13 Feb 2014 21:22:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/AMD: apply workaround for AMD F16h erratum 792 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 9bd0e75a2f31613e11455ea9cd4171741aecda68 Author: Aravind Gopalakrishnan AuthorDate: Thu Feb 13 10:17:40 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 13 10:17:40 2014 +0100 x86/AMD: apply workaround for AMD F16h erratum 792 Workaround for the Erratum will be in BIOSes spun only after Jan 2014 onwards. But initial production parts shipped in 2013 itself. Since there is a coverage hole, we should carry this fix in software in case BIOS does not do the right thing or someone is using old BIOS. Description: Processor does not ensure DRAM scrub read/write sequence is atomic wrt accesses to CC6 save state area. Therefore if a concurrent scrub read/write access is to same address the entry may appear as if it is not written. This quirk applies to Fam16h models 00h-0Fh See "Revision Guide" for AMD F16h models 00h-0fh, document 51810 rev. 3.04, Nov 2013. Equivalent Linux patch link: http://marc.info/?l=linux-kernel&m=139066012217149&w=2 Tested the patch on Fam16h server platform and it works fine. Signed-off-by: Aravind Gopalakrishnan Reviewed-by: Suravee Suthikulpanit Reviewed-by: Andrew Cooper Corrected checking for boot CPU. Made warning message conditional. Compacted warning message text. Moved comment to commit message. Signed-off-by: Jan Beulich master commit: 4d3ebb84df43d90db4cc25a48f4658709bd11678 master date: 2014-02-07 11:12:22 +0100 --- xen/arch/x86/cpu/amd.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index e20771b..3bb2dbd 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -523,6 +523,25 @@ static void __devinit init_amd(struct cpuinfo_x86 *c) " all your (PV) guest kernels. ***\n"); if (c->x86 == 0x16 && c->x86_model <= 0xf) { + if (c == &boot_cpu_data) { + l = pci_conf_read32(0, 0, 0x18, 0x3, 0x58); + h = pci_conf_read32(0, 0, 0x18, 0x3, 0x5c); + if ((l & 0x1f) | (h & 0x1)) + printk(KERN_WARNING + "Applying workaround for erratum 792: %s%s%s\n", + (l & 0x1f) ? "clearing D18F3x58[4:0]" : "", + ((l & 0x1f) && (h & 0x1)) ? " and " : "", + (h & 0x1) ? "clearing D18F3x5C[0]" : ""); + + if (l & 0x1f) + pci_conf_write32(0, 0, 0x18, 0x3, 0x58, + l & ~0x1f); + + if (h & 0x1) + pci_conf_write32(0, 0, 0x18, 0x3, 0x5c, + h & ~0x1); + } + rdmsrl(MSR_AMD64_LS_CFG, value); if (!(value & (1 << 15))) { static bool_t warned; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 21:22:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 21:22:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WE3jn-0000fp-OR; Thu, 13 Feb 2014 21:22:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WE3jm-0000ff-Hu for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 21:22:26 +0000 Received: from [85.158.137.68:24338] by server-16.bemta-3.messagelabs.com id BF/D2-29917-1973DF25; Thu, 13 Feb 2014 21:22:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1392326543!430786!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30135 invoked from network); 13 Feb 2014 21:22:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 13 Feb 2014 21:22:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WE3jj-0006J6-H3 for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 21:22:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WE3jj-0006iD-B8 for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 21:22:23 +0000 Date: Thu, 13 Feb 2014 21:22:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] AMD IOMMU: fail if there is no southbridge IO-APIC X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 6bf0275ab0b403fb6327691a06f59bbf71fa323a Author: Jan Beulich AuthorDate: Thu Feb 13 10:18:13 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 13 10:18:13 2014 +0100 AMD IOMMU: fail if there is no southbridge IO-APIC ... but interrupt remapping is requested (with per-device remapping tables). Without it, the timer interrupt is usually not working. Inspired by Linux'es "iommu/amd: Work around wrong IOAPIC device-id in IVRS table" (commit c2ff5cf5294bcbd7fa50f7d860e90a66db7e5059) by Joerg Roedel . Reported-by: Eric Houby Signed-off-by: Jan Beulich Tested-by: Eric Houby Reviewed-by: Andrew Cooper Acked-by: Suravee Suthikulpanit master commit: 06bbcaf48d09c18a41c482866941ddd5d2846b44 master date: 2014-02-10 10:05:24 +0100 --- xen/drivers/passthrough/amd/iommu_acpi.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index a0ed7b7..a444a5d 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -882,6 +882,7 @@ static int __init parse_ivrs_table(struct acpi_table_header *table) const struct acpi_ivrs_header *ivrs_block; unsigned long length; unsigned int apic; + bool_t sb_ioapic = !iommu_intremap; int error = 0; BUG_ON(!table); @@ -915,8 +916,15 @@ static int __init parse_ivrs_table(struct acpi_table_header *table) /* Each IO-APIC must have been mentioned in the table. */ for ( apic = 0; !error && iommu_intremap && apic < nr_ioapics; ++apic ) { - if ( !nr_ioapic_entries[apic] || - ioapic_sbdf[IO_APIC_ID(apic)].pin_setup ) + if ( !nr_ioapic_entries[apic] ) + continue; + + if ( !ioapic_sbdf[IO_APIC_ID(apic)].seg && + /* SB IO-APIC is always on this device in AMD systems. */ + ioapic_sbdf[IO_APIC_ID(apic)].bdf == PCI_BDF(0, 0x14, 0) ) + sb_ioapic = 1; + + if ( ioapic_sbdf[IO_APIC_ID(apic)].pin_setup ) continue; printk(XENLOG_ERR "IVHD Error: no information for IO-APIC %#x\n", @@ -935,6 +943,14 @@ static int __init parse_ivrs_table(struct acpi_table_header *table) } } + if ( !error && !sb_ioapic ) + { + if ( amd_iommu_perdev_intremap ) + error = -ENXIO; + printk("%sNo southbridge IO-APIC found in IVRS table\n", + amd_iommu_perdev_intremap ? XENLOG_ERR : XENLOG_WARNING); + } + return error; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 21:22:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 21:22:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WE3jn-0000fp-OR; Thu, 13 Feb 2014 21:22:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WE3jm-0000ff-Hu for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 21:22:26 +0000 Received: from [85.158.137.68:24338] by server-16.bemta-3.messagelabs.com id BF/D2-29917-1973DF25; Thu, 13 Feb 2014 21:22:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1392326543!430786!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30135 invoked from network); 13 Feb 2014 21:22:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 13 Feb 2014 21:22:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WE3jj-0006J6-H3 for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 21:22:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WE3jj-0006iD-B8 for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 21:22:23 +0000 Date: Thu, 13 Feb 2014 21:22:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] AMD IOMMU: fail if there is no southbridge IO-APIC X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 6bf0275ab0b403fb6327691a06f59bbf71fa323a Author: Jan Beulich AuthorDate: Thu Feb 13 10:18:13 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 13 10:18:13 2014 +0100 AMD IOMMU: fail if there is no southbridge IO-APIC ... but interrupt remapping is requested (with per-device remapping tables). Without it, the timer interrupt is usually not working. Inspired by Linux'es "iommu/amd: Work around wrong IOAPIC device-id in IVRS table" (commit c2ff5cf5294bcbd7fa50f7d860e90a66db7e5059) by Joerg Roedel . Reported-by: Eric Houby Signed-off-by: Jan Beulich Tested-by: Eric Houby Reviewed-by: Andrew Cooper Acked-by: Suravee Suthikulpanit master commit: 06bbcaf48d09c18a41c482866941ddd5d2846b44 master date: 2014-02-10 10:05:24 +0100 --- xen/drivers/passthrough/amd/iommu_acpi.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index a0ed7b7..a444a5d 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -882,6 +882,7 @@ static int __init parse_ivrs_table(struct acpi_table_header *table) const struct acpi_ivrs_header *ivrs_block; unsigned long length; unsigned int apic; + bool_t sb_ioapic = !iommu_intremap; int error = 0; BUG_ON(!table); @@ -915,8 +916,15 @@ static int __init parse_ivrs_table(struct acpi_table_header *table) /* Each IO-APIC must have been mentioned in the table. */ for ( apic = 0; !error && iommu_intremap && apic < nr_ioapics; ++apic ) { - if ( !nr_ioapic_entries[apic] || - ioapic_sbdf[IO_APIC_ID(apic)].pin_setup ) + if ( !nr_ioapic_entries[apic] ) + continue; + + if ( !ioapic_sbdf[IO_APIC_ID(apic)].seg && + /* SB IO-APIC is always on this device in AMD systems. */ + ioapic_sbdf[IO_APIC_ID(apic)].bdf == PCI_BDF(0, 0x14, 0) ) + sb_ioapic = 1; + + if ( ioapic_sbdf[IO_APIC_ID(apic)].pin_setup ) continue; printk(XENLOG_ERR "IVHD Error: no information for IO-APIC %#x\n", @@ -935,6 +943,14 @@ static int __init parse_ivrs_table(struct acpi_table_header *table) } } + if ( !error && !sb_ioapic ) + { + if ( amd_iommu_perdev_intremap ) + error = -ENXIO; + printk("%sNo southbridge IO-APIC found in IVRS table\n", + amd_iommu_perdev_intremap ? XENLOG_ERR : XENLOG_WARNING); + } + return error; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 21:22:37 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 21:22:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WE3jx-0000hF-RX; Thu, 13 Feb 2014 21:22:37 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WE3jw-0000h0-Ju for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 21:22:36 +0000 Received: from [85.158.137.68:26861] by server-10.bemta-3.messagelabs.com id E2/C8-07302-B973DF25; Thu, 13 Feb 2014 21:22:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1392326553!1734993!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21623 invoked from network); 13 Feb 2014 21:22:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 13 Feb 2014 21:22:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WE3jt-0006JF-Nt for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 21:22:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WE3jt-0006jM-KK for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 21:22:33 +0000 Date: Thu, 13 Feb 2014 21:22:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] flask: fix memory leaks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 10e715a33f2af819280843cf0bf6a8b619cb7ef9 Author: Jan Beulich AuthorDate: Thu Feb 13 10:19:20 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 13 10:19:20 2014 +0100 flask: fix memory leaks Plus, in the case of security_preserve_bools(), prevent double freeing in the case of security_get_bools() failing. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Daniel De Graaf master commit: 57c9f2caf05de41913b3e4eb48c0c3ad6c18dd3f master date: 2014-02-11 11:11:48 +0100 --- xen/xsm/flask/flask_op.c | 1 + xen/xsm/flask/ss/services.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index 537d287..a19d3f1 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -347,6 +347,7 @@ static int flask_security_set_bool(struct xen_flask_boolean *arg) if ( arg->bool_id >= num ) { + xfree(values); rv = -ENOENT; goto out; } diff --git a/xen/xsm/flask/ss/services.c b/xen/xsm/flask/ss/services.c index c4704c4..5cf9a95 100644 --- a/xen/xsm/flask/ss/services.c +++ b/xen/xsm/flask/ss/services.c @@ -1952,6 +1952,7 @@ err: { for ( i = 0; i < *len; i++ ) xfree((*names)[i]); + xfree(*names); } xfree(*values); goto out; @@ -2061,7 +2062,7 @@ static int security_preserve_bools(struct policydb *p) rc = security_get_bools(&nbools, &bnames, &bvalues, NULL); if ( rc ) - goto out; + return rc; for ( i = 0; i < nbools; i++ ) { booldatum = hashtab_search(p->p_bools.table, bnames[i]); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 21:22:37 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 21:22:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WE3jx-0000hF-RX; Thu, 13 Feb 2014 21:22:37 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WE3jw-0000h0-Ju for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 21:22:36 +0000 Received: from [85.158.137.68:26861] by server-10.bemta-3.messagelabs.com id E2/C8-07302-B973DF25; Thu, 13 Feb 2014 21:22:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1392326553!1734993!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21623 invoked from network); 13 Feb 2014 21:22:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 13 Feb 2014 21:22:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WE3jt-0006JF-Nt for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 21:22:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WE3jt-0006jM-KK for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 21:22:33 +0000 Date: Thu, 13 Feb 2014 21:22:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] flask: fix memory leaks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 10e715a33f2af819280843cf0bf6a8b619cb7ef9 Author: Jan Beulich AuthorDate: Thu Feb 13 10:19:20 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 13 10:19:20 2014 +0100 flask: fix memory leaks Plus, in the case of security_preserve_bools(), prevent double freeing in the case of security_get_bools() failing. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Daniel De Graaf master commit: 57c9f2caf05de41913b3e4eb48c0c3ad6c18dd3f master date: 2014-02-11 11:11:48 +0100 --- xen/xsm/flask/flask_op.c | 1 + xen/xsm/flask/ss/services.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index 537d287..a19d3f1 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -347,6 +347,7 @@ static int flask_security_set_bool(struct xen_flask_boolean *arg) if ( arg->bool_id >= num ) { + xfree(values); rv = -ENOENT; goto out; } diff --git a/xen/xsm/flask/ss/services.c b/xen/xsm/flask/ss/services.c index c4704c4..5cf9a95 100644 --- a/xen/xsm/flask/ss/services.c +++ b/xen/xsm/flask/ss/services.c @@ -1952,6 +1952,7 @@ err: { for ( i = 0; i < *len; i++ ) xfree((*names)[i]); + xfree(*names); } xfree(*values); goto out; @@ -2061,7 +2062,7 @@ static int security_preserve_bools(struct policydb *p) rc = security_get_bools(&nbools, &bnames, &bvalues, NULL); if ( rc ) - goto out; + return rc; for ( i = 0; i < nbools; i++ ) { booldatum = hashtab_search(p->p_bools.table, bnames[i]); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 21:22:47 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 21:22:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WE3k7-0000j7-UX; Thu, 13 Feb 2014 21:22:47 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WE3k6-0000ir-JG for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 21:22:46 +0000 Received: from [193.109.254.147:42765] by server-11.bemta-14.messagelabs.com id C7/DD-24604-5A73DF25; Thu, 13 Feb 2014 21:22:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1392326564!4202549!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13558 invoked from network); 13 Feb 2014 21:22:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 13 Feb 2014 21:22:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WE3k3-0006JL-Tx for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 21:22:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WE3k3-0006ji-SO for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 21:22:43 +0000 Date: Thu, 13 Feb 2014 21:22:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] flask: fix error propagation from flask_security_set_bool() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 6fdf926a81ad624c80ea6d97c2e8918326245fec Author: Jan Beulich AuthorDate: Thu Feb 13 10:21:02 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 13 10:21:02 2014 +0100 flask: fix error propagation from flask_security_set_bool() The function should return an error when flask_security_make_bools() fails as well as when the input ID is out of range. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Daniel De Graaf master commit: 31f3620be0e3158c205a3669135f9c4bfa40b1c7 master date: 2014-02-11 11:13:22 +0100 --- xen/xsm/flask/flask_op.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index a19d3f1..7d55f15 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -364,9 +364,10 @@ static int flask_security_set_bool(struct xen_flask_boolean *arg) else { if ( !bool_pending_values ) - flask_security_make_bools(); - - if ( arg->bool_id >= bool_num ) + rv = flask_security_make_bools(); + if ( !rv && arg->bool_id >= bool_num ) + rv = -ENOENT; + if ( rv ) goto out; bool_pending_values[arg->bool_id] = !!(arg->new_value); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 21:22:47 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 21:22:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WE3k7-0000j7-UX; Thu, 13 Feb 2014 21:22:47 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WE3k6-0000ir-JG for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 21:22:46 +0000 Received: from [193.109.254.147:42765] by server-11.bemta-14.messagelabs.com id C7/DD-24604-5A73DF25; Thu, 13 Feb 2014 21:22:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1392326564!4202549!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13558 invoked from network); 13 Feb 2014 21:22:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 13 Feb 2014 21:22:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WE3k3-0006JL-Tx for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 21:22:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WE3k3-0006ji-SO for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 21:22:43 +0000 Date: Thu, 13 Feb 2014 21:22:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] flask: fix error propagation from flask_security_set_bool() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 6fdf926a81ad624c80ea6d97c2e8918326245fec Author: Jan Beulich AuthorDate: Thu Feb 13 10:21:02 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 13 10:21:02 2014 +0100 flask: fix error propagation from flask_security_set_bool() The function should return an error when flask_security_make_bools() fails as well as when the input ID is out of range. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Daniel De Graaf master commit: 31f3620be0e3158c205a3669135f9c4bfa40b1c7 master date: 2014-02-11 11:13:22 +0100 --- xen/xsm/flask/flask_op.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index a19d3f1..7d55f15 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -364,9 +364,10 @@ static int flask_security_set_bool(struct xen_flask_boolean *arg) else { if ( !bool_pending_values ) - flask_security_make_bools(); - - if ( arg->bool_id >= bool_num ) + rv = flask_security_make_bools(); + if ( !rv && arg->bool_id >= bool_num ) + rv = -ENOENT; + if ( rv ) goto out; bool_pending_values[arg->bool_id] = !!(arg->new_value); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 21:22:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 21:22:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WE3kJ-0000kd-12; Thu, 13 Feb 2014 21:22:59 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WE3kH-0000kL-1c for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 21:22:57 +0000 Received: from [85.158.139.211:64355] by server-12.bemta-5.messagelabs.com id 95/6D-15415-0B73DF25; Thu, 13 Feb 2014 21:22:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1392326574!3793466!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26784 invoked from network); 13 Feb 2014 21:22:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 13 Feb 2014 21:22:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WE3kE-0006JR-2C for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 21:22:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WE3kE-0006k8-11 for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 21:22:54 +0000 Date: Thu, 13 Feb 2014 21:22:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] flask: check permissions first thing in flask_security_set_bool() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 640b31535ab8fe07911d0b90ae4adbe6078026c9 Author: Jan Beulich AuthorDate: Thu Feb 13 10:21:42 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 13 10:21:42 2014 +0100 flask: check permissions first thing in flask_security_set_bool() Nothing else should be done if the caller isn't permitted to set boolean values. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Daniel De Graaf master commit: ebe867052e0f782139147015c4e91b37aa5e68f1 master date: 2014-02-11 11:14:10 +0100 --- xen/xsm/flask/flask_op.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index 7d55f15..d60fbca 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -326,11 +326,11 @@ static int flask_security_set_bool(struct xen_flask_boolean *arg) { int rv; - rv = flask_security_resolve_bool(arg); + rv = domain_has_security(current->domain, SECURITY__SETBOOL); if ( rv ) return rv; - rv = domain_has_security(current->domain, SECURITY__SETBOOL); + rv = flask_security_resolve_bool(arg); if ( rv ) return rv; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 13 21:22:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Feb 2014 21:22:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WE3kJ-0000kd-12; Thu, 13 Feb 2014 21:22:59 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WE3kH-0000kL-1c for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 21:22:57 +0000 Received: from [85.158.139.211:64355] by server-12.bemta-5.messagelabs.com id 95/6D-15415-0B73DF25; Thu, 13 Feb 2014 21:22:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1392326574!3793466!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26784 invoked from network); 13 Feb 2014 21:22:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 13 Feb 2014 21:22:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WE3kE-0006JR-2C for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 21:22:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WE3kE-0006k8-11 for xen-changelog@lists.xensource.com; Thu, 13 Feb 2014 21:22:54 +0000 Date: Thu, 13 Feb 2014 21:22:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] flask: check permissions first thing in flask_security_set_bool() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 640b31535ab8fe07911d0b90ae4adbe6078026c9 Author: Jan Beulich AuthorDate: Thu Feb 13 10:21:42 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 13 10:21:42 2014 +0100 flask: check permissions first thing in flask_security_set_bool() Nothing else should be done if the caller isn't permitted to set boolean values. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Daniel De Graaf master commit: ebe867052e0f782139147015c4e91b37aa5e68f1 master date: 2014-02-11 11:14:10 +0100 --- xen/xsm/flask/flask_op.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index 7d55f15..d60fbca 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -326,11 +326,11 @@ static int flask_security_set_bool(struct xen_flask_boolean *arg) { int rv; - rv = flask_security_resolve_bool(arg); + rv = domain_has_security(current->domain, SECURITY__SETBOOL); if ( rv ) return rv; - rv = domain_has_security(current->domain, SECURITY__SETBOOL); + rv = flask_security_resolve_bool(arg); if ( rv ) return rv; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Feb 17 11:44:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Feb 2014 11:44:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFMck-0005Yn-Ob; Mon, 17 Feb 2014 11:44:34 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFMcj-0005Yh-Og for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 11:44:33 +0000 Received: from [193.109.254.147:62590] by server-6.bemta-14.messagelabs.com id 86/ED-03396-126F1035; Mon, 17 Feb 2014 11:44:33 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-27.messagelabs.com!1392637446!4852856!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 787 invoked from network); 17 Feb 2014 11:44:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 17 Feb 2014 11:44:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFMcF-0002UH-0T for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 11:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WFMcE-0001vT-RD for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 11:44:02 +0000 Message-Id: Date: Mon, 17 Feb 2014 11:44:02 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] xencons: further Dom0 handling improvements X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 1392636816 -3600 # Node ID c319bf65ef0495756ee9cc340ba7cb2e3388027e # Parent ac24179a78750ed99a8bee90e523af7c28962b3f xencons: further Dom0 handling improvements c/s 1242:731ff1f10c46 ("xencons: generalize use of add_preferred_console()") still left cases where (in Dom0) the console would get registered with index -1. Eliminate these cases by - also calling add_preferred_console() in Dom0 when "xencons=" was specified - setting the index directly when in Dom0 and "xencons=" was not given Also do some cleanup: - Move the declaration of console_use_vt into the respective global header (where it should have been placed from the beginning), and use a #define instead of a variable when !XEN. - Replace the needless uses of goto in xen_console_init() with plain return statements. Reported-by: Olaf Hering Signed-off-by: Jan Beulich --- diff -r ac24179a7875 -r c319bf65ef04 drivers/char/tty_io.c --- a/drivers/char/tty_io.c Tue Jan 28 15:00:11 2014 +0100 +++ b/drivers/char/tty_io.c Mon Feb 17 12:33:36 2014 +0100 @@ -130,7 +130,9 @@ LIST_HEAD(tty_drivers); /* linked list vt.c for deeply disgusting hack reasons */ DEFINE_MUTEX(tty_mutex); +#ifndef console_use_vt int console_use_vt = 1; +#endif #ifdef CONFIG_UNIX98_PTYS extern struct tty_driver *ptm_driver; /* Unix98 pty masters; for /dev/ptmx */ diff -r ac24179a7875 -r c319bf65ef04 drivers/xen/console/console.c --- a/drivers/xen/console/console.c Tue Jan 28 15:00:11 2014 +0100 +++ b/drivers/xen/console/console.c Mon Feb 17 12:33:36 2014 +0100 @@ -86,9 +86,8 @@ static int __init xencons_setup(char *st { char *q; int n; - extern int console_use_vt; - console_use_vt = 1; + console_use_vt = -1; if (!strncmp(str, "ttyS", 4)) { xc_mode = XC_SERIAL; str += 4; @@ -193,13 +192,13 @@ static struct console kcons_info = { static int __init xen_console_init(void) { if (!is_running_on_xen()) - goto out; + return 0; if (is_initial_xendomain()) { kcons_info.write = kcons_write_dom0; } else { if (!xen_start_info->console.domU.evtchn) - goto out; + return 0; kcons_info.write = kcons_write; } @@ -229,16 +228,17 @@ static int __init xen_console_init(void) break; default: - goto out; + return 0; } wbuf = alloc_bootmem(wbuf_size); - if (!is_initial_xendomain()) + if (console_use_vt <= 0 || !is_initial_xendomain()) add_preferred_console(kcons_info.name, xc_num, NULL); + else + kcons_info.index = xc_num; register_console(&kcons_info); - out: return 0; } console_initcall(xen_console_init); diff -r ac24179a7875 -r c319bf65ef04 include/linux/console.h --- a/include/linux/console.h Tue Jan 28 15:00:11 2014 +0100 +++ b/include/linux/console.h Mon Feb 17 12:33:36 2014 +0100 @@ -63,6 +63,12 @@ extern const struct consw vga_con; /* VG extern const struct consw newport_con; /* SGI Newport console */ extern const struct consw prom_con; /* SPARC PROM console */ +#ifdef CONFIG_XEN +extern int console_use_vt; +#else +#define console_use_vt 1 +#endif + int con_is_bound(const struct consw *csw); int register_con_driver(const struct consw *csw, int first, int last); int unregister_con_driver(const struct consw *csw); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Feb 17 11:44:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Feb 2014 11:44:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFMck-0005Yn-Ob; Mon, 17 Feb 2014 11:44:34 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFMcj-0005Yh-Og for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 11:44:33 +0000 Received: from [193.109.254.147:62590] by server-6.bemta-14.messagelabs.com id 86/ED-03396-126F1035; Mon, 17 Feb 2014 11:44:33 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-27.messagelabs.com!1392637446!4852856!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 787 invoked from network); 17 Feb 2014 11:44:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 17 Feb 2014 11:44:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFMcF-0002UH-0T for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 11:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WFMcE-0001vT-RD for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 11:44:02 +0000 Message-Id: Date: Mon, 17 Feb 2014 11:44:02 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] xencons: further Dom0 handling improvements X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 1392636816 -3600 # Node ID c319bf65ef0495756ee9cc340ba7cb2e3388027e # Parent ac24179a78750ed99a8bee90e523af7c28962b3f xencons: further Dom0 handling improvements c/s 1242:731ff1f10c46 ("xencons: generalize use of add_preferred_console()") still left cases where (in Dom0) the console would get registered with index -1. Eliminate these cases by - also calling add_preferred_console() in Dom0 when "xencons=" was specified - setting the index directly when in Dom0 and "xencons=" was not given Also do some cleanup: - Move the declaration of console_use_vt into the respective global header (where it should have been placed from the beginning), and use a #define instead of a variable when !XEN. - Replace the needless uses of goto in xen_console_init() with plain return statements. Reported-by: Olaf Hering Signed-off-by: Jan Beulich --- diff -r ac24179a7875 -r c319bf65ef04 drivers/char/tty_io.c --- a/drivers/char/tty_io.c Tue Jan 28 15:00:11 2014 +0100 +++ b/drivers/char/tty_io.c Mon Feb 17 12:33:36 2014 +0100 @@ -130,7 +130,9 @@ LIST_HEAD(tty_drivers); /* linked list vt.c for deeply disgusting hack reasons */ DEFINE_MUTEX(tty_mutex); +#ifndef console_use_vt int console_use_vt = 1; +#endif #ifdef CONFIG_UNIX98_PTYS extern struct tty_driver *ptm_driver; /* Unix98 pty masters; for /dev/ptmx */ diff -r ac24179a7875 -r c319bf65ef04 drivers/xen/console/console.c --- a/drivers/xen/console/console.c Tue Jan 28 15:00:11 2014 +0100 +++ b/drivers/xen/console/console.c Mon Feb 17 12:33:36 2014 +0100 @@ -86,9 +86,8 @@ static int __init xencons_setup(char *st { char *q; int n; - extern int console_use_vt; - console_use_vt = 1; + console_use_vt = -1; if (!strncmp(str, "ttyS", 4)) { xc_mode = XC_SERIAL; str += 4; @@ -193,13 +192,13 @@ static struct console kcons_info = { static int __init xen_console_init(void) { if (!is_running_on_xen()) - goto out; + return 0; if (is_initial_xendomain()) { kcons_info.write = kcons_write_dom0; } else { if (!xen_start_info->console.domU.evtchn) - goto out; + return 0; kcons_info.write = kcons_write; } @@ -229,16 +228,17 @@ static int __init xen_console_init(void) break; default: - goto out; + return 0; } wbuf = alloc_bootmem(wbuf_size); - if (!is_initial_xendomain()) + if (console_use_vt <= 0 || !is_initial_xendomain()) add_preferred_console(kcons_info.name, xc_num, NULL); + else + kcons_info.index = xc_num; register_console(&kcons_info); - out: return 0; } console_initcall(xen_console_init); diff -r ac24179a7875 -r c319bf65ef04 include/linux/console.h --- a/include/linux/console.h Tue Jan 28 15:00:11 2014 +0100 +++ b/include/linux/console.h Mon Feb 17 12:33:36 2014 +0100 @@ -63,6 +63,12 @@ extern const struct consw vga_con; /* VG extern const struct consw newport_con; /* SGI Newport console */ extern const struct consw prom_con; /* SPARC PROM console */ +#ifdef CONFIG_XEN +extern int console_use_vt; +#else +#define console_use_vt 1 +#endif + int con_is_bound(const struct consw *csw); int register_con_driver(const struct consw *csw, int first, int last); int unregister_con_driver(const struct consw *csw); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Feb 17 12:22:08 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Feb 2014 12:22:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFND3-0006Ws-Pb; Mon, 17 Feb 2014 12:22:05 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFND3-0006Wl-5i for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 12:22:05 +0000 Received: from [85.158.143.35:11134] by server-2.bemta-4.messagelabs.com id F9/9B-10891-CEEF1035; Mon, 17 Feb 2014 12:22:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1392639722!6233658!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21083 invoked from network); 17 Feb 2014 12:22:03 -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; 17 Feb 2014 12:22:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFND0-0002ry-Gf for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 12:22:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WFND0-0003Rm-CO for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 12:22:02 +0000 Date: Mon, 17 Feb 2014 12:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] update Xen version to 4.3.2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 b7d5b3789c92f2e95f99fddca86ffb02e73f2d2e Author: Jan Beulich AuthorDate: Fri Feb 14 16:22:59 2014 +0100 Commit: Jan Beulich CommitDate: Fri Feb 14 16:22:59 2014 +0100 update Xen version to 4.3.2 --- Config.mk | 4 ++-- xen/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 83fb486..c2ea4b3 100644 --- a/Config.mk +++ b/Config.mk @@ -212,7 +212,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-4.3-testing.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= b0855f925c6e2e0b21fbb03fab4b5fb5b6876871 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.3.2-rc1 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.3.2 SEABIOS_UPSTREAM_TAG ?= 3a28511b46f0c2af5fae1b6ed2b0c19d7913cee3 # Wed Jun 26 16:30:45 2013 +0100 # xen: Don't perform SMP setup. @@ -224,7 +224,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.3.2-rc1 +QEMU_TAG ?= xen-4.3.2 # Wed Dec 18 15:25:14 2013 +0000 # qemu-traditional: Fix build warnings on Wheezy diff --git a/xen/Makefile b/xen/Makefile index 2a5e78f..292f86c 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 3 -export XEN_EXTRAVERSION ?= .2-rc1$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .2$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Feb 17 12:22:08 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Feb 2014 12:22:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFND3-0006Ws-Pb; Mon, 17 Feb 2014 12:22:05 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFND3-0006Wl-5i for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 12:22:05 +0000 Received: from [85.158.143.35:11134] by server-2.bemta-4.messagelabs.com id F9/9B-10891-CEEF1035; Mon, 17 Feb 2014 12:22:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1392639722!6233658!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21083 invoked from network); 17 Feb 2014 12:22:03 -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; 17 Feb 2014 12:22:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFND0-0002ry-Gf for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 12:22:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WFND0-0003Rm-CO for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 12:22:02 +0000 Date: Mon, 17 Feb 2014 12:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] update Xen version to 4.3.2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 b7d5b3789c92f2e95f99fddca86ffb02e73f2d2e Author: Jan Beulich AuthorDate: Fri Feb 14 16:22:59 2014 +0100 Commit: Jan Beulich CommitDate: Fri Feb 14 16:22:59 2014 +0100 update Xen version to 4.3.2 --- Config.mk | 4 ++-- xen/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 83fb486..c2ea4b3 100644 --- a/Config.mk +++ b/Config.mk @@ -212,7 +212,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-4.3-testing.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= b0855f925c6e2e0b21fbb03fab4b5fb5b6876871 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.3.2-rc1 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.3.2 SEABIOS_UPSTREAM_TAG ?= 3a28511b46f0c2af5fae1b6ed2b0c19d7913cee3 # Wed Jun 26 16:30:45 2013 +0100 # xen: Don't perform SMP setup. @@ -224,7 +224,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.3.2-rc1 +QEMU_TAG ?= xen-4.3.2 # Wed Dec 18 15:25:14 2013 +0000 # qemu-traditional: Fix build warnings on Wheezy diff --git a/xen/Makefile b/xen/Makefile index 2a5e78f..292f86c 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 3 -export XEN_EXTRAVERSION ?= .2-rc1$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .2$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Feb 17 16:44:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Feb 2014 16:44:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRIf-0005Y4-QS; Mon, 17 Feb 2014 16:44:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRIe-0005Xz-Oa for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:44:09 +0000 Received: from [193.109.254.147:42761] by server-2.bemta-14.messagelabs.com id 29/44-01236-75C32035; Mon, 17 Feb 2014 16:44:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1392655443!4923159!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24371 invoked from network); 17 Feb 2014 16:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 17 Feb 2014 16:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRIZ-0005ih-F9 for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WFRIZ-0002jF-7w for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:44:03 +0000 Date: Mon, 17 Feb 2014 16:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: suppress suspend/resume functions on platforms which do not support it. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3ac3817762d1a8b39fa45998ec8c40cabfcfc802 Author: Ian Campbell AuthorDate: Wed Feb 12 14:27:37 2014 +0000 Commit: Ian Campbell CommitDate: Thu Feb 13 09:10:29 2014 +0000 xl: suppress suspend/resume functions on platforms which do not support it. ARM does not (currently) support migration, so stop offering tasty looking treats like "xl migrate". Apart from the UI improvement my intention is to use this in osstest to detect whether to attempt the save/restore/migrate tests. Other than the additions of the #define/#ifdef there is a tiny bit of code motion ("dump-core" in the command list and core_dump_domain in the implementations) which serves to put ifdeffable bits next to each other. Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- tools/libxl/libxl.h | 14 ++++++++++++++ tools/libxl/xl.h | 4 ++++ tools/libxl/xl_cmdimpl.c | 20 ++++++++++++-------- tools/libxl/xl_cmdtable.c | 15 +++++++++------ 4 files changed, 39 insertions(+), 14 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 0b992d1..06bbca6 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -431,6 +431,20 @@ */ #define LIBXL_HAVE_SIGCHLD_SHARING 1 +/* + * LIBXL_HAVE_NO_SUSPEND_RESUME + * + * Is this is defined then the platform has no support for saving, + * restoring or migrating a domain. In this case the related functions + * should be expected to return failure. That is: + * - libxl_domain_suspend + * - libxl_domain_resume + * - libxl_domain_remus_start + */ +#if defined(__arm__) || defined(__aarch64__) +#define LIBXL_HAVE_NO_SUSPEND_RESUME 1 +#endif + /* Functions annotated with LIBXL_EXTERNAL_CALLERS_ONLY may not be * called from within libxl itself. Callers outside libxl, who * do not #include libxl_internal.h, are fine. */ diff --git a/tools/libxl/xl.h b/tools/libxl/xl.h index c876a33..f188708 100644 --- a/tools/libxl/xl.h +++ b/tools/libxl/xl.h @@ -43,10 +43,12 @@ int main_pciattach(int argc, char **argv); int main_pciassignable_add(int argc, char **argv); int main_pciassignable_remove(int argc, char **argv); int main_pciassignable_list(int argc, char **argv); +#ifndef LIBXL_HAVE_NO_SUSPEND_RESUME int main_restore(int argc, char **argv); int main_migrate_receive(int argc, char **argv); int main_save(int argc, char **argv); int main_migrate(int argc, char **argv); +#endif int main_dump_core(int argc, char **argv); int main_pause(int argc, char **argv); int main_unpause(int argc, char **argv); @@ -104,7 +106,9 @@ int main_cpupoolnumasplit(int argc, char **argv); int main_getenforce(int argc, char **argv); int main_setenforce(int argc, char **argv); int main_loadpolicy(int argc, char **argv); +#ifndef LIBXL_HAVE_NO_SUSPEND_RESUME int main_remus(int argc, char **argv); +#endif int main_devd(int argc, char **argv); void help(const char *command); diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index aff6f90..4fc46eb 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -3384,6 +3384,15 @@ static void list_vm(void) libxl_vminfo_list_free(info, nb_vm); } +static void core_dump_domain(uint32_t domid, const char *filename) +{ + int rc; + + rc=libxl_domain_core_dump(ctx, domid, filename, NULL); + if (rc) { fprintf(stderr,"core dump failed (rc=%d)\n",rc);exit(-1); } +} + +#ifndef LIBXL_HAVE_NO_SUSPEND_RESUME static void save_domain_core_begin(uint32_t domid, const char *override_config_file, uint8_t **config_data_r, @@ -3775,14 +3784,6 @@ static void migrate_domain(uint32_t domid, const char *rune, int debug, exit(-ERROR_BADFAIL); } -static void core_dump_domain(uint32_t domid, const char *filename) -{ - int rc; - - rc=libxl_domain_core_dump(ctx, domid, filename, NULL); - if (rc) { fprintf(stderr,"core dump failed (rc=%d)\n",rc);exit(-1); } -} - static void migrate_receive(int debug, int daemonize, int monitor, int send_fd, int recv_fd, int remus) { @@ -4102,6 +4103,7 @@ int main_migrate(int argc, char **argv) migrate_domain(domid, rune, debug, config_filename); return 0; } +#endif int main_dump_core(int argc, char **argv) { @@ -7248,6 +7250,7 @@ done: return ret; } +#ifndef LIBXL_HAVE_NO_SUSPEND_RESUME int main_remus(int argc, char **argv) { uint32_t domid; @@ -7341,6 +7344,7 @@ int main_remus(int argc, char **argv) close(send_fd); return -ERROR_FAIL; } +#endif int main_devd(int argc, char **argv) { diff --git a/tools/libxl/xl_cmdtable.c b/tools/libxl/xl_cmdtable.c index ebe0220..e8ab93a 100644 --- a/tools/libxl/xl_cmdtable.c +++ b/tools/libxl/xl_cmdtable.c @@ -137,6 +137,7 @@ struct cmd_spec cmd_table[] = { " -autopass\n" "--vncviewer-autopass (consistency alias for --autopass)" }, +#ifndef LIBXL_HAVE_NO_SUSPEND_RESUME { "save", &main_save, 0, 1, "Save a domain state to restore later", @@ -158,11 +159,6 @@ struct cmd_spec cmd_table[] = { " of the domain.\n" "--debug Print huge (!) amount of debug during the migration process." }, - { "dump-core", - &main_dump_core, 0, 1, - "Core dump a domain", - " " - }, { "restore", &main_restore, 0, 1, "Restore a domain from a saved state", @@ -179,6 +175,12 @@ struct cmd_spec cmd_table[] = { "Restore a domain from a saved state", "- for internal use only", }, +#endif + { "dump-core", + &main_dump_core, 0, 1, + "Core dump a domain", + " " + }, { "cd-insert", &main_cd_insert, 1, 1, "Insert a cdrom into a guest's cd drive", @@ -474,6 +476,7 @@ struct cmd_spec cmd_table[] = { "Loads a new policy int the Flask Xen security module", "", }, +#ifndef LIBXL_HAVE_NO_SUSPEND_RESUME { "remus", &main_remus, 0, 1, "Enable Remus HA for domain", @@ -486,8 +489,8 @@ struct cmd_spec cmd_table[] = { " ssh xl migrate-receive -r [-e]\n" "-e Do not wait in the background (on ) for the death\n" " of the domain." - }, +#endif { "devd", &main_devd, 0, 1, "Daemon that listens for devices and launches backends", -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Feb 17 16:44:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Feb 2014 16:44:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRIf-0005Y4-QS; Mon, 17 Feb 2014 16:44:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRIe-0005Xz-Oa for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:44:09 +0000 Received: from [193.109.254.147:42761] by server-2.bemta-14.messagelabs.com id 29/44-01236-75C32035; Mon, 17 Feb 2014 16:44:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1392655443!4923159!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24371 invoked from network); 17 Feb 2014 16:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 17 Feb 2014 16:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRIZ-0005ih-F9 for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WFRIZ-0002jF-7w for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:44:03 +0000 Date: Mon, 17 Feb 2014 16:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: suppress suspend/resume functions on platforms which do not support it. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3ac3817762d1a8b39fa45998ec8c40cabfcfc802 Author: Ian Campbell AuthorDate: Wed Feb 12 14:27:37 2014 +0000 Commit: Ian Campbell CommitDate: Thu Feb 13 09:10:29 2014 +0000 xl: suppress suspend/resume functions on platforms which do not support it. ARM does not (currently) support migration, so stop offering tasty looking treats like "xl migrate". Apart from the UI improvement my intention is to use this in osstest to detect whether to attempt the save/restore/migrate tests. Other than the additions of the #define/#ifdef there is a tiny bit of code motion ("dump-core" in the command list and core_dump_domain in the implementations) which serves to put ifdeffable bits next to each other. Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- tools/libxl/libxl.h | 14 ++++++++++++++ tools/libxl/xl.h | 4 ++++ tools/libxl/xl_cmdimpl.c | 20 ++++++++++++-------- tools/libxl/xl_cmdtable.c | 15 +++++++++------ 4 files changed, 39 insertions(+), 14 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 0b992d1..06bbca6 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -431,6 +431,20 @@ */ #define LIBXL_HAVE_SIGCHLD_SHARING 1 +/* + * LIBXL_HAVE_NO_SUSPEND_RESUME + * + * Is this is defined then the platform has no support for saving, + * restoring or migrating a domain. In this case the related functions + * should be expected to return failure. That is: + * - libxl_domain_suspend + * - libxl_domain_resume + * - libxl_domain_remus_start + */ +#if defined(__arm__) || defined(__aarch64__) +#define LIBXL_HAVE_NO_SUSPEND_RESUME 1 +#endif + /* Functions annotated with LIBXL_EXTERNAL_CALLERS_ONLY may not be * called from within libxl itself. Callers outside libxl, who * do not #include libxl_internal.h, are fine. */ diff --git a/tools/libxl/xl.h b/tools/libxl/xl.h index c876a33..f188708 100644 --- a/tools/libxl/xl.h +++ b/tools/libxl/xl.h @@ -43,10 +43,12 @@ int main_pciattach(int argc, char **argv); int main_pciassignable_add(int argc, char **argv); int main_pciassignable_remove(int argc, char **argv); int main_pciassignable_list(int argc, char **argv); +#ifndef LIBXL_HAVE_NO_SUSPEND_RESUME int main_restore(int argc, char **argv); int main_migrate_receive(int argc, char **argv); int main_save(int argc, char **argv); int main_migrate(int argc, char **argv); +#endif int main_dump_core(int argc, char **argv); int main_pause(int argc, char **argv); int main_unpause(int argc, char **argv); @@ -104,7 +106,9 @@ int main_cpupoolnumasplit(int argc, char **argv); int main_getenforce(int argc, char **argv); int main_setenforce(int argc, char **argv); int main_loadpolicy(int argc, char **argv); +#ifndef LIBXL_HAVE_NO_SUSPEND_RESUME int main_remus(int argc, char **argv); +#endif int main_devd(int argc, char **argv); void help(const char *command); diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index aff6f90..4fc46eb 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -3384,6 +3384,15 @@ static void list_vm(void) libxl_vminfo_list_free(info, nb_vm); } +static void core_dump_domain(uint32_t domid, const char *filename) +{ + int rc; + + rc=libxl_domain_core_dump(ctx, domid, filename, NULL); + if (rc) { fprintf(stderr,"core dump failed (rc=%d)\n",rc);exit(-1); } +} + +#ifndef LIBXL_HAVE_NO_SUSPEND_RESUME static void save_domain_core_begin(uint32_t domid, const char *override_config_file, uint8_t **config_data_r, @@ -3775,14 +3784,6 @@ static void migrate_domain(uint32_t domid, const char *rune, int debug, exit(-ERROR_BADFAIL); } -static void core_dump_domain(uint32_t domid, const char *filename) -{ - int rc; - - rc=libxl_domain_core_dump(ctx, domid, filename, NULL); - if (rc) { fprintf(stderr,"core dump failed (rc=%d)\n",rc);exit(-1); } -} - static void migrate_receive(int debug, int daemonize, int monitor, int send_fd, int recv_fd, int remus) { @@ -4102,6 +4103,7 @@ int main_migrate(int argc, char **argv) migrate_domain(domid, rune, debug, config_filename); return 0; } +#endif int main_dump_core(int argc, char **argv) { @@ -7248,6 +7250,7 @@ done: return ret; } +#ifndef LIBXL_HAVE_NO_SUSPEND_RESUME int main_remus(int argc, char **argv) { uint32_t domid; @@ -7341,6 +7344,7 @@ int main_remus(int argc, char **argv) close(send_fd); return -ERROR_FAIL; } +#endif int main_devd(int argc, char **argv) { diff --git a/tools/libxl/xl_cmdtable.c b/tools/libxl/xl_cmdtable.c index ebe0220..e8ab93a 100644 --- a/tools/libxl/xl_cmdtable.c +++ b/tools/libxl/xl_cmdtable.c @@ -137,6 +137,7 @@ struct cmd_spec cmd_table[] = { " -autopass\n" "--vncviewer-autopass (consistency alias for --autopass)" }, +#ifndef LIBXL_HAVE_NO_SUSPEND_RESUME { "save", &main_save, 0, 1, "Save a domain state to restore later", @@ -158,11 +159,6 @@ struct cmd_spec cmd_table[] = { " of the domain.\n" "--debug Print huge (!) amount of debug during the migration process." }, - { "dump-core", - &main_dump_core, 0, 1, - "Core dump a domain", - " " - }, { "restore", &main_restore, 0, 1, "Restore a domain from a saved state", @@ -179,6 +175,12 @@ struct cmd_spec cmd_table[] = { "Restore a domain from a saved state", "- for internal use only", }, +#endif + { "dump-core", + &main_dump_core, 0, 1, + "Core dump a domain", + " " + }, { "cd-insert", &main_cd_insert, 1, 1, "Insert a cdrom into a guest's cd drive", @@ -474,6 +476,7 @@ struct cmd_spec cmd_table[] = { "Loads a new policy int the Flask Xen security module", "", }, +#ifndef LIBXL_HAVE_NO_SUSPEND_RESUME { "remus", &main_remus, 0, 1, "Enable Remus HA for domain", @@ -486,8 +489,8 @@ struct cmd_spec cmd_table[] = { " ssh xl migrate-receive -r [-e]\n" "-e Do not wait in the background (on ) for the death\n" " of the domain." - }, +#endif { "devd", &main_devd, 0, 1, "Daemon that listens for devices and launches backends", -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Feb 17 16:44:16 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Feb 2014 16:44: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 1WFRIm-0005Ya-TM; Mon, 17 Feb 2014 16:44:16 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRIm-0005YR-4D for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:44:16 +0000 Received: from [193.109.254.147:44688] by server-9.bemta-14.messagelabs.com id 98/53-24895-F5C32035; Mon, 17 Feb 2014 16:44:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1392655453!4929131!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13558 invoked from network); 17 Feb 2014 16:44:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 17 Feb 2014 16:44:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRIj-0005ik-JY for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:44:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WFRIj-0002jm-I4 for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:44:13 +0000 Date: Mon, 17 Feb 2014 16:44:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/pci: Store VF's memory space displacement in a 64-bit value X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 001bdcee7bc19be3e047d227b4d940c04972eb02 Author: Boris Ostrovsky AuthorDate: Thu Feb 13 10:49:55 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 13 10:49:55 2014 +0100 x86/pci: Store VF's memory space displacement in a 64-bit value VF's memory space offset can be greater than 4GB and therefore needs to be stored in a 64-bit variable. Signed-off-by: Boris Ostrovsky --- xen/arch/x86/msi.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index 284042e..1aaceeb 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -610,7 +610,8 @@ static int msi_capability_init(struct pci_dev *dev, static u64 read_pci_mem_bar(u16 seg, u8 bus, u8 slot, u8 func, u8 bir, int vf) { u8 limit; - u32 addr, base = PCI_BASE_ADDRESS_0, disp = 0; + u32 addr, base = PCI_BASE_ADDRESS_0; + u64 disp = 0; if ( vf >= 0 ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Feb 17 16:44:16 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Feb 2014 16:44: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 1WFRIm-0005Ya-TM; Mon, 17 Feb 2014 16:44:16 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRIm-0005YR-4D for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:44:16 +0000 Received: from [193.109.254.147:44688] by server-9.bemta-14.messagelabs.com id 98/53-24895-F5C32035; Mon, 17 Feb 2014 16:44:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1392655453!4929131!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13558 invoked from network); 17 Feb 2014 16:44:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 17 Feb 2014 16:44:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRIj-0005ik-JY for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:44:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WFRIj-0002jm-I4 for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:44:13 +0000 Date: Mon, 17 Feb 2014 16:44:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/pci: Store VF's memory space displacement in a 64-bit value X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 001bdcee7bc19be3e047d227b4d940c04972eb02 Author: Boris Ostrovsky AuthorDate: Thu Feb 13 10:49:55 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 13 10:49:55 2014 +0100 x86/pci: Store VF's memory space displacement in a 64-bit value VF's memory space offset can be greater than 4GB and therefore needs to be stored in a 64-bit variable. Signed-off-by: Boris Ostrovsky --- xen/arch/x86/msi.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index 284042e..1aaceeb 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -610,7 +610,8 @@ static int msi_capability_init(struct pci_dev *dev, static u64 read_pci_mem_bar(u16 seg, u8 bus, u8 slot, u8 func, u8 bir, int vf) { u8 limit; - u32 addr, base = PCI_BASE_ADDRESS_0, disp = 0; + u32 addr, base = PCI_BASE_ADDRESS_0; + u64 disp = 0; if ( vf >= 0 ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Feb 17 16:44:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Feb 2014 16:44:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRIw-0005Zf-WE; Mon, 17 Feb 2014 16:44:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRIw-0005ZZ-4K for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:44:26 +0000 Received: from [193.109.254.147:45572] by server-16.bemta-14.messagelabs.com id 2F/73-21945-96C32035; Mon, 17 Feb 2014 16:44:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1392655464!4896889!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6244 invoked from network); 17 Feb 2014 16:44:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 17 Feb 2014 16:44:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRIt-0005it-TH for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:44:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WFRIt-0002l4-Nl for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:44:23 +0000 Date: Mon, 17 Feb 2014 16:44:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs/vtpm: fix auto-shutdown reference X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 1278b09cc5a38da4efbe0de37a7f9fab9d19f913 Author: Daniel De Graaf AuthorDate: Tue Feb 11 10:25:17 2014 -0500 Commit: Ian Campbell CommitDate: Thu Feb 13 09:54:06 2014 +0000 docs/vtpm: fix auto-shutdown reference The automatic shutdown feature of the vTPM was removed because it interfered with pv-grub measurement support and was also not triggered if the guest did not use the vTPM. Virtual TPM domains will need to be shut down or destroyed on guest shutdown via a script or other user action. This also fixes an incorrect reference to the vTPM being PV-only. Signed-off-by: Daniel De Graaf Acked-by: Ian Campbell --- docs/misc/vtpm.txt | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/docs/misc/vtpm.txt b/docs/misc/vtpm.txt index b8979a3..df1dfae 100644 --- a/docs/misc/vtpm.txt +++ b/docs/misc/vtpm.txt @@ -234,7 +234,7 @@ the Linux tpmfront driver. Add the following line: vtpm=["backend=domu-vtpm"] -Currently only paravirtualized guests are supported. +Currently only Linux guests are supported (PV or HVM with PV drivers). Launching and shut down: ------------------------ @@ -280,14 +280,8 @@ You should also see the command being sent to the vtpm console as well as the vtpm saving its state. You should see the vtpm key being encrypted and stored on the vtpmmgr console. -To shutdown the guest and its vtpm, you just have to shutdown the guest -normally. As soon as the guest vm disconnects, the vtpm will shut itself -down automatically. - -On guest: -# shutdown -h now - -You may wish to write a script to start your vtpm and guest together. +You may wish to write a script to start your vtpm and guest together and +to destroy the vtpm when the guest shuts down. ------------------------------ INTEGRATION WITH PV-GRUB -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Feb 17 16:44:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Feb 2014 16:44:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRIw-0005Zf-WE; Mon, 17 Feb 2014 16:44:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRIw-0005ZZ-4K for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:44:26 +0000 Received: from [193.109.254.147:45572] by server-16.bemta-14.messagelabs.com id 2F/73-21945-96C32035; Mon, 17 Feb 2014 16:44:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1392655464!4896889!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6244 invoked from network); 17 Feb 2014 16:44:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 17 Feb 2014 16:44:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRIt-0005it-TH for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:44:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WFRIt-0002l4-Nl for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:44:23 +0000 Date: Mon, 17 Feb 2014 16:44:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs/vtpm: fix auto-shutdown reference X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 1278b09cc5a38da4efbe0de37a7f9fab9d19f913 Author: Daniel De Graaf AuthorDate: Tue Feb 11 10:25:17 2014 -0500 Commit: Ian Campbell CommitDate: Thu Feb 13 09:54:06 2014 +0000 docs/vtpm: fix auto-shutdown reference The automatic shutdown feature of the vTPM was removed because it interfered with pv-grub measurement support and was also not triggered if the guest did not use the vTPM. Virtual TPM domains will need to be shut down or destroyed on guest shutdown via a script or other user action. This also fixes an incorrect reference to the vTPM being PV-only. Signed-off-by: Daniel De Graaf Acked-by: Ian Campbell --- docs/misc/vtpm.txt | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/docs/misc/vtpm.txt b/docs/misc/vtpm.txt index b8979a3..df1dfae 100644 --- a/docs/misc/vtpm.txt +++ b/docs/misc/vtpm.txt @@ -234,7 +234,7 @@ the Linux tpmfront driver. Add the following line: vtpm=["backend=domu-vtpm"] -Currently only paravirtualized guests are supported. +Currently only Linux guests are supported (PV or HVM with PV drivers). Launching and shut down: ------------------------ @@ -280,14 +280,8 @@ You should also see the command being sent to the vtpm console as well as the vtpm saving its state. You should see the vtpm key being encrypted and stored on the vtpmmgr console. -To shutdown the guest and its vtpm, you just have to shutdown the guest -normally. As soon as the guest vm disconnects, the vtpm will shut itself -down automatically. - -On guest: -# shutdown -h now - -You may wish to write a script to start your vtpm and guest together. +You may wish to write a script to start your vtpm and guest together and +to destroy the vtpm when the guest shuts down. ------------------------------ INTEGRATION WITH PV-GRUB -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Feb 17 16:44:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Feb 2014 16:44:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRJ8-0005as-2f; Mon, 17 Feb 2014 16:44:38 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRJ7-0005ai-8O for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:44:37 +0000 Received: from [85.158.137.68:14488] by server-3.bemta-3.messagelabs.com id 8A/00-14520-47C32035; Mon, 17 Feb 2014 16:44:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1392655474!1427263!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1917 invoked from network); 17 Feb 2014 16:44:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Feb 2014 16:44:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRJ4-0005iz-3d for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:44:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WFRJ4-0002lh-1p for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:44:34 +0000 Date: Mon, 17 Feb 2014 16:44:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/configure: correct --enable-blktap1 help text X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 42788ddd24a06bf05f0f2b5da1880ed89736bd7b Author: Jan Beulich AuthorDate: Thu Feb 13 12:57:43 2014 +0000 Commit: Ian Campbell CommitDate: Thu Feb 13 13:15:32 2014 +0000 tools/configure: correct --enable-blktap1 help text Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- tools/configure | 2 +- tools/configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/configure b/tools/configure index afc3000..3f2eecf 100755 --- a/tools/configure +++ b/tools/configure @@ -1427,7 +1427,7 @@ Optional Features: --disable-seabios Disable SeaBIOS (default is ENABLED) --disable-debug Disable debug build of tools (default is ENABLED) --enable-xend Enable xend toolstack (default is DISABLED) - --enable-blktap1 Disable blktap1 tools (default is DISABLED) + --enable-blktap1 Enable blktap1 tools (default is DISABLED) --enable-qemu-traditional Enable qemu traditional device model, (DEFAULT is on for x86, otherwise off) diff --git a/tools/configure.ac b/tools/configure.ac index 0754f0e..5083c7b 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -58,7 +58,7 @@ AX_ARG_DEFAULT_ENABLE([rombios], [Disable ROM BIOS]) AX_ARG_DEFAULT_ENABLE([seabios], [Disable SeaBIOS]) AX_ARG_DEFAULT_ENABLE([debug], [Disable debug build of tools]) AX_ARG_DEFAULT_DISABLE([xend], [Enable xend toolstack]) -AX_ARG_DEFAULT_DISABLE([blktap1], [Disable blktap1 tools]) +AX_ARG_DEFAULT_DISABLE([blktap1], [Enable blktap1 tools]) AC_ARG_ENABLE([qemu-traditional], AS_HELP_STRING([--enable-qemu-traditional], -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Feb 17 16:44:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Feb 2014 16:44:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRJ8-0005as-2f; Mon, 17 Feb 2014 16:44:38 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRJ7-0005ai-8O for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:44:37 +0000 Received: from [85.158.137.68:14488] by server-3.bemta-3.messagelabs.com id 8A/00-14520-47C32035; Mon, 17 Feb 2014 16:44:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1392655474!1427263!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1917 invoked from network); 17 Feb 2014 16:44:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Feb 2014 16:44:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRJ4-0005iz-3d for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:44:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WFRJ4-0002lh-1p for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:44:34 +0000 Date: Mon, 17 Feb 2014 16:44:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/configure: correct --enable-blktap1 help text X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 42788ddd24a06bf05f0f2b5da1880ed89736bd7b Author: Jan Beulich AuthorDate: Thu Feb 13 12:57:43 2014 +0000 Commit: Ian Campbell CommitDate: Thu Feb 13 13:15:32 2014 +0000 tools/configure: correct --enable-blktap1 help text Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- tools/configure | 2 +- tools/configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/configure b/tools/configure index afc3000..3f2eecf 100755 --- a/tools/configure +++ b/tools/configure @@ -1427,7 +1427,7 @@ Optional Features: --disable-seabios Disable SeaBIOS (default is ENABLED) --disable-debug Disable debug build of tools (default is ENABLED) --enable-xend Enable xend toolstack (default is DISABLED) - --enable-blktap1 Disable blktap1 tools (default is DISABLED) + --enable-blktap1 Enable blktap1 tools (default is DISABLED) --enable-qemu-traditional Enable qemu traditional device model, (DEFAULT is on for x86, otherwise off) diff --git a/tools/configure.ac b/tools/configure.ac index 0754f0e..5083c7b 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -58,7 +58,7 @@ AX_ARG_DEFAULT_ENABLE([rombios], [Disable ROM BIOS]) AX_ARG_DEFAULT_ENABLE([seabios], [Disable SeaBIOS]) AX_ARG_DEFAULT_ENABLE([debug], [Disable debug build of tools]) AX_ARG_DEFAULT_DISABLE([xend], [Enable xend toolstack]) -AX_ARG_DEFAULT_DISABLE([blktap1], [Disable blktap1 tools]) +AX_ARG_DEFAULT_DISABLE([blktap1], [Enable blktap1 tools]) AC_ARG_ENABLE([qemu-traditional], AS_HELP_STRING([--enable-qemu-traditional], -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Feb 17 16:44:49 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Feb 2014 16:44:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRJJ-0005cQ-5Z; Mon, 17 Feb 2014 16:44:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRJH-0005cF-Nv for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:44:47 +0000 Received: from [85.158.137.68:15336] by server-1.bemta-3.messagelabs.com id 6C/9C-17293-E7C32035; Mon, 17 Feb 2014 16:44:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1392655485!2422745!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1353 invoked from network); 17 Feb 2014 16:44:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Feb 2014 16:44:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRJE-0005j5-NL for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:44:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WFRJE-0002mI-8N for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:44:44 +0000 Date: Mon, 17 Feb 2014 16:44:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: stop trying to use the system and X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 0873829a70daa3c23d03b9841ccd529f05889f21 Author: Tim Deegan AuthorDate: Thu Feb 13 12:13:58 2014 +0000 Commit: Tim Deegan CommitDate: Thu Feb 13 13:50:37 2014 +0000 xen: stop trying to use the system and We already have our own versions of the stdarg/stdbool definitions, for systems where those headers are installed in /usr/include. On linux, they're typically installed in compiler-specific paths, but finding them has proved unreliable. Drop that and use our own versions everywhere. Signed-off-by: Tim Deegan Tested-by: Julien Grall Acked-by: Keir Fraser --- xen/Rules.mk | 5 +---- xen/include/xen/stdarg.h | 30 ++++++++++++++---------------- xen/include/xen/stdbool.h | 12 ++++-------- 3 files changed, 19 insertions(+), 28 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index df1428f..3a6cec5 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -44,10 +44,7 @@ ALL_OBJS-$(x86) += $(BASEDIR)/crypto/built_in.o CFLAGS += -fno-builtin -fno-common CFLAGS += -Werror -Wredundant-decls -Wno-pointer-arith CFLAGS += -pipe -g -D__XEN__ -include $(BASEDIR)/include/xen/config.h -# Solaris puts stdarg.h &c in the system include directory. -ifneq ($(XEN_OS),SunOS) -CFLAGS += -nostdinc -iwithprefix include -endif +CFLAGS += -nostdinc CFLAGS-$(XSM_ENABLE) += -DXSM_ENABLE CFLAGS-$(FLASK_ENABLE) += -DFLASK_ENABLE -DXSM_MAGIC=0xf97cff8c diff --git a/xen/include/xen/stdarg.h b/xen/include/xen/stdarg.h index d1b2540..0283f06 100644 --- a/xen/include/xen/stdarg.h +++ b/xen/include/xen/stdarg.h @@ -1,23 +1,21 @@ #ifndef __XEN_STDARG_H__ #define __XEN_STDARG_H__ -#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) - typedef __builtin_va_list va_list; -# ifdef __GNUC__ -# define __GNUC_PREREQ__(x, y) \ - ((__GNUC__ == (x) && __GNUC_MINOR__ >= (y)) || \ - (__GNUC__ > (x))) -# else -# define __GNUC_PREREQ__(x, y) 0 -# endif -# if !__GNUC_PREREQ__(4, 5) -# define __builtin_va_start(ap, last) __builtin_stdarg_start((ap), (last)) -# endif -# define va_start(ap, last) __builtin_va_start((ap), (last)) -# define va_end(ap) __builtin_va_end(ap) -# define va_arg __builtin_va_arg +#ifdef __GNUC__ +# define __GNUC_PREREQ__(x, y) \ + ((__GNUC__ == (x) && __GNUC_MINOR__ >= (y)) || \ + (__GNUC__ > (x))) #else -# include +# define __GNUC_PREREQ__(x, y) 0 #endif +#if !__GNUC_PREREQ__(4, 5) +# define __builtin_va_start(ap, last) __builtin_stdarg_start((ap), (last)) +#endif + +typedef __builtin_va_list va_list; +#define va_start(ap, last) __builtin_va_start((ap), (last)) +#define va_end(ap) __builtin_va_end(ap) +#define va_arg __builtin_va_arg + #endif /* __XEN_STDARG_H__ */ diff --git a/xen/include/xen/stdbool.h b/xen/include/xen/stdbool.h index f0faedf..b0947a6 100644 --- a/xen/include/xen/stdbool.h +++ b/xen/include/xen/stdbool.h @@ -1,13 +1,9 @@ #ifndef __XEN_STDBOOL_H__ #define __XEN_STDBOOL_H__ -#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) -# define bool _Bool -# define true 1 -# define false 0 -# define __bool_true_false_are_defined 1 -#else -# include -#endif +#define bool _Bool +#define true 1 +#define false 0 +#define __bool_true_false_are_defined 1 #endif /* __XEN_STDBOOL_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Feb 17 16:44:49 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Feb 2014 16:44:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRJJ-0005cQ-5Z; Mon, 17 Feb 2014 16:44:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRJH-0005cF-Nv for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:44:47 +0000 Received: from [85.158.137.68:15336] by server-1.bemta-3.messagelabs.com id 6C/9C-17293-E7C32035; Mon, 17 Feb 2014 16:44:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1392655485!2422745!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1353 invoked from network); 17 Feb 2014 16:44:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Feb 2014 16:44:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRJE-0005j5-NL for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:44:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WFRJE-0002mI-8N for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:44:44 +0000 Date: Mon, 17 Feb 2014 16:44:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: stop trying to use the system and X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 0873829a70daa3c23d03b9841ccd529f05889f21 Author: Tim Deegan AuthorDate: Thu Feb 13 12:13:58 2014 +0000 Commit: Tim Deegan CommitDate: Thu Feb 13 13:50:37 2014 +0000 xen: stop trying to use the system and We already have our own versions of the stdarg/stdbool definitions, for systems where those headers are installed in /usr/include. On linux, they're typically installed in compiler-specific paths, but finding them has proved unreliable. Drop that and use our own versions everywhere. Signed-off-by: Tim Deegan Tested-by: Julien Grall Acked-by: Keir Fraser --- xen/Rules.mk | 5 +---- xen/include/xen/stdarg.h | 30 ++++++++++++++---------------- xen/include/xen/stdbool.h | 12 ++++-------- 3 files changed, 19 insertions(+), 28 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index df1428f..3a6cec5 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -44,10 +44,7 @@ ALL_OBJS-$(x86) += $(BASEDIR)/crypto/built_in.o CFLAGS += -fno-builtin -fno-common CFLAGS += -Werror -Wredundant-decls -Wno-pointer-arith CFLAGS += -pipe -g -D__XEN__ -include $(BASEDIR)/include/xen/config.h -# Solaris puts stdarg.h &c in the system include directory. -ifneq ($(XEN_OS),SunOS) -CFLAGS += -nostdinc -iwithprefix include -endif +CFLAGS += -nostdinc CFLAGS-$(XSM_ENABLE) += -DXSM_ENABLE CFLAGS-$(FLASK_ENABLE) += -DFLASK_ENABLE -DXSM_MAGIC=0xf97cff8c diff --git a/xen/include/xen/stdarg.h b/xen/include/xen/stdarg.h index d1b2540..0283f06 100644 --- a/xen/include/xen/stdarg.h +++ b/xen/include/xen/stdarg.h @@ -1,23 +1,21 @@ #ifndef __XEN_STDARG_H__ #define __XEN_STDARG_H__ -#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) - typedef __builtin_va_list va_list; -# ifdef __GNUC__ -# define __GNUC_PREREQ__(x, y) \ - ((__GNUC__ == (x) && __GNUC_MINOR__ >= (y)) || \ - (__GNUC__ > (x))) -# else -# define __GNUC_PREREQ__(x, y) 0 -# endif -# if !__GNUC_PREREQ__(4, 5) -# define __builtin_va_start(ap, last) __builtin_stdarg_start((ap), (last)) -# endif -# define va_start(ap, last) __builtin_va_start((ap), (last)) -# define va_end(ap) __builtin_va_end(ap) -# define va_arg __builtin_va_arg +#ifdef __GNUC__ +# define __GNUC_PREREQ__(x, y) \ + ((__GNUC__ == (x) && __GNUC_MINOR__ >= (y)) || \ + (__GNUC__ > (x))) #else -# include +# define __GNUC_PREREQ__(x, y) 0 #endif +#if !__GNUC_PREREQ__(4, 5) +# define __builtin_va_start(ap, last) __builtin_stdarg_start((ap), (last)) +#endif + +typedef __builtin_va_list va_list; +#define va_start(ap, last) __builtin_va_start((ap), (last)) +#define va_end(ap) __builtin_va_end(ap) +#define va_arg __builtin_va_arg + #endif /* __XEN_STDARG_H__ */ diff --git a/xen/include/xen/stdbool.h b/xen/include/xen/stdbool.h index f0faedf..b0947a6 100644 --- a/xen/include/xen/stdbool.h +++ b/xen/include/xen/stdbool.h @@ -1,13 +1,9 @@ #ifndef __XEN_STDBOOL_H__ #define __XEN_STDBOOL_H__ -#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) -# define bool _Bool -# define true 1 -# define false 0 -# define __bool_true_false_are_defined 1 -#else -# include -#endif +#define bool _Bool +#define true 1 +#define false 0 +#define __bool_true_false_are_defined 1 #endif /* __XEN_STDBOOL_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Feb 17 16:44:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Feb 2014 16:44:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRJT-0005e6-9V; Mon, 17 Feb 2014 16:44:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRJR-0005dr-Iu for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:44:57 +0000 Received: from [85.158.137.68:34521] by server-4.bemta-3.messagelabs.com id F9/60-04858-88C32035; Mon, 17 Feb 2014 16:44:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1392655495!2439581!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3385 invoked from network); 17 Feb 2014 16:44:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Feb 2014 16:44:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRJO-0005jE-TH for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:44:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WFRJO-0002mj-RK for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:44:54 +0000 Date: Mon, 17 Feb 2014 16:44:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: mention whitespace handling diskspec target= parsing X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d2985386925fab3abe075852db46df29b56c95bb Author: Olaf Hering AuthorDate: Thu Feb 13 15:43:24 2014 +0100 Commit: Ian Campbell CommitDate: Thu Feb 13 14:57:46 2014 +0000 docs: mention whitespace handling diskspec target= parsing disk=[ ' target=/dev/loop0 ' ] will fail to parse because '/dev/loop ' does not exist. Signed-off-by: Olaf Hering Acked-by: Ian Campbell --- docs/misc/xl-disk-configuration.txt | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/misc/xl-disk-configuration.txt b/docs/misc/xl-disk-configuration.txt index 5bd456d..cf22397 100644 --- a/docs/misc/xl-disk-configuration.txt +++ b/docs/misc/xl-disk-configuration.txt @@ -70,11 +70,11 @@ Special syntax: When this parameter is specified by name, ie with the "target=" syntax in the configuration file, it consumes the whole rest of the - . Therefore in that case it must come last. This is - permissible even if an empty value for the target was already - specified as a positional parameter. This is the only way to - specify a target string containing metacharacters such as commas - and (in some cases) colons, which would otherwise be + including trailing whitespaces. Therefore in that case + it must come last. This is permissible even if an empty value for + the target was already specified as a positional parameter. This + is the only way to specify a target string containing metacharacters + such as commas and (in some cases) colons, which would otherwise be misinterpreted. Future parameter and flag names will start with an ascii letter and -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Feb 17 16:44:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Feb 2014 16:44:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRJT-0005e6-9V; Mon, 17 Feb 2014 16:44:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRJR-0005dr-Iu for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:44:57 +0000 Received: from [85.158.137.68:34521] by server-4.bemta-3.messagelabs.com id F9/60-04858-88C32035; Mon, 17 Feb 2014 16:44:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1392655495!2439581!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3385 invoked from network); 17 Feb 2014 16:44:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Feb 2014 16:44:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRJO-0005jE-TH for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:44:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WFRJO-0002mj-RK for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:44:54 +0000 Date: Mon, 17 Feb 2014 16:44:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: mention whitespace handling diskspec target= parsing X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d2985386925fab3abe075852db46df29b56c95bb Author: Olaf Hering AuthorDate: Thu Feb 13 15:43:24 2014 +0100 Commit: Ian Campbell CommitDate: Thu Feb 13 14:57:46 2014 +0000 docs: mention whitespace handling diskspec target= parsing disk=[ ' target=/dev/loop0 ' ] will fail to parse because '/dev/loop ' does not exist. Signed-off-by: Olaf Hering Acked-by: Ian Campbell --- docs/misc/xl-disk-configuration.txt | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/misc/xl-disk-configuration.txt b/docs/misc/xl-disk-configuration.txt index 5bd456d..cf22397 100644 --- a/docs/misc/xl-disk-configuration.txt +++ b/docs/misc/xl-disk-configuration.txt @@ -70,11 +70,11 @@ Special syntax: When this parameter is specified by name, ie with the "target=" syntax in the configuration file, it consumes the whole rest of the - . Therefore in that case it must come last. This is - permissible even if an empty value for the target was already - specified as a positional parameter. This is the only way to - specify a target string containing metacharacters such as commas - and (in some cases) colons, which would otherwise be + including trailing whitespaces. Therefore in that case + it must come last. This is permissible even if an empty value for + the target was already specified as a positional parameter. This + is the only way to specify a target string containing metacharacters + such as commas and (in some cases) colons, which would otherwise be misinterpreted. Future parameter and flag names will start with an ascii letter and -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Feb 17 16:45:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Feb 2014 16:45:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRJd-0005fn-GJ; Mon, 17 Feb 2014 16:45:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRJc-0005fJ-4b for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:45:08 +0000 Received: from [85.158.137.68:35413] by server-13.bemta-3.messagelabs.com id FC/2F-26923-39C32035; Mon, 17 Feb 2014 16:45:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1392655505!2439501!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16690 invoked from network); 17 Feb 2014 16:45:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Feb 2014 16:45:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRJZ-0005kD-BX for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:45:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WFRJZ-0002nI-15 for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:45:05 +0000 Date: Mon, 17 Feb 2014 16:45:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: Don't use __builtin_stdarg_start(). X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1982463121929375556==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============1982463121929375556== Content-Type: text/plain commit 0e251a8371574b905d37d7650d1d625caf0f1181 Author: Tim Deegan AuthorDate: Thu Feb 13 15:13:07 2014 +0000 Commit: Tim Deegan CommitDate: Thu Feb 13 15:41:57 2014 +0000 xen: Don't use __builtin_stdarg_start(). Cset fca49a00 ("netbsd: build fix with gcc 4.5") changed the definition of va_start() to use __builtin_va_start() rather than __builtin_stdarg_start() for GCCs >= 4.5, but in fact GCC dropped __builtin_stdarg_start() before v3.3. Signed-off-by: Tim Deegan Tested-by: Roger Pau Monné --- xen/include/xen/stdarg.h | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/xen/include/xen/stdarg.h b/xen/include/xen/stdarg.h index 0283f06..216fe6d 100644 --- a/xen/include/xen/stdarg.h +++ b/xen/include/xen/stdarg.h @@ -1,18 +1,6 @@ #ifndef __XEN_STDARG_H__ #define __XEN_STDARG_H__ -#ifdef __GNUC__ -# define __GNUC_PREREQ__(x, y) \ - ((__GNUC__ == (x) && __GNUC_MINOR__ >= (y)) || \ - (__GNUC__ > (x))) -#else -# define __GNUC_PREREQ__(x, y) 0 -#endif - -#if !__GNUC_PREREQ__(4, 5) -# define __builtin_va_start(ap, last) __builtin_stdarg_start((ap), (last)) -#endif - typedef __builtin_va_list va_list; #define va_start(ap, last) __builtin_va_start((ap), (last)) #define va_end(ap) __builtin_va_end(ap) -- generated by git-patchbot for /home/xen/git/xen.git#master --===============1982463121929375556== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============1982463121929375556==-- From xen-changelog-bounces@lists.xen.org Mon Feb 17 16:45:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Feb 2014 16:45:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRJd-0005fn-GJ; Mon, 17 Feb 2014 16:45:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRJc-0005fJ-4b for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:45:08 +0000 Received: from [85.158.137.68:35413] by server-13.bemta-3.messagelabs.com id FC/2F-26923-39C32035; Mon, 17 Feb 2014 16:45:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1392655505!2439501!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16690 invoked from network); 17 Feb 2014 16:45:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Feb 2014 16:45:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRJZ-0005kD-BX for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:45:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WFRJZ-0002nI-15 for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:45:05 +0000 Date: Mon, 17 Feb 2014 16:45:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: Don't use __builtin_stdarg_start(). X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1982463121929375556==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============1982463121929375556== Content-Type: text/plain commit 0e251a8371574b905d37d7650d1d625caf0f1181 Author: Tim Deegan AuthorDate: Thu Feb 13 15:13:07 2014 +0000 Commit: Tim Deegan CommitDate: Thu Feb 13 15:41:57 2014 +0000 xen: Don't use __builtin_stdarg_start(). Cset fca49a00 ("netbsd: build fix with gcc 4.5") changed the definition of va_start() to use __builtin_va_start() rather than __builtin_stdarg_start() for GCCs >= 4.5, but in fact GCC dropped __builtin_stdarg_start() before v3.3. Signed-off-by: Tim Deegan Tested-by: Roger Pau Monné --- xen/include/xen/stdarg.h | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/xen/include/xen/stdarg.h b/xen/include/xen/stdarg.h index 0283f06..216fe6d 100644 --- a/xen/include/xen/stdarg.h +++ b/xen/include/xen/stdarg.h @@ -1,18 +1,6 @@ #ifndef __XEN_STDARG_H__ #define __XEN_STDARG_H__ -#ifdef __GNUC__ -# define __GNUC_PREREQ__(x, y) \ - ((__GNUC__ == (x) && __GNUC_MINOR__ >= (y)) || \ - (__GNUC__ > (x))) -#else -# define __GNUC_PREREQ__(x, y) 0 -#endif - -#if !__GNUC_PREREQ__(4, 5) -# define __builtin_va_start(ap, last) __builtin_stdarg_start((ap), (last)) -#endif - typedef __builtin_va_list va_list; #define va_start(ap, last) __builtin_va_start((ap), (last)) #define va_end(ap) __builtin_va_end(ap) -- generated by git-patchbot for /home/xen/git/xen.git#master --===============1982463121929375556== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog --===============1982463121929375556==-- From xen-changelog-bounces@lists.xen.org Mon Feb 17 16:45:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Feb 2014 16:45: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 1WFRJn-0005ho-LG; Mon, 17 Feb 2014 16:45:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRJm-0005hb-6X for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:45:18 +0000 Received: from [193.109.254.147:4251] by server-12.bemta-14.messagelabs.com id 8A/C5-17220-D9C32035; Mon, 17 Feb 2014 16:45:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1392655515!4894932!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10035 invoked from network); 17 Feb 2014 16:45:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 17 Feb 2014 16:45:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRJj-0005kL-IP for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:45:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WFRJj-0002nm-Go for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:45:15 +0000 Date: Mon, 17 Feb 2014 16:45:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] When enabling log dirty mode, it sets all guest's memory to readonly. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 077fc1c04d70ef1748ac2daa6622b3320a1a004c Author: Yang Zhang AuthorDate: Thu Feb 13 15:50:22 2014 +0000 Commit: Tim Deegan CommitDate: Thu Feb 13 15:50:22 2014 +0000 When enabling log dirty mode, it sets all guest's memory to readonly. And in HAP enabled domain, it modifies all EPT entries to clear write bit to make sure it is readonly. This will cause problem if VT-d shares page table with EPT: the device may issue a DMA write request, then VT-d engine tells it the target memory is readonly and result in VT-d fault. Currnetly, there are two places will enable log dirty mode: migration and vram tracking. Migration with device assigned is not allowed, so it is ok. For vram, it doesn't need to set all memory to readonly. Only track the vram range is enough. Signed-off-by: Yang Zhang Acked-by: Tim Deegan --- xen/arch/x86/mm/hap/hap.c | 20 ++++++++++++++------ xen/arch/x86/mm/paging.c | 9 +++++---- xen/arch/x86/mm/shadow/common.c | 2 +- xen/include/asm-x86/domain.h | 2 +- xen/include/asm-x86/paging.h | 5 +++-- xen/include/asm-x86/shadow.h | 2 +- 6 files changed, 25 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index d3f64bd..5f75636 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -82,7 +82,7 @@ int hap_track_dirty_vram(struct domain *d, if ( !paging_mode_log_dirty(d) ) { hap_logdirty_init(d); - rc = paging_log_dirty_enable(d); + rc = paging_log_dirty_enable(d, 0); if ( rc ) goto out; } @@ -167,17 +167,25 @@ out: /* HAP LOG DIRTY SUPPORT */ /************************************************/ -/* hap code to call when log_dirty is enable. return 0 if no problem found. */ -static int hap_enable_log_dirty(struct domain *d) +/* + * hap code to call when log_dirty is enable. return 0 if no problem found. + * + * NB: Domain that having device assigned should not set log_global. Because + * there is no way to track the memory updating from device. + */ +static int hap_enable_log_dirty(struct domain *d, bool_t log_global) { /* turn on PG_log_dirty bit in paging mode */ paging_lock(d); d->arch.paging.mode |= PG_log_dirty; paging_unlock(d); - /* set l1e entries of P2M table to be read-only. */ - p2m_change_entry_type_global(d, p2m_ram_rw, p2m_ram_logdirty); - flush_tlb_mask(d->domain_dirty_cpumask); + if ( log_global ) + { + /* set l1e entries of P2M table to be read-only. */ + p2m_change_entry_type_global(d, p2m_ram_rw, p2m_ram_logdirty); + flush_tlb_mask(d->domain_dirty_cpumask); + } return 0; } diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index 21344e5..ab5eacb 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -164,7 +164,7 @@ void paging_free_log_dirty_bitmap(struct domain *d) paging_unlock(d); } -int paging_log_dirty_enable(struct domain *d) +int paging_log_dirty_enable(struct domain *d, bool_t log_global) { int ret; @@ -172,7 +172,7 @@ int paging_log_dirty_enable(struct domain *d) return -EINVAL; domain_pause(d); - ret = d->arch.paging.log_dirty.enable_log_dirty(d); + ret = d->arch.paging.log_dirty.enable_log_dirty(d, log_global); domain_unpause(d); return ret; @@ -489,7 +489,8 @@ void paging_log_dirty_range(struct domain *d, * These function pointers must not be followed with the log-dirty lock held. */ void paging_log_dirty_init(struct domain *d, - int (*enable_log_dirty)(struct domain *d), + int (*enable_log_dirty)(struct domain *d, + bool_t log_global), int (*disable_log_dirty)(struct domain *d), void (*clean_dirty_bitmap)(struct domain *d)) { @@ -590,7 +591,7 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, case XEN_DOMCTL_SHADOW_OP_ENABLE_LOGDIRTY: if ( hap_enabled(d) ) hap_logdirty_init(d); - return paging_log_dirty_enable(d); + return paging_log_dirty_enable(d, 1); case XEN_DOMCTL_SHADOW_OP_OFF: if ( paging_mode_log_dirty(d) ) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 0bfa595..11c6b62 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3418,7 +3418,7 @@ shadow_write_p2m_entry(struct vcpu *v, unsigned long gfn, /* Shadow specific code which is called in paging_log_dirty_enable(). * Return 0 if no problem found. */ -int shadow_enable_log_dirty(struct domain *d) +int shadow_enable_log_dirty(struct domain *d, bool_t log_global) { int ret; diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index ea72db2..4ff89f0 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -169,7 +169,7 @@ struct log_dirty_domain { unsigned int dirty_count; /* functions which are paging mode specific */ - int (*enable_log_dirty )(struct domain *d); + int (*enable_log_dirty )(struct domain *d, bool_t log_global); int (*disable_log_dirty )(struct domain *d); void (*clean_dirty_bitmap )(struct domain *d); }; diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h index cd7ee3b..8dd2a61 100644 --- a/xen/include/asm-x86/paging.h +++ b/xen/include/asm-x86/paging.h @@ -143,14 +143,15 @@ void paging_log_dirty_range(struct domain *d, uint8_t *dirty_bitmap); /* enable log dirty */ -int paging_log_dirty_enable(struct domain *d); +int paging_log_dirty_enable(struct domain *d, bool_t log_global); /* disable log dirty */ int paging_log_dirty_disable(struct domain *d); /* log dirty initialization */ void paging_log_dirty_init(struct domain *d, - int (*enable_log_dirty)(struct domain *d), + int (*enable_log_dirty)(struct domain *d, + bool_t log_global), int (*disable_log_dirty)(struct domain *d), void (*clean_dirty_bitmap)(struct domain *d)); diff --git a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h index 852023d..348915e 100644 --- a/xen/include/asm-x86/shadow.h +++ b/xen/include/asm-x86/shadow.h @@ -82,7 +82,7 @@ void shadow_teardown(struct domain *d); void shadow_final_teardown(struct domain *d); /* shadow code to call when log dirty is enabled */ -int shadow_enable_log_dirty(struct domain *d); +int shadow_enable_log_dirty(struct domain *d, bool_t log_global); /* shadow code to call when log dirty is disabled */ int shadow_disable_log_dirty(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Feb 17 16:45:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Feb 2014 16:45: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 1WFRJn-0005ho-LG; Mon, 17 Feb 2014 16:45:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRJm-0005hb-6X for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:45:18 +0000 Received: from [193.109.254.147:4251] by server-12.bemta-14.messagelabs.com id 8A/C5-17220-D9C32035; Mon, 17 Feb 2014 16:45:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1392655515!4894932!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10035 invoked from network); 17 Feb 2014 16:45:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 17 Feb 2014 16:45:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRJj-0005kL-IP for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:45:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WFRJj-0002nm-Go for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:45:15 +0000 Date: Mon, 17 Feb 2014 16:45:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] When enabling log dirty mode, it sets all guest's memory to readonly. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 077fc1c04d70ef1748ac2daa6622b3320a1a004c Author: Yang Zhang AuthorDate: Thu Feb 13 15:50:22 2014 +0000 Commit: Tim Deegan CommitDate: Thu Feb 13 15:50:22 2014 +0000 When enabling log dirty mode, it sets all guest's memory to readonly. And in HAP enabled domain, it modifies all EPT entries to clear write bit to make sure it is readonly. This will cause problem if VT-d shares page table with EPT: the device may issue a DMA write request, then VT-d engine tells it the target memory is readonly and result in VT-d fault. Currnetly, there are two places will enable log dirty mode: migration and vram tracking. Migration with device assigned is not allowed, so it is ok. For vram, it doesn't need to set all memory to readonly. Only track the vram range is enough. Signed-off-by: Yang Zhang Acked-by: Tim Deegan --- xen/arch/x86/mm/hap/hap.c | 20 ++++++++++++++------ xen/arch/x86/mm/paging.c | 9 +++++---- xen/arch/x86/mm/shadow/common.c | 2 +- xen/include/asm-x86/domain.h | 2 +- xen/include/asm-x86/paging.h | 5 +++-- xen/include/asm-x86/shadow.h | 2 +- 6 files changed, 25 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index d3f64bd..5f75636 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -82,7 +82,7 @@ int hap_track_dirty_vram(struct domain *d, if ( !paging_mode_log_dirty(d) ) { hap_logdirty_init(d); - rc = paging_log_dirty_enable(d); + rc = paging_log_dirty_enable(d, 0); if ( rc ) goto out; } @@ -167,17 +167,25 @@ out: /* HAP LOG DIRTY SUPPORT */ /************************************************/ -/* hap code to call when log_dirty is enable. return 0 if no problem found. */ -static int hap_enable_log_dirty(struct domain *d) +/* + * hap code to call when log_dirty is enable. return 0 if no problem found. + * + * NB: Domain that having device assigned should not set log_global. Because + * there is no way to track the memory updating from device. + */ +static int hap_enable_log_dirty(struct domain *d, bool_t log_global) { /* turn on PG_log_dirty bit in paging mode */ paging_lock(d); d->arch.paging.mode |= PG_log_dirty; paging_unlock(d); - /* set l1e entries of P2M table to be read-only. */ - p2m_change_entry_type_global(d, p2m_ram_rw, p2m_ram_logdirty); - flush_tlb_mask(d->domain_dirty_cpumask); + if ( log_global ) + { + /* set l1e entries of P2M table to be read-only. */ + p2m_change_entry_type_global(d, p2m_ram_rw, p2m_ram_logdirty); + flush_tlb_mask(d->domain_dirty_cpumask); + } return 0; } diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index 21344e5..ab5eacb 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -164,7 +164,7 @@ void paging_free_log_dirty_bitmap(struct domain *d) paging_unlock(d); } -int paging_log_dirty_enable(struct domain *d) +int paging_log_dirty_enable(struct domain *d, bool_t log_global) { int ret; @@ -172,7 +172,7 @@ int paging_log_dirty_enable(struct domain *d) return -EINVAL; domain_pause(d); - ret = d->arch.paging.log_dirty.enable_log_dirty(d); + ret = d->arch.paging.log_dirty.enable_log_dirty(d, log_global); domain_unpause(d); return ret; @@ -489,7 +489,8 @@ void paging_log_dirty_range(struct domain *d, * These function pointers must not be followed with the log-dirty lock held. */ void paging_log_dirty_init(struct domain *d, - int (*enable_log_dirty)(struct domain *d), + int (*enable_log_dirty)(struct domain *d, + bool_t log_global), int (*disable_log_dirty)(struct domain *d), void (*clean_dirty_bitmap)(struct domain *d)) { @@ -590,7 +591,7 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, case XEN_DOMCTL_SHADOW_OP_ENABLE_LOGDIRTY: if ( hap_enabled(d) ) hap_logdirty_init(d); - return paging_log_dirty_enable(d); + return paging_log_dirty_enable(d, 1); case XEN_DOMCTL_SHADOW_OP_OFF: if ( paging_mode_log_dirty(d) ) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 0bfa595..11c6b62 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3418,7 +3418,7 @@ shadow_write_p2m_entry(struct vcpu *v, unsigned long gfn, /* Shadow specific code which is called in paging_log_dirty_enable(). * Return 0 if no problem found. */ -int shadow_enable_log_dirty(struct domain *d) +int shadow_enable_log_dirty(struct domain *d, bool_t log_global) { int ret; diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index ea72db2..4ff89f0 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -169,7 +169,7 @@ struct log_dirty_domain { unsigned int dirty_count; /* functions which are paging mode specific */ - int (*enable_log_dirty )(struct domain *d); + int (*enable_log_dirty )(struct domain *d, bool_t log_global); int (*disable_log_dirty )(struct domain *d); void (*clean_dirty_bitmap )(struct domain *d); }; diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h index cd7ee3b..8dd2a61 100644 --- a/xen/include/asm-x86/paging.h +++ b/xen/include/asm-x86/paging.h @@ -143,14 +143,15 @@ void paging_log_dirty_range(struct domain *d, uint8_t *dirty_bitmap); /* enable log dirty */ -int paging_log_dirty_enable(struct domain *d); +int paging_log_dirty_enable(struct domain *d, bool_t log_global); /* disable log dirty */ int paging_log_dirty_disable(struct domain *d); /* log dirty initialization */ void paging_log_dirty_init(struct domain *d, - int (*enable_log_dirty)(struct domain *d), + int (*enable_log_dirty)(struct domain *d, + bool_t log_global), int (*disable_log_dirty)(struct domain *d), void (*clean_dirty_bitmap)(struct domain *d)); diff --git a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h index 852023d..348915e 100644 --- a/xen/include/asm-x86/shadow.h +++ b/xen/include/asm-x86/shadow.h @@ -82,7 +82,7 @@ void shadow_teardown(struct domain *d); void shadow_final_teardown(struct domain *d); /* shadow code to call when log dirty is enabled */ -int shadow_enable_log_dirty(struct domain *d); +int shadow_enable_log_dirty(struct domain *d, bool_t log_global); /* shadow code to call when log dirty is disabled */ int shadow_disable_log_dirty(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Feb 17 16:45:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Feb 2014 16:45:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRJy-0005jX-De; Mon, 17 Feb 2014 16:45:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRJw-0005jC-Sx for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:45:29 +0000 Received: from [85.158.139.211:64126] by server-16.bemta-5.messagelabs.com id 10/58-05060-7AC32035; Mon, 17 Feb 2014 16:45:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1392655526!4444629!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10727 invoked from network); 17 Feb 2014 16:45:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 17 Feb 2014 16:45:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRJt-0005kR-OE for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:45:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WFRJt-0002ox-Lt for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:45:25 +0000 Date: Mon, 17 Feb 2014 16:45:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvh: Fix regression due to assumption that HVM paths MUST use io-backend device X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 4e8d89bc1445f91c4c6c7bf0ad8d51b0c809841e Author: Mukesh Rathor AuthorDate: Thu Feb 13 17:56:39 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 13 17:56:39 2014 +0100 pvh: Fix regression due to assumption that HVM paths MUST use io-backend device The commit 09bb434748af9bfe3f7fca4b6eef721a7d5042a4 "Nested VMX: prohibit virtual vmentry/vmexit during IO emulation" assumes that the HVM paths are only taken by HVM guests. With the PVH enabled that is no longer the case - which means that we do not have to have the IO-backend device (QEMU) enabled. As such, that patch can crash the hypervisor: Xen call trace: [] nvmx_switch_guest+0x4d/0x903 [] vmx_asm_vmexit_handler+0x4b/0xc0 Pagetable walk from 000000000000001e: L4[0x000] = 0000000000000000 ffffffffffffffff **************************************** Panic on CPU 7: FATAL PAGE FAULT [error_code=0000] Faulting linear address: 000000000000001e **************************************** as we do not have an io based backend. In the case that the PVH guest does run an HVM guest inside it - we need to do further work to suport this - and for now the check will bail us out. We also fix spelling mistakes and the sentence structure. Suggested-by: Jan Beulich Signed-off-by: Mukesh Rathor Signed-off-by: Konrad Rzeszutek Wilk Acked-by: George Dunlap Release-acked-by: George Dunlap Acked-by: "Zhang, Yang Z" Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/vmx/vvmx.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index d2ba435..40167d6 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -1394,13 +1394,17 @@ void nvmx_switch_guest(void) struct vcpu *v = current; struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); struct cpu_user_regs *regs = guest_cpu_user_regs(); + const ioreq_t *ioreq = get_ioreq(v); /* - * a pending IO emualtion may still no finished. In this case, - * no virtual vmswith is allowed. Or else, the following IO - * emulation will handled in a wrong VCPU context. + * A pending IO emulation may still be not finished. In this case, no + * virtual vmswitch is allowed. Or else, the following IO emulation will + * be handled in a wrong VCPU context. If there are no IO backends - PVH + * guest by itself or a PVH guest with an HVM guest running inside - we + * don't want to continue as this setup is not implemented nor supported + * as of right now. */ - if ( get_ioreq(v)->state != STATE_IOREQ_NONE ) + if ( !ioreq || ioreq->state != STATE_IOREQ_NONE ) return; /* * a softirq may interrupt us between a virtual vmentry is -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Feb 17 16:45:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Feb 2014 16:45:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRJy-0005jX-De; Mon, 17 Feb 2014 16:45:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRJw-0005jC-Sx for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:45:29 +0000 Received: from [85.158.139.211:64126] by server-16.bemta-5.messagelabs.com id 10/58-05060-7AC32035; Mon, 17 Feb 2014 16:45:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1392655526!4444629!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10727 invoked from network); 17 Feb 2014 16:45:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 17 Feb 2014 16:45:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRJt-0005kR-OE for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:45:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WFRJt-0002ox-Lt for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:45:25 +0000 Date: Mon, 17 Feb 2014 16:45:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvh: Fix regression due to assumption that HVM paths MUST use io-backend device X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 4e8d89bc1445f91c4c6c7bf0ad8d51b0c809841e Author: Mukesh Rathor AuthorDate: Thu Feb 13 17:56:39 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 13 17:56:39 2014 +0100 pvh: Fix regression due to assumption that HVM paths MUST use io-backend device The commit 09bb434748af9bfe3f7fca4b6eef721a7d5042a4 "Nested VMX: prohibit virtual vmentry/vmexit during IO emulation" assumes that the HVM paths are only taken by HVM guests. With the PVH enabled that is no longer the case - which means that we do not have to have the IO-backend device (QEMU) enabled. As such, that patch can crash the hypervisor: Xen call trace: [] nvmx_switch_guest+0x4d/0x903 [] vmx_asm_vmexit_handler+0x4b/0xc0 Pagetable walk from 000000000000001e: L4[0x000] = 0000000000000000 ffffffffffffffff **************************************** Panic on CPU 7: FATAL PAGE FAULT [error_code=0000] Faulting linear address: 000000000000001e **************************************** as we do not have an io based backend. In the case that the PVH guest does run an HVM guest inside it - we need to do further work to suport this - and for now the check will bail us out. We also fix spelling mistakes and the sentence structure. Suggested-by: Jan Beulich Signed-off-by: Mukesh Rathor Signed-off-by: Konrad Rzeszutek Wilk Acked-by: George Dunlap Release-acked-by: George Dunlap Acked-by: "Zhang, Yang Z" Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/vmx/vvmx.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index d2ba435..40167d6 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -1394,13 +1394,17 @@ void nvmx_switch_guest(void) struct vcpu *v = current; struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); struct cpu_user_regs *regs = guest_cpu_user_regs(); + const ioreq_t *ioreq = get_ioreq(v); /* - * a pending IO emualtion may still no finished. In this case, - * no virtual vmswith is allowed. Or else, the following IO - * emulation will handled in a wrong VCPU context. + * A pending IO emulation may still be not finished. In this case, no + * virtual vmswitch is allowed. Or else, the following IO emulation will + * be handled in a wrong VCPU context. If there are no IO backends - PVH + * guest by itself or a PVH guest with an HVM guest running inside - we + * don't want to continue as this setup is not implemented nor supported + * as of right now. */ - if ( get_ioreq(v)->state != STATE_IOREQ_NONE ) + if ( !ioreq || ioreq->state != STATE_IOREQ_NONE ) return; /* * a softirq may interrupt us between a virtual vmentry is -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Feb 17 16:45:40 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Feb 2014 16:45:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRK8-0005kw-LP; Mon, 17 Feb 2014 16:45:40 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRK6-0005kj-SW for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:45:39 +0000 Received: from [85.158.143.35:4321] by server-3.bemta-4.messagelabs.com id 4A/3B-11539-2BC32035; Mon, 17 Feb 2014 16:45:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1392655536!6305793!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31579 invoked from network); 17 Feb 2014 16:45:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 17 Feb 2014 16:45:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRK3-0005kX-Uh for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:45:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WFRK3-0002pY-SU for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:45:35 +0000 Date: Mon, 17 Feb 2014 16:45:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Update QEMU_UPSTREAM_REVISION for 4.4.0-rc4 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 b7319350278d0220febc8a7dc8be8e8d41b0abd2 Author: Ian Jackson AuthorDate: Mon Feb 17 16:33:48 2014 +0000 Commit: Ian Jackson CommitDate: Mon Feb 17 16:33:48 2014 +0000 Update QEMU_UPSTREAM_REVISION for 4.4.0-rc4 Signed-off-by: Ian Jackson --- Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index 1e034f7..a6cd2e3 100644 --- a/Config.mk +++ b/Config.mk @@ -234,7 +234,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 -QEMU_UPSTREAM_REVISION ?= master +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.4.0-rc4 SEABIOS_UPSTREAM_TAG ?= rel-1.7.3.1 # Fri Aug 2 14:12:09 2013 -0400 # Fix bug in CBFS file walking with compressed files. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Feb 17 16:45:40 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Feb 2014 16:45:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRK8-0005kw-LP; Mon, 17 Feb 2014 16:45:40 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRK6-0005kj-SW for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:45:39 +0000 Received: from [85.158.143.35:4321] by server-3.bemta-4.messagelabs.com id 4A/3B-11539-2BC32035; Mon, 17 Feb 2014 16:45:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1392655536!6305793!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31579 invoked from network); 17 Feb 2014 16:45:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 17 Feb 2014 16:45:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WFRK3-0005kX-Uh for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:45:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WFRK3-0002pY-SU for xen-changelog@lists.xensource.com; Mon, 17 Feb 2014 16:45:35 +0000 Date: Mon, 17 Feb 2014 16:45:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Update QEMU_UPSTREAM_REVISION for 4.4.0-rc4 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 b7319350278d0220febc8a7dc8be8e8d41b0abd2 Author: Ian Jackson AuthorDate: Mon Feb 17 16:33:48 2014 +0000 Commit: Ian Jackson CommitDate: Mon Feb 17 16:33:48 2014 +0000 Update QEMU_UPSTREAM_REVISION for 4.4.0-rc4 Signed-off-by: Ian Jackson --- Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index 1e034f7..a6cd2e3 100644 --- a/Config.mk +++ b/Config.mk @@ -234,7 +234,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 -QEMU_UPSTREAM_REVISION ?= master +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.4.0-rc4 SEABIOS_UPSTREAM_TAG ?= rel-1.7.3.1 # Fri Aug 2 14:12:09 2013 -0400 # Fix bug in CBFS file walking with compressed files. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Feb 19 19:55:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Feb 2014 19:55:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGDEa-0000lS-Ez; Wed, 19 Feb 2014 19:55:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGDEZ-0000lE-IT for xen-changelog@lists.xensource.com; Wed, 19 Feb 2014 19:55:07 +0000 Received: from [85.158.137.68:40182] by server-4.bemta-3.messagelabs.com id 69/83-04858-A1C05035; Wed, 19 Feb 2014 19:55:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1392839704!1657407!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23658 invoked from network); 19 Feb 2014 19:55:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Feb 2014 19:55:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGDEV-0000R3-Vu for xen-changelog@lists.xensource.com; Wed, 19 Feb 2014 19:55:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WGDEV-0000I0-ND for xen-changelog@lists.xensource.com; Wed, 19 Feb 2014 19:55:03 +0000 Date: Wed, 19 Feb 2014 19:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Correctly handle non-page aligned pointer in raw_copy_from_guest X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 4959e0eacf56456a4b16d59e98cec58f7c2d66be Author: Julien Grall AuthorDate: Tue Feb 18 16:56:17 2014 +0000 Commit: Ian Campbell CommitDate: Tue Feb 18 17:33:49 2014 +0000 xen/arm: Correctly handle non-page aligned pointer in raw_copy_from_guest The current implementation of raw_copy_guest helper may lead to data corruption and sometimes Xen crash when the guest virtual address is not aligned to PAGE_SIZE. When the total length is higher than a page, the length to read is badly compute with min(len, (unsigned)(PAGE_SIZE - offset)) As the offset is only computed one time per function, if the start address was not aligned to PAGE_SIZE, we can end up in same iteration: - to read accross page boundary => xen crash - read the previous page => data corruption This issue can be resolved by setting offset to 0 at the end of the first iteration. Indeed, after it, the virtual guest address is always aligned to PAGE_SIZE. Signed-off-by: Julien Grall Acked-by: Ian Campbell Cc: George Dunlap [ ijc -- duplicated the comment in the other two functions with this behaviour ] --- xen/arch/arm/guestcopy.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/guestcopy.c b/xen/arch/arm/guestcopy.c index af0af6b..cea5f97 100644 --- a/xen/arch/arm/guestcopy.c +++ b/xen/arch/arm/guestcopy.c @@ -30,6 +30,10 @@ static unsigned long raw_copy_to_guest_helper(void *to, const void *from, len -= size; from += size; to += size; + /* + * After the first iteration, guest virtual address is correctly + * aligned to PAGE_SIZE. + */ offset = 0; } @@ -68,6 +72,10 @@ unsigned long raw_clear_guest(void *to, unsigned len) unmap_domain_page(p - offset); len -= size; to += size; + /* + * After the first iteration, guest virtual address is correctly + * aligned to PAGE_SIZE. + */ offset = 0; } @@ -96,6 +104,11 @@ unsigned long raw_copy_from_guest(void *to, const void __user *from, unsigned le len -= size; from += size; to += size; + /* + * After the first iteration, guest virtual address is correctly + * aligned to PAGE_SIZE. + */ + offset = 0; } return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Feb 19 19:55:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Feb 2014 19:55:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGDEa-0000lS-Ez; Wed, 19 Feb 2014 19:55:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGDEZ-0000lE-IT for xen-changelog@lists.xensource.com; Wed, 19 Feb 2014 19:55:07 +0000 Received: from [85.158.137.68:40182] by server-4.bemta-3.messagelabs.com id 69/83-04858-A1C05035; Wed, 19 Feb 2014 19:55:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1392839704!1657407!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23658 invoked from network); 19 Feb 2014 19:55:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Feb 2014 19:55:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGDEV-0000R3-Vu for xen-changelog@lists.xensource.com; Wed, 19 Feb 2014 19:55:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WGDEV-0000I0-ND for xen-changelog@lists.xensource.com; Wed, 19 Feb 2014 19:55:03 +0000 Date: Wed, 19 Feb 2014 19:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Correctly handle non-page aligned pointer in raw_copy_from_guest X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 4959e0eacf56456a4b16d59e98cec58f7c2d66be Author: Julien Grall AuthorDate: Tue Feb 18 16:56:17 2014 +0000 Commit: Ian Campbell CommitDate: Tue Feb 18 17:33:49 2014 +0000 xen/arm: Correctly handle non-page aligned pointer in raw_copy_from_guest The current implementation of raw_copy_guest helper may lead to data corruption and sometimes Xen crash when the guest virtual address is not aligned to PAGE_SIZE. When the total length is higher than a page, the length to read is badly compute with min(len, (unsigned)(PAGE_SIZE - offset)) As the offset is only computed one time per function, if the start address was not aligned to PAGE_SIZE, we can end up in same iteration: - to read accross page boundary => xen crash - read the previous page => data corruption This issue can be resolved by setting offset to 0 at the end of the first iteration. Indeed, after it, the virtual guest address is always aligned to PAGE_SIZE. Signed-off-by: Julien Grall Acked-by: Ian Campbell Cc: George Dunlap [ ijc -- duplicated the comment in the other two functions with this behaviour ] --- xen/arch/arm/guestcopy.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/guestcopy.c b/xen/arch/arm/guestcopy.c index af0af6b..cea5f97 100644 --- a/xen/arch/arm/guestcopy.c +++ b/xen/arch/arm/guestcopy.c @@ -30,6 +30,10 @@ static unsigned long raw_copy_to_guest_helper(void *to, const void *from, len -= size; from += size; to += size; + /* + * After the first iteration, guest virtual address is correctly + * aligned to PAGE_SIZE. + */ offset = 0; } @@ -68,6 +72,10 @@ unsigned long raw_clear_guest(void *to, unsigned len) unmap_domain_page(p - offset); len -= size; to += size; + /* + * After the first iteration, guest virtual address is correctly + * aligned to PAGE_SIZE. + */ offset = 0; } @@ -96,6 +104,11 @@ unsigned long raw_copy_from_guest(void *to, const void __user *from, unsigned le len -= size; from += size; to += size; + /* + * After the first iteration, guest virtual address is correctly + * aligned to PAGE_SIZE. + */ + offset = 0; } return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Feb 19 19:55:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Feb 2014 19:55: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 1WGDEj-0000n0-Hi; Wed, 19 Feb 2014 19:55:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGDEi-0000mq-Tc for xen-changelog@lists.xensource.com; Wed, 19 Feb 2014 19:55:17 +0000 Received: from [85.158.143.35:11966] by server-3.bemta-4.messagelabs.com id 4E/28-11539-42C05035; Wed, 19 Feb 2014 19:55:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1392839714!6918053!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 746 invoked from network); 19 Feb 2014 19:55:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 19 Feb 2014 19:55:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGDEg-0000RD-8v for xen-changelog@lists.xensource.com; Wed, 19 Feb 2014 19:55:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WGDEg-0000J7-3Z for xen-changelog@lists.xensource.com; Wed, 19 Feb 2014 19:55:14 +0000 Date: Wed, 19 Feb 2014 19:55:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Save/restore GICH_VMCR on domain context switch X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 910b590601970440bdb135ed83fe28d8a755173e Author: Julien Grall AuthorDate: Tue Feb 18 13:58:21 2014 +0000 Commit: Ian Campbell CommitDate: Tue Feb 18 17:34:32 2014 +0000 xen/arm: Save/restore GICH_VMCR on domain context switch GICH_VMCR register contains alias to important bits of GICV interface such as: - priority mask of the CPU - EOImode - ... We were safe because Linux guest always use the same value for this bits. When new guests will handle priority or change EOI mode, VCPU interrupt management will be in a wrong state. Signed-off-by: Julien Grall Acked-by: Ian Campbell Cc: George Dunlap --- xen/arch/arm/gic.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 13bbf48..074624e 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -107,6 +107,7 @@ void gic_save_state(struct vcpu *v) v->arch.gic_lr[i] = GICH[GICH_LR + i]; v->arch.lr_mask = this_cpu(lr_mask); v->arch.gic_apr = GICH[GICH_APR]; + v->arch.gic_vmcr = GICH[GICH_VMCR]; /* Disable until next VCPU scheduled */ GICH[GICH_HCR] = 0; isb(); @@ -123,6 +124,7 @@ void gic_restore_state(struct vcpu *v) for ( i=0; iarch.gic_lr[i]; GICH[GICH_APR] = v->arch.gic_apr; + GICH[GICH_VMCR] = v->arch.gic_vmcr; GICH[GICH_HCR] = GICH_HCR_EN; isb(); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Feb 19 19:55:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Feb 2014 19:55: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 1WGDEj-0000n0-Hi; Wed, 19 Feb 2014 19:55:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGDEi-0000mq-Tc for xen-changelog@lists.xensource.com; Wed, 19 Feb 2014 19:55:17 +0000 Received: from [85.158.143.35:11966] by server-3.bemta-4.messagelabs.com id 4E/28-11539-42C05035; Wed, 19 Feb 2014 19:55:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1392839714!6918053!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 746 invoked from network); 19 Feb 2014 19:55:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 19 Feb 2014 19:55:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGDEg-0000RD-8v for xen-changelog@lists.xensource.com; Wed, 19 Feb 2014 19:55:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WGDEg-0000J7-3Z for xen-changelog@lists.xensource.com; Wed, 19 Feb 2014 19:55:14 +0000 Date: Wed, 19 Feb 2014 19:55:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Save/restore GICH_VMCR on domain context switch X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 910b590601970440bdb135ed83fe28d8a755173e Author: Julien Grall AuthorDate: Tue Feb 18 13:58:21 2014 +0000 Commit: Ian Campbell CommitDate: Tue Feb 18 17:34:32 2014 +0000 xen/arm: Save/restore GICH_VMCR on domain context switch GICH_VMCR register contains alias to important bits of GICV interface such as: - priority mask of the CPU - EOImode - ... We were safe because Linux guest always use the same value for this bits. When new guests will handle priority or change EOI mode, VCPU interrupt management will be in a wrong state. Signed-off-by: Julien Grall Acked-by: Ian Campbell Cc: George Dunlap --- xen/arch/arm/gic.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 13bbf48..074624e 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -107,6 +107,7 @@ void gic_save_state(struct vcpu *v) v->arch.gic_lr[i] = GICH[GICH_LR + i]; v->arch.lr_mask = this_cpu(lr_mask); v->arch.gic_apr = GICH[GICH_APR]; + v->arch.gic_vmcr = GICH[GICH_VMCR]; /* Disable until next VCPU scheduled */ GICH[GICH_HCR] = 0; isb(); @@ -123,6 +124,7 @@ void gic_restore_state(struct vcpu *v) for ( i=0; iarch.gic_lr[i]; GICH[GICH_APR] = v->arch.gic_apr; + GICH[GICH_VMCR] = v->arch.gic_vmcr; GICH[GICH_HCR] = GICH_HCR_EN; isb(); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Feb 19 19:55:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Feb 2014 19:55:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGDEu-0000pC-Ku; Wed, 19 Feb 2014 19:55:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGDEt-0000ot-4M for xen-changelog@lists.xensource.com; Wed, 19 Feb 2014 19:55:27 +0000 Received: from [85.158.143.35:2315] by server-2.bemta-4.messagelabs.com id 18/C8-10891-E2C05035; Wed, 19 Feb 2014 19:55:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1392839724!6923371!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11943 invoked from network); 19 Feb 2014 19:55:25 -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; 19 Feb 2014 19:55:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGDEq-0000RJ-K3 for xen-changelog@lists.xensource.com; Wed, 19 Feb 2014 19:55:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WGDEq-0000JV-Dy for xen-changelog@lists.xensource.com; Wed, 19 Feb 2014 19:55:24 +0000 Date: Wed, 19 Feb 2014 19:55:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Properly declare libxlu_disk_l.h in AUTOINCS X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 98b9a9e8d3b12cb3210c8c9edd65019b584704ef Author: Ian Jackson AuthorDate: Tue Feb 18 16:43:42 2014 +0000 Commit: Ian Jackson CommitDate: Tue Feb 18 18:27:30 2014 +0000 libxl: Properly declare libxlu_disk_l.h in AUTOINCS This is necessary so that make doesn't do things which depend on this file until flex has finished producing it. Reported-by: Olaf Hering Signed-off-by: Ian Jackson CC: Ian Campbell CC: Olaf Hering Tested-by: Olaf Hering CC: George Dunlap Acked-by: Ian Campbell --- tools/libxl/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index dab2929..755b666 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -98,7 +98,7 @@ TEST_PROGS += $(foreach t, $(LIBXL_TESTS),test_$t) $(LIBXL_OBJS) $(LIBXL_TEST_OBJS): CFLAGS += $(CFLAGS_LIBXL) -include $(XEN_ROOT)/tools/config.h AUTOINCS= libxlu_cfg_y.h libxlu_cfg_l.h _libxl_list.h _paths.h \ - _libxl_save_msgs_callout.h _libxl_save_msgs_helper.h + libxlu_disk_l.h _libxl_save_msgs_callout.h _libxl_save_msgs_helper.h AUTOSRCS= libxlu_cfg_y.c libxlu_cfg_l.c AUTOSRCS += _libxl_save_msgs_callout.c _libxl_save_msgs_helper.c LIBXLU_OBJS = libxlu_cfg_y.o libxlu_cfg_l.o libxlu_cfg.o \ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Feb 19 19:55:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Feb 2014 19:55:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGDEu-0000pC-Ku; Wed, 19 Feb 2014 19:55:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGDEt-0000ot-4M for xen-changelog@lists.xensource.com; Wed, 19 Feb 2014 19:55:27 +0000 Received: from [85.158.143.35:2315] by server-2.bemta-4.messagelabs.com id 18/C8-10891-E2C05035; Wed, 19 Feb 2014 19:55:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1392839724!6923371!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11943 invoked from network); 19 Feb 2014 19:55:25 -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; 19 Feb 2014 19:55:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGDEq-0000RJ-K3 for xen-changelog@lists.xensource.com; Wed, 19 Feb 2014 19:55:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WGDEq-0000JV-Dy for xen-changelog@lists.xensource.com; Wed, 19 Feb 2014 19:55:24 +0000 Date: Wed, 19 Feb 2014 19:55:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Properly declare libxlu_disk_l.h in AUTOINCS X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 98b9a9e8d3b12cb3210c8c9edd65019b584704ef Author: Ian Jackson AuthorDate: Tue Feb 18 16:43:42 2014 +0000 Commit: Ian Jackson CommitDate: Tue Feb 18 18:27:30 2014 +0000 libxl: Properly declare libxlu_disk_l.h in AUTOINCS This is necessary so that make doesn't do things which depend on this file until flex has finished producing it. Reported-by: Olaf Hering Signed-off-by: Ian Jackson CC: Ian Campbell CC: Olaf Hering Tested-by: Olaf Hering CC: George Dunlap Acked-by: Ian Campbell --- tools/libxl/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index dab2929..755b666 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -98,7 +98,7 @@ TEST_PROGS += $(foreach t, $(LIBXL_TESTS),test_$t) $(LIBXL_OBJS) $(LIBXL_TEST_OBJS): CFLAGS += $(CFLAGS_LIBXL) -include $(XEN_ROOT)/tools/config.h AUTOINCS= libxlu_cfg_y.h libxlu_cfg_l.h _libxl_list.h _paths.h \ - _libxl_save_msgs_callout.h _libxl_save_msgs_helper.h + libxlu_disk_l.h _libxl_save_msgs_callout.h _libxl_save_msgs_helper.h AUTOSRCS= libxlu_cfg_y.c libxlu_cfg_l.c AUTOSRCS += _libxl_save_msgs_callout.c _libxl_save_msgs_helper.c LIBXLU_OBJS = libxlu_cfg_y.o libxlu_cfg_l.o libxlu_cfg.o \ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 20 19:11:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Feb 2014 19:11:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGZ1Z-0003ZA-EY; Thu, 20 Feb 2014 19: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 1WGZ1X-0003Z1-Qo for xen-changelog@lists.xensource.com; Thu, 20 Feb 2014 19:11:08 +0000 Received: from [85.158.139.211:3549] by server-10.bemta-5.messagelabs.com id E6/89-08578-A4356035; Thu, 20 Feb 2014 19:11:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1392923464!1318533!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10493 invoked from network); 20 Feb 2014 19:11:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 20 Feb 2014 19:11:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGZ1T-0004rU-95 for xen-changelog@lists.xensource.com; Thu, 20 Feb 2014 19:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WGZ1T-0000ku-2f for xen-changelog@lists.xensource.com; Thu, 20 Feb 2014 19:11:03 +0000 Date: Thu, 20 Feb 2014 19:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] update Xen version to 4.2.4 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 6d83fd0a975731653efb0c470a4eeed6a44b99cd Author: Jan Beulich AuthorDate: Fri Feb 14 16:24:39 2014 +0100 Commit: Jan Beulich CommitDate: Fri Feb 14 16:24:39 2014 +0100 update Xen version to 4.2.4 --- Config.mk | 4 ++-- xen/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index c7a3de5..9e3e688 100644 --- a/Config.mk +++ b/Config.mk @@ -203,7 +203,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-4.2-testing.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= b0855f925c6e2e0b21fbb03fab4b5fb5b6876871 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.2.4-rc1 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.2.4 SEABIOS_UPSTREAM_TAG ?= rel-1.6.3.2 # Sun Mar 11 09:27:07 2012 -0400 # Update version to 1.6.3.2 @@ -215,7 +215,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.2.4-rc1 +QEMU_TAG ?= xen-4.2.4 # Wed Dec 18 15:25:14 2013 +0000 # qemu-traditional: Fix build warnings on Wheezy diff --git a/xen/Makefile b/xen/Makefile index ce1d0ae..ea19923 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 2 -export XEN_EXTRAVERSION ?= .4-rc1$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .4$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 20 19:11:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Feb 2014 19:11:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGZ1Z-0003ZA-EY; Thu, 20 Feb 2014 19: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 1WGZ1X-0003Z1-Qo for xen-changelog@lists.xensource.com; Thu, 20 Feb 2014 19:11:08 +0000 Received: from [85.158.139.211:3549] by server-10.bemta-5.messagelabs.com id E6/89-08578-A4356035; Thu, 20 Feb 2014 19:11:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1392923464!1318533!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10493 invoked from network); 20 Feb 2014 19:11:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 20 Feb 2014 19:11:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGZ1T-0004rU-95 for xen-changelog@lists.xensource.com; Thu, 20 Feb 2014 19:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WGZ1T-0000ku-2f for xen-changelog@lists.xensource.com; Thu, 20 Feb 2014 19:11:03 +0000 Date: Thu, 20 Feb 2014 19:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] update Xen version to 4.2.4 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 6d83fd0a975731653efb0c470a4eeed6a44b99cd Author: Jan Beulich AuthorDate: Fri Feb 14 16:24:39 2014 +0100 Commit: Jan Beulich CommitDate: Fri Feb 14 16:24:39 2014 +0100 update Xen version to 4.2.4 --- Config.mk | 4 ++-- xen/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index c7a3de5..9e3e688 100644 --- a/Config.mk +++ b/Config.mk @@ -203,7 +203,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-4.2-testing.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= b0855f925c6e2e0b21fbb03fab4b5fb5b6876871 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.2.4-rc1 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.2.4 SEABIOS_UPSTREAM_TAG ?= rel-1.6.3.2 # Sun Mar 11 09:27:07 2012 -0400 # Update version to 1.6.3.2 @@ -215,7 +215,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.2.4-rc1 +QEMU_TAG ?= xen-4.2.4 # Wed Dec 18 15:25:14 2013 +0000 # qemu-traditional: Fix build warnings on Wheezy diff --git a/xen/Makefile b/xen/Makefile index ce1d0ae..ea19923 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 2 -export XEN_EXTRAVERSION ?= .4-rc1$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .4$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 20 19:11:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Feb 2014 19:11:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGZ1h-0003aH-HG; Thu, 20 Feb 2014 19: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 1WGZ1g-0003Zx-An for xen-changelog@lists.xensource.com; Thu, 20 Feb 2014 19:11:16 +0000 Received: from [85.158.143.35:7075] by server-2.bemta-4.messagelabs.com id 72/17-10891-35356035; Thu, 20 Feb 2014 19:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1392923473!7175415!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20961 invoked from network); 20 Feb 2014 19:11:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 20 Feb 2014 19:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGZ1d-0004rb-El for xen-changelog@lists.xensource.com; Thu, 20 Feb 2014 19:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WGZ1d-0000lI-D6 for xen-changelog@lists.xensource.com; Thu, 20 Feb 2014 19:11:13 +0000 Date: Thu, 20 Feb 2014 19:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] update Xen version to 4.2.5-pre X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 062f7b9a9cd8c83023c4be27287cf85c0555e2b7 Author: Jan Beulich AuthorDate: Thu Feb 20 08:37:47 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 20 08:37:47 2014 +0100 update Xen version to 4.2.5-pre --- xen/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index ea19923..f29dec6 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 2 -export XEN_EXTRAVERSION ?= .4$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .5-pre$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 20 19:11:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Feb 2014 19:11:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGZ1h-0003aH-HG; Thu, 20 Feb 2014 19: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 1WGZ1g-0003Zx-An for xen-changelog@lists.xensource.com; Thu, 20 Feb 2014 19:11:16 +0000 Received: from [85.158.143.35:7075] by server-2.bemta-4.messagelabs.com id 72/17-10891-35356035; Thu, 20 Feb 2014 19:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1392923473!7175415!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20961 invoked from network); 20 Feb 2014 19:11:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 20 Feb 2014 19:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGZ1d-0004rb-El for xen-changelog@lists.xensource.com; Thu, 20 Feb 2014 19:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WGZ1d-0000lI-D6 for xen-changelog@lists.xensource.com; Thu, 20 Feb 2014 19:11:13 +0000 Date: Thu, 20 Feb 2014 19:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] update Xen version to 4.2.5-pre X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 062f7b9a9cd8c83023c4be27287cf85c0555e2b7 Author: Jan Beulich AuthorDate: Thu Feb 20 08:37:47 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 20 08:37:47 2014 +0100 update Xen version to 4.2.5-pre --- xen/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index ea19923..f29dec6 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 2 -export XEN_EXTRAVERSION ?= .4$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .5-pre$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 20 19:11:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Feb 2014 19:11:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGZ1r-0003bc-K0; Thu, 20 Feb 2014 19: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 1WGZ1q-0003bR-5f for xen-changelog@lists.xensource.com; Thu, 20 Feb 2014 19:11:26 +0000 Received: from [85.158.143.35:7652] by server-2.bemta-4.messagelabs.com id F1/37-10891-D5356035; Thu, 20 Feb 2014 19:11:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1392923483!7150235!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10945 invoked from network); 20 Feb 2014 19:11:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 20 Feb 2014 19:11:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGZ1n-0004rj-PK for xen-changelog@lists.xensource.com; Thu, 20 Feb 2014 19:11:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WGZ1n-0000lf-JG for xen-changelog@lists.xensource.com; Thu, 20 Feb 2014 19:11:23 +0000 Date: Thu, 20 Feb 2014 19:11:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/AMD: work around erratum 793 for 32-bit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 a8e4004c5a164914bdf36f7ef3efa088846bf2b5 Author: Jan Beulich AuthorDate: Thu Feb 20 08:38:43 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 20 08:38:43 2014 +0100 x86/AMD: work around erratum 793 for 32-bit The original change went into a 64-bit only code section, thus leaving the issue unfixed on 32-bit. Re-order code to address this. This is part of CVE-2013-6885 / XSA-82. Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/arch/x86/cpu/amd.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 3bb2dbd..0e2822f 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -522,6 +522,18 @@ static void __devinit init_amd(struct cpuinfo_x86 *c) "*** Pass \"allow_unsafe\" if you're trusting" " all your (PV) guest kernels. ***\n"); + /* AMD CPUs do not support SYSENTER outside of legacy mode. */ + clear_bit(X86_FEATURE_SEP, c->x86_capability); + + if (c->x86 == 0x10) { + /* do this for boot cpu */ + if (c == &boot_cpu_data) + check_enable_amd_mmconf_dmi(); + + fam10h_check_enable_mmcfg(); + } +#endif + if (c->x86 == 0x16 && c->x86_model <= 0xf) { if (c == &boot_cpu_data) { l = pci_conf_read32(0, 0, 0x18, 0x3, 0x58); @@ -555,18 +567,6 @@ static void __devinit init_amd(struct cpuinfo_x86 *c) } } - /* AMD CPUs do not support SYSENTER outside of legacy mode. */ - clear_bit(X86_FEATURE_SEP, c->x86_capability); - - if (c->x86 == 0x10) { - /* do this for boot cpu */ - if (c == &boot_cpu_data) - check_enable_amd_mmconf_dmi(); - - fam10h_check_enable_mmcfg(); - } -#endif - if (c->x86 == 0x10) { /* * On family 10h BIOS may not have properly enabled WC+ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 20 19:11:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Feb 2014 19:11:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGZ1r-0003bc-K0; Thu, 20 Feb 2014 19: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 1WGZ1q-0003bR-5f for xen-changelog@lists.xensource.com; Thu, 20 Feb 2014 19:11:26 +0000 Received: from [85.158.143.35:7652] by server-2.bemta-4.messagelabs.com id F1/37-10891-D5356035; Thu, 20 Feb 2014 19:11:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1392923483!7150235!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10945 invoked from network); 20 Feb 2014 19:11:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 20 Feb 2014 19:11:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGZ1n-0004rj-PK for xen-changelog@lists.xensource.com; Thu, 20 Feb 2014 19:11:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WGZ1n-0000lf-JG for xen-changelog@lists.xensource.com; Thu, 20 Feb 2014 19:11:23 +0000 Date: Thu, 20 Feb 2014 19:11:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/AMD: work around erratum 793 for 32-bit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 a8e4004c5a164914bdf36f7ef3efa088846bf2b5 Author: Jan Beulich AuthorDate: Thu Feb 20 08:38:43 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 20 08:38:43 2014 +0100 x86/AMD: work around erratum 793 for 32-bit The original change went into a 64-bit only code section, thus leaving the issue unfixed on 32-bit. Re-order code to address this. This is part of CVE-2013-6885 / XSA-82. Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/arch/x86/cpu/amd.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 3bb2dbd..0e2822f 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -522,6 +522,18 @@ static void __devinit init_amd(struct cpuinfo_x86 *c) "*** Pass \"allow_unsafe\" if you're trusting" " all your (PV) guest kernels. ***\n"); + /* AMD CPUs do not support SYSENTER outside of legacy mode. */ + clear_bit(X86_FEATURE_SEP, c->x86_capability); + + if (c->x86 == 0x10) { + /* do this for boot cpu */ + if (c == &boot_cpu_data) + check_enable_amd_mmconf_dmi(); + + fam10h_check_enable_mmcfg(); + } +#endif + if (c->x86 == 0x16 && c->x86_model <= 0xf) { if (c == &boot_cpu_data) { l = pci_conf_read32(0, 0, 0x18, 0x3, 0x58); @@ -555,18 +567,6 @@ static void __devinit init_amd(struct cpuinfo_x86 *c) } } - /* AMD CPUs do not support SYSENTER outside of legacy mode. */ - clear_bit(X86_FEATURE_SEP, c->x86_capability); - - if (c->x86 == 0x10) { - /* do this for boot cpu */ - if (c == &boot_cpu_data) - check_enable_amd_mmconf_dmi(); - - fam10h_check_enable_mmcfg(); - } -#endif - if (c->x86 == 0x10) { /* * On family 10h BIOS may not have properly enabled WC+ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 20 19:11:37 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Feb 2014 19:11:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGZ21-0003dD-Mt; Thu, 20 Feb 2014 19:11:37 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGZ20-0003d0-Rv for xen-changelog@lists.xensource.com; Thu, 20 Feb 2014 19:11:37 +0000 Received: from [85.158.137.68:10165] by server-4.bemta-3.messagelabs.com id 2D/EE-04858-86356035; Thu, 20 Feb 2014 19:11:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1392923494!1974224!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20634 invoked from network); 20 Feb 2014 19:11:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 20 Feb 2014 19:11:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGZ1x-0004rp-W3 for xen-changelog@lists.xensource.com; Thu, 20 Feb 2014 19:11:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WGZ1x-0000m5-Tr for xen-changelog@lists.xensource.com; Thu, 20 Feb 2014 19:11:33 +0000 Date: Thu, 20 Feb 2014 19:11:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86-64/percpu: Force INVALID_PERCPU_AREA into the non-canonical address region X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 1985d0a0723ba39b22fc5114d69ed510831b13ac Author: Andrew Cooper AuthorDate: Thu Feb 20 08:40:24 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 20 08:40:24 2014 +0100 x86-64/percpu: Force INVALID_PERCPU_AREA into the non-canonical address region This causes accidental uses of per_cpu() on a pcpu with an INVALID_PERCPU_AREA to result in a #GF for attempting to access the middle of the non-canonical virtual address region. This is preferable to the current behaviour, where incorrect use of per_cpu() will result in an effective NULL structure dereference which has security implication in the context of PV guests. Signed-off-by: Andrew Cooper Acked-by: Keir Fraser master commit: 7cfb0053629c4dd1a6f01dc43cca7c0c25b8b7bf master date: 2013-10-04 12:24:34 +0200 --- xen/arch/x86/percpu.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/percpu.c b/xen/arch/x86/percpu.c index e545024..441e350 100644 --- a/xen/arch/x86/percpu.c +++ b/xen/arch/x86/percpu.c @@ -6,7 +6,17 @@ #include unsigned long __per_cpu_offset[NR_CPUS]; +#ifdef __i386__ #define INVALID_PERCPU_AREA (-(long)__per_cpu_start) +#else +/* + * Force uses of per_cpu() with an invalid area to attempt to access the + * middle of the non-canonical address space resulting in a #GP, rather than a + * possible #PF at (NULL + a little) which has security implications in the + * context of PV guests. + */ +#define INVALID_PERCPU_AREA (0x8000000000000000L - (long)__per_cpu_start) +#endif #define PERCPU_ORDER (get_order_from_bytes(__per_cpu_data_end-__per_cpu_start)) void __init percpu_init_areas(void) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 20 19:11:37 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Feb 2014 19:11:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGZ21-0003dD-Mt; Thu, 20 Feb 2014 19:11:37 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGZ20-0003d0-Rv for xen-changelog@lists.xensource.com; Thu, 20 Feb 2014 19:11:37 +0000 Received: from [85.158.137.68:10165] by server-4.bemta-3.messagelabs.com id 2D/EE-04858-86356035; Thu, 20 Feb 2014 19:11:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1392923494!1974224!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20634 invoked from network); 20 Feb 2014 19:11:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 20 Feb 2014 19:11:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGZ1x-0004rp-W3 for xen-changelog@lists.xensource.com; Thu, 20 Feb 2014 19:11:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WGZ1x-0000m5-Tr for xen-changelog@lists.xensource.com; Thu, 20 Feb 2014 19:11:33 +0000 Date: Thu, 20 Feb 2014 19:11:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86-64/percpu: Force INVALID_PERCPU_AREA into the non-canonical address region X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 1985d0a0723ba39b22fc5114d69ed510831b13ac Author: Andrew Cooper AuthorDate: Thu Feb 20 08:40:24 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 20 08:40:24 2014 +0100 x86-64/percpu: Force INVALID_PERCPU_AREA into the non-canonical address region This causes accidental uses of per_cpu() on a pcpu with an INVALID_PERCPU_AREA to result in a #GF for attempting to access the middle of the non-canonical virtual address region. This is preferable to the current behaviour, where incorrect use of per_cpu() will result in an effective NULL structure dereference which has security implication in the context of PV guests. Signed-off-by: Andrew Cooper Acked-by: Keir Fraser master commit: 7cfb0053629c4dd1a6f01dc43cca7c0c25b8b7bf master date: 2013-10-04 12:24:34 +0200 --- xen/arch/x86/percpu.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/percpu.c b/xen/arch/x86/percpu.c index e545024..441e350 100644 --- a/xen/arch/x86/percpu.c +++ b/xen/arch/x86/percpu.c @@ -6,7 +6,17 @@ #include unsigned long __per_cpu_offset[NR_CPUS]; +#ifdef __i386__ #define INVALID_PERCPU_AREA (-(long)__per_cpu_start) +#else +/* + * Force uses of per_cpu() with an invalid area to attempt to access the + * middle of the non-canonical address space resulting in a #GP, rather than a + * possible #PF at (NULL + a little) which has security implications in the + * context of PV guests. + */ +#define INVALID_PERCPU_AREA (0x8000000000000000L - (long)__per_cpu_start) +#endif #define PERCPU_ORDER (get_order_from_bytes(__per_cpu_data_end-__per_cpu_start)) void __init percpu_init_areas(void) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 20 19:11:47 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Feb 2014 19:11:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGZ2B-0003f6-Pa; Thu, 20 Feb 2014 19:11:47 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGZ2A-0003ep-TQ for xen-changelog@lists.xensource.com; Thu, 20 Feb 2014 19:11:47 +0000 Received: from [85.158.137.68:37083] by server-9.bemta-3.messagelabs.com id 1C/37-10184-27356035; Thu, 20 Feb 2014 19:11:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1392923504!3242432!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15042 invoked from network); 20 Feb 2014 19:11:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 20 Feb 2014 19:11:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGZ28-0004rv-6W for xen-changelog@lists.xensource.com; Thu, 20 Feb 2014 19:11:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WGZ28-0000mR-4z for xen-changelog@lists.xensource.com; Thu, 20 Feb 2014 19:11:44 +0000 Date: Thu, 20 Feb 2014 19:11:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86: don't drop guest visible state updates when 64-bit PV guest is in user mode X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0620cc886eef9018d2b2a5fcdc641be70b5ac54b Author: Jan Beulich AuthorDate: Thu Feb 20 08:41:22 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 20 08:41:22 2014 +0100 x86: don't drop guest visible state updates when 64-bit PV guest is in user mode Since 64-bit PV uses separate kernel and user mode page tables, kernel addresses (as usually provided via VCPUOP_register_runstate_memory_area) aren't necessarily accessible when the respective updating occurs. Add logic for toggle_guest_mode() to take care of this (if necessary) the next time the vCPU switches to kernel mode. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 231d7f4098c8ac9cdb78f18fcb820d8618c8b0c2 master date: 2014-01-23 10:30:08 +0100 --- xen/arch/x86/domain.c | 24 ++++++++++++++++-------- xen/arch/x86/x86_64/traps.c | 7 +++++++ xen/include/asm-x86/domain.h | 5 +++++ 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index ecba304..2dfea87 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1563,10 +1563,10 @@ static void paravirt_ctxt_switch_to(struct vcpu *v) } /* Update per-VCPU guest runstate shared memory area (if registered). */ -static void update_runstate_area(struct vcpu *v) +bool_t update_runstate_area(const struct vcpu *v) { if ( guest_handle_is_null(runstate_guest(v)) ) - return; + return 1; #ifdef CONFIG_COMPAT if ( has_32bit_shinfo(v->domain) ) @@ -1575,11 +1575,19 @@ static void update_runstate_area(struct vcpu *v) XLAT_vcpu_runstate_info(&info, &v->runstate); __copy_to_guest(v->runstate_guest.compat, &info, 1); - return; + return 1; } #endif - __copy_to_guest(runstate_guest(v), &v->runstate, 1); + return __copy_to_guest(runstate_guest(v), &v->runstate, 1) != + sizeof(v->runstate); +} + +static void _update_runstate_area(struct vcpu *v) +{ + if ( !update_runstate_area(v) && !is_hvm_vcpu(v) && + !(v->arch.flags & TF_kernel_mode) ) + v->arch.pv_vcpu.need_update_runstate_area = 1; } static inline int need_full_gdt(struct vcpu *v) @@ -1684,8 +1692,8 @@ void context_switch(struct vcpu *prev, struct vcpu *next) flush_tlb_mask(&dirty_mask); } - if (prev != next) - update_runstate_area(prev); + if ( prev != next ) + _update_runstate_area(prev); if ( is_hvm_vcpu(prev) && !list_empty(&prev->arch.hvm_vcpu.tm_list) ) pt_save_timer(prev); @@ -1730,8 +1738,8 @@ void context_switch(struct vcpu *prev, struct vcpu *next) context_saved(prev); - if (prev != next) - update_runstate_area(next); + if ( prev != next ) + _update_runstate_area(next); schedule_tail(next); BUG(); diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index d20e528..ba1c408 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -266,6 +266,13 @@ void toggle_guest_mode(struct vcpu *v) #else write_ptbase(v); #endif + + if ( !(v->arch.flags & TF_kernel_mode) ) + return; + + if ( v->arch.pv_vcpu.need_update_runstate_area && + update_runstate_area(v) ) + v->arch.pv_vcpu.need_update_runstate_area = 0; } unsigned long do_iret(void) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 9be5239..6c62c25 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -419,6 +419,9 @@ struct pv_vcpu /* Current LDT details. */ unsigned long shadow_ldt_mapcnt; spinlock_t shadow_ldt_lock; + + /* Deferred VA-based update state. */ + bool_t need_update_runstate_area; }; struct arch_vcpu @@ -514,6 +517,8 @@ struct arch_vcpu #define hvm_vmx hvm_vcpu.u.vmx #define hvm_svm hvm_vcpu.u.svm +bool_t update_runstate_area(const struct vcpu *); + void vcpu_show_execution_state(struct vcpu *); void vcpu_show_registers(const struct vcpu *); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Feb 20 19:11:47 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 20 Feb 2014 19:11:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGZ2B-0003f6-Pa; Thu, 20 Feb 2014 19:11:47 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGZ2A-0003ep-TQ for xen-changelog@lists.xensource.com; Thu, 20 Feb 2014 19:11:47 +0000 Received: from [85.158.137.68:37083] by server-9.bemta-3.messagelabs.com id 1C/37-10184-27356035; Thu, 20 Feb 2014 19:11:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1392923504!3242432!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15042 invoked from network); 20 Feb 2014 19:11:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 20 Feb 2014 19:11:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGZ28-0004rv-6W for xen-changelog@lists.xensource.com; Thu, 20 Feb 2014 19:11:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WGZ28-0000mR-4z for xen-changelog@lists.xensource.com; Thu, 20 Feb 2014 19:11:44 +0000 Date: Thu, 20 Feb 2014 19:11:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86: don't drop guest visible state updates when 64-bit PV guest is in user mode X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0620cc886eef9018d2b2a5fcdc641be70b5ac54b Author: Jan Beulich AuthorDate: Thu Feb 20 08:41:22 2014 +0100 Commit: Jan Beulich CommitDate: Thu Feb 20 08:41:22 2014 +0100 x86: don't drop guest visible state updates when 64-bit PV guest is in user mode Since 64-bit PV uses separate kernel and user mode page tables, kernel addresses (as usually provided via VCPUOP_register_runstate_memory_area) aren't necessarily accessible when the respective updating occurs. Add logic for toggle_guest_mode() to take care of this (if necessary) the next time the vCPU switches to kernel mode. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 231d7f4098c8ac9cdb78f18fcb820d8618c8b0c2 master date: 2014-01-23 10:30:08 +0100 --- xen/arch/x86/domain.c | 24 ++++++++++++++++-------- xen/arch/x86/x86_64/traps.c | 7 +++++++ xen/include/asm-x86/domain.h | 5 +++++ 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index ecba304..2dfea87 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1563,10 +1563,10 @@ static void paravirt_ctxt_switch_to(struct vcpu *v) } /* Update per-VCPU guest runstate shared memory area (if registered). */ -static void update_runstate_area(struct vcpu *v) +bool_t update_runstate_area(const struct vcpu *v) { if ( guest_handle_is_null(runstate_guest(v)) ) - return; + return 1; #ifdef CONFIG_COMPAT if ( has_32bit_shinfo(v->domain) ) @@ -1575,11 +1575,19 @@ static void update_runstate_area(struct vcpu *v) XLAT_vcpu_runstate_info(&info, &v->runstate); __copy_to_guest(v->runstate_guest.compat, &info, 1); - return; + return 1; } #endif - __copy_to_guest(runstate_guest(v), &v->runstate, 1); + return __copy_to_guest(runstate_guest(v), &v->runstate, 1) != + sizeof(v->runstate); +} + +static void _update_runstate_area(struct vcpu *v) +{ + if ( !update_runstate_area(v) && !is_hvm_vcpu(v) && + !(v->arch.flags & TF_kernel_mode) ) + v->arch.pv_vcpu.need_update_runstate_area = 1; } static inline int need_full_gdt(struct vcpu *v) @@ -1684,8 +1692,8 @@ void context_switch(struct vcpu *prev, struct vcpu *next) flush_tlb_mask(&dirty_mask); } - if (prev != next) - update_runstate_area(prev); + if ( prev != next ) + _update_runstate_area(prev); if ( is_hvm_vcpu(prev) && !list_empty(&prev->arch.hvm_vcpu.tm_list) ) pt_save_timer(prev); @@ -1730,8 +1738,8 @@ void context_switch(struct vcpu *prev, struct vcpu *next) context_saved(prev); - if (prev != next) - update_runstate_area(next); + if ( prev != next ) + _update_runstate_area(next); schedule_tail(next); BUG(); diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index d20e528..ba1c408 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -266,6 +266,13 @@ void toggle_guest_mode(struct vcpu *v) #else write_ptbase(v); #endif + + if ( !(v->arch.flags & TF_kernel_mode) ) + return; + + if ( v->arch.pv_vcpu.need_update_runstate_area && + update_runstate_area(v) ) + v->arch.pv_vcpu.need_update_runstate_area = 0; } unsigned long do_iret(void) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 9be5239..6c62c25 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -419,6 +419,9 @@ struct pv_vcpu /* Current LDT details. */ unsigned long shadow_ldt_mapcnt; spinlock_t shadow_ldt_lock; + + /* Deferred VA-based update state. */ + bool_t need_update_runstate_area; }; struct arch_vcpu @@ -514,6 +517,8 @@ struct arch_vcpu #define hvm_vmx hvm_vcpu.u.vmx #define hvm_svm hvm_vcpu.u.svm +bool_t update_runstate_area(const struct vcpu *); + void vcpu_show_execution_state(struct vcpu *); void vcpu_show_registers(const struct vcpu *); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Feb 21 00:22:25 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 21 Feb 2014 00:22:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGdsg-0003hY-Pb; Fri, 21 Feb 2014 00:22:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGdsV-0003hQ-8c for xen-changelog@lists.xensource.com; Fri, 21 Feb 2014 00:22:16 +0000 Received: from [85.158.139.211:41210] by server-11.bemta-5.messagelabs.com id 0E/32-23886-E2C96035; Fri, 21 Feb 2014 00:22:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1392942124!5284647!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29596 invoked from network); 21 Feb 2014 00:22:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 21 Feb 2014 00:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGdsR-0008IN-Vo for xen-changelog@lists.xensource.com; Fri, 21 Feb 2014 00:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WGdsR-0001gk-Jp for xen-changelog@lists.xensource.com; Fri, 21 Feb 2014 00:22:03 +0000 Date: Fri, 21 Feb 2014 00:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen: Fix vcpu initialization. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 29a757f0fce7bfdf965d9e8ea48e8e34f997a32c Author: Anthony PERARD AuthorDate: Wed Sep 25 16:41:48 2013 +0000 Commit: Stefano Stabellini CommitDate: Mon Feb 17 15:44:43 2014 +0000 xen: Fix vcpu initialization. Each vcpu need a evtchn binded in qemu, even those that are offline at QEMU initialisation. Signed-off-by: Anthony PERARD Signed-off-by: Stefano Stabellini --- xen-all.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen-all.c b/xen-all.c index 7894ac6..0b4d934 100644 --- a/xen-all.c +++ b/xen-all.c @@ -614,13 +614,13 @@ static ioreq_t *cpu_get_ioreq(XenIOState *state) } if (port != -1) { - for (i = 0; i < smp_cpus; i++) { + for (i = 0; i < max_cpus; i++) { if (state->ioreq_local_port[i] == port) { break; } } - if (i == smp_cpus) { + if (i == max_cpus) { hw_error("Fatal error while trying to get io event!\n"); } @@ -1115,10 +1115,10 @@ int xen_hvm_init(MemoryRegion **ram_memory) hw_error("map buffered IO page returned error %d", errno); } - state->ioreq_local_port = g_malloc0(smp_cpus * sizeof (evtchn_port_t)); + state->ioreq_local_port = g_malloc0(max_cpus * sizeof (evtchn_port_t)); /* FIXME: how about if we overflow the page here? */ - for (i = 0; i < smp_cpus; i++) { + for (i = 0; i < max_cpus; i++) { rc = xc_evtchn_bind_interdomain(state->xce_handle, xen_domid, xen_vcpu_eport(state->shared_page, i)); if (rc == -1) { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Feb 21 00:22:25 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 21 Feb 2014 00:22:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGdsg-0003hY-Pb; Fri, 21 Feb 2014 00:22:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGdsV-0003hQ-8c for xen-changelog@lists.xensource.com; Fri, 21 Feb 2014 00:22:16 +0000 Received: from [85.158.139.211:41210] by server-11.bemta-5.messagelabs.com id 0E/32-23886-E2C96035; Fri, 21 Feb 2014 00:22:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1392942124!5284647!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29596 invoked from network); 21 Feb 2014 00:22:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 21 Feb 2014 00:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGdsR-0008IN-Vo for xen-changelog@lists.xensource.com; Fri, 21 Feb 2014 00:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WGdsR-0001gk-Jp for xen-changelog@lists.xensource.com; Fri, 21 Feb 2014 00:22:03 +0000 Date: Fri, 21 Feb 2014 00:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen: Fix vcpu initialization. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 29a757f0fce7bfdf965d9e8ea48e8e34f997a32c Author: Anthony PERARD AuthorDate: Wed Sep 25 16:41:48 2013 +0000 Commit: Stefano Stabellini CommitDate: Mon Feb 17 15:44:43 2014 +0000 xen: Fix vcpu initialization. Each vcpu need a evtchn binded in qemu, even those that are offline at QEMU initialisation. Signed-off-by: Anthony PERARD Signed-off-by: Stefano Stabellini --- xen-all.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen-all.c b/xen-all.c index 7894ac6..0b4d934 100644 --- a/xen-all.c +++ b/xen-all.c @@ -614,13 +614,13 @@ static ioreq_t *cpu_get_ioreq(XenIOState *state) } if (port != -1) { - for (i = 0; i < smp_cpus; i++) { + for (i = 0; i < max_cpus; i++) { if (state->ioreq_local_port[i] == port) { break; } } - if (i == smp_cpus) { + if (i == max_cpus) { hw_error("Fatal error while trying to get io event!\n"); } @@ -1115,10 +1115,10 @@ int xen_hvm_init(MemoryRegion **ram_memory) hw_error("map buffered IO page returned error %d", errno); } - state->ioreq_local_port = g_malloc0(smp_cpus * sizeof (evtchn_port_t)); + state->ioreq_local_port = g_malloc0(max_cpus * sizeof (evtchn_port_t)); /* FIXME: how about if we overflow the page here? */ - for (i = 0; i < smp_cpus; i++) { + for (i = 0; i < max_cpus; i++) { rc = xc_evtchn_bind_interdomain(state->xce_handle, xen_domid, xen_vcpu_eport(state->shared_page, i)); if (rc == -1) { -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Feb 21 00:22:25 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 21 Feb 2014 00:22:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGdsj-0003hm-V9; Fri, 21 Feb 2014 00:22:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGdsh-0003he-TB for xen-changelog@lists.xensource.com; Fri, 21 Feb 2014 00:22:20 +0000 Received: from [85.158.139.211:35329] by server-2.bemta-5.messagelabs.com id EE/96-23037-B3C96035; Fri, 21 Feb 2014 00:22:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1392942134!5302662!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26192 invoked from network); 21 Feb 2014 00:22:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 21 Feb 2014 00:22:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGdsc-0008IQ-Ll for xen-changelog@lists.xensource.com; Fri, 21 Feb 2014 00:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WGdsc-0001h8-3O for xen-changelog@lists.xensource.com; Fri, 21 Feb 2014 00:22:14 +0000 Date: Fri, 21 Feb 2014 00:22:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen: Enable cpu-hotplug on xenfv machine. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 65fc9b78ba3d868a26952db0d8e51cecf01d47b4 Author: Anthony PERARD AuthorDate: Wed Sep 25 16:43:12 2013 +0000 Commit: Stefano Stabellini CommitDate: Mon Feb 17 15:47:23 2014 +0000 xen: Enable cpu-hotplug on xenfv machine. Signed-off-by: Anthony PERARD Signed-off-by: Stefano Stabellini Conflicts: hw/i386/pc_piix.c --- hw/i386/pc_piix.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 3df2ff9..5a26135 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -754,6 +754,7 @@ static QEMUMachine xenfv_machine = { .init = pc_xen_hvm_init, .max_cpus = HVM_MAX_VCPUS, .default_machine_opts = "accel=xen", + .hot_add_cpu = pc_hot_add_cpu, DEFAULT_MACHINE_OPTIONS, }; #endif -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Feb 21 00:22:25 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 21 Feb 2014 00:22:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGdsj-0003hm-V9; Fri, 21 Feb 2014 00:22:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGdsh-0003he-TB for xen-changelog@lists.xensource.com; Fri, 21 Feb 2014 00:22:20 +0000 Received: from [85.158.139.211:35329] by server-2.bemta-5.messagelabs.com id EE/96-23037-B3C96035; Fri, 21 Feb 2014 00:22:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1392942134!5302662!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26192 invoked from network); 21 Feb 2014 00:22:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 21 Feb 2014 00:22:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WGdsc-0008IQ-Ll for xen-changelog@lists.xensource.com; Fri, 21 Feb 2014 00:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WGdsc-0001h8-3O for xen-changelog@lists.xensource.com; Fri, 21 Feb 2014 00:22:14 +0000 Date: Fri, 21 Feb 2014 00:22:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen: Enable cpu-hotplug on xenfv machine. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 65fc9b78ba3d868a26952db0d8e51cecf01d47b4 Author: Anthony PERARD AuthorDate: Wed Sep 25 16:43:12 2013 +0000 Commit: Stefano Stabellini CommitDate: Mon Feb 17 15:47:23 2014 +0000 xen: Enable cpu-hotplug on xenfv machine. Signed-off-by: Anthony PERARD Signed-off-by: Stefano Stabellini Conflicts: hw/i386/pc_piix.c --- hw/i386/pc_piix.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 3df2ff9..5a26135 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -754,6 +754,7 @@ static QEMUMachine xenfv_machine = { .init = pc_xen_hvm_init, .max_cpus = HVM_MAX_VCPUS, .default_machine_opts = "accel=xen", + .hot_add_cpu = pc_hot_add_cpu, DEFAULT_MACHINE_OPTIONS, }; #endif -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Feb 22 04:33:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Feb 2014 04:33:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WH4H8-00077Q-6T; Sat, 22 Feb 2014 04:33:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WH4H6-00077I-QX for xen-changelog@lists.xensource.com; Sat, 22 Feb 2014 04:33:17 +0000 Received: from [193.109.254.147:54658] by server-3.bemta-14.messagelabs.com id 4A/02-00432-C8828035; Sat, 22 Feb 2014 04:33:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1393043594!778267!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23081 invoked from network); 22 Feb 2014 04:33:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Feb 2014 04:33:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WH4H3-0005O1-TP for xen-changelog@lists.xensource.com; Sat, 22 Feb 2014 04:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WH4H3-0001PV-J0 for xen-changelog@lists.xensource.com; Sat, 22 Feb 2014 04:33:13 +0000 Date: Sat, 22 Feb 2014 04:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] QEMU_TAG, QEMU_UPSTREAM_REVISION: Branching X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 869f5b6deab53bc924798df4dacfae92ee198cb4 Author: Ian Jackson AuthorDate: Fri Feb 21 16:59:45 2014 +0000 Commit: Ian Jackson CommitDate: Fri Feb 21 16:59:45 2014 +0000 QEMU_TAG, QEMU_UPSTREAM_REVISION: Branching QEMU_UPSTREAM_REVISION set back to master, to track the tip. QEMU_TAG set to the specific changeset as is customary. Signed-off-by: Ian Jackson --- Config.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.mk b/Config.mk index a6cd2e3..84c558b 100644 --- a/Config.mk +++ b/Config.mk @@ -234,7 +234,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.4.0-rc4 +QEMU_UPSTREAM_REVISION ?= master SEABIOS_UPSTREAM_TAG ?= rel-1.7.3.1 # Fri Aug 2 14:12:09 2013 -0400 # Fix bug in CBFS file walking with compressed files. @@ -246,7 +246,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.4.0-rc3 +QEMU_TAG ?= 7f5b3c338e0f8938ba575dec18255dcbee0c2ee2 # Wed Dec 18 15:25:14 2013 +0000 # qemu-traditional: Fix build warnings on Wheezy -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Feb 22 04:33:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Feb 2014 04:33:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WH4H8-00077Q-6T; Sat, 22 Feb 2014 04:33:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WH4H6-00077I-QX for xen-changelog@lists.xensource.com; Sat, 22 Feb 2014 04:33:17 +0000 Received: from [193.109.254.147:54658] by server-3.bemta-14.messagelabs.com id 4A/02-00432-C8828035; Sat, 22 Feb 2014 04:33:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1393043594!778267!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23081 invoked from network); 22 Feb 2014 04:33:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Feb 2014 04:33:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WH4H3-0005O1-TP for xen-changelog@lists.xensource.com; Sat, 22 Feb 2014 04:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WH4H3-0001PV-J0 for xen-changelog@lists.xensource.com; Sat, 22 Feb 2014 04:33:13 +0000 Date: Sat, 22 Feb 2014 04:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] QEMU_TAG, QEMU_UPSTREAM_REVISION: Branching X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 869f5b6deab53bc924798df4dacfae92ee198cb4 Author: Ian Jackson AuthorDate: Fri Feb 21 16:59:45 2014 +0000 Commit: Ian Jackson CommitDate: Fri Feb 21 16:59:45 2014 +0000 QEMU_TAG, QEMU_UPSTREAM_REVISION: Branching QEMU_UPSTREAM_REVISION set back to master, to track the tip. QEMU_TAG set to the specific changeset as is customary. Signed-off-by: Ian Jackson --- Config.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.mk b/Config.mk index a6cd2e3..84c558b 100644 --- a/Config.mk +++ b/Config.mk @@ -234,7 +234,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.4.0-rc4 +QEMU_UPSTREAM_REVISION ?= master SEABIOS_UPSTREAM_TAG ?= rel-1.7.3.1 # Fri Aug 2 14:12:09 2013 -0400 # Fix bug in CBFS file walking with compressed files. @@ -246,7 +246,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.4.0-rc3 +QEMU_TAG ?= 7f5b3c338e0f8938ba575dec18255dcbee0c2ee2 # Wed Dec 18 15:25:14 2013 +0000 # qemu-traditional: Fix build warnings on Wheezy -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Feb 22 04:50:08 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Feb 2014 04:50:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WH4XO-0007NX-3a; Sat, 22 Feb 2014 04:50:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WH4XM-0007NS-2H for xen-changelog@lists.xensource.com; Sat, 22 Feb 2014 04:50:04 +0000 Received: from [85.158.143.35:41642] by server-3.bemta-4.messagelabs.com id 76/37-11539-B7C28035; Sat, 22 Feb 2014 04:50:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1393043583!7485550!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30996 invoked from network); 22 Feb 2014 04:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 22 Feb 2014 04:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WH4Gt-0005Ny-EX for xen-changelog@lists.xensource.com; Sat, 22 Feb 2014 04:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WH4Gt-0001P7-Ac for xen-changelog@lists.xensource.com; Sat, 22 Feb 2014 04:33:03 +0000 Date: Sat, 22 Feb 2014 04:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] README, xen/Makefile: Branching for 4.5 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 94ad20b737bb2776697db4370d91abef1ca2b472 Author: Ian Jackson AuthorDate: Fri Feb 21 16:59:14 2014 +0000 Commit: Ian Jackson CommitDate: Fri Feb 21 16:59:14 2014 +0000 README, xen/Makefile: Branching for 4.5 Change version numbers to 4.5-unstable. Signed-off-by: Ian Jackson --- README | 10 +++++----- xen/Makefile | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README b/README index 4148a26..9bbe734 100644 --- a/README +++ b/README @@ -1,9 +1,9 @@ ################################# -__ __ _ _ _ _ _ _ _ -\ \/ /___ _ __ | || | | || | _ _ _ __ ___| |_ __ _| |__ | | ___ - \ // _ \ '_ \ | || |_| || |_ _____| | | | '_ \/ __| __/ _` | '_ \| |/ _ \ - / \ __/ | | | |__ _|__ _|_____| |_| | | | \__ \ || (_| | |_) | | __/ -/_/\_\___|_| |_| |_|(_) |_| \__,_|_| |_|___/\__\__,_|_.__/|_|\___| +__ __ _ _ ____ _ _ _ +\ \/ /___ _ __ | || | | ___| _ _ _ __ ___| |_ __ _| |__ | | ___ + \ // _ \ '_ \ | || |_ |___ \ _____| | | | '_ \/ __| __/ _` | '_ \| |/ _ \ + / \ __/ | | | |__ _| ___) |_____| |_| | | | \__ \ || (_| | |_) | | __/ +/_/\_\___|_| |_| |_|(_)____/ \__,_|_| |_|___/\__\__,_|_.__/|_|\___| ################################# diff --git a/xen/Makefile b/xen/Makefile index 576d239..79fa8f2 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -1,8 +1,8 @@ # This is the correct place to edit the build version. # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 -export XEN_SUBVERSION = 4 -export XEN_EXTRAVERSION ?= -rc$(XEN_VENDORVERSION) +export XEN_SUBVERSION = 5 +export XEN_EXTRAVERSION ?= -unstable$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Feb 22 04:50:08 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Feb 2014 04:50:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WH4XO-0007NX-3a; Sat, 22 Feb 2014 04:50:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WH4XM-0007NS-2H for xen-changelog@lists.xensource.com; Sat, 22 Feb 2014 04:50:04 +0000 Received: from [85.158.143.35:41642] by server-3.bemta-4.messagelabs.com id 76/37-11539-B7C28035; Sat, 22 Feb 2014 04:50:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1393043583!7485550!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30996 invoked from network); 22 Feb 2014 04:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 22 Feb 2014 04:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WH4Gt-0005Ny-EX for xen-changelog@lists.xensource.com; Sat, 22 Feb 2014 04:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WH4Gt-0001P7-Ac for xen-changelog@lists.xensource.com; Sat, 22 Feb 2014 04:33:03 +0000 Date: Sat, 22 Feb 2014 04:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] README, xen/Makefile: Branching for 4.5 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 94ad20b737bb2776697db4370d91abef1ca2b472 Author: Ian Jackson AuthorDate: Fri Feb 21 16:59:14 2014 +0000 Commit: Ian Jackson CommitDate: Fri Feb 21 16:59:14 2014 +0000 README, xen/Makefile: Branching for 4.5 Change version numbers to 4.5-unstable. Signed-off-by: Ian Jackson --- README | 10 +++++----- xen/Makefile | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README b/README index 4148a26..9bbe734 100644 --- a/README +++ b/README @@ -1,9 +1,9 @@ ################################# -__ __ _ _ _ _ _ _ _ -\ \/ /___ _ __ | || | | || | _ _ _ __ ___| |_ __ _| |__ | | ___ - \ // _ \ '_ \ | || |_| || |_ _____| | | | '_ \/ __| __/ _` | '_ \| |/ _ \ - / \ __/ | | | |__ _|__ _|_____| |_| | | | \__ \ || (_| | |_) | | __/ -/_/\_\___|_| |_| |_|(_) |_| \__,_|_| |_|___/\__\__,_|_.__/|_|\___| +__ __ _ _ ____ _ _ _ +\ \/ /___ _ __ | || | | ___| _ _ _ __ ___| |_ __ _| |__ | | ___ + \ // _ \ '_ \ | || |_ |___ \ _____| | | | '_ \/ __| __/ _` | '_ \| |/ _ \ + / \ __/ | | | |__ _| ___) |_____| |_| | | | \__ \ || (_| | |_) | | __/ +/_/\_\___|_| |_| |_|(_)____/ \__,_|_| |_|___/\__\__,_|_.__/|_|\___| ################################# diff --git a/xen/Makefile b/xen/Makefile index 576d239..79fa8f2 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -1,8 +1,8 @@ # This is the correct place to edit the build version. # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 -export XEN_SUBVERSION = 4 -export XEN_EXTRAVERSION ?= -rc$(XEN_VENDORVERSION) +export XEN_SUBVERSION = 5 +export XEN_EXTRAVERSION ?= -unstable$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Feb 22 11:55:08 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Feb 2014 11:55:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WHBAh-0001v3-C9; Sat, 22 Feb 2014 11:55:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WHBAg-0001ux-G7 for xen-changelog@lists.xensource.com; Sat, 22 Feb 2014 11:55:06 +0000 Received: from [193.109.254.147:26317] by server-14.bemta-14.messagelabs.com id 38/8B-29228-91098035; Sat, 22 Feb 2014 11:55:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1393070103!6108010!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7011 invoked from network); 22 Feb 2014 11:55:04 -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; 22 Feb 2014 11:55:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WHBAd-0001Vy-Hh for xen-changelog@lists.xensource.com; Sat, 22 Feb 2014 11:55:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WHBAd-0005RQ-0N for xen-changelog@lists.xensource.com; Sat, 22 Feb 2014 11:55:03 +0000 Date: Sat, 22 Feb 2014 11:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] Config.mk: Update QEMU trees for 4.4 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 c582cadad07e295ad27d0aa24c8feb609c21ca21 Author: Ian Jackson AuthorDate: Fri Feb 21 16:38:18 2014 +0000 Commit: Ian Jackson CommitDate: Fri Feb 21 16:38:18 2014 +0000 Config.mk: Update QEMU trees for 4.4 Change these to refer to the 4.4 branches. Signed-off-by: Ian Jackson --- Config.mk | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Config.mk b/Config.mk index a6cd2e3..2a62c21 100644 --- a/Config.mk +++ b/Config.mk @@ -219,18 +219,18 @@ XEN_EXTFILES_URL ?= http://xenbits.xen.org/xen-extfiles # near the place in the Xen Makefiles where the file is used. ifeq ($(GIT_HTTP),y) -QEMU_REMOTE ?= http://xenbits.xen.org/git-http/qemu-xen-unstable.git +QEMU_REMOTE ?= http://xenbits.xen.org/git-http/qemu-xen-4.4-testing.git else -QEMU_REMOTE ?= git://xenbits.xen.org/qemu-xen-unstable.git +QEMU_REMOTE ?= git://xenbits.xen.org/qemu-xen-4.4-testing.git endif ifeq ($(GIT_HTTP),y) OVMF_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/ovmf.git -QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-upstream-unstable.git +QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-upstream-4.4-testing.git SEABIOS_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/seabios.git else OVMF_UPSTREAM_URL ?= git://xenbits.xen.org/ovmf.git -QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git +QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-4.4-testing.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Feb 22 11:55:08 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Feb 2014 11:55:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WHBAh-0001v3-C9; Sat, 22 Feb 2014 11:55:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WHBAg-0001ux-G7 for xen-changelog@lists.xensource.com; Sat, 22 Feb 2014 11:55:06 +0000 Received: from [193.109.254.147:26317] by server-14.bemta-14.messagelabs.com id 38/8B-29228-91098035; Sat, 22 Feb 2014 11:55:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1393070103!6108010!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7011 invoked from network); 22 Feb 2014 11:55:04 -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; 22 Feb 2014 11:55:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WHBAd-0001Vy-Hh for xen-changelog@lists.xensource.com; Sat, 22 Feb 2014 11:55:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WHBAd-0005RQ-0N for xen-changelog@lists.xensource.com; Sat, 22 Feb 2014 11:55:03 +0000 Date: Sat, 22 Feb 2014 11:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] Config.mk: Update QEMU trees for 4.4 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 c582cadad07e295ad27d0aa24c8feb609c21ca21 Author: Ian Jackson AuthorDate: Fri Feb 21 16:38:18 2014 +0000 Commit: Ian Jackson CommitDate: Fri Feb 21 16:38:18 2014 +0000 Config.mk: Update QEMU trees for 4.4 Change these to refer to the 4.4 branches. Signed-off-by: Ian Jackson --- Config.mk | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Config.mk b/Config.mk index a6cd2e3..2a62c21 100644 --- a/Config.mk +++ b/Config.mk @@ -219,18 +219,18 @@ XEN_EXTFILES_URL ?= http://xenbits.xen.org/xen-extfiles # near the place in the Xen Makefiles where the file is used. ifeq ($(GIT_HTTP),y) -QEMU_REMOTE ?= http://xenbits.xen.org/git-http/qemu-xen-unstable.git +QEMU_REMOTE ?= http://xenbits.xen.org/git-http/qemu-xen-4.4-testing.git else -QEMU_REMOTE ?= git://xenbits.xen.org/qemu-xen-unstable.git +QEMU_REMOTE ?= git://xenbits.xen.org/qemu-xen-4.4-testing.git endif ifeq ($(GIT_HTTP),y) OVMF_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/ovmf.git -QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-upstream-unstable.git +QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-upstream-4.4-testing.git SEABIOS_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/seabios.git else OVMF_UPSTREAM_URL ?= git://xenbits.xen.org/ovmf.git -QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git +QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-4.4-testing.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Feb 22 11:55:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Feb 2014 11:55: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 1WHBAr-0001wE-Em; Sat, 22 Feb 2014 11:55:17 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WHBAq-0001w5-B5 for xen-changelog@lists.xensource.com; Sat, 22 Feb 2014 11:55:16 +0000 Received: from [193.109.254.147:41474] by server-4.bemta-14.messagelabs.com id C8/4E-32066-32098035; Sat, 22 Feb 2014 11:55:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1393070113!6068972!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4815 invoked from network); 22 Feb 2014 11:55:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Feb 2014 11:55:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WHBAn-0001W4-NG for xen-changelog@lists.xensource.com; Sat, 22 Feb 2014 11:55:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WHBAn-0005Rr-Ka for xen-changelog@lists.xensource.com; Sat, 22 Feb 2014 11:55:13 +0000 Date: Sat, 22 Feb 2014 11:55:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] Config.mk: Non-debug build by default X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 29f130cfd9aca7ee12deddbbc0217f39d55bec60 Author: Ian Jackson AuthorDate: Fri Feb 21 18:24:23 2014 +0000 Commit: Ian Jackson CommitDate: Fri Feb 21 18:24:23 2014 +0000 Config.mk: Non-debug build by default Set debug ?= n, in preparation for releasing. Signed-off-by: Ian Jackson --- Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index 2a62c21..acde711 100644 --- a/Config.mk +++ b/Config.mk @@ -16,7 +16,7 @@ realpath = $(wildcard $(foreach file,$(1),$(shell cd -P $(dir $(file)) && echo " -include $(XEN_ROOT)/.config # A debug build of Xen and tools? -debug ?= y +debug ?= n debug_symbols ?= $(debug) # Test coverage support -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Feb 22 11:55:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 22 Feb 2014 11:55: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 1WHBAr-0001wE-Em; Sat, 22 Feb 2014 11:55:17 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WHBAq-0001w5-B5 for xen-changelog@lists.xensource.com; Sat, 22 Feb 2014 11:55:16 +0000 Received: from [193.109.254.147:41474] by server-4.bemta-14.messagelabs.com id C8/4E-32066-32098035; Sat, 22 Feb 2014 11:55:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1393070113!6068972!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4815 invoked from network); 22 Feb 2014 11:55:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Feb 2014 11:55:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WHBAn-0001W4-NG for xen-changelog@lists.xensource.com; Sat, 22 Feb 2014 11:55:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1WHBAn-0005Rr-Ka for xen-changelog@lists.xensource.com; Sat, 22 Feb 2014 11:55:13 +0000 Date: Sat, 22 Feb 2014 11:55:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] Config.mk: Non-debug build by default X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 29f130cfd9aca7ee12deddbbc0217f39d55bec60 Author: Ian Jackson AuthorDate: Fri Feb 21 18:24:23 2014 +0000 Commit: Ian Jackson CommitDate: Fri Feb 21 18:24:23 2014 +0000 Config.mk: Non-debug build by default Set debug ?= n, in preparation for releasing. Signed-off-by: Ian Jackson --- Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index 2a62c21..acde711 100644 --- a/Config.mk +++ b/Config.mk @@ -16,7 +16,7 @@ realpath = $(wildcard $(foreach file,$(1),$(shell cd -P $(dir $(file)) && echo " -include $(XEN_ROOT)/.config # A debug build of Xen and tools? -debug ?= y +debug ?= n debug_symbols ?= $(debug) # Test coverage support -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog