From xen-changelog-bounces@lists.xen.org Thu May 07 00:55:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2015 00:55: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 1YqA5q-00069P-4w; Thu, 07 May 2015 00:55:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqA5o-00069J-EX for xen-changelog@lists.xensource.com; Thu, 07 May 2015 00:55:12 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id 78/E1-03245-FE7BA455; Thu, 07 May 2015 00:55:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1430960109!15072056!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4395 invoked from network); 7 May 2015 00:55:10 -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 May 2015 00:55:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqA5f-00068B-1p for xen-changelog@lists.xensource.com; Thu, 07 May 2015 00:55:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YqA5e-0001Zd-Qs for xen-changelog@lists.xensource.com; Thu, 07 May 2015 00:55:02 +0000 Date: Thu, 07 May 2015 00:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 70bca60d35f02f512548d15b62863d366461be6f Author: Ian Jackson AuthorDate: Tue Mar 31 16:35:14 2015 +0100 Commit: Ian Jackson CommitDate: Tue Mar 31 16:35:14 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index cdd7c40..0aa6368 100644 --- a/Config.mk +++ b/Config.mk @@ -215,9 +215,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.2.5 -# Wed Dec 18 15:25:14 2013 +0000 -# qemu-traditional: Fix build warnings on Wheezy +QEMU_TAG ?= fb44e83c346436ae8dc07d91dfedb108b8a4e673 +# Tue Mar 31 16:27:45 2015 +0100 +# xen: limit guest control of PCI command register # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu May 07 00:55:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2015 00:55: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 1YqA5q-00069P-4w; Thu, 07 May 2015 00:55:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqA5o-00069J-EX for xen-changelog@lists.xensource.com; Thu, 07 May 2015 00:55:12 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id 78/E1-03245-FE7BA455; Thu, 07 May 2015 00:55:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1430960109!15072056!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4395 invoked from network); 7 May 2015 00:55:10 -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 May 2015 00:55:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqA5f-00068B-1p for xen-changelog@lists.xensource.com; Thu, 07 May 2015 00:55:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YqA5e-0001Zd-Qs for xen-changelog@lists.xensource.com; Thu, 07 May 2015 00:55:02 +0000 Date: Thu, 07 May 2015 00:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 70bca60d35f02f512548d15b62863d366461be6f Author: Ian Jackson AuthorDate: Tue Mar 31 16:35:14 2015 +0100 Commit: Ian Jackson CommitDate: Tue Mar 31 16:35:14 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index cdd7c40..0aa6368 100644 --- a/Config.mk +++ b/Config.mk @@ -215,9 +215,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.2.5 -# Wed Dec 18 15:25:14 2013 +0000 -# qemu-traditional: Fix build warnings on Wheezy +QEMU_TAG ?= fb44e83c346436ae8dc07d91dfedb108b8a4e673 +# Tue Mar 31 16:27:45 2015 +0100 +# xen: limit guest control of PCI command register # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu May 07 00:55:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2015 00:55: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 1YqA60-0006Ac-7j; Thu, 07 May 2015 00:55:24 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqA5y-0006A7-M7 for xen-changelog@lists.xensource.com; Thu, 07 May 2015 00:55:22 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id A0/0C-05057-9F7BA455; Thu, 07 May 2015 00:55:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1430960119!13087448!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4253 invoked from network); 7 May 2015 00:55:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 7 May 2015 00:55:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqA5v-00068E-Lt for xen-changelog@lists.xensource.com; Thu, 07 May 2015 00:55:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YqA5v-0001aM-KA for xen-changelog@lists.xensource.com; Thu, 07 May 2015 00:55:19 +0000 Date: Thu, 07 May 2015 00:55:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] Limit XEN_DOMCTL_memory_mapping hypercall to only process up to 64 GFNs (or less) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e3bfa4003ceaa2746cdd77655953ab2601acaf9c Author: Konrad Rzeszutek Wilk AuthorDate: Wed Apr 1 10:12:19 2015 +0100 Commit: Ian Campbell CommitDate: Wed Apr 1 10:14:57 2015 +0100 Limit XEN_DOMCTL_memory_mapping hypercall to only process up to 64 GFNs (or less) Said hypercall for large BARs can take quite a while. As such we can require that the hypercall MUST break up the request in smaller values. Another approach is to add preemption to it - whether we do the preemption using hypercall_create_continuation or returning EAGAIN to userspace (and have it re-invocate the call) - either way the issue we cannot easily solve is that in 'map_mmio_regions' if we encounter an error we MUST call 'unmap_mmio_regions' for the whole BAR region. Since the preemption would re-use input fields such as nr_mfns, first_gfn, first_mfn - we would lose the original values - and only undo what was done in the current round (i.e. ignoring anything that was done prior to earlier preemptions). Unless we re-used the return value as 'EAGAIN|nr_mfns_done<<10' but that puts a limit (since the return value is a long) on the amount of nr_mfns that can provided. This patch sidesteps this problem by: - Setting an hard limit of nr_mfns having to be 64 or less. - Toolstack adjusts correspondingly to the nr_mfn limit. - If the there is an error when adding the toolstack will call the remove operation to remove the whole region. The need to break this hypercall down is for large BARs can take more than the guest (initial domain usually) time-slice. This has the negative result in that the guest is locked out for a long duration and is unable to act on any pending events. We also augment the code to return zero if nr_mfns instead of trying to the hypercall. This is XSA-125 / CVE-2015-2752. Suggested-by: Jan Beulich Acked-by: Jan Beulich Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Ian Campbell --- tools/libxc/xc_domain.c | 55 +++++++++++++++++++++++++++++++++++++++---- xen/arch/x86/domctl.c | 5 ++++ xen/include/public/domctl.h | 1 + 3 files changed, 56 insertions(+), 5 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index d98e68b..60f7137 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -1352,6 +1352,13 @@ int xc_domain_bind_pt_isa_irq( PT_IRQ_TYPE_ISA, 0, 0, 0, machine_irq)); } +#ifndef min +#define min(X, Y) ({ \ + const typeof (X) _x = (X); \ + const typeof (Y) _y = (Y); \ + (void) (&_x == &_y); \ + (_x < _y) ? _x : _y; }) +#endif int xc_domain_memory_mapping( xc_interface *xch, uint32_t domid, @@ -1361,17 +1368,55 @@ int xc_domain_memory_mapping( uint32_t add_mapping) { DECLARE_DOMCTL; + int ret = 0, err; + unsigned long done = 0, nr, max_batch_sz; + + if ( !nr_mfns ) + return 0; domctl.cmd = XEN_DOMCTL_memory_mapping; domctl.domain = domid; - domctl.u.memory_mapping.first_gfn = first_gfn; - domctl.u.memory_mapping.first_mfn = first_mfn; - domctl.u.memory_mapping.nr_mfns = nr_mfns; domctl.u.memory_mapping.add_mapping = add_mapping; + max_batch_sz = nr_mfns; + do + { + nr = min(nr_mfns - done, max_batch_sz); + domctl.u.memory_mapping.nr_mfns = nr; + domctl.u.memory_mapping.first_gfn = first_gfn + done; + domctl.u.memory_mapping.first_mfn = first_mfn + done; + err = do_domctl(xch, &domctl); + if ( err && errno == E2BIG ) + { + if ( max_batch_sz <= 1 ) + break; + max_batch_sz >>= 1; + continue; + } + /* Save the first error... */ + if ( !ret ) + ret = err; + /* .. and ignore the rest of them when removing. */ + if ( err && add_mapping != DPCI_REMOVE_MAPPING ) + break; - return do_domctl(xch, &domctl); -} + done += nr; + } while ( done < nr_mfns ); + /* + * Undo what we have done unless unmapping, by unmapping the entire region. + * Errors here are ignored. + */ + if ( ret && add_mapping != DPCI_REMOVE_MAPPING ) + xc_domain_memory_mapping(xch, domid, first_gfn, first_mfn, nr_mfns, + DPCI_REMOVE_MAPPING); + + /* We might get E2BIG so many times that we never advance. */ + if ( !done && !ret ) + ret = -1; + + return ret; +} +#undef min int xc_domain_ioport_mapping( xc_interface *xch, uint32_t domid, diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 8bf8f09..c9a97c9 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -867,6 +867,11 @@ long arch_do_domctl( (gfn + nr_mfns - 1) < gfn ) /* wrap? */ break; + ret = -E2BIG; + /* Must break hypercall up as this could take a while. */ + if ( nr_mfns > 64 ) + break; + ret = -EPERM; if ( !IS_PRIV(current->domain) && !iomem_access_permitted(current->domain, mfn, mfn + nr_mfns - 1) ) diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 240ceb9..b45911e 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -507,6 +507,7 @@ DEFINE_XEN_GUEST_HANDLE(xen_domctl_bind_pt_irq_t); /* Bind machine I/O address range -> HVM address range. */ +/* If this returns -E2BIG lower nr_mfns value. */ /* XEN_DOMCTL_memory_mapping */ #define DPCI_ADD_MAPPING 1 #define DPCI_REMOVE_MAPPING 0 -- 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 May 07 00:55:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2015 00:55: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 1YqA60-0006Ac-7j; Thu, 07 May 2015 00:55:24 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqA5y-0006A7-M7 for xen-changelog@lists.xensource.com; Thu, 07 May 2015 00:55:22 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id A0/0C-05057-9F7BA455; Thu, 07 May 2015 00:55:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1430960119!13087448!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4253 invoked from network); 7 May 2015 00:55:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 7 May 2015 00:55:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqA5v-00068E-Lt for xen-changelog@lists.xensource.com; Thu, 07 May 2015 00:55:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YqA5v-0001aM-KA for xen-changelog@lists.xensource.com; Thu, 07 May 2015 00:55:19 +0000 Date: Thu, 07 May 2015 00:55:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] Limit XEN_DOMCTL_memory_mapping hypercall to only process up to 64 GFNs (or less) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e3bfa4003ceaa2746cdd77655953ab2601acaf9c Author: Konrad Rzeszutek Wilk AuthorDate: Wed Apr 1 10:12:19 2015 +0100 Commit: Ian Campbell CommitDate: Wed Apr 1 10:14:57 2015 +0100 Limit XEN_DOMCTL_memory_mapping hypercall to only process up to 64 GFNs (or less) Said hypercall for large BARs can take quite a while. As such we can require that the hypercall MUST break up the request in smaller values. Another approach is to add preemption to it - whether we do the preemption using hypercall_create_continuation or returning EAGAIN to userspace (and have it re-invocate the call) - either way the issue we cannot easily solve is that in 'map_mmio_regions' if we encounter an error we MUST call 'unmap_mmio_regions' for the whole BAR region. Since the preemption would re-use input fields such as nr_mfns, first_gfn, first_mfn - we would lose the original values - and only undo what was done in the current round (i.e. ignoring anything that was done prior to earlier preemptions). Unless we re-used the return value as 'EAGAIN|nr_mfns_done<<10' but that puts a limit (since the return value is a long) on the amount of nr_mfns that can provided. This patch sidesteps this problem by: - Setting an hard limit of nr_mfns having to be 64 or less. - Toolstack adjusts correspondingly to the nr_mfn limit. - If the there is an error when adding the toolstack will call the remove operation to remove the whole region. The need to break this hypercall down is for large BARs can take more than the guest (initial domain usually) time-slice. This has the negative result in that the guest is locked out for a long duration and is unable to act on any pending events. We also augment the code to return zero if nr_mfns instead of trying to the hypercall. This is XSA-125 / CVE-2015-2752. Suggested-by: Jan Beulich Acked-by: Jan Beulich Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Ian Campbell --- tools/libxc/xc_domain.c | 55 +++++++++++++++++++++++++++++++++++++++---- xen/arch/x86/domctl.c | 5 ++++ xen/include/public/domctl.h | 1 + 3 files changed, 56 insertions(+), 5 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index d98e68b..60f7137 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -1352,6 +1352,13 @@ int xc_domain_bind_pt_isa_irq( PT_IRQ_TYPE_ISA, 0, 0, 0, machine_irq)); } +#ifndef min +#define min(X, Y) ({ \ + const typeof (X) _x = (X); \ + const typeof (Y) _y = (Y); \ + (void) (&_x == &_y); \ + (_x < _y) ? _x : _y; }) +#endif int xc_domain_memory_mapping( xc_interface *xch, uint32_t domid, @@ -1361,17 +1368,55 @@ int xc_domain_memory_mapping( uint32_t add_mapping) { DECLARE_DOMCTL; + int ret = 0, err; + unsigned long done = 0, nr, max_batch_sz; + + if ( !nr_mfns ) + return 0; domctl.cmd = XEN_DOMCTL_memory_mapping; domctl.domain = domid; - domctl.u.memory_mapping.first_gfn = first_gfn; - domctl.u.memory_mapping.first_mfn = first_mfn; - domctl.u.memory_mapping.nr_mfns = nr_mfns; domctl.u.memory_mapping.add_mapping = add_mapping; + max_batch_sz = nr_mfns; + do + { + nr = min(nr_mfns - done, max_batch_sz); + domctl.u.memory_mapping.nr_mfns = nr; + domctl.u.memory_mapping.first_gfn = first_gfn + done; + domctl.u.memory_mapping.first_mfn = first_mfn + done; + err = do_domctl(xch, &domctl); + if ( err && errno == E2BIG ) + { + if ( max_batch_sz <= 1 ) + break; + max_batch_sz >>= 1; + continue; + } + /* Save the first error... */ + if ( !ret ) + ret = err; + /* .. and ignore the rest of them when removing. */ + if ( err && add_mapping != DPCI_REMOVE_MAPPING ) + break; - return do_domctl(xch, &domctl); -} + done += nr; + } while ( done < nr_mfns ); + /* + * Undo what we have done unless unmapping, by unmapping the entire region. + * Errors here are ignored. + */ + if ( ret && add_mapping != DPCI_REMOVE_MAPPING ) + xc_domain_memory_mapping(xch, domid, first_gfn, first_mfn, nr_mfns, + DPCI_REMOVE_MAPPING); + + /* We might get E2BIG so many times that we never advance. */ + if ( !done && !ret ) + ret = -1; + + return ret; +} +#undef min int xc_domain_ioport_mapping( xc_interface *xch, uint32_t domid, diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 8bf8f09..c9a97c9 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -867,6 +867,11 @@ long arch_do_domctl( (gfn + nr_mfns - 1) < gfn ) /* wrap? */ break; + ret = -E2BIG; + /* Must break hypercall up as this could take a while. */ + if ( nr_mfns > 64 ) + break; + ret = -EPERM; if ( !IS_PRIV(current->domain) && !iomem_access_permitted(current->domain, mfn, mfn + nr_mfns - 1) ) diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 240ceb9..b45911e 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -507,6 +507,7 @@ DEFINE_XEN_GUEST_HANDLE(xen_domctl_bind_pt_irq_t); /* Bind machine I/O address range -> HVM address range. */ +/* If this returns -E2BIG lower nr_mfns value. */ /* XEN_DOMCTL_memory_mapping */ #define DPCI_ADD_MAPPING 1 #define DPCI_REMOVE_MAPPING 0 -- 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 May 07 00:55:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2015 00:55:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqA6J-0006D5-Ay; Thu, 07 May 2015 00:55:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqA6H-0006Ct-EV for xen-changelog@lists.xensource.com; Thu, 07 May 2015 00:55:41 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id CD/49-03286-C08BA455; Thu, 07 May 2015 00:55:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1430960130!12944680!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10601 invoked from network); 7 May 2015 00:55:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 May 2015 00:55:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqA65-00068P-V1 for xen-changelog@lists.xensource.com; Thu, 07 May 2015 00:55:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YqA65-0001ap-PQ for xen-changelog@lists.xensource.com; Thu, 07 May 2015 00:55:29 +0000 Date: Thu, 07 May 2015 00:55:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] domctl/sysctl: don't leak hypervisor stack to toolstacks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7e527e2ab6c95ef84035d02e9e50b956a0d469c9 Author: Andrew Cooper AuthorDate: Tue Apr 21 09:27:07 2015 +0200 Commit: Jan Beulich CommitDate: Tue Apr 21 09:27:07 2015 +0200 domctl/sysctl: don't leak hypervisor stack to toolstacks This is CVE-2015-3340 / XSA-132. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Ian Campbell master commit: 4ff3449f0e9d175ceb9551d3f2aecb59273f639d master date: 2015-04-21 09:03:15 +0200 --- xen/arch/x86/domctl.c | 2 +- xen/common/sysctl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index c9a97c9..b8088bc 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1200,7 +1200,7 @@ long arch_do_domctl( case XEN_DOMCTL_gettscinfo: { struct domain *d; - xen_guest_tsc_info_t info; + xen_guest_tsc_info_t info = { 0 }; ret = -ESRCH; d = rcu_lock_domain_by_id(domctl->domain); diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c index 779872c..fdf60d6 100644 --- a/xen/common/sysctl.c +++ b/xen/common/sysctl.c @@ -95,7 +95,7 @@ long do_sysctl(XEN_GUEST_HANDLE(xen_sysctl_t) u_sysctl) case XEN_SYSCTL_getdomaininfolist: { struct domain *d; - struct xen_domctl_getdomaininfo info; + struct xen_domctl_getdomaininfo info = { 0 }; u32 num_domains = 0; rcu_read_lock(&domlist_read_lock); -- 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 May 07 00:55:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2015 00:55:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqA6J-0006D5-Ay; Thu, 07 May 2015 00:55:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqA6H-0006Ct-EV for xen-changelog@lists.xensource.com; Thu, 07 May 2015 00:55:41 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id CD/49-03286-C08BA455; Thu, 07 May 2015 00:55:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1430960130!12944680!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10601 invoked from network); 7 May 2015 00:55:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 May 2015 00:55:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqA65-00068P-V1 for xen-changelog@lists.xensource.com; Thu, 07 May 2015 00:55:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YqA65-0001ap-PQ for xen-changelog@lists.xensource.com; Thu, 07 May 2015 00:55:29 +0000 Date: Thu, 07 May 2015 00:55:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] domctl/sysctl: don't leak hypervisor stack to toolstacks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7e527e2ab6c95ef84035d02e9e50b956a0d469c9 Author: Andrew Cooper AuthorDate: Tue Apr 21 09:27:07 2015 +0200 Commit: Jan Beulich CommitDate: Tue Apr 21 09:27:07 2015 +0200 domctl/sysctl: don't leak hypervisor stack to toolstacks This is CVE-2015-3340 / XSA-132. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Ian Campbell master commit: 4ff3449f0e9d175ceb9551d3f2aecb59273f639d master date: 2015-04-21 09:03:15 +0200 --- xen/arch/x86/domctl.c | 2 +- xen/common/sysctl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index c9a97c9..b8088bc 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1200,7 +1200,7 @@ long arch_do_domctl( case XEN_DOMCTL_gettscinfo: { struct domain *d; - xen_guest_tsc_info_t info; + xen_guest_tsc_info_t info = { 0 }; ret = -ESRCH; d = rcu_lock_domain_by_id(domctl->domain); diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c index 779872c..fdf60d6 100644 --- a/xen/common/sysctl.c +++ b/xen/common/sysctl.c @@ -95,7 +95,7 @@ long do_sysctl(XEN_GUEST_HANDLE(xen_sysctl_t) u_sysctl) case XEN_SYSCTL_getdomaininfolist: { struct domain *d; - struct xen_domctl_getdomaininfo info; + struct xen_domctl_getdomaininfo info = { 0 }; u32 num_domains = 0; rcu_read_lock(&domlist_read_lock); -- 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 May 07 01:55:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2015 01:55: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 1YqB1o-0006JD-Cu; Thu, 07 May 2015 01:55:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqB1n-0006J8-Jn for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:55:07 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id B0/86-02680-AF5CA455; Thu, 07 May 2015 01:55:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1430963704!15303475!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7808 invoked from network); 7 May 2015 01:55:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 7 May 2015 01:55:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqB1j-0004qL-Da for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YqB1i-0003kX-QG for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:55:03 +0000 Date: Thu, 07 May 2015 01:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] domctl/sysctl: don't leak hypervisor stack to toolstacks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f2e08aa5b1bb470b2847d71490e28dfd96bcc2af Author: Andrew Cooper AuthorDate: Tue Apr 21 09:10:16 2015 +0200 Commit: Jan Beulich CommitDate: Tue Apr 21 09:10:16 2015 +0200 domctl/sysctl: don't leak hypervisor stack to toolstacks This is CVE-2015-3340 / XSA-132. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Ian Campbell master commit: 4ff3449f0e9d175ceb9551d3f2aecb59273f639d master date: 2015-04-21 09:03:15 +0200 --- xen/arch/x86/domctl.c | 2 +- xen/common/sysctl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 35247e1..1585526 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -886,7 +886,7 @@ long arch_do_domctl( case XEN_DOMCTL_gettscinfo: { - xen_guest_tsc_info_t info; + xen_guest_tsc_info_t info = { 0 }; ret = -EINVAL; if ( d == current->domain ) /* no domain_pause() */ diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c index 0cb6ee1..70202e8 100644 --- a/xen/common/sysctl.c +++ b/xen/common/sysctl.c @@ -76,7 +76,7 @@ long do_sysctl(XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl) case XEN_SYSCTL_getdomaininfolist: { struct domain *d; - struct xen_domctl_getdomaininfo info; + struct xen_domctl_getdomaininfo info = { 0 }; u32 num_domains = 0; rcu_read_lock(&domlist_read_lock); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu May 07 01:55:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2015 01:55: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 1YqB1o-0006JD-Cu; Thu, 07 May 2015 01:55:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqB1n-0006J8-Jn for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:55:07 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id B0/86-02680-AF5CA455; Thu, 07 May 2015 01:55:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1430963704!15303475!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7808 invoked from network); 7 May 2015 01:55:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 7 May 2015 01:55:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqB1j-0004qL-Da for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YqB1i-0003kX-QG for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:55:03 +0000 Date: Thu, 07 May 2015 01:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] domctl/sysctl: don't leak hypervisor stack to toolstacks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f2e08aa5b1bb470b2847d71490e28dfd96bcc2af Author: Andrew Cooper AuthorDate: Tue Apr 21 09:10:16 2015 +0200 Commit: Jan Beulich CommitDate: Tue Apr 21 09:10:16 2015 +0200 domctl/sysctl: don't leak hypervisor stack to toolstacks This is CVE-2015-3340 / XSA-132. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Ian Campbell master commit: 4ff3449f0e9d175ceb9551d3f2aecb59273f639d master date: 2015-04-21 09:03:15 +0200 --- xen/arch/x86/domctl.c | 2 +- xen/common/sysctl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 35247e1..1585526 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -886,7 +886,7 @@ long arch_do_domctl( case XEN_DOMCTL_gettscinfo: { - xen_guest_tsc_info_t info; + xen_guest_tsc_info_t info = { 0 }; ret = -EINVAL; if ( d == current->domain ) /* no domain_pause() */ diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c index 0cb6ee1..70202e8 100644 --- a/xen/common/sysctl.c +++ b/xen/common/sysctl.c @@ -76,7 +76,7 @@ long do_sysctl(XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl) case XEN_SYSCTL_getdomaininfolist: { struct domain *d; - struct xen_domctl_getdomaininfo info; + struct xen_domctl_getdomaininfo info = { 0 }; u32 num_domains = 0; rcu_read_lock(&domlist_read_lock); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu May 07 01:55:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2015 01: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 1YqB1y-0006K7-FZ; Thu, 07 May 2015 01:55:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqB1x-0006Jx-Sr for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:55:18 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id F7/34-02776-406CA455; Thu, 07 May 2015 01:55:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1430963714!12951493!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31182 invoked from network); 7 May 2015 01:55:15 -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; 7 May 2015 01:55:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqB1u-0004qO-Mq for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:55:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YqB1u-0003kw-L5 for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:55:14 +0000 Date: Thu, 07 May 2015 01:55:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] 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 63c3eb26b7dc13bff20ec33a9ba872fc08bc0ab0 Author: Jan Beulich AuthorDate: Tue Apr 21 09:11:43 2015 +0200 Commit: Jan Beulich CommitDate: Tue Apr 21 09:11:43 2015 +0200 QEMU_UPSTREAM_REVISION = master again Acked-by: Stefano Stabellini --- Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index e86f876..cb1d23b 100644 --- a/Config.mk +++ b/Config.mk @@ -254,7 +254,7 @@ QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-4.5-testing.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.5.0 +QEMU_UPSTREAM_REVISION ?= master SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 # Thu May 22 16:59:16 2014 -0400 # python3 fixes for vgabios and csm builds. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu May 07 01:55:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2015 01: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 1YqB1y-0006K7-FZ; Thu, 07 May 2015 01:55:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqB1x-0006Jx-Sr for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:55:18 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id F7/34-02776-406CA455; Thu, 07 May 2015 01:55:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1430963714!12951493!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31182 invoked from network); 7 May 2015 01:55:15 -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; 7 May 2015 01:55:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqB1u-0004qO-Mq for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:55:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YqB1u-0003kw-L5 for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:55:14 +0000 Date: Thu, 07 May 2015 01:55:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] 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 63c3eb26b7dc13bff20ec33a9ba872fc08bc0ab0 Author: Jan Beulich AuthorDate: Tue Apr 21 09:11:43 2015 +0200 Commit: Jan Beulich CommitDate: Tue Apr 21 09:11:43 2015 +0200 QEMU_UPSTREAM_REVISION = master again Acked-by: Stefano Stabellini --- Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index e86f876..cb1d23b 100644 --- a/Config.mk +++ b/Config.mk @@ -254,7 +254,7 @@ QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-4.5-testing.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.5.0 +QEMU_UPSTREAM_REVISION ?= master SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 # Thu May 22 16:59:16 2014 -0400 # python3 fixes for vgabios and csm builds. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu May 07 01:55:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2015 01: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 1YqB28-0006LG-IV; Thu, 07 May 2015 01:55:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqB27-0006L3-Ja for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:55:27 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id B6/31-02669-E06CA455; Thu, 07 May 2015 01:55:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1430963725!15078681!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.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4723 invoked from network); 7 May 2015 01:55:25 -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 May 2015 01:55:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqB24-0004qX-Qz for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:55:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YqB24-0003lJ-Py for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:55:24 +0000 Date: Thu, 07 May 2015 01:55:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] hvmloader: don't treat ROM BAR like other BARs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0327c934e4a2029fd3a1d922936eec4ad82fc3e4 Author: Jan Beulich AuthorDate: Tue Apr 21 09:12:50 2015 +0200 Commit: Jan Beulich CommitDate: Tue Apr 21 09:12:50 2015 +0200 hvmloader: don't treat ROM BAR like other BARs Its low 11 bits have different meaning. Signed-off-by: Jan Beulich Reviewed-by: Konrad Rzeszutek Wilk Acked-by: Ian Campbell Reviewed-by: Andrew Cooper master commit: 73aa7fc2926c5ae30d8ebd049beadbb48e24d6c6 master date: 2015-03-26 11:17:51 +0100 --- tools/firmware/hvmloader/pci.c | 36 +++++++++++++++++++++++++----------- 1 files changed, 25 insertions(+), 11 deletions(-) diff --git a/tools/firmware/hvmloader/pci.c b/tools/firmware/hvmloader/pci.c index 4e8d803..5ff87a7 100644 --- a/tools/firmware/hvmloader/pci.c +++ b/tools/firmware/hvmloader/pci.c @@ -179,18 +179,31 @@ void pci_setup(void) bar_reg = PCI_ROM_ADDRESS; bar_data = pci_readl(devfn, bar_reg); - is_64bar = !!((bar_data & (PCI_BASE_ADDRESS_SPACE | - PCI_BASE_ADDRESS_MEM_TYPE_MASK)) == - (PCI_BASE_ADDRESS_SPACE_MEMORY | - PCI_BASE_ADDRESS_MEM_TYPE_64)); - pci_writel(devfn, bar_reg, ~0); + if ( bar_reg != PCI_ROM_ADDRESS ) + { + is_64bar = !!((bar_data & (PCI_BASE_ADDRESS_SPACE | + PCI_BASE_ADDRESS_MEM_TYPE_MASK)) == + (PCI_BASE_ADDRESS_SPACE_MEMORY | + PCI_BASE_ADDRESS_MEM_TYPE_64)); + pci_writel(devfn, bar_reg, ~0); + } + else + { + is_64bar = 0; + pci_writel(devfn, bar_reg, + (bar_data | PCI_ROM_ADDRESS_MASK) & + ~PCI_ROM_ADDRESS_ENABLE); + } bar_sz = pci_readl(devfn, bar_reg); pci_writel(devfn, bar_reg, bar_data); - bar_sz &= (((bar_data & PCI_BASE_ADDRESS_SPACE) == - PCI_BASE_ADDRESS_SPACE_MEMORY) ? - PCI_BASE_ADDRESS_MEM_MASK : - (PCI_BASE_ADDRESS_IO_MASK & 0xffff)); + if ( bar_reg != PCI_ROM_ADDRESS ) + bar_sz &= (((bar_data & PCI_BASE_ADDRESS_SPACE) == + PCI_BASE_ADDRESS_SPACE_MEMORY) ? + PCI_BASE_ADDRESS_MEM_MASK : + (PCI_BASE_ADDRESS_IO_MASK & 0xffff)); + else + bar_sz &= PCI_ROM_ADDRESS_MASK; if (is_64bar) { bar_data_upper = pci_readl(devfn, bar_reg + 4); pci_writel(devfn, bar_reg + 4, ~0); @@ -214,8 +227,9 @@ void pci_setup(void) bars[i].bar_reg = bar_reg; bars[i].bar_sz = bar_sz; - if ( (bar_data & PCI_BASE_ADDRESS_SPACE) == - PCI_BASE_ADDRESS_SPACE_MEMORY ) + if ( ((bar_data & PCI_BASE_ADDRESS_SPACE) == + PCI_BASE_ADDRESS_SPACE_MEMORY) || + (bar_reg == PCI_ROM_ADDRESS) ) mmio_total += bar_sz; nr_bars++; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu May 07 01:55:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2015 01: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 1YqB28-0006LG-IV; Thu, 07 May 2015 01:55:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqB27-0006L3-Ja for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:55:27 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id B6/31-02669-E06CA455; Thu, 07 May 2015 01:55:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1430963725!15078681!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.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4723 invoked from network); 7 May 2015 01:55:25 -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 May 2015 01:55:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqB24-0004qX-Qz for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:55:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YqB24-0003lJ-Py for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:55:24 +0000 Date: Thu, 07 May 2015 01:55:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] hvmloader: don't treat ROM BAR like other BARs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0327c934e4a2029fd3a1d922936eec4ad82fc3e4 Author: Jan Beulich AuthorDate: Tue Apr 21 09:12:50 2015 +0200 Commit: Jan Beulich CommitDate: Tue Apr 21 09:12:50 2015 +0200 hvmloader: don't treat ROM BAR like other BARs Its low 11 bits have different meaning. Signed-off-by: Jan Beulich Reviewed-by: Konrad Rzeszutek Wilk Acked-by: Ian Campbell Reviewed-by: Andrew Cooper master commit: 73aa7fc2926c5ae30d8ebd049beadbb48e24d6c6 master date: 2015-03-26 11:17:51 +0100 --- tools/firmware/hvmloader/pci.c | 36 +++++++++++++++++++++++++----------- 1 files changed, 25 insertions(+), 11 deletions(-) diff --git a/tools/firmware/hvmloader/pci.c b/tools/firmware/hvmloader/pci.c index 4e8d803..5ff87a7 100644 --- a/tools/firmware/hvmloader/pci.c +++ b/tools/firmware/hvmloader/pci.c @@ -179,18 +179,31 @@ void pci_setup(void) bar_reg = PCI_ROM_ADDRESS; bar_data = pci_readl(devfn, bar_reg); - is_64bar = !!((bar_data & (PCI_BASE_ADDRESS_SPACE | - PCI_BASE_ADDRESS_MEM_TYPE_MASK)) == - (PCI_BASE_ADDRESS_SPACE_MEMORY | - PCI_BASE_ADDRESS_MEM_TYPE_64)); - pci_writel(devfn, bar_reg, ~0); + if ( bar_reg != PCI_ROM_ADDRESS ) + { + is_64bar = !!((bar_data & (PCI_BASE_ADDRESS_SPACE | + PCI_BASE_ADDRESS_MEM_TYPE_MASK)) == + (PCI_BASE_ADDRESS_SPACE_MEMORY | + PCI_BASE_ADDRESS_MEM_TYPE_64)); + pci_writel(devfn, bar_reg, ~0); + } + else + { + is_64bar = 0; + pci_writel(devfn, bar_reg, + (bar_data | PCI_ROM_ADDRESS_MASK) & + ~PCI_ROM_ADDRESS_ENABLE); + } bar_sz = pci_readl(devfn, bar_reg); pci_writel(devfn, bar_reg, bar_data); - bar_sz &= (((bar_data & PCI_BASE_ADDRESS_SPACE) == - PCI_BASE_ADDRESS_SPACE_MEMORY) ? - PCI_BASE_ADDRESS_MEM_MASK : - (PCI_BASE_ADDRESS_IO_MASK & 0xffff)); + if ( bar_reg != PCI_ROM_ADDRESS ) + bar_sz &= (((bar_data & PCI_BASE_ADDRESS_SPACE) == + PCI_BASE_ADDRESS_SPACE_MEMORY) ? + PCI_BASE_ADDRESS_MEM_MASK : + (PCI_BASE_ADDRESS_IO_MASK & 0xffff)); + else + bar_sz &= PCI_ROM_ADDRESS_MASK; if (is_64bar) { bar_data_upper = pci_readl(devfn, bar_reg + 4); pci_writel(devfn, bar_reg + 4, ~0); @@ -214,8 +227,9 @@ void pci_setup(void) bars[i].bar_reg = bar_reg; bars[i].bar_sz = bar_sz; - if ( (bar_data & PCI_BASE_ADDRESS_SPACE) == - PCI_BASE_ADDRESS_SPACE_MEMORY ) + if ( ((bar_data & PCI_BASE_ADDRESS_SPACE) == + PCI_BASE_ADDRESS_SPACE_MEMORY) || + (bar_reg == PCI_ROM_ADDRESS) ) mmio_total += bar_sz; nr_bars++; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu May 07 01:55:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2015 01:55: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 1YqB2I-0006Mh-L9; Thu, 07 May 2015 01:55:38 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqB2I-0006MW-0T for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:55:38 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 52/43-02928-816CA455; Thu, 07 May 2015 01:55:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1430963735!10575620!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13948 invoked from network); 7 May 2015 01:55:36 -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; 7 May 2015 01:55:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqB2F-0004qf-4i for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:55:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YqB2F-0003lm-31 for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:55:35 +0000 Date: Thu, 07 May 2015 01:55:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] LZ4 : fix the data abort issue X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 51d8325b256ed8930a9d2700c5bbf73d0f3c3e8d Author: JeHyeon Yeon AuthorDate: Tue Apr 21 09:13:14 2015 +0200 Commit: Jan Beulich CommitDate: Tue Apr 21 09:13:14 2015 +0200 LZ4 : fix the data abort issue If the part of the compression data are corrupted, or the compression data is totally fake, the memory access over the limit is possible. This is the log from my system usning lz4 decompression. [6502]data abort, halting [6503]r0 0x00000000 r1 0x00000000 r2 0xdcea0ffc r3 0xdcea0ffc [6509]r4 0xb9ab0bfd r5 0xdcea0ffc r6 0xdcea0ff8 r7 0xdce80000 [6515]r8 0x00000000 r9 0x00000000 r10 0x00000000 r11 0xb9a98000 [6522]r12 0xdcea1000 usp 0x00000000 ulr 0x00000000 pc 0x820149bc [6528]spsr 0x400001f3 and the memory addresses of some variables at the moment are ref:0xdcea0ffc, op:0xdcea0ffc, oend:0xdcea1000 As you can see, COPYLENGH is 8bytes, so @ref and @op can access the momory over @oend. Signed-off-by: JeHyeon Yeon Reviewed-by: David Sterba [Linux commit d5e7cafd69da24e6d6cc988fab6ea313a2577efc] Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: fcc17f96c2776eb220e3dee79fd0ad6a624ffcd9 master date: 2015-03-26 11:19:10 +0100 --- xen/common/lz4/decompress.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/common/lz4/decompress.c b/xen/common/lz4/decompress.c index 5cf8f37..94ad591 100644 --- a/xen/common/lz4/decompress.c +++ b/xen/common/lz4/decompress.c @@ -132,6 +132,9 @@ static int INIT lz4_uncompress(const unsigned char *source, unsigned char *dest, /* Error: request to write beyond destination buffer */ if (cpy > oend) goto _output_error; + if ((ref + COPYLENGTH) > oend || + (op + COPYLENGTH) > oend) + goto _output_error; LZ4_SECURECOPY(ref, op, (oend - COPYLENGTH)); while (op < cpy) *op++ = *ref++; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu May 07 01:55:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2015 01:55: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 1YqB2I-0006Mh-L9; Thu, 07 May 2015 01:55:38 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqB2I-0006MW-0T for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:55:38 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 52/43-02928-816CA455; Thu, 07 May 2015 01:55:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1430963735!10575620!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13948 invoked from network); 7 May 2015 01:55:36 -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; 7 May 2015 01:55:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqB2F-0004qf-4i for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:55:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YqB2F-0003lm-31 for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:55:35 +0000 Date: Thu, 07 May 2015 01:55:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] LZ4 : fix the data abort issue X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 51d8325b256ed8930a9d2700c5bbf73d0f3c3e8d Author: JeHyeon Yeon AuthorDate: Tue Apr 21 09:13:14 2015 +0200 Commit: Jan Beulich CommitDate: Tue Apr 21 09:13:14 2015 +0200 LZ4 : fix the data abort issue If the part of the compression data are corrupted, or the compression data is totally fake, the memory access over the limit is possible. This is the log from my system usning lz4 decompression. [6502]data abort, halting [6503]r0 0x00000000 r1 0x00000000 r2 0xdcea0ffc r3 0xdcea0ffc [6509]r4 0xb9ab0bfd r5 0xdcea0ffc r6 0xdcea0ff8 r7 0xdce80000 [6515]r8 0x00000000 r9 0x00000000 r10 0x00000000 r11 0xb9a98000 [6522]r12 0xdcea1000 usp 0x00000000 ulr 0x00000000 pc 0x820149bc [6528]spsr 0x400001f3 and the memory addresses of some variables at the moment are ref:0xdcea0ffc, op:0xdcea0ffc, oend:0xdcea1000 As you can see, COPYLENGH is 8bytes, so @ref and @op can access the momory over @oend. Signed-off-by: JeHyeon Yeon Reviewed-by: David Sterba [Linux commit d5e7cafd69da24e6d6cc988fab6ea313a2577efc] Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: fcc17f96c2776eb220e3dee79fd0ad6a624ffcd9 master date: 2015-03-26 11:19:10 +0100 --- xen/common/lz4/decompress.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/common/lz4/decompress.c b/xen/common/lz4/decompress.c index 5cf8f37..94ad591 100644 --- a/xen/common/lz4/decompress.c +++ b/xen/common/lz4/decompress.c @@ -132,6 +132,9 @@ static int INIT lz4_uncompress(const unsigned char *source, unsigned char *dest, /* Error: request to write beyond destination buffer */ if (cpy > oend) goto _output_error; + if ((ref + COPYLENGTH) > oend || + (op + COPYLENGTH) > oend) + goto _output_error; LZ4_SECURECOPY(ref, op, (oend - COPYLENGTH)); while (op < cpy) *op++ = *ref++; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu May 07 01:55:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2015 01: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 1YqB2T-0006Ot-QO; Thu, 07 May 2015 01: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 1YqB2S-0006Oe-97 for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:55:48 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 5A/9C-03197-326CA455; Thu, 07 May 2015 01:55:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1430963745!9291278!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12364 invoked from network); 7 May 2015 01:55:46 -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 May 2015 01:55:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqB2P-0004ql-BB for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:55:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YqB2P-0003ms-95 for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:55:45 +0000 Date: Thu, 07 May 2015 01:55:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/MSI: fix error handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5a7c04221c47c3196326e669f55beb4524d0de56 Author: Jan Beulich AuthorDate: Tue Apr 21 09:13:51 2015 +0200 Commit: Jan Beulich CommitDate: Tue Apr 21 09:13:51 2015 +0200 x86/MSI: fix error handling __setup_msi_irq() needs to undo what it did before calling write_msi_msg() in case that returned an error. map_domain_pirq() needs to get rid of the MSI descriptor it (implicitly) allocated. The case of a setup_msi_irq() failure on a non-initial multi-vector-MSI interrupt needs special handling: While the initial IRQ will get freed by the caller (who also passed it to us), we need to undo the effect setup_msi_irq() had on it. (As a benefit from the added call to msi_free_irq() we no longer need to explicitly call destroy_irq() on the non-initial slots.) Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 29c1b7886c36d4e6aa03a779b2251b829d9689c3 master date: 2015-03-26 11:19:57 +0100 --- xen/arch/x86/irq.c | 27 ++++++++++++++++++--------- xen/arch/x86/msi.c | 14 ++++++++++++-- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index f214072..84738e5 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -1973,6 +1973,8 @@ int map_domain_pirq( dprintk(XENLOG_G_ERR, "dom%d: irq %d in use\n", d->domain_id, irq); pci_disable_msi(msi_desc); + msi_desc->irq = -1; + msi_free_irq(msi_desc); ret = -EBUSY; goto done; } @@ -2027,22 +2029,29 @@ int map_domain_pirq( if ( ret ) { spin_unlock_irqrestore(&desc->lock, flags); + pci_disable_msi(msi_desc); + if ( nr ) + { + ASSERT(msi_desc->irq >= 0); + desc = irq_to_desc(msi_desc->irq); + spin_lock_irqsave(&desc->lock, flags); + desc->handler = &no_irq_type; + desc->msi_desc = NULL; + spin_unlock_irqrestore(&desc->lock, flags); + } while ( nr-- ) { - if ( irq >= 0 ) - { - if ( irq_deny_access(d, irq) ) - printk(XENLOG_G_ERR - "dom%d: could not revoke access to IRQ%d (pirq %d)\n", - d->domain_id, irq, pirq); - destroy_irq(irq); - } + if ( irq >= 0 && irq_deny_access(d, irq) ) + printk(XENLOG_G_ERR + "dom%d: could not revoke access to IRQ%d (pirq %d)\n", + d->domain_id, irq, pirq); if ( info ) cleanup_domain_irq_pirq(d, irq, info); info = pirq_info(d, pirq + nr); irq = info->arch.irq; } - pci_disable_msi(msi_desc); + msi_desc->irq = -1; + msi_free_irq(msi_desc); goto done; } diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index 14d37ec..7410d03 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -470,6 +470,7 @@ static struct msi_desc *alloc_msi_entry(unsigned int nr) while ( nr-- ) { entry[nr].dev = NULL; + entry[nr].irq = -1; entry[nr].remap_index = -1; } @@ -487,11 +488,19 @@ int __setup_msi_irq(struct irq_desc *desc, struct msi_desc *msidesc, hw_irq_controller *handler) { struct msi_msg msg; + int ret; desc->msi_desc = msidesc; desc->handler = handler; msi_compose_msg(desc->arch.vector, desc->arch.cpu_mask, &msg); - return write_msi_msg(msidesc, &msg); + ret = write_msi_msg(msidesc, &msg); + if ( unlikely(ret) ) + { + desc->handler = &no_irq_type; + desc->msi_desc = NULL; + } + + return ret; } int msi_free_irq(struct msi_desc *entry) @@ -501,7 +510,8 @@ int msi_free_irq(struct msi_desc *entry) while ( nr-- ) { - destroy_irq(entry[nr].irq); + if ( entry[nr].irq >= 0 ) + destroy_irq(entry[nr].irq); /* Free the unused IRTE if intr remap enabled */ if ( iommu_intremap ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu May 07 01:55:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2015 01: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 1YqB2T-0006Ot-QO; Thu, 07 May 2015 01: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 1YqB2S-0006Oe-97 for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:55:48 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 5A/9C-03197-326CA455; Thu, 07 May 2015 01:55:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1430963745!9291278!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12364 invoked from network); 7 May 2015 01:55:46 -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 May 2015 01:55:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqB2P-0004ql-BB for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:55:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YqB2P-0003ms-95 for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:55:45 +0000 Date: Thu, 07 May 2015 01:55:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/MSI: fix error handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5a7c04221c47c3196326e669f55beb4524d0de56 Author: Jan Beulich AuthorDate: Tue Apr 21 09:13:51 2015 +0200 Commit: Jan Beulich CommitDate: Tue Apr 21 09:13:51 2015 +0200 x86/MSI: fix error handling __setup_msi_irq() needs to undo what it did before calling write_msi_msg() in case that returned an error. map_domain_pirq() needs to get rid of the MSI descriptor it (implicitly) allocated. The case of a setup_msi_irq() failure on a non-initial multi-vector-MSI interrupt needs special handling: While the initial IRQ will get freed by the caller (who also passed it to us), we need to undo the effect setup_msi_irq() had on it. (As a benefit from the added call to msi_free_irq() we no longer need to explicitly call destroy_irq() on the non-initial slots.) Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 29c1b7886c36d4e6aa03a779b2251b829d9689c3 master date: 2015-03-26 11:19:57 +0100 --- xen/arch/x86/irq.c | 27 ++++++++++++++++++--------- xen/arch/x86/msi.c | 14 ++++++++++++-- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index f214072..84738e5 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -1973,6 +1973,8 @@ int map_domain_pirq( dprintk(XENLOG_G_ERR, "dom%d: irq %d in use\n", d->domain_id, irq); pci_disable_msi(msi_desc); + msi_desc->irq = -1; + msi_free_irq(msi_desc); ret = -EBUSY; goto done; } @@ -2027,22 +2029,29 @@ int map_domain_pirq( if ( ret ) { spin_unlock_irqrestore(&desc->lock, flags); + pci_disable_msi(msi_desc); + if ( nr ) + { + ASSERT(msi_desc->irq >= 0); + desc = irq_to_desc(msi_desc->irq); + spin_lock_irqsave(&desc->lock, flags); + desc->handler = &no_irq_type; + desc->msi_desc = NULL; + spin_unlock_irqrestore(&desc->lock, flags); + } while ( nr-- ) { - if ( irq >= 0 ) - { - if ( irq_deny_access(d, irq) ) - printk(XENLOG_G_ERR - "dom%d: could not revoke access to IRQ%d (pirq %d)\n", - d->domain_id, irq, pirq); - destroy_irq(irq); - } + if ( irq >= 0 && irq_deny_access(d, irq) ) + printk(XENLOG_G_ERR + "dom%d: could not revoke access to IRQ%d (pirq %d)\n", + d->domain_id, irq, pirq); if ( info ) cleanup_domain_irq_pirq(d, irq, info); info = pirq_info(d, pirq + nr); irq = info->arch.irq; } - pci_disable_msi(msi_desc); + msi_desc->irq = -1; + msi_free_irq(msi_desc); goto done; } diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index 14d37ec..7410d03 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -470,6 +470,7 @@ static struct msi_desc *alloc_msi_entry(unsigned int nr) while ( nr-- ) { entry[nr].dev = NULL; + entry[nr].irq = -1; entry[nr].remap_index = -1; } @@ -487,11 +488,19 @@ int __setup_msi_irq(struct irq_desc *desc, struct msi_desc *msidesc, hw_irq_controller *handler) { struct msi_msg msg; + int ret; desc->msi_desc = msidesc; desc->handler = handler; msi_compose_msg(desc->arch.vector, desc->arch.cpu_mask, &msg); - return write_msi_msg(msidesc, &msg); + ret = write_msi_msg(msidesc, &msg); + if ( unlikely(ret) ) + { + desc->handler = &no_irq_type; + desc->msi_desc = NULL; + } + + return ret; } int msi_free_irq(struct msi_desc *entry) @@ -501,7 +510,8 @@ int msi_free_irq(struct msi_desc *entry) while ( nr-- ) { - destroy_irq(entry[nr].irq); + if ( entry[nr].irq >= 0 ) + destroy_irq(entry[nr].irq); /* Free the unused IRTE if intr remap enabled */ if ( iommu_intremap ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu May 07 01:56:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2015 01: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 1YqB2d-0006QX-Uy; Thu, 07 May 2015 01:55:59 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqB2c-0006QI-Dr for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:55:58 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id 75/C3-03206-D26CA455; Thu, 07 May 2015 01:55:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1430963755!15296895!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14450 invoked from network); 7 May 2015 01:55:56 -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; 7 May 2015 01:55:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqB2Z-0004qu-G7 for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:55:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YqB2Z-0003nE-EY for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:55:55 +0000 Date: Thu, 07 May 2015 01:55:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] VT-d: improve fault info logging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4a521010b143cf10e99891bca9869307ed7428b7 Author: Jan Beulich AuthorDate: Tue Apr 21 09:14:34 2015 +0200 Commit: Jan Beulich CommitDate: Tue Apr 21 09:14:34 2015 +0200 VT-d: improve fault info logging I got repeatedly annoyed by there not getting anything logged by default on VT-d faults (and hence having to tell people to add extra command line options), and hence I think it is time to redo this code: Log basic fault information at guest-warning level (rate limited by default), and show the page walk in verbose rather than only in debug mode. Break up multi-line message so that each gets a proper log level attached, at once splitting out the common part. Also don't log "unknown" faults as interrupt-remapping ones. As a minor cleanup fix the type of the involved "fault_type" variables. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Yang Zhang master commit: f0250f4b4818f5f4230995407ea2501de3485934 master date: 2015-03-27 15:23:25 +0100 --- xen/drivers/passthrough/vtd/iommu.c | 64 +++++++++++++++++++++------------- 1 files changed, 39 insertions(+), 25 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 2e113d7..5a946d4 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -799,7 +799,8 @@ static const char *intr_remap_fault_reasons[] = "Blocked an interrupt request due to source-id verification failure", }; -static const char *iommu_get_fault_reason(u8 fault_reason, int *fault_type) +static const char *iommu_get_fault_reason(u8 fault_reason, + enum faulttype *fault_type) { if ( fault_reason >= 0x20 && ( fault_reason < 0x20 + ARRAY_SIZE(intr_remap_fault_reasons)) ) @@ -822,35 +823,48 @@ static const char *iommu_get_fault_reason(u8 fault_reason, int *fault_type) static int iommu_page_fault_do_one(struct iommu *iommu, int type, u8 fault_reason, u16 source_id, u64 addr) { - const char *reason; - int fault_type; + const char *reason, *kind; + enum faulttype fault_type; u16 seg = iommu->intel->drhd->segment; - reason = iommu_get_fault_reason(fault_reason, &fault_type); - if ( fault_type == DMA_REMAP ) - { - INTEL_IOMMU_DEBUG( - "DMAR:[%s] Request device [%04x:%02x:%02x.%u] " - "fault addr %"PRIx64", iommu reg = %p\n" - "DMAR:[fault reason %02xh] %s\n", - (type ? "DMA Read" : "DMA Write"), - seg, (source_id >> 8), PCI_SLOT(source_id & 0xFF), - PCI_FUNC(source_id & 0xFF), addr, iommu->reg, - fault_reason, reason); - if (iommu_debug) - print_vtd_entries(iommu, (source_id >> 8), - (source_id & 0xff), (addr >> PAGE_SHIFT)); + reason = iommu_get_fault_reason(fault_reason, &fault_type); + switch ( fault_type ) + { + case DMA_REMAP: + printk(XENLOG_G_WARNING VTDPREFIX + "DMAR:[%s] Request device [%04x:%02x:%02x.%u] " + "fault addr %"PRIx64", iommu reg = %p\n", + (type ? "DMA Read" : "DMA Write"), + seg, PCI_BUS(source_id), PCI_SLOT(source_id), + PCI_FUNC(source_id), addr, iommu->reg); + kind = "DMAR"; + break; + case INTR_REMAP: + printk(XENLOG_G_WARNING VTDPREFIX + "INTR-REMAP: Request device [%04x:%02x:%02x.%u] " + "fault index %"PRIx64", iommu reg = %p\n", + seg, PCI_BUS(source_id), PCI_SLOT(source_id), + PCI_FUNC(source_id), addr >> 48, iommu->reg); + kind = "INTR-REMAP"; + break; + default: + printk(XENLOG_G_WARNING VTDPREFIX + "UNKNOWN: Request device [%04x:%02x:%02x.%u] " + "fault addr %"PRIx64", iommu reg = %p\n", + seg, PCI_BUS(source_id), PCI_SLOT(source_id), + PCI_FUNC(source_id), addr, iommu->reg); + kind = "UNKNOWN"; + break; } - else - INTEL_IOMMU_DEBUG( - "INTR-REMAP: Request device [%04x:%02x:%02x.%u] " - "fault index %"PRIx64", iommu reg = %p\n" - "INTR-REMAP:[fault reason %02xh] %s\n", - seg, (source_id >> 8), PCI_SLOT(source_id & 0xFF), - PCI_FUNC(source_id & 0xFF), addr >> 48, iommu->reg, - fault_reason, reason); - return 0; + printk(XENLOG_G_WARNING VTDPREFIX "%s: reason %02x - %s\n", + kind, fault_reason, reason); + + if ( iommu_verbose && fault_type == DMA_REMAP ) + print_vtd_entries(iommu, PCI_BUS(source_id), PCI_DEVFN2(source_id), + addr >> PAGE_SHIFT); + + return 0; } static void iommu_fault_status(u32 fault_status) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu May 07 01:56:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2015 01: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 1YqB2d-0006QX-Uy; Thu, 07 May 2015 01:55:59 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqB2c-0006QI-Dr for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:55:58 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id 75/C3-03206-D26CA455; Thu, 07 May 2015 01:55:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1430963755!15296895!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14450 invoked from network); 7 May 2015 01:55:56 -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; 7 May 2015 01:55:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqB2Z-0004qu-G7 for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:55:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YqB2Z-0003nE-EY for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:55:55 +0000 Date: Thu, 07 May 2015 01:55:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] VT-d: improve fault info logging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4a521010b143cf10e99891bca9869307ed7428b7 Author: Jan Beulich AuthorDate: Tue Apr 21 09:14:34 2015 +0200 Commit: Jan Beulich CommitDate: Tue Apr 21 09:14:34 2015 +0200 VT-d: improve fault info logging I got repeatedly annoyed by there not getting anything logged by default on VT-d faults (and hence having to tell people to add extra command line options), and hence I think it is time to redo this code: Log basic fault information at guest-warning level (rate limited by default), and show the page walk in verbose rather than only in debug mode. Break up multi-line message so that each gets a proper log level attached, at once splitting out the common part. Also don't log "unknown" faults as interrupt-remapping ones. As a minor cleanup fix the type of the involved "fault_type" variables. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Yang Zhang master commit: f0250f4b4818f5f4230995407ea2501de3485934 master date: 2015-03-27 15:23:25 +0100 --- xen/drivers/passthrough/vtd/iommu.c | 64 +++++++++++++++++++++------------- 1 files changed, 39 insertions(+), 25 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 2e113d7..5a946d4 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -799,7 +799,8 @@ static const char *intr_remap_fault_reasons[] = "Blocked an interrupt request due to source-id verification failure", }; -static const char *iommu_get_fault_reason(u8 fault_reason, int *fault_type) +static const char *iommu_get_fault_reason(u8 fault_reason, + enum faulttype *fault_type) { if ( fault_reason >= 0x20 && ( fault_reason < 0x20 + ARRAY_SIZE(intr_remap_fault_reasons)) ) @@ -822,35 +823,48 @@ static const char *iommu_get_fault_reason(u8 fault_reason, int *fault_type) static int iommu_page_fault_do_one(struct iommu *iommu, int type, u8 fault_reason, u16 source_id, u64 addr) { - const char *reason; - int fault_type; + const char *reason, *kind; + enum faulttype fault_type; u16 seg = iommu->intel->drhd->segment; - reason = iommu_get_fault_reason(fault_reason, &fault_type); - if ( fault_type == DMA_REMAP ) - { - INTEL_IOMMU_DEBUG( - "DMAR:[%s] Request device [%04x:%02x:%02x.%u] " - "fault addr %"PRIx64", iommu reg = %p\n" - "DMAR:[fault reason %02xh] %s\n", - (type ? "DMA Read" : "DMA Write"), - seg, (source_id >> 8), PCI_SLOT(source_id & 0xFF), - PCI_FUNC(source_id & 0xFF), addr, iommu->reg, - fault_reason, reason); - if (iommu_debug) - print_vtd_entries(iommu, (source_id >> 8), - (source_id & 0xff), (addr >> PAGE_SHIFT)); + reason = iommu_get_fault_reason(fault_reason, &fault_type); + switch ( fault_type ) + { + case DMA_REMAP: + printk(XENLOG_G_WARNING VTDPREFIX + "DMAR:[%s] Request device [%04x:%02x:%02x.%u] " + "fault addr %"PRIx64", iommu reg = %p\n", + (type ? "DMA Read" : "DMA Write"), + seg, PCI_BUS(source_id), PCI_SLOT(source_id), + PCI_FUNC(source_id), addr, iommu->reg); + kind = "DMAR"; + break; + case INTR_REMAP: + printk(XENLOG_G_WARNING VTDPREFIX + "INTR-REMAP: Request device [%04x:%02x:%02x.%u] " + "fault index %"PRIx64", iommu reg = %p\n", + seg, PCI_BUS(source_id), PCI_SLOT(source_id), + PCI_FUNC(source_id), addr >> 48, iommu->reg); + kind = "INTR-REMAP"; + break; + default: + printk(XENLOG_G_WARNING VTDPREFIX + "UNKNOWN: Request device [%04x:%02x:%02x.%u] " + "fault addr %"PRIx64", iommu reg = %p\n", + seg, PCI_BUS(source_id), PCI_SLOT(source_id), + PCI_FUNC(source_id), addr, iommu->reg); + kind = "UNKNOWN"; + break; } - else - INTEL_IOMMU_DEBUG( - "INTR-REMAP: Request device [%04x:%02x:%02x.%u] " - "fault index %"PRIx64", iommu reg = %p\n" - "INTR-REMAP:[fault reason %02xh] %s\n", - seg, (source_id >> 8), PCI_SLOT(source_id & 0xFF), - PCI_FUNC(source_id & 0xFF), addr >> 48, iommu->reg, - fault_reason, reason); - return 0; + printk(XENLOG_G_WARNING VTDPREFIX "%s: reason %02x - %s\n", + kind, fault_reason, reason); + + if ( iommu_verbose && fault_type == DMA_REMAP ) + print_vtd_entries(iommu, PCI_BUS(source_id), PCI_DEVFN2(source_id), + addr >> PAGE_SHIFT); + + return 0; } static void iommu_fault_status(u32 fault_status) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu May 07 01:56:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2015 01:56: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 1YqB2n-0006S8-D0; Thu, 07 May 2015 01:56:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqB2m-0006Rw-Cq for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:56:08 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 10/AF-03201-736CA455; Thu, 07 May 2015 01:56:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1430963766!10655536!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22978 invoked from network); 7 May 2015 01:56:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 7 May 2015 01:56:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqB2j-0004rT-R8 for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:56:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YqB2j-0003nl-KF for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:56:05 +0000 Date: Thu, 07 May 2015 01:56:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86_emulate: split the {reg, mem} union in struct operand X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4a69292bc4b70e9a664031349ec611fb34beb1ed Author: Tim Deegan AuthorDate: Tue Apr 21 09:15:07 2015 +0200 Commit: Jan Beulich CommitDate: Tue Apr 21 09:15:07 2015 +0200 x86_emulate: split the {reg,mem} union in struct operand In the hopes of making any future errors along the lines of XSA-123 into clean crashes instead of memory corruption bugs. Signed-off-by: Tim Deegan Reviewed-by: Andrew Cooper master commit: dd766684e7c97641bbaf16ee2b0e9add388199b7 master date: 2015-03-27 16:13:07 +0100 --- xen/arch/x86/x86_emulate/x86_emulate.c | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 8ff31d0..656a06f 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -325,16 +325,20 @@ struct operand { uint32_t orig_bigval[4]; }; - union { - /* OP_REG: Pointer to register field. */ - unsigned long *reg; - /* OP_MEM: Segment and offset. */ - struct { - enum x86_segment seg; - unsigned long off; - } mem; - }; + /* OP_REG: Pointer to register field. */ + unsigned long *reg; + + /* OP_MEM: Segment and offset. */ + struct { + enum x86_segment seg; + unsigned long off; + } mem; }; +#ifdef __x86_64__ +#define REG_POISON ((unsigned long *) 0x8086000000008086UL) /* non-canonical */ +#else +#define REG_POISON NULL /* 32-bit builds are for user-space, so NULL is OK. */ +#endif typedef union { uint64_t mmx; @@ -1460,14 +1464,15 @@ x86_emulate( unsigned int op_bytes, def_op_bytes, ad_bytes, def_ad_bytes; bool_t lock_prefix = 0; int override_seg = -1, rc = X86EMUL_OKAY; - struct operand src, dst; + struct operand src = { .reg = REG_POISON }; + struct operand dst = { .reg = REG_POISON }; enum x86_swint_type swint_type; DECLARE_ALIGNED(mmval_t, mmval); /* * Data operand effective address (usually computed from ModRM). * Default is a memory operand relative to segment DS. */ - struct operand ea = { .type = OP_MEM }; + struct operand ea = { .type = OP_MEM, .reg = REG_POISON }; ea.mem.seg = x86_seg_ds; /* gcc may reject anon union initializer */ ctxt->retire.byte = 0; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu May 07 01:56:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2015 01:56: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 1YqB2n-0006S8-D0; Thu, 07 May 2015 01:56:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqB2m-0006Rw-Cq for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:56:08 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 10/AF-03201-736CA455; Thu, 07 May 2015 01:56:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1430963766!10655536!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22978 invoked from network); 7 May 2015 01:56:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 7 May 2015 01:56:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqB2j-0004rT-R8 for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:56:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YqB2j-0003nl-KF for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:56:05 +0000 Date: Thu, 07 May 2015 01:56:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86_emulate: split the {reg, mem} union in struct operand X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4a69292bc4b70e9a664031349ec611fb34beb1ed Author: Tim Deegan AuthorDate: Tue Apr 21 09:15:07 2015 +0200 Commit: Jan Beulich CommitDate: Tue Apr 21 09:15:07 2015 +0200 x86_emulate: split the {reg,mem} union in struct operand In the hopes of making any future errors along the lines of XSA-123 into clean crashes instead of memory corruption bugs. Signed-off-by: Tim Deegan Reviewed-by: Andrew Cooper master commit: dd766684e7c97641bbaf16ee2b0e9add388199b7 master date: 2015-03-27 16:13:07 +0100 --- xen/arch/x86/x86_emulate/x86_emulate.c | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 8ff31d0..656a06f 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -325,16 +325,20 @@ struct operand { uint32_t orig_bigval[4]; }; - union { - /* OP_REG: Pointer to register field. */ - unsigned long *reg; - /* OP_MEM: Segment and offset. */ - struct { - enum x86_segment seg; - unsigned long off; - } mem; - }; + /* OP_REG: Pointer to register field. */ + unsigned long *reg; + + /* OP_MEM: Segment and offset. */ + struct { + enum x86_segment seg; + unsigned long off; + } mem; }; +#ifdef __x86_64__ +#define REG_POISON ((unsigned long *) 0x8086000000008086UL) /* non-canonical */ +#else +#define REG_POISON NULL /* 32-bit builds are for user-space, so NULL is OK. */ +#endif typedef union { uint64_t mmx; @@ -1460,14 +1464,15 @@ x86_emulate( unsigned int op_bytes, def_op_bytes, ad_bytes, def_ad_bytes; bool_t lock_prefix = 0; int override_seg = -1, rc = X86EMUL_OKAY; - struct operand src, dst; + struct operand src = { .reg = REG_POISON }; + struct operand dst = { .reg = REG_POISON }; enum x86_swint_type swint_type; DECLARE_ALIGNED(mmval_t, mmval); /* * Data operand effective address (usually computed from ModRM). * Default is a memory operand relative to segment DS. */ - struct operand ea = { .type = OP_MEM }; + struct operand ea = { .type = OP_MEM, .reg = REG_POISON }; ea.mem.seg = x86_seg_ds; /* gcc may reject anon union initializer */ ctxt->retire.byte = 0; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu May 07 01:56:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2015 01:56: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 1YqB2y-0006Tc-FX; Thu, 07 May 2015 01:56:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqB2w-0006TO-Ny for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:56:18 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 7B/81-02669-146CA455; Thu, 07 May 2015 01:56:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1430963776!15205642!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8473 invoked from network); 7 May 2015 01:56:17 -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; 7 May 2015 01:56:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqB2u-0004rc-07 for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:56:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YqB2t-0003oA-Uj for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:56:15 +0000 Date: Thu, 07 May 2015 01:56:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/hvm: fix the unknown nested vmexit reason 80000021 bug X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 56fe488893759c7a134c4a69a63840095ac3552d Author: Liang Li AuthorDate: Tue Apr 21 09:16:06 2015 +0200 Commit: Jan Beulich CommitDate: Tue Apr 21 09:16:06 2015 +0200 x86/hvm: fix the unknown nested vmexit reason 80000021 bug This bug will be trigged when NMI happen in the L2 guest. The current code handles the NMI incorrectly. According to Intel SDM 31.7.1.2 (Resuming Guest Software after Handling an Exception), If bit 31 of the IDT-vectoring information fields is set, and the virtual NMIs VM-execution control is 1, while bits 10:8 in the IDT-vectoring information field is 2, bit 3 in the interruptibility-state field should be cleared to avoid the next VM entry fail. Signed-off-by: Liang Li Acked-by: Kevin Tian Acked-by: Andrew Cooper master commit: f7708796db463410a97b5fa3dd5902f6e8a1d102 master date: 2015-04-10 11:35:46 -0400 --- xen/arch/x86/hvm/vmx/vmx.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index f40f89d..8584f1f 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2606,7 +2606,8 @@ static void vmx_idtv_reinject(unsigned long idtv_info) * Clear NMI-blocking interruptibility info if an NMI delivery faulted. * Re-delivery will re-set it (see SDM 3B 25.7.1.2). */ - if ( (idtv_info & INTR_INFO_INTR_TYPE_MASK) == (X86_EVENTTYPE_NMI<<8) ) + if ( cpu_has_vmx_vnmi && ((idtv_info & INTR_INFO_INTR_TYPE_MASK) == + (X86_EVENTTYPE_NMI<<8)) ) { unsigned long intr_info; @@ -2757,8 +2758,7 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) hvm_maybe_deassert_evtchn_irq(); __vmread(IDT_VECTORING_INFO, &idtv_info); - if ( !nestedhvm_vcpu_in_guestmode(v) && - exit_reason != EXIT_REASON_TASK_SWITCH ) + if ( exit_reason != EXIT_REASON_TASK_SWITCH ) vmx_idtv_reinject(idtv_info); switch ( exit_reason ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu May 07 01:56:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2015 01:56: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 1YqB2y-0006Tc-FX; Thu, 07 May 2015 01:56:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqB2w-0006TO-Ny for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:56:18 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 7B/81-02669-146CA455; Thu, 07 May 2015 01:56:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1430963776!15205642!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8473 invoked from network); 7 May 2015 01:56:17 -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; 7 May 2015 01:56:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqB2u-0004rc-07 for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:56:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YqB2t-0003oA-Uj for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:56:15 +0000 Date: Thu, 07 May 2015 01:56:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/hvm: fix the unknown nested vmexit reason 80000021 bug X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 56fe488893759c7a134c4a69a63840095ac3552d Author: Liang Li AuthorDate: Tue Apr 21 09:16:06 2015 +0200 Commit: Jan Beulich CommitDate: Tue Apr 21 09:16:06 2015 +0200 x86/hvm: fix the unknown nested vmexit reason 80000021 bug This bug will be trigged when NMI happen in the L2 guest. The current code handles the NMI incorrectly. According to Intel SDM 31.7.1.2 (Resuming Guest Software after Handling an Exception), If bit 31 of the IDT-vectoring information fields is set, and the virtual NMIs VM-execution control is 1, while bits 10:8 in the IDT-vectoring information field is 2, bit 3 in the interruptibility-state field should be cleared to avoid the next VM entry fail. Signed-off-by: Liang Li Acked-by: Kevin Tian Acked-by: Andrew Cooper master commit: f7708796db463410a97b5fa3dd5902f6e8a1d102 master date: 2015-04-10 11:35:46 -0400 --- xen/arch/x86/hvm/vmx/vmx.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index f40f89d..8584f1f 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2606,7 +2606,8 @@ static void vmx_idtv_reinject(unsigned long idtv_info) * Clear NMI-blocking interruptibility info if an NMI delivery faulted. * Re-delivery will re-set it (see SDM 3B 25.7.1.2). */ - if ( (idtv_info & INTR_INFO_INTR_TYPE_MASK) == (X86_EVENTTYPE_NMI<<8) ) + if ( cpu_has_vmx_vnmi && ((idtv_info & INTR_INFO_INTR_TYPE_MASK) == + (X86_EVENTTYPE_NMI<<8)) ) { unsigned long intr_info; @@ -2757,8 +2758,7 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) hvm_maybe_deassert_evtchn_irq(); __vmread(IDT_VECTORING_INFO, &idtv_info); - if ( !nestedhvm_vcpu_in_guestmode(v) && - exit_reason != EXIT_REASON_TASK_SWITCH ) + if ( exit_reason != EXIT_REASON_TASK_SWITCH ) vmx_idtv_reinject(idtv_info); switch ( exit_reason ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu May 07 01:56:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2015 01:56: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 1YqB39-0006V4-II; Thu, 07 May 2015 01:56:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqB38-0006Uu-CK for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:56:30 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 5C/9F-02797-D46CA455; Thu, 07 May 2015 01:56:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1430963786!13033434!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29915 invoked from network); 7 May 2015 01:56:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 May 2015 01:56:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqB34-0004ri-4Z for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:56:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YqB34-0003oW-36 for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:56:26 +0000 Date: Thu, 07 May 2015 01:56:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] Config.mk: Fix QEMU_TAG and QEMU_TRADITIONAL_REVISION handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d41906197d9a89355f43d4359d795b1d0257a53a Author: Ian Jackson AuthorDate: Tue Apr 21 14:47:38 2015 +0100 Commit: Ian Jackson CommitDate: Tue Apr 21 14:47:38 2015 +0100 Config.mk: Fix QEMU_TAG and QEMU_TRADITIONAL_REVISION handling In 2417e243 "QEMU_TAG update" my tag update script mangled the machinery which sets QEMU_TRADITIONAL_REVISION, by replacing the first assignment to QEMU_TRADITIONAL_REVISION it found rather than the one which ought to have been replaced. The result was that from that commit on, QEMU_TAG was no longer honoured although QEMU_TRADITIONAL_REVISION still was. Fix this by restoring the transfer from QEMU_TAG. This fix is analogous to 5d4c0952 "Config.mk: Fix (and, effectively, update) QEMU_TAG" from xen.git#staging, but in 4.5 there has not been a subsequent attempt to update the qemu revision, so both settings of QEMU_TRADITIONAL_REVISION are the same, and restoring the proper behaviour will not have the side effect of making a previous qemu tag update effective. Signed-off-by: Ian Jackson CC: Wei Liu CC: Ian Campbell CC: George Dunlap CC: Jan Beulich Reported-by: Jan Beulich --- Config.mk | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index cb1d23b..08df07d 100644 --- a/Config.mk +++ b/Config.mk @@ -237,9 +237,7 @@ ifneq (,$(CONFIG_QEMU)) QEMU_TRADITIONAL_LOC ?= $(CONFIG_QEMU) endif ifneq (,$(QEMU_TAG)) -QEMU_TRADITIONAL_REVISION ?= 62e41581f69c3fd4a8f829a773015eb4c17f1f3e -# Tue Mar 31 16:27:45 2015 +0100 -# xen: limit guest control of PCI command register +QEMU_TRADITIONAL_REVISION ?= $(QEMU_TAG) endif ifeq ($(GIT_HTTP),y) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu May 07 01:56:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2015 01:56: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 1YqB39-0006V4-II; Thu, 07 May 2015 01:56:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqB38-0006Uu-CK for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:56:30 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 5C/9F-02797-D46CA455; Thu, 07 May 2015 01:56:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1430963786!13033434!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29915 invoked from network); 7 May 2015 01:56:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 May 2015 01:56:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqB34-0004ri-4Z for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:56:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YqB34-0003oW-36 for xen-changelog@lists.xensource.com; Thu, 07 May 2015 01:56:26 +0000 Date: Thu, 07 May 2015 01:56:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] Config.mk: Fix QEMU_TAG and QEMU_TRADITIONAL_REVISION handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d41906197d9a89355f43d4359d795b1d0257a53a Author: Ian Jackson AuthorDate: Tue Apr 21 14:47:38 2015 +0100 Commit: Ian Jackson CommitDate: Tue Apr 21 14:47:38 2015 +0100 Config.mk: Fix QEMU_TAG and QEMU_TRADITIONAL_REVISION handling In 2417e243 "QEMU_TAG update" my tag update script mangled the machinery which sets QEMU_TRADITIONAL_REVISION, by replacing the first assignment to QEMU_TRADITIONAL_REVISION it found rather than the one which ought to have been replaced. The result was that from that commit on, QEMU_TAG was no longer honoured although QEMU_TRADITIONAL_REVISION still was. Fix this by restoring the transfer from QEMU_TAG. This fix is analogous to 5d4c0952 "Config.mk: Fix (and, effectively, update) QEMU_TAG" from xen.git#staging, but in 4.5 there has not been a subsequent attempt to update the qemu revision, so both settings of QEMU_TRADITIONAL_REVISION are the same, and restoring the proper behaviour will not have the side effect of making a previous qemu tag update effective. Signed-off-by: Ian Jackson CC: Wei Liu CC: Ian Campbell CC: George Dunlap CC: Jan Beulich Reported-by: Jan Beulich --- Config.mk | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index cb1d23b..08df07d 100644 --- a/Config.mk +++ b/Config.mk @@ -237,9 +237,7 @@ ifneq (,$(CONFIG_QEMU)) QEMU_TRADITIONAL_LOC ?= $(CONFIG_QEMU) endif ifneq (,$(QEMU_TAG)) -QEMU_TRADITIONAL_REVISION ?= 62e41581f69c3fd4a8f829a773015eb4c17f1f3e -# Tue Mar 31 16:27:45 2015 +0100 -# xen: limit guest control of PCI command register +QEMU_TRADITIONAL_REVISION ?= $(QEMU_TAG) endif ifeq ($(GIT_HTTP),y) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 08 14:44:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 May 2015 14:44:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqjVY-0001qB-Pw; Fri, 08 May 2015 14:44:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqjVW-0001pE-Lf for xen-changelog@lists.xensource.com; Fri, 08 May 2015 14:44:07 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 40/DE-02776-5BBCC455; Fri, 08 May 2015 14:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1431096243!13633214!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21631 invoked from network); 8 May 2015 14:44: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; 8 May 2015 14:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqjVT-0005l3-3X for xen-changelog@lists.xensource.com; Fri, 08 May 2015 14:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YqjVS-0006Z8-Sb for xen-changelog@lists.xensource.com; Fri, 08 May 2015 14:44:02 +0000 Date: Fri, 08 May 2015 14:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] glib-compat: fix problems with not-quite glib 2.22 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6a47d1ef7af7f5df35986b5084ce61a2255b649e Author: Cornelia Huck AuthorDate: Thu Apr 2 17:17:45 2015 +0200 Commit: Stefano Stabellini CommitDate: Thu Apr 23 14:04:33 2015 +0000 glib-compat: fix problems with not-quite glib 2.22 Commit 89b516d8b9444ece8ccabb322a9389587c7a7b83 ("glib: add compatibility interface for g_get_monotonic_time()") aimed at making qemu build with old glib versions. At least SLES11SP3, however, contains a backport of g_get_monotonic_time() while keeping the reported glib version at 2.22. Let's work around this by a strategically placed #define. upstream-commit-id: 14655e9a18276d67eebad62a9c388ca5964bb353 Signed-off-by: Cornelia Huck Message-id: 1427987865-433-2-git-send-email-cornelia.huck@de.ibm.com Signed-off-by: Peter Maydell --- include/glib-compat.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/include/glib-compat.h b/include/glib-compat.h index f0615c9..011352b 100644 --- a/include/glib-compat.h +++ b/include/glib-compat.h @@ -32,7 +32,7 @@ static inline guint g_timeout_add_seconds(guint interval, GSourceFunc function, #endif #if !GLIB_CHECK_VERSION(2, 28, 0) -static inline gint64 g_get_monotonic_time(void) +static inline gint64 qemu_g_get_monotonic_time(void) { /* g_get_monotonic_time() is best-effort so we can use the wall clock as a * fallback. @@ -43,6 +43,8 @@ static inline gint64 g_get_monotonic_time(void) return time.tv_sec * G_TIME_SPAN_SECOND + time.tv_usec; } +/* work around distro backports of this interface */ +#define g_get_monotonic_time() qemu_g_get_monotonic_time() #endif #if !GLIB_CHECK_VERSION(2, 16, 0) -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 08 14:44:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 May 2015 14:44:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqjVY-0001qB-Pw; Fri, 08 May 2015 14:44:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqjVW-0001pE-Lf for xen-changelog@lists.xensource.com; Fri, 08 May 2015 14:44:07 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 40/DE-02776-5BBCC455; Fri, 08 May 2015 14:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1431096243!13633214!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21631 invoked from network); 8 May 2015 14:44: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; 8 May 2015 14:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqjVT-0005l3-3X for xen-changelog@lists.xensource.com; Fri, 08 May 2015 14:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YqjVS-0006Z8-Sb for xen-changelog@lists.xensource.com; Fri, 08 May 2015 14:44:02 +0000 Date: Fri, 08 May 2015 14:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] glib-compat: fix problems with not-quite glib 2.22 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6a47d1ef7af7f5df35986b5084ce61a2255b649e Author: Cornelia Huck AuthorDate: Thu Apr 2 17:17:45 2015 +0200 Commit: Stefano Stabellini CommitDate: Thu Apr 23 14:04:33 2015 +0000 glib-compat: fix problems with not-quite glib 2.22 Commit 89b516d8b9444ece8ccabb322a9389587c7a7b83 ("glib: add compatibility interface for g_get_monotonic_time()") aimed at making qemu build with old glib versions. At least SLES11SP3, however, contains a backport of g_get_monotonic_time() while keeping the reported glib version at 2.22. Let's work around this by a strategically placed #define. upstream-commit-id: 14655e9a18276d67eebad62a9c388ca5964bb353 Signed-off-by: Cornelia Huck Message-id: 1427987865-433-2-git-send-email-cornelia.huck@de.ibm.com Signed-off-by: Peter Maydell --- include/glib-compat.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/include/glib-compat.h b/include/glib-compat.h index f0615c9..011352b 100644 --- a/include/glib-compat.h +++ b/include/glib-compat.h @@ -32,7 +32,7 @@ static inline guint g_timeout_add_seconds(guint interval, GSourceFunc function, #endif #if !GLIB_CHECK_VERSION(2, 28, 0) -static inline gint64 g_get_monotonic_time(void) +static inline gint64 qemu_g_get_monotonic_time(void) { /* g_get_monotonic_time() is best-effort so we can use the wall clock as a * fallback. @@ -43,6 +43,8 @@ static inline gint64 g_get_monotonic_time(void) return time.tv_sec * G_TIME_SPAN_SECOND + time.tv_usec; } +/* work around distro backports of this interface */ +#define g_get_monotonic_time() qemu_g_get_monotonic_time() #endif #if !GLIB_CHECK_VERSION(2, 16, 0) -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 08 14:55:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 May 2015 14: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 1YqjgB-0003w3-JF; Fri, 08 May 2015 14:55:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yqjg9-0003vd-Vo for xen-changelog@lists.xensource.com; Fri, 08 May 2015 14:55:06 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 1B/8C-03224-94ECC455; Fri, 08 May 2015 14:55:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1431096903!13607114!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14341 invoked from network); 8 May 2015 14:55:04 -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; 8 May 2015 14:55:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yqjg7-0005t5-8T for xen-changelog@lists.xensource.com; Fri, 08 May 2015 14:55:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yqjg6-0006wE-Ro for xen-changelog@lists.xensource.com; Fri, 08 May 2015 14:55:02 +0000 Date: Fri, 08 May 2015 14:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2d63e96d82f67371cb55c7b13b1a80e9a7fac496 Author: Ian Jackson AuthorDate: Tue Mar 31 16:31:37 2015 +0100 Commit: Ian Jackson CommitDate: Tue Mar 31 16:31:37 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 94c4601..2681926 100644 --- a/Config.mk +++ b/Config.mk @@ -224,9 +224,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.3.4 -# Mon Feb 2 16:49:59 2015 +0000 -# cirrus: fix an uninitialized variable +QEMU_TAG ?= edb43a7abbec40fb601140fecdc29d693358963b +# Tue Mar 31 16:27:45 2015 +0100 +# xen: limit guest control of PCI command register # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 08 14:55:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 May 2015 14: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 1YqjgB-0003w3-JF; Fri, 08 May 2015 14:55:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yqjg9-0003vd-Vo for xen-changelog@lists.xensource.com; Fri, 08 May 2015 14:55:06 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 1B/8C-03224-94ECC455; Fri, 08 May 2015 14:55:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1431096903!13607114!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14341 invoked from network); 8 May 2015 14:55:04 -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; 8 May 2015 14:55:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yqjg7-0005t5-8T for xen-changelog@lists.xensource.com; Fri, 08 May 2015 14:55:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yqjg6-0006wE-Ro for xen-changelog@lists.xensource.com; Fri, 08 May 2015 14:55:02 +0000 Date: Fri, 08 May 2015 14:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2d63e96d82f67371cb55c7b13b1a80e9a7fac496 Author: Ian Jackson AuthorDate: Tue Mar 31 16:31:37 2015 +0100 Commit: Ian Jackson CommitDate: Tue Mar 31 16:31:37 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 94c4601..2681926 100644 --- a/Config.mk +++ b/Config.mk @@ -224,9 +224,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.3.4 -# Mon Feb 2 16:49:59 2015 +0000 -# cirrus: fix an uninitialized variable +QEMU_TAG ?= edb43a7abbec40fb601140fecdc29d693358963b +# Tue Mar 31 16:27:45 2015 +0100 +# xen: limit guest control of PCI command register # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 08 14:55:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 May 2015 14:55:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqjgM-00040l-MF; Fri, 08 May 2015 14:55:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqjgK-000401-Pg for xen-changelog@lists.xensource.com; Fri, 08 May 2015 14:55:16 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id B1/83-02785-35ECC455; Fri, 08 May 2015 14:55:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1431096913!10715216!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29190 invoked from network); 8 May 2015 14:55:14 -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; 8 May 2015 14:55:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqjgH-0005t9-Hy for xen-changelog@lists.xensource.com; Fri, 08 May 2015 14:55:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YqjgH-0006wg-DW for xen-changelog@lists.xensource.com; Fri, 08 May 2015 14:55:13 +0000 Date: Fri, 08 May 2015 14:55:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] Limit XEN_DOMCTL_memory_mapping hypercall to only process up to 64 GFNs (or less) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 18856366dceb254f16577113e11e4bb94cdc59d9 Author: Konrad Rzeszutek Wilk AuthorDate: Wed Apr 1 10:11:28 2015 +0100 Commit: Ian Campbell CommitDate: Wed Apr 1 10:15:21 2015 +0100 Limit XEN_DOMCTL_memory_mapping hypercall to only process up to 64 GFNs (or less) Said hypercall for large BARs can take quite a while. As such we can require that the hypercall MUST break up the request in smaller values. Another approach is to add preemption to it - whether we do the preemption using hypercall_create_continuation or returning EAGAIN to userspace (and have it re-invocate the call) - either way the issue we cannot easily solve is that in 'map_mmio_regions' if we encounter an error we MUST call 'unmap_mmio_regions' for the whole BAR region. Since the preemption would re-use input fields such as nr_mfns, first_gfn, first_mfn - we would lose the original values - and only undo what was done in the current round (i.e. ignoring anything that was done prior to earlier preemptions). Unless we re-used the return value as 'EAGAIN|nr_mfns_done<<10' but that puts a limit (since the return value is a long) on the amount of nr_mfns that can provided. This patch sidesteps this problem by: - Setting an hard limit of nr_mfns having to be 64 or less. - Toolstack adjusts correspondingly to the nr_mfn limit. - If the there is an error when adding the toolstack will call the remove operation to remove the whole region. The need to break this hypercall down is for large BARs can take more than the guest (initial domain usually) time-slice. This has the negative result in that the guest is locked out for a long duration and is unable to act on any pending events. We also augment the code to return zero if nr_mfns instead of trying to the hypercall. This is XSA-125 / CVE-2015-2752. Suggested-by: Jan Beulich Acked-by: Jan Beulich Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Ian Campbell --- tools/libxc/xc_domain.c | 55 +++++++++++++++++++++++++++++++++++++++---- xen/arch/x86/domctl.c | 5 ++++ xen/include/public/domctl.h | 1 + 3 files changed, 56 insertions(+), 5 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 3257e2a..7386e58 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -1467,6 +1467,13 @@ int xc_domain_bind_pt_isa_irq( PT_IRQ_TYPE_ISA, 0, 0, 0, machine_irq)); } +#ifndef min +#define min(X, Y) ({ \ + const typeof (X) _x = (X); \ + const typeof (Y) _y = (Y); \ + (void) (&_x == &_y); \ + (_x < _y) ? _x : _y; }) +#endif int xc_domain_memory_mapping( xc_interface *xch, uint32_t domid, @@ -1476,17 +1483,55 @@ int xc_domain_memory_mapping( uint32_t add_mapping) { DECLARE_DOMCTL; + int ret = 0, err; + unsigned long done = 0, nr, max_batch_sz; + + if ( !nr_mfns ) + return 0; domctl.cmd = XEN_DOMCTL_memory_mapping; domctl.domain = domid; - domctl.u.memory_mapping.first_gfn = first_gfn; - domctl.u.memory_mapping.first_mfn = first_mfn; - domctl.u.memory_mapping.nr_mfns = nr_mfns; domctl.u.memory_mapping.add_mapping = add_mapping; + max_batch_sz = nr_mfns; + do + { + nr = min(nr_mfns - done, max_batch_sz); + domctl.u.memory_mapping.nr_mfns = nr; + domctl.u.memory_mapping.first_gfn = first_gfn + done; + domctl.u.memory_mapping.first_mfn = first_mfn + done; + err = do_domctl(xch, &domctl); + if ( err && errno == E2BIG ) + { + if ( max_batch_sz <= 1 ) + break; + max_batch_sz >>= 1; + continue; + } + /* Save the first error... */ + if ( !ret ) + ret = err; + /* .. and ignore the rest of them when removing. */ + if ( err && add_mapping != DPCI_REMOVE_MAPPING ) + break; - return do_domctl(xch, &domctl); -} + done += nr; + } while ( done < nr_mfns ); + /* + * Undo what we have done unless unmapping, by unmapping the entire region. + * Errors here are ignored. + */ + if ( ret && add_mapping != DPCI_REMOVE_MAPPING ) + xc_domain_memory_mapping(xch, domid, first_gfn, first_mfn, nr_mfns, + DPCI_REMOVE_MAPPING); + + /* We might get E2BIG so many times that we never advance. */ + if ( !done && !ret ) + ret = -1; + + return ret; +} +#undef min int xc_domain_ioport_mapping( xc_interface *xch, uint32_t domid, diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 173bf01..306297a 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -655,6 +655,11 @@ long arch_do_domctl( (gfn + nr_mfns - 1) < gfn ) /* wrap? */ break; + ret = -E2BIG; + /* Must break hypercall up as this could take a while. */ + if ( nr_mfns > 64 ) + break; + ret = -EPERM; if ( !iomem_access_permitted(current->domain, mfn, mfn + nr_mfns - 1) ) break; diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index d381903..8f9d5c0 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -513,6 +513,7 @@ DEFINE_XEN_GUEST_HANDLE(xen_domctl_bind_pt_irq_t); /* Bind machine I/O address range -> HVM address range. */ +/* If this returns -E2BIG lower nr_mfns value. */ /* XEN_DOMCTL_memory_mapping */ #define DPCI_ADD_MAPPING 1 #define DPCI_REMOVE_MAPPING 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 Fri May 08 14:55:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 May 2015 14:55:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqjgM-00040l-MF; Fri, 08 May 2015 14:55:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqjgK-000401-Pg for xen-changelog@lists.xensource.com; Fri, 08 May 2015 14:55:16 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id B1/83-02785-35ECC455; Fri, 08 May 2015 14:55:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1431096913!10715216!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29190 invoked from network); 8 May 2015 14:55:14 -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; 8 May 2015 14:55:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqjgH-0005t9-Hy for xen-changelog@lists.xensource.com; Fri, 08 May 2015 14:55:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YqjgH-0006wg-DW for xen-changelog@lists.xensource.com; Fri, 08 May 2015 14:55:13 +0000 Date: Fri, 08 May 2015 14:55:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] Limit XEN_DOMCTL_memory_mapping hypercall to only process up to 64 GFNs (or less) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 18856366dceb254f16577113e11e4bb94cdc59d9 Author: Konrad Rzeszutek Wilk AuthorDate: Wed Apr 1 10:11:28 2015 +0100 Commit: Ian Campbell CommitDate: Wed Apr 1 10:15:21 2015 +0100 Limit XEN_DOMCTL_memory_mapping hypercall to only process up to 64 GFNs (or less) Said hypercall for large BARs can take quite a while. As such we can require that the hypercall MUST break up the request in smaller values. Another approach is to add preemption to it - whether we do the preemption using hypercall_create_continuation or returning EAGAIN to userspace (and have it re-invocate the call) - either way the issue we cannot easily solve is that in 'map_mmio_regions' if we encounter an error we MUST call 'unmap_mmio_regions' for the whole BAR region. Since the preemption would re-use input fields such as nr_mfns, first_gfn, first_mfn - we would lose the original values - and only undo what was done in the current round (i.e. ignoring anything that was done prior to earlier preemptions). Unless we re-used the return value as 'EAGAIN|nr_mfns_done<<10' but that puts a limit (since the return value is a long) on the amount of nr_mfns that can provided. This patch sidesteps this problem by: - Setting an hard limit of nr_mfns having to be 64 or less. - Toolstack adjusts correspondingly to the nr_mfn limit. - If the there is an error when adding the toolstack will call the remove operation to remove the whole region. The need to break this hypercall down is for large BARs can take more than the guest (initial domain usually) time-slice. This has the negative result in that the guest is locked out for a long duration and is unable to act on any pending events. We also augment the code to return zero if nr_mfns instead of trying to the hypercall. This is XSA-125 / CVE-2015-2752. Suggested-by: Jan Beulich Acked-by: Jan Beulich Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Ian Campbell --- tools/libxc/xc_domain.c | 55 +++++++++++++++++++++++++++++++++++++++---- xen/arch/x86/domctl.c | 5 ++++ xen/include/public/domctl.h | 1 + 3 files changed, 56 insertions(+), 5 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 3257e2a..7386e58 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -1467,6 +1467,13 @@ int xc_domain_bind_pt_isa_irq( PT_IRQ_TYPE_ISA, 0, 0, 0, machine_irq)); } +#ifndef min +#define min(X, Y) ({ \ + const typeof (X) _x = (X); \ + const typeof (Y) _y = (Y); \ + (void) (&_x == &_y); \ + (_x < _y) ? _x : _y; }) +#endif int xc_domain_memory_mapping( xc_interface *xch, uint32_t domid, @@ -1476,17 +1483,55 @@ int xc_domain_memory_mapping( uint32_t add_mapping) { DECLARE_DOMCTL; + int ret = 0, err; + unsigned long done = 0, nr, max_batch_sz; + + if ( !nr_mfns ) + return 0; domctl.cmd = XEN_DOMCTL_memory_mapping; domctl.domain = domid; - domctl.u.memory_mapping.first_gfn = first_gfn; - domctl.u.memory_mapping.first_mfn = first_mfn; - domctl.u.memory_mapping.nr_mfns = nr_mfns; domctl.u.memory_mapping.add_mapping = add_mapping; + max_batch_sz = nr_mfns; + do + { + nr = min(nr_mfns - done, max_batch_sz); + domctl.u.memory_mapping.nr_mfns = nr; + domctl.u.memory_mapping.first_gfn = first_gfn + done; + domctl.u.memory_mapping.first_mfn = first_mfn + done; + err = do_domctl(xch, &domctl); + if ( err && errno == E2BIG ) + { + if ( max_batch_sz <= 1 ) + break; + max_batch_sz >>= 1; + continue; + } + /* Save the first error... */ + if ( !ret ) + ret = err; + /* .. and ignore the rest of them when removing. */ + if ( err && add_mapping != DPCI_REMOVE_MAPPING ) + break; - return do_domctl(xch, &domctl); -} + done += nr; + } while ( done < nr_mfns ); + /* + * Undo what we have done unless unmapping, by unmapping the entire region. + * Errors here are ignored. + */ + if ( ret && add_mapping != DPCI_REMOVE_MAPPING ) + xc_domain_memory_mapping(xch, domid, first_gfn, first_mfn, nr_mfns, + DPCI_REMOVE_MAPPING); + + /* We might get E2BIG so many times that we never advance. */ + if ( !done && !ret ) + ret = -1; + + return ret; +} +#undef min int xc_domain_ioport_mapping( xc_interface *xch, uint32_t domid, diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 173bf01..306297a 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -655,6 +655,11 @@ long arch_do_domctl( (gfn + nr_mfns - 1) < gfn ) /* wrap? */ break; + ret = -E2BIG; + /* Must break hypercall up as this could take a while. */ + if ( nr_mfns > 64 ) + break; + ret = -EPERM; if ( !iomem_access_permitted(current->domain, mfn, mfn + nr_mfns - 1) ) break; diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index d381903..8f9d5c0 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -513,6 +513,7 @@ DEFINE_XEN_GUEST_HANDLE(xen_domctl_bind_pt_irq_t); /* Bind machine I/O address range -> HVM address range. */ +/* If this returns -E2BIG lower nr_mfns value. */ /* XEN_DOMCTL_memory_mapping */ #define DPCI_ADD_MAPPING 1 #define DPCI_REMOVE_MAPPING 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 Fri May 08 14:55:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 May 2015 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 1YqjgW-00044N-P6; Fri, 08 May 2015 14:55:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqjgU-00043l-PW for xen-changelog@lists.xensource.com; Fri, 08 May 2015 14:55:26 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 43/B9-02785-D5ECC455; Fri, 08 May 2015 14:55:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1431096924!15798011!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17077 invoked from network); 8 May 2015 14:55:25 -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; 8 May 2015 14:55:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqjgR-0005tI-VW for xen-changelog@lists.xensource.com; Fri, 08 May 2015 14:55:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YqjgR-0006xg-Kb for xen-changelog@lists.xensource.com; Fri, 08 May 2015 14:55:23 +0000 Date: Fri, 08 May 2015 14:55:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] domctl: don't allow a toolstack domain to call domain_pause() on itself X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 46ed0083a76efa82713ea979b312fa69250380b2 Author: Andrew Cooper AuthorDate: Wed Apr 1 10:11:30 2015 +0100 Commit: Ian Campbell CommitDate: Wed Apr 1 10:15:29 2015 +0100 domctl: don't allow a toolstack domain to call domain_pause() on itself These DOMCTL subops were accidentally declared safe for disaggregation in the wake of XSA-77. This is XSA-127 / CVE-2015-2751. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Ian Campbell --- xen/arch/x86/domctl.c | 8 ++++++++ xen/common/domctl.c | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 306297a..07000de 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -946,6 +946,10 @@ long arch_do_domctl( { xen_guest_tsc_info_t info; + ret = -EINVAL; + if ( d == current->domain ) /* no domain_pause() */ + break; + domain_pause(d); tsc_get_info(d, &info.tsc_mode, &info.elapsed_nsec, @@ -961,6 +965,10 @@ long arch_do_domctl( case XEN_DOMCTL_settscinfo: { + ret = -EINVAL; + if ( d == current->domain ) /* no domain_pause() */ + break; + domain_pause(d); tsc_set_info(d, domctl->u.tsc_info.info.tsc_mode, domctl->u.tsc_info.info.elapsed_nsec, diff --git a/xen/common/domctl.c b/xen/common/domctl.c index bc8e9d8..53c9d91 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -391,8 +391,10 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) case XEN_DOMCTL_resumedomain: { - domain_resume(d); - ret = 0; + if ( d == current->domain ) /* no domain_pause() */ + ret = -EINVAL; + else + domain_resume(d); } 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 Fri May 08 14:55:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 May 2015 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 1YqjgW-00044N-P6; Fri, 08 May 2015 14:55:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqjgU-00043l-PW for xen-changelog@lists.xensource.com; Fri, 08 May 2015 14:55:26 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 43/B9-02785-D5ECC455; Fri, 08 May 2015 14:55:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1431096924!15798011!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17077 invoked from network); 8 May 2015 14:55:25 -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; 8 May 2015 14:55:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YqjgR-0005tI-VW for xen-changelog@lists.xensource.com; Fri, 08 May 2015 14:55:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YqjgR-0006xg-Kb for xen-changelog@lists.xensource.com; Fri, 08 May 2015 14:55:23 +0000 Date: Fri, 08 May 2015 14:55:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] domctl: don't allow a toolstack domain to call domain_pause() on itself X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 46ed0083a76efa82713ea979b312fa69250380b2 Author: Andrew Cooper AuthorDate: Wed Apr 1 10:11:30 2015 +0100 Commit: Ian Campbell CommitDate: Wed Apr 1 10:15:29 2015 +0100 domctl: don't allow a toolstack domain to call domain_pause() on itself These DOMCTL subops were accidentally declared safe for disaggregation in the wake of XSA-77. This is XSA-127 / CVE-2015-2751. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Ian Campbell --- xen/arch/x86/domctl.c | 8 ++++++++ xen/common/domctl.c | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 306297a..07000de 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -946,6 +946,10 @@ long arch_do_domctl( { xen_guest_tsc_info_t info; + ret = -EINVAL; + if ( d == current->domain ) /* no domain_pause() */ + break; + domain_pause(d); tsc_get_info(d, &info.tsc_mode, &info.elapsed_nsec, @@ -961,6 +965,10 @@ long arch_do_domctl( case XEN_DOMCTL_settscinfo: { + ret = -EINVAL; + if ( d == current->domain ) /* no domain_pause() */ + break; + domain_pause(d); tsc_set_info(d, domctl->u.tsc_info.info.tsc_mode, domctl->u.tsc_info.info.elapsed_nsec, diff --git a/xen/common/domctl.c b/xen/common/domctl.c index bc8e9d8..53c9d91 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -391,8 +391,10 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) case XEN_DOMCTL_resumedomain: { - domain_resume(d); - ret = 0; + if ( d == current->domain ) /* no domain_pause() */ + ret = -EINVAL; + else + domain_resume(d); } 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 Fri May 08 14:55:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 May 2015 14:55: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 1Yqjgg-00047P-S6; Fri, 08 May 2015 14:55:38 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yqjge-00046U-O8 for xen-changelog@lists.xensource.com; Fri, 08 May 2015 14:55:36 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 7B/9C-03197-76ECC455; Fri, 08 May 2015 14:55:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1431096934!11202271!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13519 invoked from network); 8 May 2015 14:55:35 -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; 8 May 2015 14:55:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yqjgc-0005tT-4V for xen-changelog@lists.xensource.com; Fri, 08 May 2015 14:55:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yqjgc-0006yn-2y for xen-changelog@lists.xensource.com; Fri, 08 May 2015 14:55:34 +0000 Date: Fri, 08 May 2015 14:55:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] domctl/sysctl: don't leak hypervisor stack to toolstacks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 58db71c5cdd48126b9380c230dc5b61554bad7d8 Author: Andrew Cooper AuthorDate: Tue Apr 21 09:25:03 2015 +0200 Commit: Jan Beulich CommitDate: Tue Apr 21 09:25:03 2015 +0200 domctl/sysctl: don't leak hypervisor stack to toolstacks This is CVE-2015-3340 / XSA-132. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Ian Campbell master commit: 4ff3449f0e9d175ceb9551d3f2aecb59273f639d master date: 2015-04-21 09:03:15 +0200 --- xen/arch/x86/domctl.c | 2 +- xen/common/sysctl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 07000de..a115278 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -944,7 +944,7 @@ long arch_do_domctl( case XEN_DOMCTL_gettscinfo: { - xen_guest_tsc_info_t info; + xen_guest_tsc_info_t info = { 0 }; ret = -EINVAL; if ( d == current->domain ) /* no domain_pause() */ diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c index 0cb6ee1..70202e8 100644 --- a/xen/common/sysctl.c +++ b/xen/common/sysctl.c @@ -76,7 +76,7 @@ long do_sysctl(XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl) case XEN_SYSCTL_getdomaininfolist: { struct domain *d; - struct xen_domctl_getdomaininfo info; + struct xen_domctl_getdomaininfo info = { 0 }; u32 num_domains = 0; rcu_read_lock(&domlist_read_lock); -- 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 May 08 14:55:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 May 2015 14:55: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 1Yqjgg-00047P-S6; Fri, 08 May 2015 14:55:38 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yqjge-00046U-O8 for xen-changelog@lists.xensource.com; Fri, 08 May 2015 14:55:36 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 7B/9C-03197-76ECC455; Fri, 08 May 2015 14:55:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1431096934!11202271!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13519 invoked from network); 8 May 2015 14:55:35 -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; 8 May 2015 14:55:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yqjgc-0005tT-4V for xen-changelog@lists.xensource.com; Fri, 08 May 2015 14:55:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yqjgc-0006yn-2y for xen-changelog@lists.xensource.com; Fri, 08 May 2015 14:55:34 +0000 Date: Fri, 08 May 2015 14:55:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] domctl/sysctl: don't leak hypervisor stack to toolstacks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 58db71c5cdd48126b9380c230dc5b61554bad7d8 Author: Andrew Cooper AuthorDate: Tue Apr 21 09:25:03 2015 +0200 Commit: Jan Beulich CommitDate: Tue Apr 21 09:25:03 2015 +0200 domctl/sysctl: don't leak hypervisor stack to toolstacks This is CVE-2015-3340 / XSA-132. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Ian Campbell master commit: 4ff3449f0e9d175ceb9551d3f2aecb59273f639d master date: 2015-04-21 09:03:15 +0200 --- xen/arch/x86/domctl.c | 2 +- xen/common/sysctl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 07000de..a115278 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -944,7 +944,7 @@ long arch_do_domctl( case XEN_DOMCTL_gettscinfo: { - xen_guest_tsc_info_t info; + xen_guest_tsc_info_t info = { 0 }; ret = -EINVAL; if ( d == current->domain ) /* no domain_pause() */ diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c index 0cb6ee1..70202e8 100644 --- a/xen/common/sysctl.c +++ b/xen/common/sysctl.c @@ -76,7 +76,7 @@ long do_sysctl(XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl) case XEN_SYSCTL_getdomaininfolist: { struct domain *d; - struct xen_domctl_getdomaininfo info; + struct xen_domctl_getdomaininfo info = { 0 }; u32 num_domains = 0; rcu_read_lock(&domlist_read_lock); -- 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 Sat May 09 13:22:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 May 2015 13: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 1Yr4hk-0000l2-VO; Sat, 09 May 2015 13:22:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yr4hj-0000kT-TW for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:22:08 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id A8/80-03245-FF90E455; Sat, 09 May 2015 13:22:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1431177725!16080963!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7794 invoked from network); 9 May 2015 13:22:06 -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; 9 May 2015 13:22:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yr4hf-00044S-A0 for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:22:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yr4he-0006I6-UQ for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:22:03 +0000 Date: Sat, 09 May 2015 13:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] domctl/sysctl: don't leak hypervisor stack to toolstacks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5365c7b98240acdaac2a332fe2070d5cc5aa596f Author: Andrew Cooper AuthorDate: Tue Apr 21 09:18:39 2015 +0200 Commit: Jan Beulich CommitDate: Tue Apr 21 09:18:39 2015 +0200 domctl/sysctl: don't leak hypervisor stack to toolstacks This is CVE-2015-3340 / XSA-132. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Ian Campbell master commit: 4ff3449f0e9d175ceb9551d3f2aecb59273f639d master date: 2015-04-21 09:03:15 +0200 --- xen/arch/x86/domctl.c | 2 +- xen/common/sysctl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index f01771d..434dc59 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -958,7 +958,7 @@ long arch_do_domctl( case XEN_DOMCTL_gettscinfo: { - xen_guest_tsc_info_t info; + xen_guest_tsc_info_t info = { 0 }; ret = -EINVAL; if ( d == current->domain ) /* no domain_pause() */ diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c index 0cb6ee1..70202e8 100644 --- a/xen/common/sysctl.c +++ b/xen/common/sysctl.c @@ -76,7 +76,7 @@ long do_sysctl(XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl) case XEN_SYSCTL_getdomaininfolist: { struct domain *d; - struct xen_domctl_getdomaininfo info; + struct xen_domctl_getdomaininfo info = { 0 }; u32 num_domains = 0; rcu_read_lock(&domlist_read_lock); -- 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 May 09 13:22:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 May 2015 13: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 1Yr4hk-0000l2-VO; Sat, 09 May 2015 13:22:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yr4hj-0000kT-TW for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:22:08 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id A8/80-03245-FF90E455; Sat, 09 May 2015 13:22:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1431177725!16080963!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7794 invoked from network); 9 May 2015 13:22:06 -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; 9 May 2015 13:22:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yr4hf-00044S-A0 for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:22:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yr4he-0006I6-UQ for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:22:03 +0000 Date: Sat, 09 May 2015 13:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] domctl/sysctl: don't leak hypervisor stack to toolstacks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5365c7b98240acdaac2a332fe2070d5cc5aa596f Author: Andrew Cooper AuthorDate: Tue Apr 21 09:18:39 2015 +0200 Commit: Jan Beulich CommitDate: Tue Apr 21 09:18:39 2015 +0200 domctl/sysctl: don't leak hypervisor stack to toolstacks This is CVE-2015-3340 / XSA-132. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Ian Campbell master commit: 4ff3449f0e9d175ceb9551d3f2aecb59273f639d master date: 2015-04-21 09:03:15 +0200 --- xen/arch/x86/domctl.c | 2 +- xen/common/sysctl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index f01771d..434dc59 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -958,7 +958,7 @@ long arch_do_domctl( case XEN_DOMCTL_gettscinfo: { - xen_guest_tsc_info_t info; + xen_guest_tsc_info_t info = { 0 }; ret = -EINVAL; if ( d == current->domain ) /* no domain_pause() */ diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c index 0cb6ee1..70202e8 100644 --- a/xen/common/sysctl.c +++ b/xen/common/sysctl.c @@ -76,7 +76,7 @@ long do_sysctl(XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl) case XEN_SYSCTL_getdomaininfolist: { struct domain *d; - struct xen_domctl_getdomaininfo info; + struct xen_domctl_getdomaininfo info = { 0 }; u32 num_domains = 0; rcu_read_lock(&domlist_read_lock); -- 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 May 09 13:22:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 May 2015 13:22:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yr4hv-0000n5-1l; Sat, 09 May 2015 13:22:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yr4hu-0000mn-Cm for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:22:18 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id 27/7B-02824-90A0E455; Sat, 09 May 2015 13:22:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1431177735!10404378!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21514 invoked from network); 9 May 2015 13:22:16 -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 May 2015 13:22:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yr4hr-00044e-Aw for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:22:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yr4hr-0006IX-6B for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:22:15 +0000 Date: Sat, 09 May 2015 13:22:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] 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 5fea6a3db9ad60e956a5182e2bd8184bdf992fa8 Author: Stefano Stabellini AuthorDate: Tue Apr 21 09:19:37 2015 +0200 Commit: Jan Beulich CommitDate: Tue Apr 21 09:19:37 2015 +0200 QEMU_UPSTREAM_REVISION = master again Signed-off-by: Stefano Stabellini --- Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index 1d58838..89dd55a 100644 --- a/Config.mk +++ b/Config.mk @@ -234,7 +234,7 @@ 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 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.4.2 +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#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 May 09 13:22:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 May 2015 13:22:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yr4hv-0000n5-1l; Sat, 09 May 2015 13:22:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yr4hu-0000mn-Cm for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:22:18 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id 27/7B-02824-90A0E455; Sat, 09 May 2015 13:22:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1431177735!10404378!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21514 invoked from network); 9 May 2015 13:22:16 -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 May 2015 13:22:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yr4hr-00044e-Aw for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:22:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yr4hr-0006IX-6B for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:22:15 +0000 Date: Sat, 09 May 2015 13:22:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] 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 5fea6a3db9ad60e956a5182e2bd8184bdf992fa8 Author: Stefano Stabellini AuthorDate: Tue Apr 21 09:19:37 2015 +0200 Commit: Jan Beulich CommitDate: Tue Apr 21 09:19:37 2015 +0200 QEMU_UPSTREAM_REVISION = master again Signed-off-by: Stefano Stabellini --- Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index 1d58838..89dd55a 100644 --- a/Config.mk +++ b/Config.mk @@ -234,7 +234,7 @@ 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 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.4.2 +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#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 May 09 13:22:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 May 2015 13:22: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 1Yr4i6-0000pD-4P; Sat, 09 May 2015 13:22:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yr4i4-0000op-LA for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:22:28 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id 11/E3-02948-31A0E455; Sat, 09 May 2015 13:22:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1431177746!11386296!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.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11526 invoked from network); 9 May 2015 13:22: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; 9 May 2015 13:22:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yr4i1-00044m-Om for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:22:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yr4i1-0006It-Dd for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:22:25 +0000 Date: Sat, 09 May 2015 13:22:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] hvmloader: don't treat ROM BAR like other BARs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1af109570552b4f7b2aaa3a335b447c50ebb676c Author: Jan Beulich AuthorDate: Tue Apr 21 09:20:34 2015 +0200 Commit: Jan Beulich CommitDate: Tue Apr 21 09:20:34 2015 +0200 hvmloader: don't treat ROM BAR like other BARs Its low 11 bits have different meaning. Signed-off-by: Jan Beulich Reviewed-by: Konrad Rzeszutek Wilk Acked-by: Ian Campbell Reviewed-by: Andrew Cooper master commit: 73aa7fc2926c5ae30d8ebd049beadbb48e24d6c6 master date: 2015-03-26 11:17:51 +0100 --- tools/firmware/hvmloader/pci.c | 36 +++++++++++++++++++++++++----------- 1 files changed, 25 insertions(+), 11 deletions(-) diff --git a/tools/firmware/hvmloader/pci.c b/tools/firmware/hvmloader/pci.c index 627e8cb..460f183 100644 --- a/tools/firmware/hvmloader/pci.c +++ b/tools/firmware/hvmloader/pci.c @@ -172,18 +172,31 @@ void pci_setup(void) bar_reg = PCI_ROM_ADDRESS; bar_data = pci_readl(devfn, bar_reg); - is_64bar = !!((bar_data & (PCI_BASE_ADDRESS_SPACE | - PCI_BASE_ADDRESS_MEM_TYPE_MASK)) == - (PCI_BASE_ADDRESS_SPACE_MEMORY | - PCI_BASE_ADDRESS_MEM_TYPE_64)); - pci_writel(devfn, bar_reg, ~0); + if ( bar_reg != PCI_ROM_ADDRESS ) + { + is_64bar = !!((bar_data & (PCI_BASE_ADDRESS_SPACE | + PCI_BASE_ADDRESS_MEM_TYPE_MASK)) == + (PCI_BASE_ADDRESS_SPACE_MEMORY | + PCI_BASE_ADDRESS_MEM_TYPE_64)); + pci_writel(devfn, bar_reg, ~0); + } + else + { + is_64bar = 0; + pci_writel(devfn, bar_reg, + (bar_data | PCI_ROM_ADDRESS_MASK) & + ~PCI_ROM_ADDRESS_ENABLE); + } bar_sz = pci_readl(devfn, bar_reg); pci_writel(devfn, bar_reg, bar_data); - bar_sz &= (((bar_data & PCI_BASE_ADDRESS_SPACE) == - PCI_BASE_ADDRESS_SPACE_MEMORY) ? - PCI_BASE_ADDRESS_MEM_MASK : - (PCI_BASE_ADDRESS_IO_MASK & 0xffff)); + if ( bar_reg != PCI_ROM_ADDRESS ) + bar_sz &= (((bar_data & PCI_BASE_ADDRESS_SPACE) == + PCI_BASE_ADDRESS_SPACE_MEMORY) ? + PCI_BASE_ADDRESS_MEM_MASK : + (PCI_BASE_ADDRESS_IO_MASK & 0xffff)); + else + bar_sz &= PCI_ROM_ADDRESS_MASK; if (is_64bar) { bar_data_upper = pci_readl(devfn, bar_reg + 4); pci_writel(devfn, bar_reg + 4, ~0); @@ -207,8 +220,9 @@ void pci_setup(void) bars[i].bar_reg = bar_reg; bars[i].bar_sz = bar_sz; - if ( (bar_data & PCI_BASE_ADDRESS_SPACE) == - PCI_BASE_ADDRESS_SPACE_MEMORY ) + if ( ((bar_data & PCI_BASE_ADDRESS_SPACE) == + PCI_BASE_ADDRESS_SPACE_MEMORY) || + (bar_reg == PCI_ROM_ADDRESS) ) mmio_total += bar_sz; nr_bars++; -- 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 May 09 13:22:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 May 2015 13:22: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 1Yr4i6-0000pD-4P; Sat, 09 May 2015 13:22:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yr4i4-0000op-LA for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:22:28 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id 11/E3-02948-31A0E455; Sat, 09 May 2015 13:22:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1431177746!11386296!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.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11526 invoked from network); 9 May 2015 13:22: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; 9 May 2015 13:22:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yr4i1-00044m-Om for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:22:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yr4i1-0006It-Dd for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:22:25 +0000 Date: Sat, 09 May 2015 13:22:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] hvmloader: don't treat ROM BAR like other BARs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1af109570552b4f7b2aaa3a335b447c50ebb676c Author: Jan Beulich AuthorDate: Tue Apr 21 09:20:34 2015 +0200 Commit: Jan Beulich CommitDate: Tue Apr 21 09:20:34 2015 +0200 hvmloader: don't treat ROM BAR like other BARs Its low 11 bits have different meaning. Signed-off-by: Jan Beulich Reviewed-by: Konrad Rzeszutek Wilk Acked-by: Ian Campbell Reviewed-by: Andrew Cooper master commit: 73aa7fc2926c5ae30d8ebd049beadbb48e24d6c6 master date: 2015-03-26 11:17:51 +0100 --- tools/firmware/hvmloader/pci.c | 36 +++++++++++++++++++++++++----------- 1 files changed, 25 insertions(+), 11 deletions(-) diff --git a/tools/firmware/hvmloader/pci.c b/tools/firmware/hvmloader/pci.c index 627e8cb..460f183 100644 --- a/tools/firmware/hvmloader/pci.c +++ b/tools/firmware/hvmloader/pci.c @@ -172,18 +172,31 @@ void pci_setup(void) bar_reg = PCI_ROM_ADDRESS; bar_data = pci_readl(devfn, bar_reg); - is_64bar = !!((bar_data & (PCI_BASE_ADDRESS_SPACE | - PCI_BASE_ADDRESS_MEM_TYPE_MASK)) == - (PCI_BASE_ADDRESS_SPACE_MEMORY | - PCI_BASE_ADDRESS_MEM_TYPE_64)); - pci_writel(devfn, bar_reg, ~0); + if ( bar_reg != PCI_ROM_ADDRESS ) + { + is_64bar = !!((bar_data & (PCI_BASE_ADDRESS_SPACE | + PCI_BASE_ADDRESS_MEM_TYPE_MASK)) == + (PCI_BASE_ADDRESS_SPACE_MEMORY | + PCI_BASE_ADDRESS_MEM_TYPE_64)); + pci_writel(devfn, bar_reg, ~0); + } + else + { + is_64bar = 0; + pci_writel(devfn, bar_reg, + (bar_data | PCI_ROM_ADDRESS_MASK) & + ~PCI_ROM_ADDRESS_ENABLE); + } bar_sz = pci_readl(devfn, bar_reg); pci_writel(devfn, bar_reg, bar_data); - bar_sz &= (((bar_data & PCI_BASE_ADDRESS_SPACE) == - PCI_BASE_ADDRESS_SPACE_MEMORY) ? - PCI_BASE_ADDRESS_MEM_MASK : - (PCI_BASE_ADDRESS_IO_MASK & 0xffff)); + if ( bar_reg != PCI_ROM_ADDRESS ) + bar_sz &= (((bar_data & PCI_BASE_ADDRESS_SPACE) == + PCI_BASE_ADDRESS_SPACE_MEMORY) ? + PCI_BASE_ADDRESS_MEM_MASK : + (PCI_BASE_ADDRESS_IO_MASK & 0xffff)); + else + bar_sz &= PCI_ROM_ADDRESS_MASK; if (is_64bar) { bar_data_upper = pci_readl(devfn, bar_reg + 4); pci_writel(devfn, bar_reg + 4, ~0); @@ -207,8 +220,9 @@ void pci_setup(void) bars[i].bar_reg = bar_reg; bars[i].bar_sz = bar_sz; - if ( (bar_data & PCI_BASE_ADDRESS_SPACE) == - PCI_BASE_ADDRESS_SPACE_MEMORY ) + if ( ((bar_data & PCI_BASE_ADDRESS_SPACE) == + PCI_BASE_ADDRESS_SPACE_MEMORY) || + (bar_reg == PCI_ROM_ADDRESS) ) mmio_total += bar_sz; nr_bars++; -- 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 May 09 13:22:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 May 2015 13:22:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yr4iF-0000rU-6t; Sat, 09 May 2015 13:22:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yr4iE-0000r8-G4 for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:22:38 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 2D/A3-03028-D1A0E455; Sat, 09 May 2015 13:22:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1431177756!11386318!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11904 invoked from network); 9 May 2015 13:22:37 -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; 9 May 2015 13:22:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yr4iB-00044u-SS for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:22:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yr4iB-0006JL-R5 for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:22:35 +0000 Date: Sat, 09 May 2015 13:22:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] LZ4 : fix the data abort issue X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ce516e8880b3fedf7a87438534e5df5fdb7613d4 Author: JeHyeon Yeon AuthorDate: Tue Apr 21 09:21:05 2015 +0200 Commit: Jan Beulich CommitDate: Tue Apr 21 09:21:05 2015 +0200 LZ4 : fix the data abort issue If the part of the compression data are corrupted, or the compression data is totally fake, the memory access over the limit is possible. This is the log from my system usning lz4 decompression. [6502]data abort, halting [6503]r0 0x00000000 r1 0x00000000 r2 0xdcea0ffc r3 0xdcea0ffc [6509]r4 0xb9ab0bfd r5 0xdcea0ffc r6 0xdcea0ff8 r7 0xdce80000 [6515]r8 0x00000000 r9 0x00000000 r10 0x00000000 r11 0xb9a98000 [6522]r12 0xdcea1000 usp 0x00000000 ulr 0x00000000 pc 0x820149bc [6528]spsr 0x400001f3 and the memory addresses of some variables at the moment are ref:0xdcea0ffc, op:0xdcea0ffc, oend:0xdcea1000 As you can see, COPYLENGH is 8bytes, so @ref and @op can access the momory over @oend. Signed-off-by: JeHyeon Yeon Reviewed-by: David Sterba [Linux commit d5e7cafd69da24e6d6cc988fab6ea313a2577efc] Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: fcc17f96c2776eb220e3dee79fd0ad6a624ffcd9 master date: 2015-03-26 11:19:10 +0100 --- xen/common/lz4/decompress.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/common/lz4/decompress.c b/xen/common/lz4/decompress.c index 5cf8f37..94ad591 100644 --- a/xen/common/lz4/decompress.c +++ b/xen/common/lz4/decompress.c @@ -132,6 +132,9 @@ static int INIT lz4_uncompress(const unsigned char *source, unsigned char *dest, /* Error: request to write beyond destination buffer */ if (cpy > oend) goto _output_error; + if ((ref + COPYLENGTH) > oend || + (op + COPYLENGTH) > oend) + goto _output_error; LZ4_SECURECOPY(ref, op, (oend - COPYLENGTH)); while (op < cpy) *op++ = *ref++; -- 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 May 09 13:22:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 May 2015 13:22:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yr4iF-0000rU-6t; Sat, 09 May 2015 13:22:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yr4iE-0000r8-G4 for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:22:38 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 2D/A3-03028-D1A0E455; Sat, 09 May 2015 13:22:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1431177756!11386318!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11904 invoked from network); 9 May 2015 13:22:37 -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; 9 May 2015 13:22:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yr4iB-00044u-SS for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:22:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yr4iB-0006JL-R5 for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:22:35 +0000 Date: Sat, 09 May 2015 13:22:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] LZ4 : fix the data abort issue X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ce516e8880b3fedf7a87438534e5df5fdb7613d4 Author: JeHyeon Yeon AuthorDate: Tue Apr 21 09:21:05 2015 +0200 Commit: Jan Beulich CommitDate: Tue Apr 21 09:21:05 2015 +0200 LZ4 : fix the data abort issue If the part of the compression data are corrupted, or the compression data is totally fake, the memory access over the limit is possible. This is the log from my system usning lz4 decompression. [6502]data abort, halting [6503]r0 0x00000000 r1 0x00000000 r2 0xdcea0ffc r3 0xdcea0ffc [6509]r4 0xb9ab0bfd r5 0xdcea0ffc r6 0xdcea0ff8 r7 0xdce80000 [6515]r8 0x00000000 r9 0x00000000 r10 0x00000000 r11 0xb9a98000 [6522]r12 0xdcea1000 usp 0x00000000 ulr 0x00000000 pc 0x820149bc [6528]spsr 0x400001f3 and the memory addresses of some variables at the moment are ref:0xdcea0ffc, op:0xdcea0ffc, oend:0xdcea1000 As you can see, COPYLENGH is 8bytes, so @ref and @op can access the momory over @oend. Signed-off-by: JeHyeon Yeon Reviewed-by: David Sterba [Linux commit d5e7cafd69da24e6d6cc988fab6ea313a2577efc] Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: fcc17f96c2776eb220e3dee79fd0ad6a624ffcd9 master date: 2015-03-26 11:19:10 +0100 --- xen/common/lz4/decompress.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/common/lz4/decompress.c b/xen/common/lz4/decompress.c index 5cf8f37..94ad591 100644 --- a/xen/common/lz4/decompress.c +++ b/xen/common/lz4/decompress.c @@ -132,6 +132,9 @@ static int INIT lz4_uncompress(const unsigned char *source, unsigned char *dest, /* Error: request to write beyond destination buffer */ if (cpy > oend) goto _output_error; + if ((ref + COPYLENGTH) > oend || + (op + COPYLENGTH) > oend) + goto _output_error; LZ4_SECURECOPY(ref, op, (oend - COPYLENGTH)); while (op < cpy) *op++ = *ref++; -- 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 May 09 13:22:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 May 2015 13:22:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yr4iQ-0000tr-9K; Sat, 09 May 2015 13:22:50 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yr4iO-0000tX-LR for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:22:48 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id 21/40-02796-72A0E455; Sat, 09 May 2015 13:22:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1431177766!16081407!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10419 invoked from network); 9 May 2015 13:22:47 -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; 9 May 2015 13:22:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yr4iM-000450-0f for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:22:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yr4iL-0006Ji-VD for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:22:45 +0000 Date: Sat, 09 May 2015 13:22:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/MSI: fix error handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8f2d240fc097c519ac1b4aabf28dff706843486c Author: Jan Beulich AuthorDate: Tue Apr 21 09:21:41 2015 +0200 Commit: Jan Beulich CommitDate: Tue Apr 21 09:21:41 2015 +0200 x86/MSI: fix error handling __setup_msi_irq() needs to undo what it did before calling write_msi_msg() in case that returned an error. map_domain_pirq() needs to get rid of the MSI descriptor it (implicitly) allocated. The case of a setup_msi_irq() failure on a non-initial multi-vector-MSI interrupt needs special handling: While the initial IRQ will get freed by the caller (who also passed it to us), we need to undo the effect setup_msi_irq() had on it. (As a benefit from the added call to msi_free_irq() we no longer need to explicitly call destroy_irq() on the non-initial slots.) Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 29c1b7886c36d4e6aa03a779b2251b829d9689c3 master date: 2015-03-26 11:19:57 +0100 --- xen/arch/x86/irq.c | 27 ++++++++++++++++++--------- xen/arch/x86/msi.c | 14 ++++++++++++-- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 72faed0..fd5e7a7 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -1970,6 +1970,8 @@ int map_domain_pirq( dprintk(XENLOG_G_ERR, "dom%d: irq %d in use\n", d->domain_id, irq); pci_disable_msi(msi_desc); + msi_desc->irq = -1; + msi_free_irq(msi_desc); ret = -EBUSY; goto done; } @@ -2024,22 +2026,29 @@ int map_domain_pirq( if ( ret ) { spin_unlock_irqrestore(&desc->lock, flags); + pci_disable_msi(msi_desc); + if ( nr ) + { + ASSERT(msi_desc->irq >= 0); + desc = irq_to_desc(msi_desc->irq); + spin_lock_irqsave(&desc->lock, flags); + desc->handler = &no_irq_type; + desc->msi_desc = NULL; + spin_unlock_irqrestore(&desc->lock, flags); + } while ( nr-- ) { - if ( irq >= 0 ) - { - if ( irq_deny_access(d, irq) ) - printk(XENLOG_G_ERR - "dom%d: could not revoke access to IRQ%d (pirq %d)\n", - d->domain_id, irq, pirq); - destroy_irq(irq); - } + if ( irq >= 0 && irq_deny_access(d, irq) ) + printk(XENLOG_G_ERR + "dom%d: could not revoke access to IRQ%d (pirq %d)\n", + d->domain_id, irq, pirq); if ( info ) cleanup_domain_irq_pirq(d, irq, info); info = pirq_info(d, pirq + nr); irq = info->arch.irq; } - pci_disable_msi(msi_desc); + msi_desc->irq = -1; + msi_free_irq(msi_desc); goto done; } diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index 99312d9..32a2594 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -470,6 +470,7 @@ static struct msi_desc *alloc_msi_entry(unsigned int nr) while ( nr-- ) { entry[nr].dev = NULL; + entry[nr].irq = -1; entry[nr].remap_index = -1; } @@ -487,11 +488,19 @@ int __setup_msi_irq(struct irq_desc *desc, struct msi_desc *msidesc, hw_irq_controller *handler) { struct msi_msg msg; + int ret; desc->msi_desc = msidesc; desc->handler = handler; msi_compose_msg(desc->arch.vector, desc->arch.cpu_mask, &msg); - return write_msi_msg(msidesc, &msg); + ret = write_msi_msg(msidesc, &msg); + if ( unlikely(ret) ) + { + desc->handler = &no_irq_type; + desc->msi_desc = NULL; + } + + return ret; } int msi_free_irq(struct msi_desc *entry) @@ -501,7 +510,8 @@ int msi_free_irq(struct msi_desc *entry) while ( nr-- ) { - destroy_irq(entry[nr].irq); + if ( entry[nr].irq >= 0 ) + destroy_irq(entry[nr].irq); /* Free the unused IRTE if intr remap enabled */ if ( iommu_intremap ) -- 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 May 09 13:22:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 May 2015 13:22:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yr4iQ-0000tr-9K; Sat, 09 May 2015 13:22:50 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yr4iO-0000tX-LR for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:22:48 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id 21/40-02796-72A0E455; Sat, 09 May 2015 13:22:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1431177766!16081407!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10419 invoked from network); 9 May 2015 13:22:47 -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; 9 May 2015 13:22:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yr4iM-000450-0f for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:22:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yr4iL-0006Ji-VD for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:22:45 +0000 Date: Sat, 09 May 2015 13:22:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/MSI: fix error handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8f2d240fc097c519ac1b4aabf28dff706843486c Author: Jan Beulich AuthorDate: Tue Apr 21 09:21:41 2015 +0200 Commit: Jan Beulich CommitDate: Tue Apr 21 09:21:41 2015 +0200 x86/MSI: fix error handling __setup_msi_irq() needs to undo what it did before calling write_msi_msg() in case that returned an error. map_domain_pirq() needs to get rid of the MSI descriptor it (implicitly) allocated. The case of a setup_msi_irq() failure on a non-initial multi-vector-MSI interrupt needs special handling: While the initial IRQ will get freed by the caller (who also passed it to us), we need to undo the effect setup_msi_irq() had on it. (As a benefit from the added call to msi_free_irq() we no longer need to explicitly call destroy_irq() on the non-initial slots.) Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 29c1b7886c36d4e6aa03a779b2251b829d9689c3 master date: 2015-03-26 11:19:57 +0100 --- xen/arch/x86/irq.c | 27 ++++++++++++++++++--------- xen/arch/x86/msi.c | 14 ++++++++++++-- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 72faed0..fd5e7a7 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -1970,6 +1970,8 @@ int map_domain_pirq( dprintk(XENLOG_G_ERR, "dom%d: irq %d in use\n", d->domain_id, irq); pci_disable_msi(msi_desc); + msi_desc->irq = -1; + msi_free_irq(msi_desc); ret = -EBUSY; goto done; } @@ -2024,22 +2026,29 @@ int map_domain_pirq( if ( ret ) { spin_unlock_irqrestore(&desc->lock, flags); + pci_disable_msi(msi_desc); + if ( nr ) + { + ASSERT(msi_desc->irq >= 0); + desc = irq_to_desc(msi_desc->irq); + spin_lock_irqsave(&desc->lock, flags); + desc->handler = &no_irq_type; + desc->msi_desc = NULL; + spin_unlock_irqrestore(&desc->lock, flags); + } while ( nr-- ) { - if ( irq >= 0 ) - { - if ( irq_deny_access(d, irq) ) - printk(XENLOG_G_ERR - "dom%d: could not revoke access to IRQ%d (pirq %d)\n", - d->domain_id, irq, pirq); - destroy_irq(irq); - } + if ( irq >= 0 && irq_deny_access(d, irq) ) + printk(XENLOG_G_ERR + "dom%d: could not revoke access to IRQ%d (pirq %d)\n", + d->domain_id, irq, pirq); if ( info ) cleanup_domain_irq_pirq(d, irq, info); info = pirq_info(d, pirq + nr); irq = info->arch.irq; } - pci_disable_msi(msi_desc); + msi_desc->irq = -1; + msi_free_irq(msi_desc); goto done; } diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index 99312d9..32a2594 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -470,6 +470,7 @@ static struct msi_desc *alloc_msi_entry(unsigned int nr) while ( nr-- ) { entry[nr].dev = NULL; + entry[nr].irq = -1; entry[nr].remap_index = -1; } @@ -487,11 +488,19 @@ int __setup_msi_irq(struct irq_desc *desc, struct msi_desc *msidesc, hw_irq_controller *handler) { struct msi_msg msg; + int ret; desc->msi_desc = msidesc; desc->handler = handler; msi_compose_msg(desc->arch.vector, desc->arch.cpu_mask, &msg); - return write_msi_msg(msidesc, &msg); + ret = write_msi_msg(msidesc, &msg); + if ( unlikely(ret) ) + { + desc->handler = &no_irq_type; + desc->msi_desc = NULL; + } + + return ret; } int msi_free_irq(struct msi_desc *entry) @@ -501,7 +510,8 @@ int msi_free_irq(struct msi_desc *entry) while ( nr-- ) { - destroy_irq(entry[nr].irq); + if ( entry[nr].irq >= 0 ) + destroy_irq(entry[nr].irq); /* Free the unused IRTE if intr remap enabled */ if ( iommu_intremap ) -- 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 May 09 13:23:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 May 2015 13:23:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yr4ia-0000vd-Bj; Sat, 09 May 2015 13:23:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yr4iY-0000vO-Vo for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:22:59 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 46/C6-02789-23A0E455; Sat, 09 May 2015 13:22:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1431177776!13738796!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2651 invoked from network); 9 May 2015 13:22:57 -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; 9 May 2015 13:22:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yr4iW-000459-68 for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:22:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yr4iW-0006K4-4R for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:22:56 +0000 Date: Sat, 09 May 2015 13:22:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] VT-d: improve fault info logging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 19ae8c19539159b132cd63dada4c18b17cf71a4a Author: Jan Beulich AuthorDate: Tue Apr 21 09:22:17 2015 +0200 Commit: Jan Beulich CommitDate: Tue Apr 21 09:22:17 2015 +0200 VT-d: improve fault info logging I got repeatedly annoyed by there not getting anything logged by default on VT-d faults (and hence having to tell people to add extra command line options), and hence I think it is time to redo this code: Log basic fault information at guest-warning level (rate limited by default), and show the page walk in verbose rather than only in debug mode. Break up multi-line message so that each gets a proper log level attached, at once splitting out the common part. Also don't log "unknown" faults as interrupt-remapping ones. As a minor cleanup fix the type of the involved "fault_type" variables. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Yang Zhang master commit: f0250f4b4818f5f4230995407ea2501de3485934 master date: 2015-03-27 15:23:25 +0100 --- xen/drivers/passthrough/vtd/iommu.c | 64 +++++++++++++++++++++------------- 1 files changed, 39 insertions(+), 25 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 81ea72f..3ba7cea 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -800,7 +800,8 @@ static const char *intr_remap_fault_reasons[] = "Blocked an interrupt request due to source-id verification failure", }; -static const char *iommu_get_fault_reason(u8 fault_reason, int *fault_type) +static const char *iommu_get_fault_reason(u8 fault_reason, + enum faulttype *fault_type) { if ( fault_reason >= 0x20 && ( fault_reason < 0x20 + ARRAY_SIZE(intr_remap_fault_reasons)) ) @@ -823,35 +824,48 @@ static const char *iommu_get_fault_reason(u8 fault_reason, int *fault_type) static int iommu_page_fault_do_one(struct iommu *iommu, int type, u8 fault_reason, u16 source_id, u64 addr) { - const char *reason; - int fault_type; + const char *reason, *kind; + enum faulttype fault_type; u16 seg = iommu->intel->drhd->segment; - reason = iommu_get_fault_reason(fault_reason, &fault_type); - if ( fault_type == DMA_REMAP ) - { - INTEL_IOMMU_DEBUG( - "DMAR:[%s] Request device [%04x:%02x:%02x.%u] " - "fault addr %"PRIx64", iommu reg = %p\n" - "DMAR:[fault reason %02xh] %s\n", - (type ? "DMA Read" : "DMA Write"), - seg, (source_id >> 8), PCI_SLOT(source_id & 0xFF), - PCI_FUNC(source_id & 0xFF), addr, iommu->reg, - fault_reason, reason); - if (iommu_debug) - print_vtd_entries(iommu, (source_id >> 8), - (source_id & 0xff), (addr >> PAGE_SHIFT)); + reason = iommu_get_fault_reason(fault_reason, &fault_type); + switch ( fault_type ) + { + case DMA_REMAP: + printk(XENLOG_G_WARNING VTDPREFIX + "DMAR:[%s] Request device [%04x:%02x:%02x.%u] " + "fault addr %"PRIx64", iommu reg = %p\n", + (type ? "DMA Read" : "DMA Write"), + seg, PCI_BUS(source_id), PCI_SLOT(source_id), + PCI_FUNC(source_id), addr, iommu->reg); + kind = "DMAR"; + break; + case INTR_REMAP: + printk(XENLOG_G_WARNING VTDPREFIX + "INTR-REMAP: Request device [%04x:%02x:%02x.%u] " + "fault index %"PRIx64", iommu reg = %p\n", + seg, PCI_BUS(source_id), PCI_SLOT(source_id), + PCI_FUNC(source_id), addr >> 48, iommu->reg); + kind = "INTR-REMAP"; + break; + default: + printk(XENLOG_G_WARNING VTDPREFIX + "UNKNOWN: Request device [%04x:%02x:%02x.%u] " + "fault addr %"PRIx64", iommu reg = %p\n", + seg, PCI_BUS(source_id), PCI_SLOT(source_id), + PCI_FUNC(source_id), addr, iommu->reg); + kind = "UNKNOWN"; + break; } - else - INTEL_IOMMU_DEBUG( - "INTR-REMAP: Request device [%04x:%02x:%02x.%u] " - "fault index %"PRIx64", iommu reg = %p\n" - "INTR-REMAP:[fault reason %02xh] %s\n", - seg, (source_id >> 8), PCI_SLOT(source_id & 0xFF), - PCI_FUNC(source_id & 0xFF), addr >> 48, iommu->reg, - fault_reason, reason); - return 0; + printk(XENLOG_G_WARNING VTDPREFIX "%s: reason %02x - %s\n", + kind, fault_reason, reason); + + if ( iommu_verbose && fault_type == DMA_REMAP ) + print_vtd_entries(iommu, PCI_BUS(source_id), PCI_DEVFN2(source_id), + addr >> PAGE_SHIFT); + + return 0; } static void iommu_fault_status(u32 fault_status) -- 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 May 09 13:23:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 May 2015 13:23:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yr4ia-0000vd-Bj; Sat, 09 May 2015 13:23:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yr4iY-0000vO-Vo for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:22:59 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 46/C6-02789-23A0E455; Sat, 09 May 2015 13:22:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1431177776!13738796!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2651 invoked from network); 9 May 2015 13:22:57 -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; 9 May 2015 13:22:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yr4iW-000459-68 for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:22:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yr4iW-0006K4-4R for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:22:56 +0000 Date: Sat, 09 May 2015 13:22:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] VT-d: improve fault info logging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 19ae8c19539159b132cd63dada4c18b17cf71a4a Author: Jan Beulich AuthorDate: Tue Apr 21 09:22:17 2015 +0200 Commit: Jan Beulich CommitDate: Tue Apr 21 09:22:17 2015 +0200 VT-d: improve fault info logging I got repeatedly annoyed by there not getting anything logged by default on VT-d faults (and hence having to tell people to add extra command line options), and hence I think it is time to redo this code: Log basic fault information at guest-warning level (rate limited by default), and show the page walk in verbose rather than only in debug mode. Break up multi-line message so that each gets a proper log level attached, at once splitting out the common part. Also don't log "unknown" faults as interrupt-remapping ones. As a minor cleanup fix the type of the involved "fault_type" variables. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Yang Zhang master commit: f0250f4b4818f5f4230995407ea2501de3485934 master date: 2015-03-27 15:23:25 +0100 --- xen/drivers/passthrough/vtd/iommu.c | 64 +++++++++++++++++++++------------- 1 files changed, 39 insertions(+), 25 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 81ea72f..3ba7cea 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -800,7 +800,8 @@ static const char *intr_remap_fault_reasons[] = "Blocked an interrupt request due to source-id verification failure", }; -static const char *iommu_get_fault_reason(u8 fault_reason, int *fault_type) +static const char *iommu_get_fault_reason(u8 fault_reason, + enum faulttype *fault_type) { if ( fault_reason >= 0x20 && ( fault_reason < 0x20 + ARRAY_SIZE(intr_remap_fault_reasons)) ) @@ -823,35 +824,48 @@ static const char *iommu_get_fault_reason(u8 fault_reason, int *fault_type) static int iommu_page_fault_do_one(struct iommu *iommu, int type, u8 fault_reason, u16 source_id, u64 addr) { - const char *reason; - int fault_type; + const char *reason, *kind; + enum faulttype fault_type; u16 seg = iommu->intel->drhd->segment; - reason = iommu_get_fault_reason(fault_reason, &fault_type); - if ( fault_type == DMA_REMAP ) - { - INTEL_IOMMU_DEBUG( - "DMAR:[%s] Request device [%04x:%02x:%02x.%u] " - "fault addr %"PRIx64", iommu reg = %p\n" - "DMAR:[fault reason %02xh] %s\n", - (type ? "DMA Read" : "DMA Write"), - seg, (source_id >> 8), PCI_SLOT(source_id & 0xFF), - PCI_FUNC(source_id & 0xFF), addr, iommu->reg, - fault_reason, reason); - if (iommu_debug) - print_vtd_entries(iommu, (source_id >> 8), - (source_id & 0xff), (addr >> PAGE_SHIFT)); + reason = iommu_get_fault_reason(fault_reason, &fault_type); + switch ( fault_type ) + { + case DMA_REMAP: + printk(XENLOG_G_WARNING VTDPREFIX + "DMAR:[%s] Request device [%04x:%02x:%02x.%u] " + "fault addr %"PRIx64", iommu reg = %p\n", + (type ? "DMA Read" : "DMA Write"), + seg, PCI_BUS(source_id), PCI_SLOT(source_id), + PCI_FUNC(source_id), addr, iommu->reg); + kind = "DMAR"; + break; + case INTR_REMAP: + printk(XENLOG_G_WARNING VTDPREFIX + "INTR-REMAP: Request device [%04x:%02x:%02x.%u] " + "fault index %"PRIx64", iommu reg = %p\n", + seg, PCI_BUS(source_id), PCI_SLOT(source_id), + PCI_FUNC(source_id), addr >> 48, iommu->reg); + kind = "INTR-REMAP"; + break; + default: + printk(XENLOG_G_WARNING VTDPREFIX + "UNKNOWN: Request device [%04x:%02x:%02x.%u] " + "fault addr %"PRIx64", iommu reg = %p\n", + seg, PCI_BUS(source_id), PCI_SLOT(source_id), + PCI_FUNC(source_id), addr, iommu->reg); + kind = "UNKNOWN"; + break; } - else - INTEL_IOMMU_DEBUG( - "INTR-REMAP: Request device [%04x:%02x:%02x.%u] " - "fault index %"PRIx64", iommu reg = %p\n" - "INTR-REMAP:[fault reason %02xh] %s\n", - seg, (source_id >> 8), PCI_SLOT(source_id & 0xFF), - PCI_FUNC(source_id & 0xFF), addr >> 48, iommu->reg, - fault_reason, reason); - return 0; + printk(XENLOG_G_WARNING VTDPREFIX "%s: reason %02x - %s\n", + kind, fault_reason, reason); + + if ( iommu_verbose && fault_type == DMA_REMAP ) + print_vtd_entries(iommu, PCI_BUS(source_id), PCI_DEVFN2(source_id), + addr >> PAGE_SHIFT); + + return 0; } static void iommu_fault_status(u32 fault_status) -- 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 May 09 13:23:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 May 2015 13:23:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yr4ik-0000y6-G3; Sat, 09 May 2015 13:23:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yr4ij-0000xk-4p for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:23:09 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 35/38-03032-C3A0E455; Sat, 09 May 2015 13:23:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1431177786!16085147!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11758 invoked from network); 9 May 2015 13:23:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 9 May 2015 13:23:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yr4ig-00045i-Eb for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:23:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yr4ig-0006L7-8i for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:23:06 +0000 Date: Sat, 09 May 2015 13:23:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86_emulate: split the {reg, mem} union in struct operand X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cb296dd08587df2c59ef7ebc6d600cdace468bf2 Author: Tim Deegan AuthorDate: Tue Apr 21 09:22:56 2015 +0200 Commit: Jan Beulich CommitDate: Tue Apr 21 09:22:56 2015 +0200 x86_emulate: split the {reg,mem} union in struct operand In the hopes of making any future errors along the lines of XSA-123 into clean crashes instead of memory corruption bugs. Signed-off-by: Tim Deegan Reviewed-by: Andrew Cooper master commit: dd766684e7c97641bbaf16ee2b0e9add388199b7 master date: 2015-03-27 16:13:07 +0100 --- xen/arch/x86/x86_emulate/x86_emulate.c | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 6656072..219e143 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -325,16 +325,20 @@ struct operand { uint32_t orig_bigval[4]; }; - union { - /* OP_REG: Pointer to register field. */ - unsigned long *reg; - /* OP_MEM: Segment and offset. */ - struct { - enum x86_segment seg; - unsigned long off; - } mem; - }; + /* OP_REG: Pointer to register field. */ + unsigned long *reg; + + /* OP_MEM: Segment and offset. */ + struct { + enum x86_segment seg; + unsigned long off; + } mem; }; +#ifdef __x86_64__ +#define REG_POISON ((unsigned long *) 0x8086000000008086UL) /* non-canonical */ +#else +#define REG_POISON NULL /* 32-bit builds are for user-space, so NULL is OK. */ +#endif typedef union { uint64_t mmx; @@ -1346,13 +1350,14 @@ x86_emulate( unsigned int op_bytes, def_op_bytes, ad_bytes, def_ad_bytes; bool_t lock_prefix = 0; int override_seg = -1, rc = X86EMUL_OKAY; - struct operand src, dst; + struct operand src = { .reg = REG_POISON }; + struct operand dst = { .reg = REG_POISON }; DECLARE_ALIGNED(mmval_t, mmval); /* * Data operand effective address (usually computed from ModRM). * Default is a memory operand relative to segment DS. */ - struct operand ea = { .type = OP_MEM }; + struct operand ea = { .type = OP_MEM, .reg = REG_POISON }; ea.mem.seg = x86_seg_ds; /* gcc may reject anon union initializer */ ctxt->retire.byte = 0; -- 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 May 09 13:23:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 09 May 2015 13:23:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yr4ik-0000y6-G3; Sat, 09 May 2015 13:23:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yr4ij-0000xk-4p for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:23:09 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 35/38-03032-C3A0E455; Sat, 09 May 2015 13:23:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1431177786!16085147!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11758 invoked from network); 9 May 2015 13:23:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 9 May 2015 13:23:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yr4ig-00045i-Eb for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:23:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yr4ig-0006L7-8i for xen-changelog@lists.xensource.com; Sat, 09 May 2015 13:23:06 +0000 Date: Sat, 09 May 2015 13:23:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86_emulate: split the {reg, mem} union in struct operand X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cb296dd08587df2c59ef7ebc6d600cdace468bf2 Author: Tim Deegan AuthorDate: Tue Apr 21 09:22:56 2015 +0200 Commit: Jan Beulich CommitDate: Tue Apr 21 09:22:56 2015 +0200 x86_emulate: split the {reg,mem} union in struct operand In the hopes of making any future errors along the lines of XSA-123 into clean crashes instead of memory corruption bugs. Signed-off-by: Tim Deegan Reviewed-by: Andrew Cooper master commit: dd766684e7c97641bbaf16ee2b0e9add388199b7 master date: 2015-03-27 16:13:07 +0100 --- xen/arch/x86/x86_emulate/x86_emulate.c | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 6656072..219e143 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -325,16 +325,20 @@ struct operand { uint32_t orig_bigval[4]; }; - union { - /* OP_REG: Pointer to register field. */ - unsigned long *reg; - /* OP_MEM: Segment and offset. */ - struct { - enum x86_segment seg; - unsigned long off; - } mem; - }; + /* OP_REG: Pointer to register field. */ + unsigned long *reg; + + /* OP_MEM: Segment and offset. */ + struct { + enum x86_segment seg; + unsigned long off; + } mem; }; +#ifdef __x86_64__ +#define REG_POISON ((unsigned long *) 0x8086000000008086UL) /* non-canonical */ +#else +#define REG_POISON NULL /* 32-bit builds are for user-space, so NULL is OK. */ +#endif typedef union { uint64_t mmx; @@ -1346,13 +1350,14 @@ x86_emulate( unsigned int op_bytes, def_op_bytes, ad_bytes, def_ad_bytes; bool_t lock_prefix = 0; int override_seg = -1, rc = X86EMUL_OKAY; - struct operand src, dst; + struct operand src = { .reg = REG_POISON }; + struct operand dst = { .reg = REG_POISON }; DECLARE_ALIGNED(mmval_t, mmval); /* * Data operand effective address (usually computed from ModRM). * Default is a memory operand relative to segment DS. */ - struct operand ea = { .type = OP_MEM }; + struct operand ea = { .type = OP_MEM, .reg = REG_POISON }; ea.mem.seg = x86_seg_ds; /* gcc may reject anon union initializer */ ctxt->retire.byte = 0; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed May 13 03:22:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 May 2015 03: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 1YsNFK-0004qW-3u; Wed, 13 May 2015 03:22:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YsNFI-0004pi-JP for xen-changelog@lists.xensource.com; Wed, 13 May 2015 03:22:08 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id F4/AF-03739-F53C2555; Wed, 13 May 2015 03:22:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1431487326!14555616!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10615 invoked from network); 13 May 2015 03:22:06 -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; 13 May 2015 03:22:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YsNFF-0002mX-VA for xen-changelog@lists.xensource.com; Wed, 13 May 2015 03:22:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YsNFF-00075Z-DM for xen-changelog@lists.xensource.com; Wed, 13 May 2015 03:22:05 +0000 Date: Wed, 13 May 2015 03:22:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: Fix missing break from c/s b49a7517 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org *** New tip has no discernable common ancestor with previous history *** Previously reported histories end at: e01fa4e223fc077e18936d890dbd4813c3e7c9b1 3a28f760508fb35c430edac17a9efde5aff6d1d5 123c7793797502b222300eb710cd3873dcca41ee commit f48218fd2d35e274ef58caee889aecd6610c8cb6 Author: Andrew Cooper AuthorDate: Fri May 8 21:59:27 2015 +0100 Commit: Ian Campbell CommitDate: Mon May 11 11:27:16 2015 +0100 tools/libxc: Fix missing break from c/s b49a7517 Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Julien Grall Reviewed-by: Julien Grall Acked-by: Ian Campbell -- 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 May 13 03:22:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 May 2015 03: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 1YsNFK-0004qW-3u; Wed, 13 May 2015 03:22:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YsNFI-0004pi-JP for xen-changelog@lists.xensource.com; Wed, 13 May 2015 03:22:08 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id F4/AF-03739-F53C2555; Wed, 13 May 2015 03:22:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1431487326!14555616!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.14; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10615 invoked from network); 13 May 2015 03:22:06 -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; 13 May 2015 03:22:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YsNFF-0002mX-VA for xen-changelog@lists.xensource.com; Wed, 13 May 2015 03:22:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YsNFF-00075Z-DM for xen-changelog@lists.xensource.com; Wed, 13 May 2015 03:22:05 +0000 Date: Wed, 13 May 2015 03:22:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: Fix missing break from c/s b49a7517 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org *** New tip has no discernable common ancestor with previous history *** Previously reported histories end at: e01fa4e223fc077e18936d890dbd4813c3e7c9b1 3a28f760508fb35c430edac17a9efde5aff6d1d5 123c7793797502b222300eb710cd3873dcca41ee commit f48218fd2d35e274ef58caee889aecd6610c8cb6 Author: Andrew Cooper AuthorDate: Fri May 8 21:59:27 2015 +0100 Commit: Ian Campbell CommitDate: Mon May 11 11:27:16 2015 +0100 tools/libxc: Fix missing break from c/s b49a7517 Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Julien Grall Reviewed-by: Julien Grall Acked-by: Ian Campbell -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 11:11:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 11: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 1YtDWG-0002EN-S1; Fri, 15 May 2015 11:11:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtDWG-0002E9-5u for xen-changelog@lists.xensource.com; Fri, 15 May 2015 11:11:08 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id 09/44-03747-B44D5555; Fri, 15 May 2015 11:11:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1431688265!7942377!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24356 invoked from network); 15 May 2015 11:11:06 -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; 15 May 2015 11:11:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtDWA-000837-QI for xen-changelog@lists.xensource.com; Fri, 15 May 2015 11:11:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtDWA-0001Rr-Eh for xen-changelog@lists.xensource.com; Fri, 15 May 2015 11:11:02 +0000 Date: Fri, 15 May 2015 11:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] fdc: force the fifo access to be in bounds of the allocated buffer X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b2da824bc5ad35fb9f1e74a203d7be96a7b0345e Author: Petr Matousek AuthorDate: Wed May 6 09:48:59 2015 +0200 Commit: Stefano Stabellini CommitDate: Wed May 13 14:28:25 2015 +0000 fdc: force the fifo access to be in bounds of the allocated buffer During processing of certain commands such as FD_CMD_READ_ID and FD_CMD_DRIVE_SPECIFICATION_COMMAND the fifo memory access could get out of bounds leading to memory corruption with values coming from the guest. Fix this by making sure that the index is always bounded by the allocated memory. This is CVE-2015-3456. Signed-off-by: Petr Matousek Reviewed-by: John Snow --- hw/block/fdc.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 739a03e..1168e8c 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -1512,7 +1512,7 @@ static uint32_t fdctrl_read_data(FDCtrl *fdctrl) { FDrive *cur_drv; uint32_t retval = 0; - int pos; + uint32_t pos; cur_drv = get_cur_drv(fdctrl); fdctrl->dsr &= ~FD_DSR_PWRDOWN; @@ -1521,8 +1521,8 @@ static uint32_t fdctrl_read_data(FDCtrl *fdctrl) return 0; } pos = fdctrl->data_pos; + pos %= FD_SECTOR_LEN; if (fdctrl->msr & FD_MSR_NONDMA) { - pos %= FD_SECTOR_LEN; if (pos == 0) { if (fdctrl->data_pos != 0) if (!fdctrl_seek_to_next_sect(fdctrl, cur_drv)) { @@ -1867,10 +1867,13 @@ static void fdctrl_handle_option(FDCtrl *fdctrl, int direction) static void fdctrl_handle_drive_specification_command(FDCtrl *fdctrl, int direction) { FDrive *cur_drv = get_cur_drv(fdctrl); + uint32_t pos; - if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x80) { + pos = fdctrl->data_pos - 1; + pos %= FD_SECTOR_LEN; + if (fdctrl->fifo[pos] & 0x80) { /* Command parameters done */ - if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x40) { + if (fdctrl->fifo[pos] & 0x40) { fdctrl->fifo[0] = fdctrl->fifo[1]; fdctrl->fifo[2] = 0; fdctrl->fifo[3] = 0; @@ -1970,7 +1973,7 @@ static uint8_t command_to_handler[256]; static void fdctrl_write_data(FDCtrl *fdctrl, uint32_t value) { FDrive *cur_drv; - int pos; + uint32_t pos; /* Reset mode */ if (!(fdctrl->dor & FD_DOR_nRESET)) { @@ -2019,7 +2022,9 @@ static void fdctrl_write_data(FDCtrl *fdctrl, uint32_t value) } FLOPPY_DPRINTF("%s: %02x\n", __func__, value); - fdctrl->fifo[fdctrl->data_pos++] = value; + pos = fdctrl->data_pos++; + pos %= FD_SECTOR_LEN; + fdctrl->fifo[pos] = value; if (fdctrl->data_pos == fdctrl->data_len) { /* We now have all parameters * and will be able to treat the command -- 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 May 15 11:11:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 11: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 1YtDWG-0002EN-S1; Fri, 15 May 2015 11:11:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtDWG-0002E9-5u for xen-changelog@lists.xensource.com; Fri, 15 May 2015 11:11:08 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id 09/44-03747-B44D5555; Fri, 15 May 2015 11:11:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1431688265!7942377!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24356 invoked from network); 15 May 2015 11:11:06 -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; 15 May 2015 11:11:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtDWA-000837-QI for xen-changelog@lists.xensource.com; Fri, 15 May 2015 11:11:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtDWA-0001Rr-Eh for xen-changelog@lists.xensource.com; Fri, 15 May 2015 11:11:02 +0000 Date: Fri, 15 May 2015 11:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] fdc: force the fifo access to be in bounds of the allocated buffer X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b2da824bc5ad35fb9f1e74a203d7be96a7b0345e Author: Petr Matousek AuthorDate: Wed May 6 09:48:59 2015 +0200 Commit: Stefano Stabellini CommitDate: Wed May 13 14:28:25 2015 +0000 fdc: force the fifo access to be in bounds of the allocated buffer During processing of certain commands such as FD_CMD_READ_ID and FD_CMD_DRIVE_SPECIFICATION_COMMAND the fifo memory access could get out of bounds leading to memory corruption with values coming from the guest. Fix this by making sure that the index is always bounded by the allocated memory. This is CVE-2015-3456. Signed-off-by: Petr Matousek Reviewed-by: John Snow --- hw/block/fdc.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 739a03e..1168e8c 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -1512,7 +1512,7 @@ static uint32_t fdctrl_read_data(FDCtrl *fdctrl) { FDrive *cur_drv; uint32_t retval = 0; - int pos; + uint32_t pos; cur_drv = get_cur_drv(fdctrl); fdctrl->dsr &= ~FD_DSR_PWRDOWN; @@ -1521,8 +1521,8 @@ static uint32_t fdctrl_read_data(FDCtrl *fdctrl) return 0; } pos = fdctrl->data_pos; + pos %= FD_SECTOR_LEN; if (fdctrl->msr & FD_MSR_NONDMA) { - pos %= FD_SECTOR_LEN; if (pos == 0) { if (fdctrl->data_pos != 0) if (!fdctrl_seek_to_next_sect(fdctrl, cur_drv)) { @@ -1867,10 +1867,13 @@ static void fdctrl_handle_option(FDCtrl *fdctrl, int direction) static void fdctrl_handle_drive_specification_command(FDCtrl *fdctrl, int direction) { FDrive *cur_drv = get_cur_drv(fdctrl); + uint32_t pos; - if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x80) { + pos = fdctrl->data_pos - 1; + pos %= FD_SECTOR_LEN; + if (fdctrl->fifo[pos] & 0x80) { /* Command parameters done */ - if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x40) { + if (fdctrl->fifo[pos] & 0x40) { fdctrl->fifo[0] = fdctrl->fifo[1]; fdctrl->fifo[2] = 0; fdctrl->fifo[3] = 0; @@ -1970,7 +1973,7 @@ static uint8_t command_to_handler[256]; static void fdctrl_write_data(FDCtrl *fdctrl, uint32_t value) { FDrive *cur_drv; - int pos; + uint32_t pos; /* Reset mode */ if (!(fdctrl->dor & FD_DOR_nRESET)) { @@ -2019,7 +2022,9 @@ static void fdctrl_write_data(FDCtrl *fdctrl, uint32_t value) } FLOPPY_DPRINTF("%s: %02x\n", __func__, value); - fdctrl->fifo[fdctrl->data_pos++] = value; + pos = fdctrl->data_pos++; + pos %= FD_SECTOR_LEN; + fdctrl->fifo[pos] = value; if (fdctrl->data_pos == fdctrl->data_len) { /* We now have all parameters * and will be able to treat the command -- 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 May 15 14:11:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:11:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGKR-00012J-Qv; Fri, 15 May 2015 14: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 1YtGKQ-00012B-Rt for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:11:06 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id 5A/E5-17942-97EF5555; Fri, 15 May 2015 14:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1431699064!10831641!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27305 invoked from network); 15 May 2015 14:11:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 15 May 2015 14:11:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGKN-0001eb-Rg for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGKN-00088Y-FQ for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:11:03 +0000 Date: Fri, 15 May 2015 14:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: provide add_sized() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3c694aec08dda782d9c866e599b848dff86f474f Author: David Vrabel AuthorDate: Wed May 13 15:00:58 2015 +0200 Commit: Jan Beulich CommitDate: Wed May 13 15:00:58 2015 +0200 x86: provide add_sized() add_sized(ptr, inc) adds inc to the value at ptr using only the correct size of loads and stores for the type of *ptr. The add is /not/ atomic. This is needed for ticket locks to ensure the increment of the head ticket does not affect the tail ticket. Signed-off-by: David Vrabel --- xen/include/asm-x86/atomic.h | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/xen/include/asm-x86/atomic.h b/xen/include/asm-x86/atomic.h index 52af083..2b8c877 100644 --- a/xen/include/asm-x86/atomic.h +++ b/xen/include/asm-x86/atomic.h @@ -14,6 +14,14 @@ static inline void name(volatile type *addr, type val) \ { asm volatile("mov" size " %1,%0": "=m" (*(volatile type *)addr) \ :reg (val) barrier); } +#define build_add_sized(name, size, type, reg) \ + static inline void name(volatile type *addr, type val) \ + { \ + asm volatile("add" size " %1,%0" \ + : "=m" (*addr) \ + : reg (val)); \ + } + build_read_atomic(read_u8_atomic, "b", uint8_t, "=q", ) build_read_atomic(read_u16_atomic, "w", uint16_t, "=r", ) build_read_atomic(read_u32_atomic, "l", uint32_t, "=r", ) @@ -24,8 +32,14 @@ build_write_atomic(write_u16_atomic, "w", uint16_t, "r", ) build_write_atomic(write_u32_atomic, "l", uint32_t, "r", ) build_write_atomic(write_u64_atomic, "q", uint64_t, "r", ) +build_add_sized(add_u8_sized, "b", uint8_t, "qi") +build_add_sized(add_u16_sized, "w", uint16_t, "ri") +build_add_sized(add_u32_sized, "l", uint32_t, "ri") +build_add_sized(add_u64_sized, "q", uint64_t, "ri") + #undef build_read_atomic #undef build_write_atomic +#undef build_add_sized void __bad_atomic_size(void); @@ -53,6 +67,18 @@ void __bad_atomic_size(void); } \ }) +#define add_sized(p, x) ({ \ + typeof(*(p)) x_ = (x); \ + switch ( sizeof(*(p)) ) \ + { \ + case 1: add_u8_sized((uint8_t *)(p), x_); break; \ + case 2: add_u16_sized((uint16_t *)(p), x_); break; \ + case 4: add_u32_sized((uint32_t *)(p), x_); break; \ + case 8: add_u64_sized((uint64_t *)(p), x_); break; \ + default: __bad_atomic_size(); break; \ + } \ +}) + /* * NB. I've pushed the volatile qualifier into the operations. This allows * fast accessors such as _atomic_read() and _atomic_set() which don't give -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:11:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:11:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGKR-00012J-Qv; Fri, 15 May 2015 14: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 1YtGKQ-00012B-Rt for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:11:06 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id 5A/E5-17942-97EF5555; Fri, 15 May 2015 14:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1431699064!10831641!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27305 invoked from network); 15 May 2015 14:11:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 15 May 2015 14:11:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGKN-0001eb-Rg for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGKN-00088Y-FQ for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:11:03 +0000 Date: Fri, 15 May 2015 14:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: provide add_sized() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3c694aec08dda782d9c866e599b848dff86f474f Author: David Vrabel AuthorDate: Wed May 13 15:00:58 2015 +0200 Commit: Jan Beulich CommitDate: Wed May 13 15:00:58 2015 +0200 x86: provide add_sized() add_sized(ptr, inc) adds inc to the value at ptr using only the correct size of loads and stores for the type of *ptr. The add is /not/ atomic. This is needed for ticket locks to ensure the increment of the head ticket does not affect the tail ticket. Signed-off-by: David Vrabel --- xen/include/asm-x86/atomic.h | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/xen/include/asm-x86/atomic.h b/xen/include/asm-x86/atomic.h index 52af083..2b8c877 100644 --- a/xen/include/asm-x86/atomic.h +++ b/xen/include/asm-x86/atomic.h @@ -14,6 +14,14 @@ static inline void name(volatile type *addr, type val) \ { asm volatile("mov" size " %1,%0": "=m" (*(volatile type *)addr) \ :reg (val) barrier); } +#define build_add_sized(name, size, type, reg) \ + static inline void name(volatile type *addr, type val) \ + { \ + asm volatile("add" size " %1,%0" \ + : "=m" (*addr) \ + : reg (val)); \ + } + build_read_atomic(read_u8_atomic, "b", uint8_t, "=q", ) build_read_atomic(read_u16_atomic, "w", uint16_t, "=r", ) build_read_atomic(read_u32_atomic, "l", uint32_t, "=r", ) @@ -24,8 +32,14 @@ build_write_atomic(write_u16_atomic, "w", uint16_t, "r", ) build_write_atomic(write_u32_atomic, "l", uint32_t, "r", ) build_write_atomic(write_u64_atomic, "q", uint64_t, "r", ) +build_add_sized(add_u8_sized, "b", uint8_t, "qi") +build_add_sized(add_u16_sized, "w", uint16_t, "ri") +build_add_sized(add_u32_sized, "l", uint32_t, "ri") +build_add_sized(add_u64_sized, "q", uint64_t, "ri") + #undef build_read_atomic #undef build_write_atomic +#undef build_add_sized void __bad_atomic_size(void); @@ -53,6 +67,18 @@ void __bad_atomic_size(void); } \ }) +#define add_sized(p, x) ({ \ + typeof(*(p)) x_ = (x); \ + switch ( sizeof(*(p)) ) \ + { \ + case 1: add_u8_sized((uint8_t *)(p), x_); break; \ + case 2: add_u16_sized((uint16_t *)(p), x_); break; \ + case 4: add_u32_sized((uint32_t *)(p), x_); break; \ + case 8: add_u64_sized((uint64_t *)(p), x_); break; \ + default: __bad_atomic_size(); break; \ + } \ +}) + /* * NB. I've pushed the volatile qualifier into the operations. This allows * fast accessors such as _atomic_read() and _atomic_set() which don't give -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:11:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:11:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGKc-000137-TM; Fri, 15 May 2015 14:11:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGKb-00012x-5R for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:11:17 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 12/03-03275-48EF5555; Fri, 15 May 2015 14:11:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1431699074!10890793!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31984 invoked from network); 15 May 2015 14:11:15 -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; 15 May 2015 14:11:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGKY-0001ee-Cw for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:11:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGKX-00089X-UI for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:11:14 +0000 Date: Fri, 15 May 2015 14:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] arm: provide add_sized() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 890674d13feb4a270aa112ca452dcf62fdd53f34 Author: David Vrabel AuthorDate: Wed May 13 15:01:25 2015 +0200 Commit: Jan Beulich CommitDate: Wed May 13 15:01:25 2015 +0200 arm: provide add_sized() add_sized(ptr, inc) adds inc to the value at ptr using only the correct size of loads and stores for the type of *ptr. The add is /not/ atomic. This is needed for ticket locks to ensure the increment of the head ticket does not affect the tail ticket. Signed-off-by: David Vrabel Acked-by: Ian Campbell --- xen/include/asm-arm/atomic.h | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/xen/include/asm-arm/atomic.h b/xen/include/asm-arm/atomic.h index 7d15fb0..5a38c67 100644 --- a/xen/include/asm-arm/atomic.h +++ b/xen/include/asm-arm/atomic.h @@ -23,6 +23,17 @@ static inline void name(volatile type *addr, type val) \ : reg (val)); \ } +#define build_add_sized(name, size, width, type, reg) \ +static inline void name(volatile type *addr, type val) \ +{ \ + type t; \ + asm volatile("ldr" size " %"width"1,%0\n" \ + "add %"width"1,%"width"1,%"width"2\n" \ + "str" size " %"width"1,%0" \ + : "=m" (*(volatile type *)addr), "=r" (t) \ + : reg (val)); \ +} + #if defined (CONFIG_ARM_32) #define BYTE "" #define WORD "" @@ -46,6 +57,10 @@ build_atomic_read(read_u64_atomic, "x", uint64_t, "=r") build_atomic_write(write_u64_atomic, "x", uint64_t, "r") #endif +build_add_sized(add_u8_sized, "b", BYTE, uint8_t, "ri") +build_add_sized(add_u16_sized, "h", WORD, uint16_t, "ri") +build_add_sized(add_u32_sized, "", WORD, uint32_t, "ri") + void __bad_atomic_size(void); #define read_atomic(p) ({ \ @@ -70,6 +85,17 @@ void __bad_atomic_size(void); __x; \ }) +#define add_sized(p, x) ({ \ + typeof(*(p)) __x = (x); \ + switch ( sizeof(*(p)) ) \ + { \ + case 1: add_u8_sized((uint8_t *)(p), __x); break; \ + case 2: add_u16_sized((uint16_t *)(p), __x); break; \ + case 4: add_u32_sized((uint32_t *)(p), __x); break; \ + default: __bad_atomic_size(); break; \ + } \ +}) + /* * NB. I've pushed the volatile qualifier into the operations. This allows * fast accessors such as _atomic_read() and _atomic_set() which don't give -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:11:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:11:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGKc-000137-TM; Fri, 15 May 2015 14:11:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGKb-00012x-5R for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:11:17 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 12/03-03275-48EF5555; Fri, 15 May 2015 14:11:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1431699074!10890793!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31984 invoked from network); 15 May 2015 14:11:15 -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; 15 May 2015 14:11:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGKY-0001ee-Cw for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:11:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGKX-00089X-UI for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:11:14 +0000 Date: Fri, 15 May 2015 14:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] arm: provide add_sized() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 890674d13feb4a270aa112ca452dcf62fdd53f34 Author: David Vrabel AuthorDate: Wed May 13 15:01:25 2015 +0200 Commit: Jan Beulich CommitDate: Wed May 13 15:01:25 2015 +0200 arm: provide add_sized() add_sized(ptr, inc) adds inc to the value at ptr using only the correct size of loads and stores for the type of *ptr. The add is /not/ atomic. This is needed for ticket locks to ensure the increment of the head ticket does not affect the tail ticket. Signed-off-by: David Vrabel Acked-by: Ian Campbell --- xen/include/asm-arm/atomic.h | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/xen/include/asm-arm/atomic.h b/xen/include/asm-arm/atomic.h index 7d15fb0..5a38c67 100644 --- a/xen/include/asm-arm/atomic.h +++ b/xen/include/asm-arm/atomic.h @@ -23,6 +23,17 @@ static inline void name(volatile type *addr, type val) \ : reg (val)); \ } +#define build_add_sized(name, size, width, type, reg) \ +static inline void name(volatile type *addr, type val) \ +{ \ + type t; \ + asm volatile("ldr" size " %"width"1,%0\n" \ + "add %"width"1,%"width"1,%"width"2\n" \ + "str" size " %"width"1,%0" \ + : "=m" (*(volatile type *)addr), "=r" (t) \ + : reg (val)); \ +} + #if defined (CONFIG_ARM_32) #define BYTE "" #define WORD "" @@ -46,6 +57,10 @@ build_atomic_read(read_u64_atomic, "x", uint64_t, "=r") build_atomic_write(write_u64_atomic, "x", uint64_t, "r") #endif +build_add_sized(add_u8_sized, "b", BYTE, uint8_t, "ri") +build_add_sized(add_u16_sized, "h", WORD, uint16_t, "ri") +build_add_sized(add_u32_sized, "", WORD, uint32_t, "ri") + void __bad_atomic_size(void); #define read_atomic(p) ({ \ @@ -70,6 +85,17 @@ void __bad_atomic_size(void); __x; \ }) +#define add_sized(p, x) ({ \ + typeof(*(p)) __x = (x); \ + switch ( sizeof(*(p)) ) \ + { \ + case 1: add_u8_sized((uint8_t *)(p), __x); break; \ + case 2: add_u16_sized((uint16_t *)(p), __x); break; \ + case 4: add_u32_sized((uint32_t *)(p), __x); break; \ + default: __bad_atomic_size(); break; \ + } \ +}) + /* * NB. I've pushed the volatile qualifier into the operations. This allows * fast accessors such as _atomic_read() and _atomic_set() which don't give -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:11:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:11: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 1YtGKm-00014p-WE; Fri, 15 May 2015 14:11:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGKl-00014a-KC for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:11:27 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id 02/55-02680-E8EF5555; Fri, 15 May 2015 14:11:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1431699084!17830822!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9589 invoked from network); 15 May 2015 14:11:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 May 2015 14:11:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGKi-0001en-H3 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:11:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGKi-0008D6-Fa for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:11:24 +0000 Date: Fri, 15 May 2015 14:11:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] cpupools: avoid crashing if shutting down with free CPUs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7ff6f1fc39ebf2fa939d78a6ca3f883adff04bc9 Author: Dario Faggioli AuthorDate: Wed May 13 15:08:30 2015 +0200 Commit: Jan Beulich CommitDate: Wed May 13 15:08:30 2015 +0200 cpupools: avoid crashing if shutting down with free CPUs in fact, before this change, shutting down or suspending the system with some CPUs not assigned to any cpupool, would crash as follows: (XEN) Xen call trace: (XEN) [] disable_nonboot_cpus+0xb5/0x138 (XEN) [] enter_state_helper+0xbd/0x369 (XEN) [] continue_hypercall_tasklet_handler+0x4a/0xb1 (XEN) [] do_tasklet_work+0x78/0xab (XEN) [] do_tasklet+0x5e/0x8a (XEN) [] idle_loop+0x56/0x6b (XEN) (XEN) (XEN) **************************************** (XEN) Panic on CPU 0: (XEN) Xen BUG at cpu.c:191 (XEN) **************************************** This is because, for free CPUs, -EBUSY were being returned when trying to tear them down, making cpu_down() unhappy. It is certainly unpractical to forbid shutting down or suspenging if there are unassigned CPUs, so this change fixes the above by just avoiding returning -EBUSY for those CPUs. If shutting off, that does not matter much anyway. If suspending, we make sure that the CPUs remain unassigned when resuming. While there, take the chance to: - fix the doc comment of cpupool_cpu_remove() (it was wrong); - improve comments in general around and in cpupool_cpu_remove() and cpupool_cpu_add(); - add a couple of ASSERT()-s for checking consistency. Signed-off-by: Dario Faggioli Reviewed-by: Juergen Gross Tested-by: Juergen Gross --- xen/common/cpupool.c | 82 ++++++++++++++++++++++++++++++++++--------------- 1 files changed, 57 insertions(+), 25 deletions(-) diff --git a/xen/common/cpupool.c b/xen/common/cpupool.c index cabaccd..563864d 100644 --- a/xen/common/cpupool.c +++ b/xen/common/cpupool.c @@ -453,14 +453,16 @@ void cpupool_rm_domain(struct domain *d) } /* - * called to add a new cpu to pool admin - * we add a hotplugged cpu to the cpupool0 to be able to add it to dom0, - * unless we are resuming from S3, in which case we put the cpu back - * in the cpupool it was in prior to suspend. + * Called to add a cpu to a pool. CPUs being hot-plugged are added to pool0, + * as they must have been in there when unplugged. + * + * If, on the other hand, we are adding CPUs because we are resuming (e.g., + * after ACPI S3) we put the cpu back in the pool where it was in prior when + * we suspended. */ static int cpupool_cpu_add(unsigned int cpu) { - int ret = -EINVAL; + int ret = 0; spin_lock(&cpupool_lock); cpumask_clear_cpu(cpu, &cpupool_locked_cpus); @@ -478,12 +480,28 @@ static int cpupool_cpu_add(unsigned int cpu) if ( ret ) goto out; cpumask_clear_cpu(cpu, (*c)->cpu_suspended); + break; } } - } - if ( cpumask_test_cpu(cpu, &cpupool_free_cpus) ) + /* + * Either cpu has been found as suspended in a pool, and added back + * there, or it stayed free (if it did not belong to any pool when + * suspending), and we don't want to do anything. + */ + ASSERT(cpumask_test_cpu(cpu, &cpupool_free_cpus) || + cpumask_test_cpu(cpu, (*c)->cpu_valid)); + } + else + { + /* + * If we are not resuming, we are hot-plugging cpu, and in which case + * we add it to pool0, as it certainly was there when hot-unplagged + * (or unplugging would have failed) and that is the default behavior + * anyway. + */ ret = cpupool_assign_cpu_locked(cpupool0, cpu); + } out: spin_unlock(&cpupool_lock); @@ -491,29 +509,52 @@ static int cpupool_cpu_add(unsigned int cpu) } /* - * called to remove a cpu from pool admin - * the cpu to be removed is locked to avoid removing it from dom0 - * returns failure if not in pool0 + * Called to remove a CPU from a pool. The CPU is locked, to forbid removing + * it from pool0. In fact, if we want to hot-unplug a CPU, it must belong to + * pool0, or we fail. + * + * However, if we are suspending (e.g., to ACPI S3), we mark the CPU in such + * a way that it can be put back in its pool when resuming. */ static int cpupool_cpu_remove(unsigned int cpu) { int ret = -EBUSY; - struct cpupool **c; spin_lock(&cpupool_lock); - if ( cpumask_test_cpu(cpu, cpupool0->cpu_valid) ) - ret = 0; - else + if ( system_state == SYS_STATE_suspend ) { + struct cpupool **c; + for_each_cpupool(c) { - if ( cpumask_test_cpu(cpu, (*c)->cpu_suspended ) ) + if ( cpumask_test_cpu(cpu, (*c)->cpu_valid ) ) { - ret = 0; + cpumask_set_cpu(cpu, (*c)->cpu_suspended); break; } } + + /* + * Either we found cpu in a pool, or it must be free (if it has been + * hot-unplagged, then we must have found it in pool0). It is, of + * course, fine to suspend or shutdown with CPUs not assigned to a + * pool, and (in case of suspend) they will stay free when resuming. + */ + ASSERT(cpumask_test_cpu(cpu, &cpupool_free_cpus) || + cpumask_test_cpu(cpu, (*c)->cpu_suspended)); + ASSERT(cpumask_test_cpu(cpu, &cpu_online_map) || + cpumask_test_cpu(cpu, cpupool0->cpu_suspended)); + ret = 0; + } + else if ( cpumask_test_cpu(cpu, cpupool0->cpu_valid) ) + { + /* + * If we are not suspending, we are hot-unplugging cpu, and that is + * allowed only for CPUs in pool0. + */ + ret = 0; } + if ( !ret ) cpumask_set_cpu(cpu, &cpupool_locked_cpus); spin_unlock(&cpupool_lock); @@ -709,15 +750,6 @@ static int cpu_callback( unsigned int cpu = (unsigned long)hcpu; int rc = 0; - if ( system_state == SYS_STATE_suspend ) - { - struct cpupool **c; - - for_each_cpupool(c) - if ( cpumask_test_cpu(cpu, (*c)->cpu_valid ) ) - cpumask_set_cpu(cpu, (*c)->cpu_suspended); - } - switch ( action ) { case CPU_DOWN_FAILED: -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:11:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:11: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 1YtGKm-00014p-WE; Fri, 15 May 2015 14:11:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGKl-00014a-KC for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:11:27 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id 02/55-02680-E8EF5555; Fri, 15 May 2015 14:11:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1431699084!17830822!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9589 invoked from network); 15 May 2015 14:11:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 May 2015 14:11:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGKi-0001en-H3 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:11:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGKi-0008D6-Fa for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:11:24 +0000 Date: Fri, 15 May 2015 14:11:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] cpupools: avoid crashing if shutting down with free CPUs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7ff6f1fc39ebf2fa939d78a6ca3f883adff04bc9 Author: Dario Faggioli AuthorDate: Wed May 13 15:08:30 2015 +0200 Commit: Jan Beulich CommitDate: Wed May 13 15:08:30 2015 +0200 cpupools: avoid crashing if shutting down with free CPUs in fact, before this change, shutting down or suspending the system with some CPUs not assigned to any cpupool, would crash as follows: (XEN) Xen call trace: (XEN) [] disable_nonboot_cpus+0xb5/0x138 (XEN) [] enter_state_helper+0xbd/0x369 (XEN) [] continue_hypercall_tasklet_handler+0x4a/0xb1 (XEN) [] do_tasklet_work+0x78/0xab (XEN) [] do_tasklet+0x5e/0x8a (XEN) [] idle_loop+0x56/0x6b (XEN) (XEN) (XEN) **************************************** (XEN) Panic on CPU 0: (XEN) Xen BUG at cpu.c:191 (XEN) **************************************** This is because, for free CPUs, -EBUSY were being returned when trying to tear them down, making cpu_down() unhappy. It is certainly unpractical to forbid shutting down or suspenging if there are unassigned CPUs, so this change fixes the above by just avoiding returning -EBUSY for those CPUs. If shutting off, that does not matter much anyway. If suspending, we make sure that the CPUs remain unassigned when resuming. While there, take the chance to: - fix the doc comment of cpupool_cpu_remove() (it was wrong); - improve comments in general around and in cpupool_cpu_remove() and cpupool_cpu_add(); - add a couple of ASSERT()-s for checking consistency. Signed-off-by: Dario Faggioli Reviewed-by: Juergen Gross Tested-by: Juergen Gross --- xen/common/cpupool.c | 82 ++++++++++++++++++++++++++++++++++--------------- 1 files changed, 57 insertions(+), 25 deletions(-) diff --git a/xen/common/cpupool.c b/xen/common/cpupool.c index cabaccd..563864d 100644 --- a/xen/common/cpupool.c +++ b/xen/common/cpupool.c @@ -453,14 +453,16 @@ void cpupool_rm_domain(struct domain *d) } /* - * called to add a new cpu to pool admin - * we add a hotplugged cpu to the cpupool0 to be able to add it to dom0, - * unless we are resuming from S3, in which case we put the cpu back - * in the cpupool it was in prior to suspend. + * Called to add a cpu to a pool. CPUs being hot-plugged are added to pool0, + * as they must have been in there when unplugged. + * + * If, on the other hand, we are adding CPUs because we are resuming (e.g., + * after ACPI S3) we put the cpu back in the pool where it was in prior when + * we suspended. */ static int cpupool_cpu_add(unsigned int cpu) { - int ret = -EINVAL; + int ret = 0; spin_lock(&cpupool_lock); cpumask_clear_cpu(cpu, &cpupool_locked_cpus); @@ -478,12 +480,28 @@ static int cpupool_cpu_add(unsigned int cpu) if ( ret ) goto out; cpumask_clear_cpu(cpu, (*c)->cpu_suspended); + break; } } - } - if ( cpumask_test_cpu(cpu, &cpupool_free_cpus) ) + /* + * Either cpu has been found as suspended in a pool, and added back + * there, or it stayed free (if it did not belong to any pool when + * suspending), and we don't want to do anything. + */ + ASSERT(cpumask_test_cpu(cpu, &cpupool_free_cpus) || + cpumask_test_cpu(cpu, (*c)->cpu_valid)); + } + else + { + /* + * If we are not resuming, we are hot-plugging cpu, and in which case + * we add it to pool0, as it certainly was there when hot-unplagged + * (or unplugging would have failed) and that is the default behavior + * anyway. + */ ret = cpupool_assign_cpu_locked(cpupool0, cpu); + } out: spin_unlock(&cpupool_lock); @@ -491,29 +509,52 @@ static int cpupool_cpu_add(unsigned int cpu) } /* - * called to remove a cpu from pool admin - * the cpu to be removed is locked to avoid removing it from dom0 - * returns failure if not in pool0 + * Called to remove a CPU from a pool. The CPU is locked, to forbid removing + * it from pool0. In fact, if we want to hot-unplug a CPU, it must belong to + * pool0, or we fail. + * + * However, if we are suspending (e.g., to ACPI S3), we mark the CPU in such + * a way that it can be put back in its pool when resuming. */ static int cpupool_cpu_remove(unsigned int cpu) { int ret = -EBUSY; - struct cpupool **c; spin_lock(&cpupool_lock); - if ( cpumask_test_cpu(cpu, cpupool0->cpu_valid) ) - ret = 0; - else + if ( system_state == SYS_STATE_suspend ) { + struct cpupool **c; + for_each_cpupool(c) { - if ( cpumask_test_cpu(cpu, (*c)->cpu_suspended ) ) + if ( cpumask_test_cpu(cpu, (*c)->cpu_valid ) ) { - ret = 0; + cpumask_set_cpu(cpu, (*c)->cpu_suspended); break; } } + + /* + * Either we found cpu in a pool, or it must be free (if it has been + * hot-unplagged, then we must have found it in pool0). It is, of + * course, fine to suspend or shutdown with CPUs not assigned to a + * pool, and (in case of suspend) they will stay free when resuming. + */ + ASSERT(cpumask_test_cpu(cpu, &cpupool_free_cpus) || + cpumask_test_cpu(cpu, (*c)->cpu_suspended)); + ASSERT(cpumask_test_cpu(cpu, &cpu_online_map) || + cpumask_test_cpu(cpu, cpupool0->cpu_suspended)); + ret = 0; + } + else if ( cpumask_test_cpu(cpu, cpupool0->cpu_valid) ) + { + /* + * If we are not suspending, we are hot-unplugging cpu, and that is + * allowed only for CPUs in pool0. + */ + ret = 0; } + if ( !ret ) cpumask_set_cpu(cpu, &cpupool_locked_cpus); spin_unlock(&cpupool_lock); @@ -709,15 +750,6 @@ static int cpu_callback( unsigned int cpu = (unsigned long)hcpu; int rc = 0; - if ( system_state == SYS_STATE_suspend ) - { - struct cpupool **c; - - for_each_cpupool(c) - if ( cpumask_test_cpu(cpu, (*c)->cpu_valid ) ) - cpumask_set_cpu(cpu, (*c)->cpu_suspended); - } - switch ( action ) { case CPU_DOWN_FAILED: -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:11:42 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:11: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 1YtGL0-000171-2j; Fri, 15 May 2015 14:11:42 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGKy-00016q-RM for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:11:40 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id A5/5B-03747-B9EF5555; Fri, 15 May 2015 14:11:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1431699094!10893078!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29316 invoked from network); 15 May 2015 14:11:35 -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; 15 May 2015 14:11:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGKs-0001ev-Ms for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:11:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGKs-0008HA-LF for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:11:34 +0000 Date: Fri, 15 May 2015 14:11:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Re-order iommu_setup to after setup_virt_paging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a1ce81ca2669d1dee2c8c5cf989f409d8d02f7cc Author: Edgar E. Iglesias AuthorDate: Fri May 8 17:10:08 2015 +1000 Commit: Ian Campbell CommitDate: Wed May 13 14:49:09 2015 +0100 xen/arm: Re-order iommu_setup to after setup_virt_paging This is needed to allow the paging setup to probe for IPA bit sizes to be used in p2m tables prior to iommu setup. Acked-by: Ian Campbell Reviewed-by: Julien Grall Signed-off-by: Edgar E. Iglesias --- xen/arch/arm/setup.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 711562c..06f8e54 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -800,8 +800,6 @@ void __init start_xen(unsigned long boot_phys_offset, local_irq_enable(); local_abort_enable(); - iommu_setup(); - smp_prepare_cpus(cpus); initialize_keytable(); @@ -825,6 +823,8 @@ void __init start_xen(unsigned long boot_phys_offset, setup_virt_paging(); + iommu_setup(); + do_initcalls(); /* Create initial domain 0. */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:11:42 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:11: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 1YtGL0-000171-2j; Fri, 15 May 2015 14:11:42 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGKy-00016q-RM for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:11:40 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id A5/5B-03747-B9EF5555; Fri, 15 May 2015 14:11:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1431699094!10893078!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29316 invoked from network); 15 May 2015 14:11:35 -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; 15 May 2015 14:11:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGKs-0001ev-Ms for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:11:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGKs-0008HA-LF for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:11:34 +0000 Date: Fri, 15 May 2015 14:11:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Re-order iommu_setup to after setup_virt_paging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a1ce81ca2669d1dee2c8c5cf989f409d8d02f7cc Author: Edgar E. Iglesias AuthorDate: Fri May 8 17:10:08 2015 +1000 Commit: Ian Campbell CommitDate: Wed May 13 14:49:09 2015 +0100 xen/arm: Re-order iommu_setup to after setup_virt_paging This is needed to allow the paging setup to probe for IPA bit sizes to be used in p2m tables prior to iommu setup. Acked-by: Ian Campbell Reviewed-by: Julien Grall Signed-off-by: Edgar E. Iglesias --- xen/arch/arm/setup.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 711562c..06f8e54 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -800,8 +800,6 @@ void __init start_xen(unsigned long boot_phys_offset, local_irq_enable(); local_abort_enable(); - iommu_setup(); - smp_prepare_cpus(cpus); initialize_keytable(); @@ -825,6 +823,8 @@ void __init start_xen(unsigned long boot_phys_offset, setup_virt_paging(); + iommu_setup(); + do_initcalls(); /* Create initial domain 0. */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:11:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14: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 1YtGL7-00018m-57; Fri, 15 May 2015 14:11:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGL5-00018J-Dm for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:11:47 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id CD/08-02795-2AEF5555; Fri, 15 May 2015 14:11:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1431699105!17875829!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31372 invoked from network); 15 May 2015 14:11:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 May 2015 14:11:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGL2-0001f1-R1 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:11:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGL2-0008Lx-Q5 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:11:44 +0000 Date: Fri, 15 May 2015 14:11:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Add p2m_ipa_bits X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cb493c714190216a86a81f7748b4608343576b6a Author: Edgar E. Iglesias AuthorDate: Fri May 8 17:10:09 2015 +1000 Commit: Ian Campbell CommitDate: Wed May 13 14:49:39 2015 +0100 xen/arm: Add p2m_ipa_bits Export p2m_ipa_bits holding the bit size of IPAs used in p2m tables. Signed-off-by: Edgar E. Iglesias Acked-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/p2m.c | 6 +++++- xen/include/asm-arm/p2m.h | 3 +++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 59dd23a..903fa3f 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -27,6 +27,8 @@ static unsigned int __read_mostly p2m_root_level; #define P2M_ROOT_PAGES (1< Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14: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 1YtGL7-00018m-57; Fri, 15 May 2015 14:11:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGL5-00018J-Dm for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:11:47 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id CD/08-02795-2AEF5555; Fri, 15 May 2015 14:11:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1431699105!17875829!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31372 invoked from network); 15 May 2015 14:11:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 May 2015 14:11:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGL2-0001f1-R1 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:11:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGL2-0008Lx-Q5 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:11:44 +0000 Date: Fri, 15 May 2015 14:11:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Add p2m_ipa_bits X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cb493c714190216a86a81f7748b4608343576b6a Author: Edgar E. Iglesias AuthorDate: Fri May 8 17:10:09 2015 +1000 Commit: Ian Campbell CommitDate: Wed May 13 14:49:39 2015 +0100 xen/arm: Add p2m_ipa_bits Export p2m_ipa_bits holding the bit size of IPAs used in p2m tables. Signed-off-by: Edgar E. Iglesias Acked-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/p2m.c | 6 +++++- xen/include/asm-arm/p2m.h | 3 +++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 59dd23a..903fa3f 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -27,6 +27,8 @@ static unsigned int __read_mostly p2m_root_level; #define P2M_ROOT_PAGES (1< Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:11: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 1YtGLH-0001B5-7X; Fri, 15 May 2015 14:11:59 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGLF-0001Al-Ml for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:11:57 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 51/EE-02785-CAEF5555; Fri, 15 May 2015 14:11:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1431699115!17865922!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29828 invoked from network); 15 May 2015 14:11:56 -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; 15 May 2015 14:11:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGLD-0001fA-2L for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:11:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGLC-0008Mt-Tr for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:11:55 +0000 Date: Fri, 15 May 2015 14:11:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/iommu: arm: Use p2m_ipa_bits as stage2 input size X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3de112bcac21daecf42c2cdaaef7c5b8e21489d5 Author: Edgar E. Iglesias AuthorDate: Fri May 8 17:10:10 2015 +1000 Commit: Ian Campbell CommitDate: Wed May 13 14:49:43 2015 +0100 xen/iommu: arm: Use p2m_ipa_bits as stage2 input size The Stage2 input-size must match what the CPU uses because the SMMU and the CPU share page-tables. Test that the SMMU supports the P2M IPA bit size, use it if supported or bail out if not. Reviewed-by: Julien Grall Signed-off-by: Edgar E. Iglesias Acked-by: Ian Campbell --- xen/drivers/passthrough/arm/smmu.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/arm/smmu.c b/xen/drivers/passthrough/arm/smmu.c index 65de50b..6cc4394 100644 --- a/xen/drivers/passthrough/arm/smmu.c +++ b/xen/drivers/passthrough/arm/smmu.c @@ -2230,8 +2230,14 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu) size = arm_smmu_id_size_to_bits((id >> ID2_IAS_SHIFT) & ID2_IAS_MASK); smmu->s1_output_size = min_t(unsigned long, PHYS_MASK_SHIFT, size); - /* Xen: Stage-2 input size is not restricted */ - smmu->s2_input_size = size; + /* Xen: Stage-2 input size has to match p2m_ipa_bits. */ + if (size < p2m_ipa_bits) { + dev_err(smmu->dev, + "P2M IPA size not supported (P2M=%u SMMU=%lu)!\n", + p2m_ipa_bits, size); + return -ENODEV; + } + smmu->s2_input_size = p2m_ipa_bits; #if 0 /* Stage-2 input size limited due to pgd allocation (PTRS_PER_PGD) */ #ifdef CONFIG_64BIT -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:11:59 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:11: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 1YtGLH-0001B5-7X; Fri, 15 May 2015 14:11:59 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGLF-0001Al-Ml for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:11:57 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 51/EE-02785-CAEF5555; Fri, 15 May 2015 14:11:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1431699115!17865922!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29828 invoked from network); 15 May 2015 14:11:56 -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; 15 May 2015 14:11:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGLD-0001fA-2L for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:11:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGLC-0008Mt-Tr for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:11:55 +0000 Date: Fri, 15 May 2015 14:11:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/iommu: arm: Use p2m_ipa_bits as stage2 input size X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3de112bcac21daecf42c2cdaaef7c5b8e21489d5 Author: Edgar E. Iglesias AuthorDate: Fri May 8 17:10:10 2015 +1000 Commit: Ian Campbell CommitDate: Wed May 13 14:49:43 2015 +0100 xen/iommu: arm: Use p2m_ipa_bits as stage2 input size The Stage2 input-size must match what the CPU uses because the SMMU and the CPU share page-tables. Test that the SMMU supports the P2M IPA bit size, use it if supported or bail out if not. Reviewed-by: Julien Grall Signed-off-by: Edgar E. Iglesias Acked-by: Ian Campbell --- xen/drivers/passthrough/arm/smmu.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/arm/smmu.c b/xen/drivers/passthrough/arm/smmu.c index 65de50b..6cc4394 100644 --- a/xen/drivers/passthrough/arm/smmu.c +++ b/xen/drivers/passthrough/arm/smmu.c @@ -2230,8 +2230,14 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu) size = arm_smmu_id_size_to_bits((id >> ID2_IAS_SHIFT) & ID2_IAS_MASK); smmu->s1_output_size = min_t(unsigned long, PHYS_MASK_SHIFT, size); - /* Xen: Stage-2 input size is not restricted */ - smmu->s2_input_size = size; + /* Xen: Stage-2 input size has to match p2m_ipa_bits. */ + if (size < p2m_ipa_bits) { + dev_err(smmu->dev, + "P2M IPA size not supported (P2M=%u SMMU=%lu)!\n", + p2m_ipa_bits, size); + return -ENODEV; + } + smmu->s2_input_size = p2m_ipa_bits; #if 0 /* Stage-2 input size limited due to pgd allocation (PTRS_PER_PGD) */ #ifdef CONFIG_64BIT -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:12:08 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:12: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 1YtGLQ-0001G7-DS; Fri, 15 May 2015 14:12:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGLP-0001Fg-QV for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:12:07 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 9F/4C-03041-6BEF5555; Fri, 15 May 2015 14:12:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1431699125!5578855!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31931 invoked from network); 15 May 2015 14:12:06 -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; 15 May 2015 14:12:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGLN-0001fq-BZ for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:12:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGLN-0008NX-5r for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:12:05 +0000 Date: Fri, 15 May 2015 14:12:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Document '-F' option of create subcommand. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b3c8f22904c13e29739c87bb3e947a2a0bea91d9 Author: Giuseppe Mazzotta AuthorDate: Tue May 12 14:51:42 2015 +0000 Commit: Ian Campbell CommitDate: Wed May 13 14:51:12 2015 +0100 Document '-F' option of create subcommand. Other options are still missing and not part of this patch. Signed-off-by: Giuseppe Mazzotta Acked-by: Ian Campbell --- docs/man/xl.pod.1 | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/docs/man/xl.pod.1 b/docs/man/xl.pod.1 index 16783c8..02bf531 100644 --- a/docs/man/xl.pod.1 +++ b/docs/man/xl.pod.1 @@ -115,6 +115,9 @@ Create will return B as the domain is started. This B mean the guest OS in the domain has actually booted, or is available for input. +If the I<-F> option is specified, create will start the domain and not +return until its death. + B =over 4 @@ -131,6 +134,10 @@ Use the given configuration file. Leave the domain paused after it is created. +=item B<-F> + +Run in foreground until death of the domain. + =item B<-V>, B<--vncviewer> Attach to domain's VNC server, forking a vncviewer process. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:12:08 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:12: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 1YtGLQ-0001G7-DS; Fri, 15 May 2015 14:12:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGLP-0001Fg-QV for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:12:07 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 9F/4C-03041-6BEF5555; Fri, 15 May 2015 14:12:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1431699125!5578855!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31931 invoked from network); 15 May 2015 14:12:06 -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; 15 May 2015 14:12:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGLN-0001fq-BZ for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:12:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGLN-0008NX-5r for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:12:05 +0000 Date: Fri, 15 May 2015 14:12:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Document '-F' option of create subcommand. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b3c8f22904c13e29739c87bb3e947a2a0bea91d9 Author: Giuseppe Mazzotta AuthorDate: Tue May 12 14:51:42 2015 +0000 Commit: Ian Campbell CommitDate: Wed May 13 14:51:12 2015 +0100 Document '-F' option of create subcommand. Other options are still missing and not part of this patch. Signed-off-by: Giuseppe Mazzotta Acked-by: Ian Campbell --- docs/man/xl.pod.1 | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/docs/man/xl.pod.1 b/docs/man/xl.pod.1 index 16783c8..02bf531 100644 --- a/docs/man/xl.pod.1 +++ b/docs/man/xl.pod.1 @@ -115,6 +115,9 @@ Create will return B as the domain is started. This B mean the guest OS in the domain has actually booted, or is available for input. +If the I<-F> option is specified, create will start the domain and not +return until its death. + B =over 4 @@ -131,6 +134,10 @@ Use the given configuration file. Leave the domain paused after it is created. +=item B<-F> + +Run in foreground until death of the domain. + =item B<-V>, B<--vncviewer> Attach to domain's VNC server, forking a vncviewer process. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:12:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:12: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 1YtGLc-0001JB-GN; Fri, 15 May 2015 14:12:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGLb-0001Im-5K for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:12:19 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id 22/0F-02948-2CEF5555; Fri, 15 May 2015 14:12:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1431699135!6458017!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21867 invoked from network); 15 May 2015 14:12:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 15 May 2015 14:12:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGLX-0001g5-NX for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:12:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGLX-0008P4-Fq for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:12:15 +0000 Date: Fri, 15 May 2015 14:12:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl/libxc: Move libxl_get_cpu_topology()'s hypercall buffer management to libxc X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 250f0b43af1a71f8e0ccfe1c6fdb7dd284cc042c Author: Boris Ostrovsky AuthorDate: Mon May 11 12:31:27 2015 -0400 Commit: Ian Campbell CommitDate: Wed May 13 15:03:37 2015 +0100 libxl/libxc: Move libxl_get_cpu_topology()'s hypercall buffer management to libxc xc_cputopoinfo() is not expected to be used on a hot path and therefore hypercall buffer management can be pushed into libxc. This will simplify life for callers. Also update error reporting macros. Signed-off-by: Boris Ostrovsky Acked-by: Ian Campbell --- tools/libxc/include/xenctrl.h | 5 ++- tools/libxc/xc_misc.c | 23 +++++++++++----- tools/libxl/libxl.c | 37 ++++++++------------------ tools/misc/xenpm.c | 51 ++++++++++++++++--------------------- tools/python/xen/lowlevel/xc/xc.c | 20 ++++++-------- 5 files changed, 61 insertions(+), 75 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index a689caf..e4d608d 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -1238,7 +1238,7 @@ int xc_readconsolering(xc_interface *xch, int xc_send_debug_keys(xc_interface *xch, char *keys); typedef xen_sysctl_physinfo_t xc_physinfo_t; -typedef xen_sysctl_cputopoinfo_t xc_cputopoinfo_t; +typedef xen_sysctl_cputopo_t xc_cputopo_t; typedef xen_sysctl_numainfo_t xc_numainfo_t; typedef uint32_t xc_cpu_to_node_t; @@ -1249,7 +1249,8 @@ typedef uint64_t xc_node_to_memfree_t; typedef uint32_t xc_node_to_node_dist_t; int xc_physinfo(xc_interface *xch, xc_physinfo_t *info); -int xc_cputopoinfo(xc_interface *xch, xc_cputopoinfo_t *info); +int xc_cputopoinfo(xc_interface *xch, unsigned *max_cpus, + xc_cputopo_t *cputopo); int xc_numainfo(xc_interface *xch, xc_numainfo_t *info); int xc_sched_id(xc_interface *xch, diff --git a/tools/libxc/xc_misc.c b/tools/libxc/xc_misc.c index 3a1784b..b3bdbef 100644 --- a/tools/libxc/xc_misc.c +++ b/tools/libxc/xc_misc.c @@ -203,22 +203,31 @@ int xc_physinfo(xc_interface *xch, return 0; } -int xc_cputopoinfo(xc_interface *xch, - xc_cputopoinfo_t *put_info) +int xc_cputopoinfo(xc_interface *xch, unsigned *max_cpus, + xc_cputopo_t *cputopo) { int ret; DECLARE_SYSCTL; + DECLARE_HYPERCALL_BOUNCE(cputopo, *max_cpus * sizeof(*cputopo), + XC_HYPERCALL_BUFFER_BOUNCE_OUT); - sysctl.cmd = XEN_SYSCTL_cputopoinfo; + if ( (ret = xc_hypercall_bounce_pre(xch, cputopo)) ) + goto out; - memcpy(&sysctl.u.cputopoinfo, put_info, sizeof(*put_info)); + sysctl.u.cputopoinfo.num_cpus = *max_cpus; + set_xen_guest_handle(sysctl.u.cputopoinfo.cputopo, cputopo); + + sysctl.cmd = XEN_SYSCTL_cputopoinfo; if ( (ret = do_sysctl(xch, &sysctl)) != 0 ) - return ret; + goto out; - memcpy(put_info, &sysctl.u.cputopoinfo, sizeof(*put_info)); + *max_cpus = sysctl.u.cputopoinfo.num_cpus; - return 0; +out: + xc_hypercall_bounce_post(xch, cputopo); + + return ret; } int xc_numainfo(xc_interface *xch, diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 516713e..5f2fcff 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -5102,37 +5102,28 @@ int libxl_get_physinfo(libxl_ctx *ctx, libxl_physinfo *physinfo) libxl_cputopology *libxl_get_cpu_topology(libxl_ctx *ctx, int *nb_cpu_out) { GC_INIT(ctx); - xc_cputopoinfo_t tinfo; - DECLARE_HYPERCALL_BUFFER(xen_sysctl_cputopo_t, cputopo); + xc_cputopo_t *cputopo; libxl_cputopology *ret = NULL; int i; + unsigned num_cpus; - /* Setting buffer to NULL makes the hypercall return number of CPUs */ - set_xen_guest_handle(tinfo.cputopo, HYPERCALL_BUFFER_NULL); - if (xc_cputopoinfo(ctx->xch, &tinfo) != 0) + /* Setting buffer to NULL makes the call return number of CPUs */ + if (xc_cputopoinfo(ctx->xch, &num_cpus, NULL)) { - LIBXL__LOG(ctx, XTL_ERROR, "Unable to determine number of CPUS"); - ret = NULL; + LOGE(ERROR, "Unable to determine number of CPUS"); goto out; } - cputopo = xc_hypercall_buffer_alloc(ctx->xch, cputopo, - sizeof(*cputopo) * tinfo.num_cpus); - if (cputopo == NULL) { - LIBXL__LOG_ERRNOVAL(ctx, XTL_ERROR, ENOMEM, - "Unable to allocate hypercall arguments"); - goto fail; - } - set_xen_guest_handle(tinfo.cputopo, cputopo); + cputopo = libxl__zalloc(gc, sizeof(*cputopo) * num_cpus); - if (xc_cputopoinfo(ctx->xch, &tinfo) != 0) { - LIBXL__LOG_ERRNO(ctx, XTL_ERROR, "CPU topology info hypercall failed"); - goto fail; + if (xc_cputopoinfo(ctx->xch, &num_cpus, cputopo)) { + LOGE(ERROR, "CPU topology info hypercall failed"); + goto out; } - ret = libxl__zalloc(NOGC, sizeof(libxl_cputopology) * tinfo.num_cpus); + ret = libxl__zalloc(NOGC, sizeof(libxl_cputopology) * num_cpus); - for (i = 0; i < tinfo.num_cpus; i++) { + for (i = 0; i < num_cpus; i++) { #define V(map, i, invalid) ( cputopo[i].map == invalid) ? \ LIBXL_CPUTOPOLOGY_INVALID_ENTRY : cputopo[i].map ret[i].core = V(core, i, XEN_INVALID_CORE_ID); @@ -5141,11 +5132,7 @@ libxl_cputopology *libxl_get_cpu_topology(libxl_ctx *ctx, int *nb_cpu_out) #undef V } -fail: - xc_hypercall_buffer_free(ctx->xch, cputopo); - - if (ret) - *nb_cpu_out = tinfo.num_cpus; + *nb_cpu_out = num_cpus; out: GC_FREE; diff --git a/tools/misc/xenpm.c b/tools/misc/xenpm.c index a5d07de..24ee6ef 100644 --- a/tools/misc/xenpm.c +++ b/tools/misc/xenpm.c @@ -355,20 +355,17 @@ static void signal_int_handler(int signo) int i, j, k; struct timeval tv; int cx_cap = 0, px_cap = 0; - DECLARE_HYPERCALL_BUFFER(xen_sysctl_cputopo_t, cputopo); - xc_cputopoinfo_t info = { 0 }; + xc_cputopo_t *cputopo; + unsigned max_cpus; - set_xen_guest_handle(info.cputopo, HYPERCALL_BUFFER_NULL); - if ( xc_cputopoinfo(xc_handle, &info) != 0 ) + if ( xc_cputopoinfo(xc_handle, &max_cpus, NULL) != 0 ) { fprintf(stderr, "failed to discover number of CPUs: %s\n", strerror(errno)); goto out; } - cputopo = xc_hypercall_buffer_alloc(xc_handle, cputopo, - sizeof(*cputopo) * info.num_cpus); - + cputopo = calloc(max_cpus, sizeof(*cputopo)); if ( cputopo == NULL ) { fprintf(stderr, "failed to allocate hypercall buffers\n"); @@ -453,28 +450,26 @@ static void signal_int_handler(int signo) printf(" Avg freq\t%d\tKHz\n", avgfreq[i]); } - set_xen_guest_handle(info.cputopo, cputopo); - - if ( cx_cap && !xc_cputopoinfo(xc_handle, &info) ) + if ( cx_cap && !xc_cputopoinfo(xc_handle, &max_cpus, cputopo) ) { uint32_t socket_ids[MAX_NR_CPU]; uint32_t core_ids[MAX_NR_CPU]; uint32_t socket_nr = 0; uint32_t core_nr = 0; - if ( info.num_cpus > MAX_NR_CPU ) - info.num_cpus = MAX_NR_CPU; + if ( max_cpus > MAX_NR_CPU ) + max_cpus = MAX_NR_CPU; /* check validity */ - for ( i = 0; i < info.num_cpus; i++ ) + for ( i = 0; i < max_cpus; i++ ) { if ( cputopo[i].core == XEN_INVALID_CORE_ID || cputopo[i].socket == XEN_INVALID_SOCKET_ID ) break; } - if ( i >= info.num_cpus ) + if ( i >= max_cpus ) { /* find socket nr & core nr per socket */ - for ( i = 0; i < info.num_cpus; i++ ) + for ( i = 0; i < max_cpus; i++ ) { for ( j = 0; j < socket_nr; j++ ) if ( cputopo[i].socket == socket_ids[j] ) @@ -501,7 +496,7 @@ static void signal_int_handler(int signo) unsigned int n; uint64_t res; - for ( j = 0; j < info.num_cpus; j++ ) + for ( j = 0; j < max_cpus; j++ ) { if ( cputopo[j].socket == socket_ids[i] ) break; @@ -520,7 +515,7 @@ static void signal_int_handler(int signo) } for ( k = 0; k < core_nr; k++ ) { - for ( j = 0; j < info.num_cpus; j++ ) + for ( j = 0; j < max_cpus; j++ ) { if ( cputopo[j].socket == socket_ids[i] && cputopo[j].core == core_ids[k] ) @@ -558,7 +553,7 @@ static void signal_int_handler(int signo) free(sum); free(avgfreq); out: - xc_hypercall_buffer_free(xc_handle, cputopo); + free(cputopo); xc_interface_close(xc_handle); exit(0); } @@ -965,12 +960,11 @@ void scaling_governor_func(int argc, char *argv[]) void cpu_topology_func(int argc, char *argv[]) { - DECLARE_HYPERCALL_BUFFER(xen_sysctl_cputopo_t, cputopo); - xc_cputopoinfo_t info = { 0 }; - int i, rc = ENOMEM; + xc_cputopo_t *cputopo; + unsigned max_cpus; + int i, rc; - set_xen_guest_handle(info.cputopo, HYPERCALL_BUFFER_NULL); - if ( xc_cputopoinfo(xc_handle, &info) ) + if ( xc_cputopoinfo(xc_handle, &max_cpus, NULL) != 0 ) { rc = errno; fprintf(stderr, "failed to discover number of CPUs (%d - %s)\n", @@ -978,16 +972,15 @@ void cpu_topology_func(int argc, char *argv[]) goto out; } - cputopo = xc_hypercall_buffer_alloc(xc_handle, cputopo, - sizeof(*cputopo) * info.num_cpus); + cputopo = calloc(max_cpus, sizeof(*cputopo)); if ( cputopo == NULL ) { + rc = ENOMEM; fprintf(stderr, "failed to allocate hypercall buffers\n"); goto out; } - set_xen_guest_handle(info.cputopo, cputopo); - if ( xc_cputopoinfo(xc_handle, &info) ) + if ( xc_cputopoinfo(xc_handle, &max_cpus, cputopo) ) { rc = errno; fprintf(stderr, "Cannot get Xen CPU topology (%d - %s)\n", @@ -996,7 +989,7 @@ void cpu_topology_func(int argc, char *argv[]) } printf("CPU\tcore\tsocket\tnode\n"); - for ( i = 0; i < info.num_cpus; i++ ) + for ( i = 0; i < max_cpus; i++ ) { if ( cputopo[i].core == XEN_INVALID_CORE_ID ) continue; @@ -1005,7 +998,7 @@ void cpu_topology_func(int argc, char *argv[]) } rc = 0; out: - xc_hypercall_buffer_free(xc_handle, cputopo); + free(cputopo); if ( rc ) exit(rc); } diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index ba66d55..21ba57d 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -1220,30 +1220,26 @@ static PyObject *pyxc_getcpuinfo(XcObject *self, PyObject *args, PyObject *kwds) static PyObject *pyxc_topologyinfo(XcObject *self) { - xc_cputopoinfo_t tinfo = { 0 }; - unsigned i; + xc_cputopo_t *cputopo = NULL; + unsigned i, num_cpus; PyObject *ret_obj = NULL; PyObject *cpu_to_core_obj, *cpu_to_socket_obj, *cpu_to_node_obj; - DECLARE_HYPERCALL_BUFFER(xen_sysctl_cputopo_t, cputopo); - set_xen_guest_handle(tinfo.cputopo, HYPERCALL_BUFFER_NULL); - if ( xc_cputopoinfo(self->xc_handle, &tinfo) != 0 ) + if ( xc_cputopoinfo(self->xc_handle, &num_cpus, NULL) != 0 ) goto out; - cputopo = xc_hypercall_buffer_alloc(self->xc_handle, cputopo, - sizeof(*cputopo) * tinfo.num_cpus); + cputopo = calloc(num_cpus, sizeof(*cputopo)); if ( cputopo == NULL ) goto out; - set_xen_guest_handle(tinfo.cputopo, cputopo); - if ( xc_cputopoinfo(self->xc_handle, &tinfo) != 0 ) + if ( xc_cputopoinfo(self->xc_handle, &num_cpus, cputopo) != 0 ) goto out; /* Construct cpu-to-* lists. */ cpu_to_core_obj = PyList_New(0); cpu_to_socket_obj = PyList_New(0); cpu_to_node_obj = PyList_New(0); - for ( i = 0; i < tinfo.num_cpus; i++ ) + for ( i = 0; i < num_cpus; i++ ) { if ( cputopo[i].core == XEN_INVALID_CORE_ID ) { @@ -1279,7 +1275,7 @@ static PyObject *pyxc_topologyinfo(XcObject *self) } } - ret_obj = Py_BuildValue("{s:i}", "max_cpu_index", tinfo.num_cpus + 1); + ret_obj = Py_BuildValue("{s:i}", "max_cpu_index", num_cpus + 1); PyDict_SetItemString(ret_obj, "cpu_to_core", cpu_to_core_obj); Py_DECREF(cpu_to_core_obj); @@ -1291,7 +1287,7 @@ static PyObject *pyxc_topologyinfo(XcObject *self) Py_DECREF(cpu_to_node_obj); out: - xc_hypercall_buffer_free(self->xc_handle, cputopo); + free(cputopo); return ret_obj ? ret_obj : pyxc_error_to_exception(self->xc_handle); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:12:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:12: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 1YtGLc-0001JB-GN; Fri, 15 May 2015 14:12:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGLb-0001Im-5K for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:12:19 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id 22/0F-02948-2CEF5555; Fri, 15 May 2015 14:12:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1431699135!6458017!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21867 invoked from network); 15 May 2015 14:12:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 15 May 2015 14:12:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGLX-0001g5-NX for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:12:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGLX-0008P4-Fq for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:12:15 +0000 Date: Fri, 15 May 2015 14:12:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl/libxc: Move libxl_get_cpu_topology()'s hypercall buffer management to libxc X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 250f0b43af1a71f8e0ccfe1c6fdb7dd284cc042c Author: Boris Ostrovsky AuthorDate: Mon May 11 12:31:27 2015 -0400 Commit: Ian Campbell CommitDate: Wed May 13 15:03:37 2015 +0100 libxl/libxc: Move libxl_get_cpu_topology()'s hypercall buffer management to libxc xc_cputopoinfo() is not expected to be used on a hot path and therefore hypercall buffer management can be pushed into libxc. This will simplify life for callers. Also update error reporting macros. Signed-off-by: Boris Ostrovsky Acked-by: Ian Campbell --- tools/libxc/include/xenctrl.h | 5 ++- tools/libxc/xc_misc.c | 23 +++++++++++----- tools/libxl/libxl.c | 37 ++++++++------------------ tools/misc/xenpm.c | 51 ++++++++++++++++--------------------- tools/python/xen/lowlevel/xc/xc.c | 20 ++++++-------- 5 files changed, 61 insertions(+), 75 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index a689caf..e4d608d 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -1238,7 +1238,7 @@ int xc_readconsolering(xc_interface *xch, int xc_send_debug_keys(xc_interface *xch, char *keys); typedef xen_sysctl_physinfo_t xc_physinfo_t; -typedef xen_sysctl_cputopoinfo_t xc_cputopoinfo_t; +typedef xen_sysctl_cputopo_t xc_cputopo_t; typedef xen_sysctl_numainfo_t xc_numainfo_t; typedef uint32_t xc_cpu_to_node_t; @@ -1249,7 +1249,8 @@ typedef uint64_t xc_node_to_memfree_t; typedef uint32_t xc_node_to_node_dist_t; int xc_physinfo(xc_interface *xch, xc_physinfo_t *info); -int xc_cputopoinfo(xc_interface *xch, xc_cputopoinfo_t *info); +int xc_cputopoinfo(xc_interface *xch, unsigned *max_cpus, + xc_cputopo_t *cputopo); int xc_numainfo(xc_interface *xch, xc_numainfo_t *info); int xc_sched_id(xc_interface *xch, diff --git a/tools/libxc/xc_misc.c b/tools/libxc/xc_misc.c index 3a1784b..b3bdbef 100644 --- a/tools/libxc/xc_misc.c +++ b/tools/libxc/xc_misc.c @@ -203,22 +203,31 @@ int xc_physinfo(xc_interface *xch, return 0; } -int xc_cputopoinfo(xc_interface *xch, - xc_cputopoinfo_t *put_info) +int xc_cputopoinfo(xc_interface *xch, unsigned *max_cpus, + xc_cputopo_t *cputopo) { int ret; DECLARE_SYSCTL; + DECLARE_HYPERCALL_BOUNCE(cputopo, *max_cpus * sizeof(*cputopo), + XC_HYPERCALL_BUFFER_BOUNCE_OUT); - sysctl.cmd = XEN_SYSCTL_cputopoinfo; + if ( (ret = xc_hypercall_bounce_pre(xch, cputopo)) ) + goto out; - memcpy(&sysctl.u.cputopoinfo, put_info, sizeof(*put_info)); + sysctl.u.cputopoinfo.num_cpus = *max_cpus; + set_xen_guest_handle(sysctl.u.cputopoinfo.cputopo, cputopo); + + sysctl.cmd = XEN_SYSCTL_cputopoinfo; if ( (ret = do_sysctl(xch, &sysctl)) != 0 ) - return ret; + goto out; - memcpy(put_info, &sysctl.u.cputopoinfo, sizeof(*put_info)); + *max_cpus = sysctl.u.cputopoinfo.num_cpus; - return 0; +out: + xc_hypercall_bounce_post(xch, cputopo); + + return ret; } int xc_numainfo(xc_interface *xch, diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 516713e..5f2fcff 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -5102,37 +5102,28 @@ int libxl_get_physinfo(libxl_ctx *ctx, libxl_physinfo *physinfo) libxl_cputopology *libxl_get_cpu_topology(libxl_ctx *ctx, int *nb_cpu_out) { GC_INIT(ctx); - xc_cputopoinfo_t tinfo; - DECLARE_HYPERCALL_BUFFER(xen_sysctl_cputopo_t, cputopo); + xc_cputopo_t *cputopo; libxl_cputopology *ret = NULL; int i; + unsigned num_cpus; - /* Setting buffer to NULL makes the hypercall return number of CPUs */ - set_xen_guest_handle(tinfo.cputopo, HYPERCALL_BUFFER_NULL); - if (xc_cputopoinfo(ctx->xch, &tinfo) != 0) + /* Setting buffer to NULL makes the call return number of CPUs */ + if (xc_cputopoinfo(ctx->xch, &num_cpus, NULL)) { - LIBXL__LOG(ctx, XTL_ERROR, "Unable to determine number of CPUS"); - ret = NULL; + LOGE(ERROR, "Unable to determine number of CPUS"); goto out; } - cputopo = xc_hypercall_buffer_alloc(ctx->xch, cputopo, - sizeof(*cputopo) * tinfo.num_cpus); - if (cputopo == NULL) { - LIBXL__LOG_ERRNOVAL(ctx, XTL_ERROR, ENOMEM, - "Unable to allocate hypercall arguments"); - goto fail; - } - set_xen_guest_handle(tinfo.cputopo, cputopo); + cputopo = libxl__zalloc(gc, sizeof(*cputopo) * num_cpus); - if (xc_cputopoinfo(ctx->xch, &tinfo) != 0) { - LIBXL__LOG_ERRNO(ctx, XTL_ERROR, "CPU topology info hypercall failed"); - goto fail; + if (xc_cputopoinfo(ctx->xch, &num_cpus, cputopo)) { + LOGE(ERROR, "CPU topology info hypercall failed"); + goto out; } - ret = libxl__zalloc(NOGC, sizeof(libxl_cputopology) * tinfo.num_cpus); + ret = libxl__zalloc(NOGC, sizeof(libxl_cputopology) * num_cpus); - for (i = 0; i < tinfo.num_cpus; i++) { + for (i = 0; i < num_cpus; i++) { #define V(map, i, invalid) ( cputopo[i].map == invalid) ? \ LIBXL_CPUTOPOLOGY_INVALID_ENTRY : cputopo[i].map ret[i].core = V(core, i, XEN_INVALID_CORE_ID); @@ -5141,11 +5132,7 @@ libxl_cputopology *libxl_get_cpu_topology(libxl_ctx *ctx, int *nb_cpu_out) #undef V } -fail: - xc_hypercall_buffer_free(ctx->xch, cputopo); - - if (ret) - *nb_cpu_out = tinfo.num_cpus; + *nb_cpu_out = num_cpus; out: GC_FREE; diff --git a/tools/misc/xenpm.c b/tools/misc/xenpm.c index a5d07de..24ee6ef 100644 --- a/tools/misc/xenpm.c +++ b/tools/misc/xenpm.c @@ -355,20 +355,17 @@ static void signal_int_handler(int signo) int i, j, k; struct timeval tv; int cx_cap = 0, px_cap = 0; - DECLARE_HYPERCALL_BUFFER(xen_sysctl_cputopo_t, cputopo); - xc_cputopoinfo_t info = { 0 }; + xc_cputopo_t *cputopo; + unsigned max_cpus; - set_xen_guest_handle(info.cputopo, HYPERCALL_BUFFER_NULL); - if ( xc_cputopoinfo(xc_handle, &info) != 0 ) + if ( xc_cputopoinfo(xc_handle, &max_cpus, NULL) != 0 ) { fprintf(stderr, "failed to discover number of CPUs: %s\n", strerror(errno)); goto out; } - cputopo = xc_hypercall_buffer_alloc(xc_handle, cputopo, - sizeof(*cputopo) * info.num_cpus); - + cputopo = calloc(max_cpus, sizeof(*cputopo)); if ( cputopo == NULL ) { fprintf(stderr, "failed to allocate hypercall buffers\n"); @@ -453,28 +450,26 @@ static void signal_int_handler(int signo) printf(" Avg freq\t%d\tKHz\n", avgfreq[i]); } - set_xen_guest_handle(info.cputopo, cputopo); - - if ( cx_cap && !xc_cputopoinfo(xc_handle, &info) ) + if ( cx_cap && !xc_cputopoinfo(xc_handle, &max_cpus, cputopo) ) { uint32_t socket_ids[MAX_NR_CPU]; uint32_t core_ids[MAX_NR_CPU]; uint32_t socket_nr = 0; uint32_t core_nr = 0; - if ( info.num_cpus > MAX_NR_CPU ) - info.num_cpus = MAX_NR_CPU; + if ( max_cpus > MAX_NR_CPU ) + max_cpus = MAX_NR_CPU; /* check validity */ - for ( i = 0; i < info.num_cpus; i++ ) + for ( i = 0; i < max_cpus; i++ ) { if ( cputopo[i].core == XEN_INVALID_CORE_ID || cputopo[i].socket == XEN_INVALID_SOCKET_ID ) break; } - if ( i >= info.num_cpus ) + if ( i >= max_cpus ) { /* find socket nr & core nr per socket */ - for ( i = 0; i < info.num_cpus; i++ ) + for ( i = 0; i < max_cpus; i++ ) { for ( j = 0; j < socket_nr; j++ ) if ( cputopo[i].socket == socket_ids[j] ) @@ -501,7 +496,7 @@ static void signal_int_handler(int signo) unsigned int n; uint64_t res; - for ( j = 0; j < info.num_cpus; j++ ) + for ( j = 0; j < max_cpus; j++ ) { if ( cputopo[j].socket == socket_ids[i] ) break; @@ -520,7 +515,7 @@ static void signal_int_handler(int signo) } for ( k = 0; k < core_nr; k++ ) { - for ( j = 0; j < info.num_cpus; j++ ) + for ( j = 0; j < max_cpus; j++ ) { if ( cputopo[j].socket == socket_ids[i] && cputopo[j].core == core_ids[k] ) @@ -558,7 +553,7 @@ static void signal_int_handler(int signo) free(sum); free(avgfreq); out: - xc_hypercall_buffer_free(xc_handle, cputopo); + free(cputopo); xc_interface_close(xc_handle); exit(0); } @@ -965,12 +960,11 @@ void scaling_governor_func(int argc, char *argv[]) void cpu_topology_func(int argc, char *argv[]) { - DECLARE_HYPERCALL_BUFFER(xen_sysctl_cputopo_t, cputopo); - xc_cputopoinfo_t info = { 0 }; - int i, rc = ENOMEM; + xc_cputopo_t *cputopo; + unsigned max_cpus; + int i, rc; - set_xen_guest_handle(info.cputopo, HYPERCALL_BUFFER_NULL); - if ( xc_cputopoinfo(xc_handle, &info) ) + if ( xc_cputopoinfo(xc_handle, &max_cpus, NULL) != 0 ) { rc = errno; fprintf(stderr, "failed to discover number of CPUs (%d - %s)\n", @@ -978,16 +972,15 @@ void cpu_topology_func(int argc, char *argv[]) goto out; } - cputopo = xc_hypercall_buffer_alloc(xc_handle, cputopo, - sizeof(*cputopo) * info.num_cpus); + cputopo = calloc(max_cpus, sizeof(*cputopo)); if ( cputopo == NULL ) { + rc = ENOMEM; fprintf(stderr, "failed to allocate hypercall buffers\n"); goto out; } - set_xen_guest_handle(info.cputopo, cputopo); - if ( xc_cputopoinfo(xc_handle, &info) ) + if ( xc_cputopoinfo(xc_handle, &max_cpus, cputopo) ) { rc = errno; fprintf(stderr, "Cannot get Xen CPU topology (%d - %s)\n", @@ -996,7 +989,7 @@ void cpu_topology_func(int argc, char *argv[]) } printf("CPU\tcore\tsocket\tnode\n"); - for ( i = 0; i < info.num_cpus; i++ ) + for ( i = 0; i < max_cpus; i++ ) { if ( cputopo[i].core == XEN_INVALID_CORE_ID ) continue; @@ -1005,7 +998,7 @@ void cpu_topology_func(int argc, char *argv[]) } rc = 0; out: - xc_hypercall_buffer_free(xc_handle, cputopo); + free(cputopo); if ( rc ) exit(rc); } diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index ba66d55..21ba57d 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -1220,30 +1220,26 @@ static PyObject *pyxc_getcpuinfo(XcObject *self, PyObject *args, PyObject *kwds) static PyObject *pyxc_topologyinfo(XcObject *self) { - xc_cputopoinfo_t tinfo = { 0 }; - unsigned i; + xc_cputopo_t *cputopo = NULL; + unsigned i, num_cpus; PyObject *ret_obj = NULL; PyObject *cpu_to_core_obj, *cpu_to_socket_obj, *cpu_to_node_obj; - DECLARE_HYPERCALL_BUFFER(xen_sysctl_cputopo_t, cputopo); - set_xen_guest_handle(tinfo.cputopo, HYPERCALL_BUFFER_NULL); - if ( xc_cputopoinfo(self->xc_handle, &tinfo) != 0 ) + if ( xc_cputopoinfo(self->xc_handle, &num_cpus, NULL) != 0 ) goto out; - cputopo = xc_hypercall_buffer_alloc(self->xc_handle, cputopo, - sizeof(*cputopo) * tinfo.num_cpus); + cputopo = calloc(num_cpus, sizeof(*cputopo)); if ( cputopo == NULL ) goto out; - set_xen_guest_handle(tinfo.cputopo, cputopo); - if ( xc_cputopoinfo(self->xc_handle, &tinfo) != 0 ) + if ( xc_cputopoinfo(self->xc_handle, &num_cpus, cputopo) != 0 ) goto out; /* Construct cpu-to-* lists. */ cpu_to_core_obj = PyList_New(0); cpu_to_socket_obj = PyList_New(0); cpu_to_node_obj = PyList_New(0); - for ( i = 0; i < tinfo.num_cpus; i++ ) + for ( i = 0; i < num_cpus; i++ ) { if ( cputopo[i].core == XEN_INVALID_CORE_ID ) { @@ -1279,7 +1275,7 @@ static PyObject *pyxc_topologyinfo(XcObject *self) } } - ret_obj = Py_BuildValue("{s:i}", "max_cpu_index", tinfo.num_cpus + 1); + ret_obj = Py_BuildValue("{s:i}", "max_cpu_index", num_cpus + 1); PyDict_SetItemString(ret_obj, "cpu_to_core", cpu_to_core_obj); Py_DECREF(cpu_to_core_obj); @@ -1291,7 +1287,7 @@ static PyObject *pyxc_topologyinfo(XcObject *self) Py_DECREF(cpu_to_node_obj); out: - xc_hypercall_buffer_free(self->xc_handle, cputopo); + free(cputopo); return ret_obj ? ret_obj : pyxc_error_to_exception(self->xc_handle); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:12:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:12: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 1YtGLl-0001MO-Iv; Fri, 15 May 2015 14:12:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGLk-0001M0-Rc for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:12:29 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 01/B0-02790-BCEF5555; Fri, 15 May 2015 14:12:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1431699146!17873326!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24639 invoked from network); 15 May 2015 14:12:26 -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; 15 May 2015 14:12:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGLh-0001gH-SY for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:12:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGLh-0008PX-Qz for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:12:25 +0000 Date: Fri, 15 May 2015 14:12:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl/libxc: Move libxl_get_numainfo()'s hypercall buffer management to libxc X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 85d78b4cdfaab02d3b22599144d10e92c6f05068 Author: Boris Ostrovsky AuthorDate: Mon May 11 12:31:28 2015 -0400 Commit: Ian Campbell CommitDate: Wed May 13 15:03:37 2015 +0100 libxl/libxc: Move libxl_get_numainfo()'s hypercall buffer management to libxc xc_numainfo() is not expected to be used on a hot path and therefore hypercall buffer management can be pushed into libxc. This will simplify life for callers. Also update error logging macros. Signed-off-by: Boris Ostrovsky Acked-by: Ian Campbell --- tools/libxc/include/xenctrl.h | 4 ++- tools/libxc/xc_misc.c | 30 ++++++++++++++++----- tools/libxl/libxl.c | 51 ++++++++++++------------------------ tools/python/xen/lowlevel/xc/xc.c | 38 ++++++++++----------------- 4 files changed, 57 insertions(+), 66 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index e4d608d..a404855 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -1240,6 +1240,7 @@ int xc_send_debug_keys(xc_interface *xch, char *keys); typedef xen_sysctl_physinfo_t xc_physinfo_t; typedef xen_sysctl_cputopo_t xc_cputopo_t; typedef xen_sysctl_numainfo_t xc_numainfo_t; +typedef xen_sysctl_meminfo_t xc_meminfo_t; typedef uint32_t xc_cpu_to_node_t; typedef uint32_t xc_cpu_to_socket_t; @@ -1251,7 +1252,8 @@ typedef uint32_t xc_node_to_node_dist_t; int xc_physinfo(xc_interface *xch, xc_physinfo_t *info); int xc_cputopoinfo(xc_interface *xch, unsigned *max_cpus, xc_cputopo_t *cputopo); -int xc_numainfo(xc_interface *xch, xc_numainfo_t *info); +int xc_numainfo(xc_interface *xch, unsigned *max_nodes, + xc_meminfo_t *meminfo, uint32_t *distance); int xc_sched_id(xc_interface *xch, int *sched_id); diff --git a/tools/libxc/xc_misc.c b/tools/libxc/xc_misc.c index b3bdbef..e1b89eb 100644 --- a/tools/libxc/xc_misc.c +++ b/tools/libxc/xc_misc.c @@ -230,22 +230,38 @@ out: return ret; } -int xc_numainfo(xc_interface *xch, - xc_numainfo_t *put_info) +int xc_numainfo(xc_interface *xch, unsigned *max_nodes, + xc_meminfo_t *meminfo, uint32_t *distance) { int ret; DECLARE_SYSCTL; + DECLARE_HYPERCALL_BOUNCE(meminfo, *max_nodes * sizeof(*meminfo), + XC_HYPERCALL_BUFFER_BOUNCE_OUT); + DECLARE_HYPERCALL_BOUNCE(distance, + *max_nodes * *max_nodes * sizeof(*distance), + XC_HYPERCALL_BUFFER_BOUNCE_OUT); + + if ( (ret = xc_hypercall_bounce_pre(xch, meminfo)) ) + goto out; + if ((ret = xc_hypercall_bounce_pre(xch, distance)) ) + goto out; + + sysctl.u.numainfo.num_nodes = *max_nodes; + set_xen_guest_handle(sysctl.u.numainfo.meminfo, meminfo); + set_xen_guest_handle(sysctl.u.numainfo.distance, distance); sysctl.cmd = XEN_SYSCTL_numainfo; - memcpy(&sysctl.u.numainfo, put_info, sizeof(*put_info)); + if ( (ret = do_sysctl(xch, &sysctl)) != 0 ) + goto out; - if ((ret = do_sysctl(xch, &sysctl)) != 0) - return ret; + *max_nodes = sysctl.u.numainfo.num_nodes; - memcpy(put_info, &sysctl.u.numainfo, sizeof(*put_info)); +out: + xc_hypercall_bounce_post(xch, meminfo); + xc_hypercall_bounce_post(xch, distance); - return 0; + return ret; } diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 5f2fcff..5c88a88 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -5142,61 +5142,44 @@ libxl_cputopology *libxl_get_cpu_topology(libxl_ctx *ctx, int *nb_cpu_out) libxl_numainfo *libxl_get_numainfo(libxl_ctx *ctx, int *nr) { GC_INIT(ctx); - xc_numainfo_t ninfo; - DECLARE_HYPERCALL_BUFFER(xen_sysctl_meminfo_t, meminfo); - DECLARE_HYPERCALL_BUFFER(uint32_t, distance); + xc_meminfo_t *meminfo; + uint32_t *distance; libxl_numainfo *ret = NULL; int i, j; + unsigned num_nodes; - set_xen_guest_handle(ninfo.meminfo, HYPERCALL_BUFFER_NULL); - set_xen_guest_handle(ninfo.distance, HYPERCALL_BUFFER_NULL); - if (xc_numainfo(ctx->xch, &ninfo) != 0) { - LIBXL__LOG(ctx, XTL_ERROR, "Unable to determine number of NODES"); - ret = NULL; + if (xc_numainfo(ctx->xch, &num_nodes, NULL, NULL)) { + LOGE(ERROR, "Unable to determine number of nodes"); goto out; } - meminfo = xc_hypercall_buffer_alloc(ctx->xch, meminfo, - sizeof(*meminfo) * ninfo.num_nodes); - distance = xc_hypercall_buffer_alloc(ctx->xch, distance, - sizeof(*distance) * - ninfo.num_nodes * ninfo.num_nodes); - if ((meminfo == NULL) || (distance == NULL)) { - LIBXL__LOG_ERRNOVAL(ctx, XTL_ERROR, ENOMEM, - "Unable to allocate hypercall arguments"); - goto fail; - } + meminfo = libxl__zalloc(gc, sizeof(*meminfo) * num_nodes); + distance = libxl__zalloc(gc, sizeof(*distance) * num_nodes * num_nodes); - set_xen_guest_handle(ninfo.meminfo, meminfo); - set_xen_guest_handle(ninfo.distance, distance); - if (xc_numainfo(ctx->xch, &ninfo) != 0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "getting numainfo"); - goto fail; + if (xc_numainfo(ctx->xch, &num_nodes, meminfo, distance)) { + LOGE(ERROR, "getting numainfo"); + goto out; } - *nr = ninfo.num_nodes; + *nr = num_nodes; - ret = libxl__zalloc(NOGC, sizeof(libxl_numainfo) * ninfo.num_nodes); - for (i = 0; i < ninfo.num_nodes; i++) - ret[i].dists = libxl__calloc(NOGC, ninfo.num_nodes, sizeof(*distance)); + ret = libxl__zalloc(NOGC, sizeof(libxl_numainfo) * num_nodes); + for (i = 0; i < num_nodes; i++) + ret[i].dists = libxl__calloc(NOGC, num_nodes, sizeof(*distance)); - for (i = 0; i < ninfo.num_nodes; i++) { + for (i = 0; i < num_nodes; i++) { #define V(val, invalid) (val == invalid) ? \ LIBXL_NUMAINFO_INVALID_ENTRY : val ret[i].size = V(meminfo[i].memsize, XEN_INVALID_MEM_SZ); ret[i].free = V(meminfo[i].memfree, XEN_INVALID_MEM_SZ); - ret[i].num_dists = ninfo.num_nodes; + ret[i].num_dists = num_nodes; for (j = 0; j < ret[i].num_dists; j++) { - unsigned idx = i * ninfo.num_nodes + j; + unsigned idx = i * num_nodes + j; ret[i].dists[j] = V(distance[idx], XEN_INVALID_NODE_DIST); } #undef V } - fail: - xc_hypercall_buffer_free(ctx->xch, meminfo); - xc_hypercall_buffer_free(ctx->xch, distance); - out: GC_FREE; return ret; diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index 21ba57d..fbd93db 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -1293,33 +1293,23 @@ out: static PyObject *pyxc_numainfo(XcObject *self) { - xc_numainfo_t ninfo = { 0 }; - unsigned i, j; + unsigned i, j, num_nodes; uint64_t free_heap; PyObject *ret_obj = NULL, *node_to_node_dist_list_obj; PyObject *node_to_memsize_obj, *node_to_memfree_obj; PyObject *node_to_dma32_mem_obj, *node_to_node_dist_obj; - DECLARE_HYPERCALL_BUFFER(xen_sysctl_meminfo_t, meminfo); - DECLARE_HYPERCALL_BUFFER(uint32_t, distance); + xc_meminfo_t *meminfo = NULL; + uint32_t *distance = NULL; - set_xen_guest_handle(ninfo.meminfo, HYPERCALL_BUFFER_NULL); - set_xen_guest_handle(ninfo.distance, HYPERCALL_BUFFER_NULL); - if ( xc_numainfo(self->xc_handle, &ninfo) != 0 ) + if ( xc_numainfo(self->xc_handle, &num_nodes, NULL, NULL) != 0 ) goto out; - meminfo = xc_hypercall_buffer_alloc(self->xc_handle, meminfo, - sizeof(*meminfo) * ninfo.num_nodes); - if ( meminfo == NULL ) - goto out; - distance = xc_hypercall_buffer_alloc(self->xc_handle, distance, - sizeof(*distance) * - ninfo.num_nodes * ninfo.num_nodes); - if ( distance == NULL ) + meminfo = calloc(num_nodes, sizeof(*meminfo)); + distance = calloc(num_nodes * num_nodes, sizeof(*distance)); + if ( (meminfo == NULL) || (distance == NULL) ) goto out; - set_xen_guest_handle(ninfo.meminfo, meminfo); - set_xen_guest_handle(ninfo.distance, distance); - if ( xc_numainfo(self->xc_handle, &ninfo) != 0 ) + if ( xc_numainfo(self->xc_handle, &num_nodes, meminfo, distance) != 0 ) goto out; /* Construct node-to-* lists. */ @@ -1327,7 +1317,7 @@ static PyObject *pyxc_numainfo(XcObject *self) node_to_memfree_obj = PyList_New(0); node_to_dma32_mem_obj = PyList_New(0); node_to_node_dist_list_obj = PyList_New(0); - for ( i = 0; i < ninfo.num_nodes; i++ ) + for ( i = 0; i < num_nodes; i++ ) { PyObject *pyint; unsigned invalid_node; @@ -1351,9 +1341,9 @@ static PyObject *pyxc_numainfo(XcObject *self) /* Node to Node Distance */ node_to_node_dist_obj = PyList_New(0); invalid_node = (meminfo[i].memsize == XEN_INVALID_MEM_SZ); - for ( j = 0; j < ninfo.num_nodes; j++ ) + for ( j = 0; j < num_nodes; j++ ) { - uint32_t dist = distance[i * ninfo.num_nodes + j]; + uint32_t dist = distance[i * num_nodes + j]; if ( invalid_node || (dist == XEN_INVALID_NODE_DIST) ) { PyList_Append(node_to_node_dist_obj, Py_None); @@ -1369,7 +1359,7 @@ static PyObject *pyxc_numainfo(XcObject *self) Py_DECREF(node_to_node_dist_obj); } - ret_obj = Py_BuildValue("{s:i}", "max_node_index", ninfo.num_nodes + 1); + ret_obj = Py_BuildValue("{s:i}", "max_node_index", num_nodes + 1); PyDict_SetItemString(ret_obj, "node_memsize", node_to_memsize_obj); Py_DECREF(node_to_memsize_obj); @@ -1385,8 +1375,8 @@ static PyObject *pyxc_numainfo(XcObject *self) Py_DECREF(node_to_node_dist_list_obj); out: - xc_hypercall_buffer_free(self->xc_handle, meminfo); - xc_hypercall_buffer_free(self->xc_handle, distance); + free(meminfo); + free(distance); return ret_obj ? ret_obj : pyxc_error_to_exception(self->xc_handle); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:12:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:12: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 1YtGLl-0001MO-Iv; Fri, 15 May 2015 14:12:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGLk-0001M0-Rc for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:12:29 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 01/B0-02790-BCEF5555; Fri, 15 May 2015 14:12:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1431699146!17873326!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24639 invoked from network); 15 May 2015 14:12:26 -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; 15 May 2015 14:12:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGLh-0001gH-SY for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:12:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGLh-0008PX-Qz for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:12:25 +0000 Date: Fri, 15 May 2015 14:12:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl/libxc: Move libxl_get_numainfo()'s hypercall buffer management to libxc X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 85d78b4cdfaab02d3b22599144d10e92c6f05068 Author: Boris Ostrovsky AuthorDate: Mon May 11 12:31:28 2015 -0400 Commit: Ian Campbell CommitDate: Wed May 13 15:03:37 2015 +0100 libxl/libxc: Move libxl_get_numainfo()'s hypercall buffer management to libxc xc_numainfo() is not expected to be used on a hot path and therefore hypercall buffer management can be pushed into libxc. This will simplify life for callers. Also update error logging macros. Signed-off-by: Boris Ostrovsky Acked-by: Ian Campbell --- tools/libxc/include/xenctrl.h | 4 ++- tools/libxc/xc_misc.c | 30 ++++++++++++++++----- tools/libxl/libxl.c | 51 ++++++++++++------------------------ tools/python/xen/lowlevel/xc/xc.c | 38 ++++++++++----------------- 4 files changed, 57 insertions(+), 66 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index e4d608d..a404855 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -1240,6 +1240,7 @@ int xc_send_debug_keys(xc_interface *xch, char *keys); typedef xen_sysctl_physinfo_t xc_physinfo_t; typedef xen_sysctl_cputopo_t xc_cputopo_t; typedef xen_sysctl_numainfo_t xc_numainfo_t; +typedef xen_sysctl_meminfo_t xc_meminfo_t; typedef uint32_t xc_cpu_to_node_t; typedef uint32_t xc_cpu_to_socket_t; @@ -1251,7 +1252,8 @@ typedef uint32_t xc_node_to_node_dist_t; int xc_physinfo(xc_interface *xch, xc_physinfo_t *info); int xc_cputopoinfo(xc_interface *xch, unsigned *max_cpus, xc_cputopo_t *cputopo); -int xc_numainfo(xc_interface *xch, xc_numainfo_t *info); +int xc_numainfo(xc_interface *xch, unsigned *max_nodes, + xc_meminfo_t *meminfo, uint32_t *distance); int xc_sched_id(xc_interface *xch, int *sched_id); diff --git a/tools/libxc/xc_misc.c b/tools/libxc/xc_misc.c index b3bdbef..e1b89eb 100644 --- a/tools/libxc/xc_misc.c +++ b/tools/libxc/xc_misc.c @@ -230,22 +230,38 @@ out: return ret; } -int xc_numainfo(xc_interface *xch, - xc_numainfo_t *put_info) +int xc_numainfo(xc_interface *xch, unsigned *max_nodes, + xc_meminfo_t *meminfo, uint32_t *distance) { int ret; DECLARE_SYSCTL; + DECLARE_HYPERCALL_BOUNCE(meminfo, *max_nodes * sizeof(*meminfo), + XC_HYPERCALL_BUFFER_BOUNCE_OUT); + DECLARE_HYPERCALL_BOUNCE(distance, + *max_nodes * *max_nodes * sizeof(*distance), + XC_HYPERCALL_BUFFER_BOUNCE_OUT); + + if ( (ret = xc_hypercall_bounce_pre(xch, meminfo)) ) + goto out; + if ((ret = xc_hypercall_bounce_pre(xch, distance)) ) + goto out; + + sysctl.u.numainfo.num_nodes = *max_nodes; + set_xen_guest_handle(sysctl.u.numainfo.meminfo, meminfo); + set_xen_guest_handle(sysctl.u.numainfo.distance, distance); sysctl.cmd = XEN_SYSCTL_numainfo; - memcpy(&sysctl.u.numainfo, put_info, sizeof(*put_info)); + if ( (ret = do_sysctl(xch, &sysctl)) != 0 ) + goto out; - if ((ret = do_sysctl(xch, &sysctl)) != 0) - return ret; + *max_nodes = sysctl.u.numainfo.num_nodes; - memcpy(put_info, &sysctl.u.numainfo, sizeof(*put_info)); +out: + xc_hypercall_bounce_post(xch, meminfo); + xc_hypercall_bounce_post(xch, distance); - return 0; + return ret; } diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 5f2fcff..5c88a88 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -5142,61 +5142,44 @@ libxl_cputopology *libxl_get_cpu_topology(libxl_ctx *ctx, int *nb_cpu_out) libxl_numainfo *libxl_get_numainfo(libxl_ctx *ctx, int *nr) { GC_INIT(ctx); - xc_numainfo_t ninfo; - DECLARE_HYPERCALL_BUFFER(xen_sysctl_meminfo_t, meminfo); - DECLARE_HYPERCALL_BUFFER(uint32_t, distance); + xc_meminfo_t *meminfo; + uint32_t *distance; libxl_numainfo *ret = NULL; int i, j; + unsigned num_nodes; - set_xen_guest_handle(ninfo.meminfo, HYPERCALL_BUFFER_NULL); - set_xen_guest_handle(ninfo.distance, HYPERCALL_BUFFER_NULL); - if (xc_numainfo(ctx->xch, &ninfo) != 0) { - LIBXL__LOG(ctx, XTL_ERROR, "Unable to determine number of NODES"); - ret = NULL; + if (xc_numainfo(ctx->xch, &num_nodes, NULL, NULL)) { + LOGE(ERROR, "Unable to determine number of nodes"); goto out; } - meminfo = xc_hypercall_buffer_alloc(ctx->xch, meminfo, - sizeof(*meminfo) * ninfo.num_nodes); - distance = xc_hypercall_buffer_alloc(ctx->xch, distance, - sizeof(*distance) * - ninfo.num_nodes * ninfo.num_nodes); - if ((meminfo == NULL) || (distance == NULL)) { - LIBXL__LOG_ERRNOVAL(ctx, XTL_ERROR, ENOMEM, - "Unable to allocate hypercall arguments"); - goto fail; - } + meminfo = libxl__zalloc(gc, sizeof(*meminfo) * num_nodes); + distance = libxl__zalloc(gc, sizeof(*distance) * num_nodes * num_nodes); - set_xen_guest_handle(ninfo.meminfo, meminfo); - set_xen_guest_handle(ninfo.distance, distance); - if (xc_numainfo(ctx->xch, &ninfo) != 0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "getting numainfo"); - goto fail; + if (xc_numainfo(ctx->xch, &num_nodes, meminfo, distance)) { + LOGE(ERROR, "getting numainfo"); + goto out; } - *nr = ninfo.num_nodes; + *nr = num_nodes; - ret = libxl__zalloc(NOGC, sizeof(libxl_numainfo) * ninfo.num_nodes); - for (i = 0; i < ninfo.num_nodes; i++) - ret[i].dists = libxl__calloc(NOGC, ninfo.num_nodes, sizeof(*distance)); + ret = libxl__zalloc(NOGC, sizeof(libxl_numainfo) * num_nodes); + for (i = 0; i < num_nodes; i++) + ret[i].dists = libxl__calloc(NOGC, num_nodes, sizeof(*distance)); - for (i = 0; i < ninfo.num_nodes; i++) { + for (i = 0; i < num_nodes; i++) { #define V(val, invalid) (val == invalid) ? \ LIBXL_NUMAINFO_INVALID_ENTRY : val ret[i].size = V(meminfo[i].memsize, XEN_INVALID_MEM_SZ); ret[i].free = V(meminfo[i].memfree, XEN_INVALID_MEM_SZ); - ret[i].num_dists = ninfo.num_nodes; + ret[i].num_dists = num_nodes; for (j = 0; j < ret[i].num_dists; j++) { - unsigned idx = i * ninfo.num_nodes + j; + unsigned idx = i * num_nodes + j; ret[i].dists[j] = V(distance[idx], XEN_INVALID_NODE_DIST); } #undef V } - fail: - xc_hypercall_buffer_free(ctx->xch, meminfo); - xc_hypercall_buffer_free(ctx->xch, distance); - out: GC_FREE; return ret; diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index 21ba57d..fbd93db 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -1293,33 +1293,23 @@ out: static PyObject *pyxc_numainfo(XcObject *self) { - xc_numainfo_t ninfo = { 0 }; - unsigned i, j; + unsigned i, j, num_nodes; uint64_t free_heap; PyObject *ret_obj = NULL, *node_to_node_dist_list_obj; PyObject *node_to_memsize_obj, *node_to_memfree_obj; PyObject *node_to_dma32_mem_obj, *node_to_node_dist_obj; - DECLARE_HYPERCALL_BUFFER(xen_sysctl_meminfo_t, meminfo); - DECLARE_HYPERCALL_BUFFER(uint32_t, distance); + xc_meminfo_t *meminfo = NULL; + uint32_t *distance = NULL; - set_xen_guest_handle(ninfo.meminfo, HYPERCALL_BUFFER_NULL); - set_xen_guest_handle(ninfo.distance, HYPERCALL_BUFFER_NULL); - if ( xc_numainfo(self->xc_handle, &ninfo) != 0 ) + if ( xc_numainfo(self->xc_handle, &num_nodes, NULL, NULL) != 0 ) goto out; - meminfo = xc_hypercall_buffer_alloc(self->xc_handle, meminfo, - sizeof(*meminfo) * ninfo.num_nodes); - if ( meminfo == NULL ) - goto out; - distance = xc_hypercall_buffer_alloc(self->xc_handle, distance, - sizeof(*distance) * - ninfo.num_nodes * ninfo.num_nodes); - if ( distance == NULL ) + meminfo = calloc(num_nodes, sizeof(*meminfo)); + distance = calloc(num_nodes * num_nodes, sizeof(*distance)); + if ( (meminfo == NULL) || (distance == NULL) ) goto out; - set_xen_guest_handle(ninfo.meminfo, meminfo); - set_xen_guest_handle(ninfo.distance, distance); - if ( xc_numainfo(self->xc_handle, &ninfo) != 0 ) + if ( xc_numainfo(self->xc_handle, &num_nodes, meminfo, distance) != 0 ) goto out; /* Construct node-to-* lists. */ @@ -1327,7 +1317,7 @@ static PyObject *pyxc_numainfo(XcObject *self) node_to_memfree_obj = PyList_New(0); node_to_dma32_mem_obj = PyList_New(0); node_to_node_dist_list_obj = PyList_New(0); - for ( i = 0; i < ninfo.num_nodes; i++ ) + for ( i = 0; i < num_nodes; i++ ) { PyObject *pyint; unsigned invalid_node; @@ -1351,9 +1341,9 @@ static PyObject *pyxc_numainfo(XcObject *self) /* Node to Node Distance */ node_to_node_dist_obj = PyList_New(0); invalid_node = (meminfo[i].memsize == XEN_INVALID_MEM_SZ); - for ( j = 0; j < ninfo.num_nodes; j++ ) + for ( j = 0; j < num_nodes; j++ ) { - uint32_t dist = distance[i * ninfo.num_nodes + j]; + uint32_t dist = distance[i * num_nodes + j]; if ( invalid_node || (dist == XEN_INVALID_NODE_DIST) ) { PyList_Append(node_to_node_dist_obj, Py_None); @@ -1369,7 +1359,7 @@ static PyObject *pyxc_numainfo(XcObject *self) Py_DECREF(node_to_node_dist_obj); } - ret_obj = Py_BuildValue("{s:i}", "max_node_index", ninfo.num_nodes + 1); + ret_obj = Py_BuildValue("{s:i}", "max_node_index", num_nodes + 1); PyDict_SetItemString(ret_obj, "node_memsize", node_to_memsize_obj); Py_DECREF(node_to_memsize_obj); @@ -1385,8 +1375,8 @@ static PyObject *pyxc_numainfo(XcObject *self) Py_DECREF(node_to_node_dist_list_obj); out: - xc_hypercall_buffer_free(self->xc_handle, meminfo); - xc_hypercall_buffer_free(self->xc_handle, distance); + free(meminfo); + free(distance); return ret_obj ? ret_obj : pyxc_error_to_exception(self->xc_handle); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:12:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:12: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 1YtGLv-0001QC-NQ; Fri, 15 May 2015 14:12:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGLu-0001Pq-KS for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:12:38 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id BA/0C-03561-5DEF5555; Fri, 15 May 2015 14:12:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1431699156!10893345!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4814 invoked from network); 15 May 2015 14:12:37 -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; 15 May 2015 14:12:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGLs-0001gV-0G for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:12:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGLr-0008QV-VD for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:12:35 +0000 Date: Fri, 15 May 2015 14:12:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: Provide set_xen_guest_handle_offset macro X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e47d65dc63013f4b140d3f8760fd9113e353280f Author: Boris Ostrovsky AuthorDate: Mon May 11 12:31:29 2015 -0400 Commit: Ian Campbell CommitDate: Wed May 13 15:03:38 2015 +0100 libxc: Provide set_xen_guest_handle_offset macro Add set_xen_guest_handle_offset() macro that can be used for setting xen_guest_handle to an offset into hypercall buffer. Signed-off-by: Boris Ostrovsky Acked-by: Ian Campbell --- tools/libxc/include/xenctrl.h | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index a404855..4b3c26e 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -322,16 +322,24 @@ typedef struct xc_hypercall_buffer xc_hypercall_buffer_t; * Set a xen_guest_handle in a type safe manner, ensuring that the * data pointer has been correctly allocated. */ -#undef set_xen_guest_handle -#define set_xen_guest_handle(_hnd, _val) \ +#define set_xen_guest_handle_impl(_hnd, _val, _byte_off) \ do { \ xc_hypercall_buffer_t _hcbuf_hnd1; \ typeof(XC__HYPERCALL_BUFFER_NAME(_val)) *_hcbuf_hnd2 = \ HYPERCALL_BUFFER(_val); \ (void) (&_hcbuf_hnd1 == _hcbuf_hnd2); \ - set_xen_guest_handle_raw(_hnd, (_hcbuf_hnd2)->hbuf); \ + set_xen_guest_handle_raw(_hnd, \ + (_hcbuf_hnd2)->hbuf + (_byte_off)); \ } while (0) +#undef set_xen_guest_handle +#define set_xen_guest_handle(_hnd, _val) \ + set_xen_guest_handle_impl(_hnd, _val, 0) + +#define set_xen_guest_handle_offset(_hnd, _val, _off) \ + set_xen_guest_handle_impl(_hnd, _val, \ + ((sizeof(*_val)*(_off)))) + /* Use with set_xen_guest_handle in place of NULL */ extern xc_hypercall_buffer_t XC__HYPERCALL_BUFFER_NAME(HYPERCALL_BUFFER_NULL); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:12:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:12: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 1YtGLv-0001QC-NQ; Fri, 15 May 2015 14:12:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGLu-0001Pq-KS for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:12:38 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id BA/0C-03561-5DEF5555; Fri, 15 May 2015 14:12:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1431699156!10893345!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4814 invoked from network); 15 May 2015 14:12:37 -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; 15 May 2015 14:12:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGLs-0001gV-0G for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:12:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGLr-0008QV-VD for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:12:35 +0000 Date: Fri, 15 May 2015 14:12:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: Provide set_xen_guest_handle_offset macro X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e47d65dc63013f4b140d3f8760fd9113e353280f Author: Boris Ostrovsky AuthorDate: Mon May 11 12:31:29 2015 -0400 Commit: Ian Campbell CommitDate: Wed May 13 15:03:38 2015 +0100 libxc: Provide set_xen_guest_handle_offset macro Add set_xen_guest_handle_offset() macro that can be used for setting xen_guest_handle to an offset into hypercall buffer. Signed-off-by: Boris Ostrovsky Acked-by: Ian Campbell --- tools/libxc/include/xenctrl.h | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index a404855..4b3c26e 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -322,16 +322,24 @@ typedef struct xc_hypercall_buffer xc_hypercall_buffer_t; * Set a xen_guest_handle in a type safe manner, ensuring that the * data pointer has been correctly allocated. */ -#undef set_xen_guest_handle -#define set_xen_guest_handle(_hnd, _val) \ +#define set_xen_guest_handle_impl(_hnd, _val, _byte_off) \ do { \ xc_hypercall_buffer_t _hcbuf_hnd1; \ typeof(XC__HYPERCALL_BUFFER_NAME(_val)) *_hcbuf_hnd2 = \ HYPERCALL_BUFFER(_val); \ (void) (&_hcbuf_hnd1 == _hcbuf_hnd2); \ - set_xen_guest_handle_raw(_hnd, (_hcbuf_hnd2)->hbuf); \ + set_xen_guest_handle_raw(_hnd, \ + (_hcbuf_hnd2)->hbuf + (_byte_off)); \ } while (0) +#undef set_xen_guest_handle +#define set_xen_guest_handle(_hnd, _val) \ + set_xen_guest_handle_impl(_hnd, _val, 0) + +#define set_xen_guest_handle_offset(_hnd, _val, _off) \ + set_xen_guest_handle_impl(_hnd, _val, \ + ((sizeof(*_val)*(_off)))) + /* Use with set_xen_guest_handle in place of NULL */ extern xc_hypercall_buffer_t XC__HYPERCALL_BUFFER_NAME(HYPERCALL_BUFFER_NULL); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:12:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:12:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGM6-0001Sy-Pv; Fri, 15 May 2015 14:12:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGM5-0001Sj-U4 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:12:50 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id B8/79-02927-0EEF5555; Fri, 15 May 2015 14:12:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1431699166!10891307!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12442 invoked from network); 15 May 2015 14:12:47 -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; 15 May 2015 14:12:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGM2-0001gc-5x for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:12:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGM2-0008R0-4R for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:12:46 +0000 Date: Fri, 15 May 2015 14:12:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Add interface for querying hypervisor about PCI topology X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e78e8b9bb649bf0f18d940fb12a4f6c55be34915 Author: Boris Ostrovsky AuthorDate: Mon May 11 12:31:30 2015 -0400 Commit: Ian Campbell CommitDate: Wed May 13 15:03:38 2015 +0100 libxl: Add interface for querying hypervisor about PCI topology .. and use this new interface to display it along with CPU topology and NUMA information when 'xl info -n' command is issued The output will look like ... cpu_topology : cpu: core socket node 0: 0 0 0 ... device topology : device node 0000:00:00.0 0 0000:00:01.0 0 ... Signed-off-by: Boris Ostrovsky Acked-by: Ian Campbell --- tools/libxc/include/xenctrl.h | 3 ++ tools/libxc/xc_misc.c | 39 +++++++++++++++++++++++ tools/libxl/libxl.c | 45 ++++++++++++++++++++++++++ tools/libxl/libxl.h | 12 +++++++ tools/libxl/libxl_freebsd.c | 12 +++++++ tools/libxl/libxl_internal.h | 5 +++ tools/libxl/libxl_linux.c | 70 +++++++++++++++++++++++++++++++++++++++++ tools/libxl/libxl_netbsd.c | 12 +++++++ tools/libxl/libxl_types.idl | 7 ++++ tools/libxl/libxl_utils.c | 8 +++++ tools/libxl/xl_cmdimpl.c | 40 +++++++++++++++++++---- 11 files changed, 246 insertions(+), 7 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 4b3c26e..09faa7f 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -1249,6 +1249,7 @@ typedef xen_sysctl_physinfo_t xc_physinfo_t; typedef xen_sysctl_cputopo_t xc_cputopo_t; typedef xen_sysctl_numainfo_t xc_numainfo_t; typedef xen_sysctl_meminfo_t xc_meminfo_t; +typedef xen_sysctl_pcitopoinfo_t xc_pcitopoinfo_t; typedef uint32_t xc_cpu_to_node_t; typedef uint32_t xc_cpu_to_socket_t; @@ -1262,6 +1263,8 @@ int xc_cputopoinfo(xc_interface *xch, unsigned *max_cpus, xc_cputopo_t *cputopo); int xc_numainfo(xc_interface *xch, unsigned *max_nodes, xc_meminfo_t *meminfo, uint32_t *distance); +int xc_pcitopoinfo(xc_interface *xch, unsigned num_devs, + physdev_pci_device_t *devs, uint32_t *nodes); int xc_sched_id(xc_interface *xch, int *sched_id); diff --git a/tools/libxc/xc_misc.c b/tools/libxc/xc_misc.c index e1b89eb..b827bbb 100644 --- a/tools/libxc/xc_misc.c +++ b/tools/libxc/xc_misc.c @@ -264,6 +264,45 @@ out: return ret; } +int xc_pcitopoinfo(xc_interface *xch, unsigned num_devs, + physdev_pci_device_t *devs, + uint32_t *nodes) +{ + int ret = 0; + unsigned processed = 0; + DECLARE_SYSCTL; + DECLARE_HYPERCALL_BOUNCE(devs, num_devs * sizeof(*devs), + XC_HYPERCALL_BUFFER_BOUNCE_IN); + DECLARE_HYPERCALL_BOUNCE(nodes, num_devs* sizeof(*nodes), + XC_HYPERCALL_BUFFER_BOUNCE_BOTH); + + if ( (ret = xc_hypercall_bounce_pre(xch, devs)) ) + goto out; + if ( (ret = xc_hypercall_bounce_pre(xch, nodes)) ) + goto out; + + sysctl.cmd = XEN_SYSCTL_pcitopoinfo; + + while ( processed < num_devs ) + { + sysctl.u.pcitopoinfo.num_devs = num_devs - processed; + set_xen_guest_handle_offset(sysctl.u.pcitopoinfo.devs, devs, + processed); + set_xen_guest_handle_offset(sysctl.u.pcitopoinfo.nodes, nodes, + processed); + + if ( (ret = do_sysctl(xch, &sysctl)) != 0 ) + break; + + processed += sysctl.u.pcitopoinfo.num_devs; + } + + out: + xc_hypercall_bounce_post(xch, devs); + xc_hypercall_bounce_post(xch, nodes); + + return ret; +} int xc_sched_id(xc_interface *xch, int *sched_id) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 5c88a88..a6eb2df 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -5139,6 +5139,51 @@ libxl_cputopology *libxl_get_cpu_topology(libxl_ctx *ctx, int *nb_cpu_out) return ret; } +libxl_pcitopology *libxl_get_pci_topology(libxl_ctx *ctx, int *num_devs) +{ + GC_INIT(ctx); + physdev_pci_device_t *devs; + uint32_t *nodes; + libxl_pcitopology *ret = NULL; + int i, rc; + + *num_devs = libxl__pci_numdevs(gc); + if (*num_devs < 0) { + LOG(ERROR, "Unable to determine number of PCI devices, rc %d", + *num_devs); + goto out; + } + + devs = libxl__zalloc(gc, sizeof(*devs) * *num_devs); + nodes = libxl__zalloc(gc, sizeof(*nodes) * *num_devs); + + rc = libxl__pci_topology_init(gc, devs, *num_devs); + if (rc) { + LOG(ERROR, "Cannot initialize PCI hypercall structure, rc %d", rc); + goto out; + } + + if (xc_pcitopoinfo(ctx->xch, *num_devs, devs, nodes) != 0) { + LOGE(ERROR, "PCI topology info hypercall failed"); + goto out; + } + + ret = libxl__zalloc(NOGC, sizeof(libxl_pcitopology) * *num_devs); + + for (i = 0; i < *num_devs; i++) { + ret[i].seg = devs[i].seg; + ret[i].bus = devs[i].bus; + ret[i].devfn = devs[i].devfn; + ret[i].node = ((nodes[i] == XEN_INVALID_NODE_ID) || + (nodes[i] == XEN_INVALID_DEV)) ? + LIBXL_PCITOPOLOGY_INVALID_ENTRY : nodes[i]; + } + + out: + GC_FREE; + return ret; +} + libxl_numainfo *libxl_get_numainfo(libxl_ctx *ctx, int *nr) { GC_INIT(ctx); diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index efc0617..2ed7194 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -760,6 +760,14 @@ void libxl_mac_copy(libxl_ctx *ctx, libxl_mac *dst, libxl_mac *src); #define LIBXL_HAVE_PSR_MBM 1 #endif +/* + * LIBXL_HAVE_PCITOPOLOGY + * + * If this is defined, then interface to query hypervisor about PCI device + * topology is available. + */ +#define LIBXL_HAVE_PCITOPOLOGY 1 + typedef char **libxl_string_list; void libxl_string_list_dispose(libxl_string_list *sl); int libxl_string_list_length(const libxl_string_list *sl); @@ -1152,6 +1160,10 @@ void libxl_vminfo_list_free(libxl_vminfo *list, int nb_vm); libxl_cputopology *libxl_get_cpu_topology(libxl_ctx *ctx, int *nb_cpu_out); void libxl_cputopology_list_free(libxl_cputopology *, int nb_cpu); +#define LIBXL_PCITOPOLOGY_INVALID_ENTRY (~(uint32_t)0) +libxl_pcitopology *libxl_get_pci_topology(libxl_ctx *ctx, int *num_devs); +void libxl_pcitopology_list_free(libxl_pcitopology *, int num_devs); + #define LIBXL_NUMAINFO_INVALID_ENTRY (~(uint32_t)0) libxl_numainfo *libxl_get_numainfo(libxl_ctx *ctx, int *nr); void libxl_numainfo_list_free(libxl_numainfo *, int nr); diff --git a/tools/libxl/libxl_freebsd.c b/tools/libxl/libxl_freebsd.c index e8b88b3..47c3391 100644 --- a/tools/libxl/libxl_freebsd.c +++ b/tools/libxl/libxl_freebsd.c @@ -131,3 +131,15 @@ libxl_device_model_version libxl__default_device_model(libxl__gc *gc) { return LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; } + +int libxl__pci_numdevs(libxl__gc *gc) +{ + return ERROR_NI; +} + +int libxl__pci_topology_init(libxl__gc *gc, + physdev_pci_device_t *devs, + int num_devs) +{ + return ERROR_NI; +} diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 8eb38aa..8aaa1ad 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1196,6 +1196,11 @@ _hidden int libxl__try_phy_backend(mode_t st_mode); _hidden char *libxl__devid_to_localdev(libxl__gc *gc, int devid); +_hidden int libxl__pci_numdevs(libxl__gc *gc); +_hidden int libxl__pci_topology_init(libxl__gc *gc, + physdev_pci_device_t *devs, + int num_devs); + /* from libxl_pci */ _hidden int libxl__device_pci_add(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, int starting); diff --git a/tools/libxl/libxl_linux.c b/tools/libxl/libxl_linux.c index b51930c..f42a89a 100644 --- a/tools/libxl/libxl_linux.c +++ b/tools/libxl/libxl_linux.c @@ -279,3 +279,73 @@ libxl_device_model_version libxl__default_device_model(libxl__gc *gc) { return LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; } + +int libxl__pci_numdevs(libxl__gc *gc) +{ + DIR *dir; + struct dirent *entry; + int num_devs = 0; + + dir = opendir("/sys/bus/pci/devices"); + if (!dir) { + LOGE(ERROR, "Cannot open /sys/bus/pci/devices"); + return ERROR_FAIL; + } + + while ((entry = readdir(dir))) { + if (entry->d_name[0] == '.') + continue; + num_devs++; + } + closedir(dir); + + return num_devs; +} + +int libxl__pci_topology_init(libxl__gc *gc, + physdev_pci_device_t *devs, + int num_devs) +{ + + DIR *dir; + struct dirent *entry; + int i, err = 0; + + dir = opendir("/sys/bus/pci/devices"); + if (!dir) { + LOGE(ERROR, "Cannot open /sys/bus/pci/devices"); + return ERROR_FAIL; + } + + i = 0; + while ((entry = readdir(dir))) { + unsigned int dom, bus, dev, func; + + if (entry->d_name[0] == '.') + continue; + + if (i == num_devs) { + LOG(ERROR, "Too many devices"); + err = ERROR_FAIL; + errno = -ENOSPC; + goto out; + } + + if (sscanf(entry->d_name, "%x:%x:%x.%d", &dom, &bus, &dev, &func) < 4) { + LOGE(ERROR, "Error processing /sys/bus/pci/devices"); + err = ERROR_FAIL; + goto out; + } + + devs[i].seg = dom; + devs[i].bus = bus; + devs[i].devfn = ((dev & 0x1f) << 3) | (func & 7); + + i++; + } + + out: + closedir(dir); + + return err; +} diff --git a/tools/libxl/libxl_netbsd.c b/tools/libxl/libxl_netbsd.c index 898e160..a2a962e 100644 --- a/tools/libxl/libxl_netbsd.c +++ b/tools/libxl/libxl_netbsd.c @@ -95,3 +95,15 @@ libxl_device_model_version libxl__default_device_model(libxl__gc *gc) { return LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; } + +int libxl__pci_numdevs(libxl__gc *gc) +{ + return ERROR_NI; +} + +int libxl__pci_topology_init(libxl__gc *gc, + physdev_pci_device_t *devs, + int num_devs) +{ + return ERROR_NI; +} diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 023b21e..65d479f 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -657,6 +657,13 @@ libxl_cputopology = Struct("cputopology", [ ("node", uint32), ], dir=DIR_OUT) +libxl_pcitopology = Struct("pcitopology", [ + ("seg", uint16), + ("bus", uint8), + ("devfn", uint8), + ("node", uint32), + ], dir=DIR_OUT) + libxl_sched_credit_params = Struct("sched_credit_params", [ ("tslice_ms", integer), ("ratelimit_us", integer), diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index 67c0b1c..f6be2d7 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -952,6 +952,14 @@ void libxl_cputopology_list_free(libxl_cputopology *list, int nr) free(list); } +void libxl_pcitopology_list_free(libxl_pcitopology *list, int nr) +{ + int i; + for (i = 0; i < nr; i++) + libxl_pcitopology_dispose(&list[i]); + free(list); +} + void libxl_numainfo_list_free(libxl_numainfo *list, int nr) { int i; diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 526a1f6..373aa37 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -5420,12 +5420,15 @@ static void output_numainfo(void) static void output_topologyinfo(void) { - libxl_cputopology *info; + libxl_cputopology *cpuinfo; int i, nr; + libxl_pcitopology *pciinfo; + int valid_devs; - info = libxl_get_cpu_topology(ctx, &nr); - if (info == NULL) { - fprintf(stderr, "libxl_get_topologyinfo failed.\n"); + + cpuinfo = libxl_get_cpu_topology(ctx, &nr); + if (cpuinfo == NULL) { + fprintf(stderr, "libxl_get_cpu_topology failed.\n"); return; } @@ -5433,12 +5436,35 @@ static void output_topologyinfo(void) printf("cpu: core socket node\n"); for (i = 0; i < nr; i++) { - if (info[i].core != LIBXL_CPUTOPOLOGY_INVALID_ENTRY) + if (cpuinfo[i].core != LIBXL_CPUTOPOLOGY_INVALID_ENTRY) printf("%3d: %4d %4d %4d\n", i, - info[i].core, info[i].socket, info[i].node); + cpuinfo[i].core, cpuinfo[i].socket, cpuinfo[i].node); + } + + libxl_cputopology_list_free(cpuinfo, nr); + + pciinfo = libxl_get_pci_topology(ctx, &nr); + if (pciinfo == NULL) { + fprintf(stderr, "libxl_get_pci_topology failed.\n"); + return; } - libxl_cputopology_list_free(info, nr); + printf("device topology :\n"); + printf("device node\n"); + for (i = 0; i < nr; i++) { + if (pciinfo[i].node != LIBXL_PCITOPOLOGY_INVALID_ENTRY) { + printf("%04x:%02x:%02x.%01x %d\n", pciinfo[i].seg, + pciinfo[i].bus, + ((pciinfo[i].devfn >> 3) & 0x1f), (pciinfo[i].devfn & 7), + pciinfo[i].node); + valid_devs++; + } + } + + if (valid_devs == 0) + printf("No device topology data available\n"); + + libxl_pcitopology_list_free(pciinfo, nr); return; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:12:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:12:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGM6-0001Sy-Pv; Fri, 15 May 2015 14:12:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGM5-0001Sj-U4 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:12:50 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id B8/79-02927-0EEF5555; Fri, 15 May 2015 14:12:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1431699166!10891307!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12442 invoked from network); 15 May 2015 14:12:47 -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; 15 May 2015 14:12:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGM2-0001gc-5x for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:12:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGM2-0008R0-4R for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:12:46 +0000 Date: Fri, 15 May 2015 14:12:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Add interface for querying hypervisor about PCI topology X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e78e8b9bb649bf0f18d940fb12a4f6c55be34915 Author: Boris Ostrovsky AuthorDate: Mon May 11 12:31:30 2015 -0400 Commit: Ian Campbell CommitDate: Wed May 13 15:03:38 2015 +0100 libxl: Add interface for querying hypervisor about PCI topology .. and use this new interface to display it along with CPU topology and NUMA information when 'xl info -n' command is issued The output will look like ... cpu_topology : cpu: core socket node 0: 0 0 0 ... device topology : device node 0000:00:00.0 0 0000:00:01.0 0 ... Signed-off-by: Boris Ostrovsky Acked-by: Ian Campbell --- tools/libxc/include/xenctrl.h | 3 ++ tools/libxc/xc_misc.c | 39 +++++++++++++++++++++++ tools/libxl/libxl.c | 45 ++++++++++++++++++++++++++ tools/libxl/libxl.h | 12 +++++++ tools/libxl/libxl_freebsd.c | 12 +++++++ tools/libxl/libxl_internal.h | 5 +++ tools/libxl/libxl_linux.c | 70 +++++++++++++++++++++++++++++++++++++++++ tools/libxl/libxl_netbsd.c | 12 +++++++ tools/libxl/libxl_types.idl | 7 ++++ tools/libxl/libxl_utils.c | 8 +++++ tools/libxl/xl_cmdimpl.c | 40 +++++++++++++++++++---- 11 files changed, 246 insertions(+), 7 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 4b3c26e..09faa7f 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -1249,6 +1249,7 @@ typedef xen_sysctl_physinfo_t xc_physinfo_t; typedef xen_sysctl_cputopo_t xc_cputopo_t; typedef xen_sysctl_numainfo_t xc_numainfo_t; typedef xen_sysctl_meminfo_t xc_meminfo_t; +typedef xen_sysctl_pcitopoinfo_t xc_pcitopoinfo_t; typedef uint32_t xc_cpu_to_node_t; typedef uint32_t xc_cpu_to_socket_t; @@ -1262,6 +1263,8 @@ int xc_cputopoinfo(xc_interface *xch, unsigned *max_cpus, xc_cputopo_t *cputopo); int xc_numainfo(xc_interface *xch, unsigned *max_nodes, xc_meminfo_t *meminfo, uint32_t *distance); +int xc_pcitopoinfo(xc_interface *xch, unsigned num_devs, + physdev_pci_device_t *devs, uint32_t *nodes); int xc_sched_id(xc_interface *xch, int *sched_id); diff --git a/tools/libxc/xc_misc.c b/tools/libxc/xc_misc.c index e1b89eb..b827bbb 100644 --- a/tools/libxc/xc_misc.c +++ b/tools/libxc/xc_misc.c @@ -264,6 +264,45 @@ out: return ret; } +int xc_pcitopoinfo(xc_interface *xch, unsigned num_devs, + physdev_pci_device_t *devs, + uint32_t *nodes) +{ + int ret = 0; + unsigned processed = 0; + DECLARE_SYSCTL; + DECLARE_HYPERCALL_BOUNCE(devs, num_devs * sizeof(*devs), + XC_HYPERCALL_BUFFER_BOUNCE_IN); + DECLARE_HYPERCALL_BOUNCE(nodes, num_devs* sizeof(*nodes), + XC_HYPERCALL_BUFFER_BOUNCE_BOTH); + + if ( (ret = xc_hypercall_bounce_pre(xch, devs)) ) + goto out; + if ( (ret = xc_hypercall_bounce_pre(xch, nodes)) ) + goto out; + + sysctl.cmd = XEN_SYSCTL_pcitopoinfo; + + while ( processed < num_devs ) + { + sysctl.u.pcitopoinfo.num_devs = num_devs - processed; + set_xen_guest_handle_offset(sysctl.u.pcitopoinfo.devs, devs, + processed); + set_xen_guest_handle_offset(sysctl.u.pcitopoinfo.nodes, nodes, + processed); + + if ( (ret = do_sysctl(xch, &sysctl)) != 0 ) + break; + + processed += sysctl.u.pcitopoinfo.num_devs; + } + + out: + xc_hypercall_bounce_post(xch, devs); + xc_hypercall_bounce_post(xch, nodes); + + return ret; +} int xc_sched_id(xc_interface *xch, int *sched_id) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 5c88a88..a6eb2df 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -5139,6 +5139,51 @@ libxl_cputopology *libxl_get_cpu_topology(libxl_ctx *ctx, int *nb_cpu_out) return ret; } +libxl_pcitopology *libxl_get_pci_topology(libxl_ctx *ctx, int *num_devs) +{ + GC_INIT(ctx); + physdev_pci_device_t *devs; + uint32_t *nodes; + libxl_pcitopology *ret = NULL; + int i, rc; + + *num_devs = libxl__pci_numdevs(gc); + if (*num_devs < 0) { + LOG(ERROR, "Unable to determine number of PCI devices, rc %d", + *num_devs); + goto out; + } + + devs = libxl__zalloc(gc, sizeof(*devs) * *num_devs); + nodes = libxl__zalloc(gc, sizeof(*nodes) * *num_devs); + + rc = libxl__pci_topology_init(gc, devs, *num_devs); + if (rc) { + LOG(ERROR, "Cannot initialize PCI hypercall structure, rc %d", rc); + goto out; + } + + if (xc_pcitopoinfo(ctx->xch, *num_devs, devs, nodes) != 0) { + LOGE(ERROR, "PCI topology info hypercall failed"); + goto out; + } + + ret = libxl__zalloc(NOGC, sizeof(libxl_pcitopology) * *num_devs); + + for (i = 0; i < *num_devs; i++) { + ret[i].seg = devs[i].seg; + ret[i].bus = devs[i].bus; + ret[i].devfn = devs[i].devfn; + ret[i].node = ((nodes[i] == XEN_INVALID_NODE_ID) || + (nodes[i] == XEN_INVALID_DEV)) ? + LIBXL_PCITOPOLOGY_INVALID_ENTRY : nodes[i]; + } + + out: + GC_FREE; + return ret; +} + libxl_numainfo *libxl_get_numainfo(libxl_ctx *ctx, int *nr) { GC_INIT(ctx); diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index efc0617..2ed7194 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -760,6 +760,14 @@ void libxl_mac_copy(libxl_ctx *ctx, libxl_mac *dst, libxl_mac *src); #define LIBXL_HAVE_PSR_MBM 1 #endif +/* + * LIBXL_HAVE_PCITOPOLOGY + * + * If this is defined, then interface to query hypervisor about PCI device + * topology is available. + */ +#define LIBXL_HAVE_PCITOPOLOGY 1 + typedef char **libxl_string_list; void libxl_string_list_dispose(libxl_string_list *sl); int libxl_string_list_length(const libxl_string_list *sl); @@ -1152,6 +1160,10 @@ void libxl_vminfo_list_free(libxl_vminfo *list, int nb_vm); libxl_cputopology *libxl_get_cpu_topology(libxl_ctx *ctx, int *nb_cpu_out); void libxl_cputopology_list_free(libxl_cputopology *, int nb_cpu); +#define LIBXL_PCITOPOLOGY_INVALID_ENTRY (~(uint32_t)0) +libxl_pcitopology *libxl_get_pci_topology(libxl_ctx *ctx, int *num_devs); +void libxl_pcitopology_list_free(libxl_pcitopology *, int num_devs); + #define LIBXL_NUMAINFO_INVALID_ENTRY (~(uint32_t)0) libxl_numainfo *libxl_get_numainfo(libxl_ctx *ctx, int *nr); void libxl_numainfo_list_free(libxl_numainfo *, int nr); diff --git a/tools/libxl/libxl_freebsd.c b/tools/libxl/libxl_freebsd.c index e8b88b3..47c3391 100644 --- a/tools/libxl/libxl_freebsd.c +++ b/tools/libxl/libxl_freebsd.c @@ -131,3 +131,15 @@ libxl_device_model_version libxl__default_device_model(libxl__gc *gc) { return LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; } + +int libxl__pci_numdevs(libxl__gc *gc) +{ + return ERROR_NI; +} + +int libxl__pci_topology_init(libxl__gc *gc, + physdev_pci_device_t *devs, + int num_devs) +{ + return ERROR_NI; +} diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 8eb38aa..8aaa1ad 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1196,6 +1196,11 @@ _hidden int libxl__try_phy_backend(mode_t st_mode); _hidden char *libxl__devid_to_localdev(libxl__gc *gc, int devid); +_hidden int libxl__pci_numdevs(libxl__gc *gc); +_hidden int libxl__pci_topology_init(libxl__gc *gc, + physdev_pci_device_t *devs, + int num_devs); + /* from libxl_pci */ _hidden int libxl__device_pci_add(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, int starting); diff --git a/tools/libxl/libxl_linux.c b/tools/libxl/libxl_linux.c index b51930c..f42a89a 100644 --- a/tools/libxl/libxl_linux.c +++ b/tools/libxl/libxl_linux.c @@ -279,3 +279,73 @@ libxl_device_model_version libxl__default_device_model(libxl__gc *gc) { return LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; } + +int libxl__pci_numdevs(libxl__gc *gc) +{ + DIR *dir; + struct dirent *entry; + int num_devs = 0; + + dir = opendir("/sys/bus/pci/devices"); + if (!dir) { + LOGE(ERROR, "Cannot open /sys/bus/pci/devices"); + return ERROR_FAIL; + } + + while ((entry = readdir(dir))) { + if (entry->d_name[0] == '.') + continue; + num_devs++; + } + closedir(dir); + + return num_devs; +} + +int libxl__pci_topology_init(libxl__gc *gc, + physdev_pci_device_t *devs, + int num_devs) +{ + + DIR *dir; + struct dirent *entry; + int i, err = 0; + + dir = opendir("/sys/bus/pci/devices"); + if (!dir) { + LOGE(ERROR, "Cannot open /sys/bus/pci/devices"); + return ERROR_FAIL; + } + + i = 0; + while ((entry = readdir(dir))) { + unsigned int dom, bus, dev, func; + + if (entry->d_name[0] == '.') + continue; + + if (i == num_devs) { + LOG(ERROR, "Too many devices"); + err = ERROR_FAIL; + errno = -ENOSPC; + goto out; + } + + if (sscanf(entry->d_name, "%x:%x:%x.%d", &dom, &bus, &dev, &func) < 4) { + LOGE(ERROR, "Error processing /sys/bus/pci/devices"); + err = ERROR_FAIL; + goto out; + } + + devs[i].seg = dom; + devs[i].bus = bus; + devs[i].devfn = ((dev & 0x1f) << 3) | (func & 7); + + i++; + } + + out: + closedir(dir); + + return err; +} diff --git a/tools/libxl/libxl_netbsd.c b/tools/libxl/libxl_netbsd.c index 898e160..a2a962e 100644 --- a/tools/libxl/libxl_netbsd.c +++ b/tools/libxl/libxl_netbsd.c @@ -95,3 +95,15 @@ libxl_device_model_version libxl__default_device_model(libxl__gc *gc) { return LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; } + +int libxl__pci_numdevs(libxl__gc *gc) +{ + return ERROR_NI; +} + +int libxl__pci_topology_init(libxl__gc *gc, + physdev_pci_device_t *devs, + int num_devs) +{ + return ERROR_NI; +} diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 023b21e..65d479f 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -657,6 +657,13 @@ libxl_cputopology = Struct("cputopology", [ ("node", uint32), ], dir=DIR_OUT) +libxl_pcitopology = Struct("pcitopology", [ + ("seg", uint16), + ("bus", uint8), + ("devfn", uint8), + ("node", uint32), + ], dir=DIR_OUT) + libxl_sched_credit_params = Struct("sched_credit_params", [ ("tslice_ms", integer), ("ratelimit_us", integer), diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index 67c0b1c..f6be2d7 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -952,6 +952,14 @@ void libxl_cputopology_list_free(libxl_cputopology *list, int nr) free(list); } +void libxl_pcitopology_list_free(libxl_pcitopology *list, int nr) +{ + int i; + for (i = 0; i < nr; i++) + libxl_pcitopology_dispose(&list[i]); + free(list); +} + void libxl_numainfo_list_free(libxl_numainfo *list, int nr) { int i; diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 526a1f6..373aa37 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -5420,12 +5420,15 @@ static void output_numainfo(void) static void output_topologyinfo(void) { - libxl_cputopology *info; + libxl_cputopology *cpuinfo; int i, nr; + libxl_pcitopology *pciinfo; + int valid_devs; - info = libxl_get_cpu_topology(ctx, &nr); - if (info == NULL) { - fprintf(stderr, "libxl_get_topologyinfo failed.\n"); + + cpuinfo = libxl_get_cpu_topology(ctx, &nr); + if (cpuinfo == NULL) { + fprintf(stderr, "libxl_get_cpu_topology failed.\n"); return; } @@ -5433,12 +5436,35 @@ static void output_topologyinfo(void) printf("cpu: core socket node\n"); for (i = 0; i < nr; i++) { - if (info[i].core != LIBXL_CPUTOPOLOGY_INVALID_ENTRY) + if (cpuinfo[i].core != LIBXL_CPUTOPOLOGY_INVALID_ENTRY) printf("%3d: %4d %4d %4d\n", i, - info[i].core, info[i].socket, info[i].node); + cpuinfo[i].core, cpuinfo[i].socket, cpuinfo[i].node); + } + + libxl_cputopology_list_free(cpuinfo, nr); + + pciinfo = libxl_get_pci_topology(ctx, &nr); + if (pciinfo == NULL) { + fprintf(stderr, "libxl_get_pci_topology failed.\n"); + return; } - libxl_cputopology_list_free(info, nr); + printf("device topology :\n"); + printf("device node\n"); + for (i = 0; i < nr; i++) { + if (pciinfo[i].node != LIBXL_PCITOPOLOGY_INVALID_ENTRY) { + printf("%04x:%02x:%02x.%01x %d\n", pciinfo[i].seg, + pciinfo[i].bus, + ((pciinfo[i].devfn >> 3) & 0x1f), (pciinfo[i].devfn & 7), + pciinfo[i].node); + valid_devs++; + } + } + + if (valid_devs == 0) + printf("No device topology data available\n"); + + libxl_pcitopology_list_free(pciinfo, nr); return; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:13:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:13:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGMI-0001Uc-SZ; Fri, 15 May 2015 14:13:02 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGMH-0001UO-M0 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:13:01 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 1A/6A-03032-CEEF5555; Fri, 15 May 2015 14:13:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1431699176!11734110!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9774 invoked from network); 15 May 2015 14:12:57 -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; 15 May 2015 14:12:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGMC-0001gl-KZ for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:12:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGMC-0008RZ-H0 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:12:56 +0000 Date: Fri, 15 May 2015 14:12:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] IOMMU/x86: avoid pages without GFN in page table creation/updating X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7349efc695852c70b8c5e24d9ecf208757e8b471 Author: Jan Beulich AuthorDate: Wed May 13 16:35:54 2015 +0200 Commit: Jan Beulich CommitDate: Wed May 13 16:35:54 2015 +0200 IOMMU/x86: avoid pages without GFN in page table creation/updating Handing INVALID_GFN to functions like hd->platform_ops->map_page() just can't do any good, and the ioreq server code results in such pages being on the list of ones owned by a guest. While - as suggested by Tim - we should use get_gfn()/put_gfn() there to eliminate races, we really can't due to holding the domain's page alloc lock. Ultimately arch_iommu_populate_page_table() may need to be switched to be GFN based. Here is what Tim said in this regard: "Ideally this loop would be iterating over all gfns in the p2m rather than over all owned MFNs. As long as needs_iommu gets set first, such a loop could safely be paused and restarted without worrying about concurrent updates. The code sould even stay in this file, though exposing an iterator from the p2m code would be a lot more efficient." Original by Andrew Cooper , using further suggestions from Tim Deegan . Reported-by: Sander Eikelenboom Signed-off-by: Jan Beulich Tested-by: Sander Eikelenboom Acked-by: Tim Deegan Reviewed-by: Andrew Cooper Acked-by: Yang Zhang Acked-by: Suravee Suthikulpanit --- xen/drivers/passthrough/amd/iommu_map.c | 13 ++++++++++--- xen/drivers/passthrough/vtd/iommu.h | 1 - xen/drivers/passthrough/x86/iommu.c | 15 +++++++++++---- xen/include/asm-x86/hvm/iommu.h | 2 ++ xen/include/asm-x86/hvm/svm/amd-iommu-defs.h | 2 -- 5 files changed, 23 insertions(+), 10 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_map.c b/xen/drivers/passthrough/amd/iommu_map.c index 495ff5c..64c5225 100644 --- a/xen/drivers/passthrough/amd/iommu_map.c +++ b/xen/drivers/passthrough/amd/iommu_map.c @@ -557,6 +557,10 @@ static int update_paging_mode(struct domain *d, unsigned long gfn) unsigned long old_root_mfn; struct hvm_iommu *hd = domain_hvm_iommu(d); + if ( gfn == INVALID_MFN ) + return -EADDRNOTAVAIL; + ASSERT(!(gfn >> DEFAULT_DOMAIN_ADDRESS_WIDTH)); + level = hd->arch.paging_mode; old_root = hd->arch.root_table; offset = gfn >> (PTE_PER_TABLE_SHIFT * (level - 1)); @@ -729,12 +733,15 @@ int amd_iommu_unmap_page(struct domain *d, unsigned long gfn) * we might need a deeper page table for lager gfn now */ if ( is_hvm_domain(d) ) { - if ( update_paging_mode(d, gfn) ) + int rc = update_paging_mode(d, gfn); + + if ( rc ) { spin_unlock(&hd->arch.mapping_lock); AMD_IOMMU_DEBUG("Update page mode failed gfn = %lx\n", gfn); - domain_crash(d); - return -EFAULT; + if ( rc != -EADDRNOTAVAIL ) + domain_crash(d); + return rc; } } diff --git a/xen/drivers/passthrough/vtd/iommu.h b/xen/drivers/passthrough/vtd/iommu.h index d6e6520..80f8830 100644 --- a/xen/drivers/passthrough/vtd/iommu.h +++ b/xen/drivers/passthrough/vtd/iommu.h @@ -482,7 +482,6 @@ struct qinval_entry { #define VTD_PAGE_TABLE_LEVEL_3 3 #define VTD_PAGE_TABLE_LEVEL_4 4 -#define DEFAULT_DOMAIN_ADDRESS_WIDTH 48 #define MAX_IOMMU_REGS 0xc0 extern struct list_head acpi_drhd_units; diff --git a/xen/drivers/passthrough/x86/iommu.c b/xen/drivers/passthrough/x86/iommu.c index 9eb8d33..90b78d0 100644 --- a/xen/drivers/passthrough/x86/iommu.c +++ b/xen/drivers/passthrough/x86/iommu.c @@ -59,10 +59,17 @@ int arch_iommu_populate_page_table(struct domain *d) if ( has_hvm_container_domain(d) || (page->u.inuse.type_info & PGT_type_mask) == PGT_writable_page ) { - BUG_ON(SHARED_M2P(mfn_to_gmfn(d, page_to_mfn(page)))); - rc = hd->platform_ops->map_page( - d, mfn_to_gmfn(d, page_to_mfn(page)), page_to_mfn(page), - IOMMUF_readable|IOMMUF_writable); + unsigned long mfn = page_to_mfn(page); + unsigned long gfn = mfn_to_gmfn(d, mfn); + + if ( gfn != INVALID_MFN ) + { + ASSERT(!(gfn >> DEFAULT_DOMAIN_ADDRESS_WIDTH)); + BUG_ON(SHARED_M2P(gfn)); + rc = hd->platform_ops->map_page(d, gfn, mfn, + IOMMUF_readable | + IOMMUF_writable); + } if ( rc ) { page_list_add(page, &d->page_list); diff --git a/xen/include/asm-x86/hvm/iommu.h b/xen/include/asm-x86/hvm/iommu.h index 46cb126..3a4c68a 100644 --- a/xen/include/asm-x86/hvm/iommu.h +++ b/xen/include/asm-x86/hvm/iommu.h @@ -46,6 +46,8 @@ struct g2m_ioport { unsigned int np; }; +#define DEFAULT_DOMAIN_ADDRESS_WIDTH 48 + struct arch_hvm_iommu { u64 pgd_maddr; /* io page directory machine address */ diff --git a/xen/include/asm-x86/hvm/svm/amd-iommu-defs.h b/xen/include/asm-x86/hvm/svm/amd-iommu-defs.h index 2ac6f75..44a2fd9 100644 --- a/xen/include/asm-x86/hvm/svm/amd-iommu-defs.h +++ b/xen/include/asm-x86/hvm/svm/amd-iommu-defs.h @@ -464,8 +464,6 @@ #define IOMMU_CONTROL_DISABLED 0 #define IOMMU_CONTROL_ENABLED 1 -#define DEFAULT_DOMAIN_ADDRESS_WIDTH 48 - /* interrupt remapping table */ #define INT_REMAP_ENTRY_REMAPEN_MASK 0x00000001 #define INT_REMAP_ENTRY_REMAPEN_SHIFT 0 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:13:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:13:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGMI-0001Uc-SZ; Fri, 15 May 2015 14:13:02 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGMH-0001UO-M0 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:13:01 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 1A/6A-03032-CEEF5555; Fri, 15 May 2015 14:13:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1431699176!11734110!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9774 invoked from network); 15 May 2015 14:12:57 -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; 15 May 2015 14:12:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGMC-0001gl-KZ for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:12:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGMC-0008RZ-H0 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:12:56 +0000 Date: Fri, 15 May 2015 14:12:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] IOMMU/x86: avoid pages without GFN in page table creation/updating X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7349efc695852c70b8c5e24d9ecf208757e8b471 Author: Jan Beulich AuthorDate: Wed May 13 16:35:54 2015 +0200 Commit: Jan Beulich CommitDate: Wed May 13 16:35:54 2015 +0200 IOMMU/x86: avoid pages without GFN in page table creation/updating Handing INVALID_GFN to functions like hd->platform_ops->map_page() just can't do any good, and the ioreq server code results in such pages being on the list of ones owned by a guest. While - as suggested by Tim - we should use get_gfn()/put_gfn() there to eliminate races, we really can't due to holding the domain's page alloc lock. Ultimately arch_iommu_populate_page_table() may need to be switched to be GFN based. Here is what Tim said in this regard: "Ideally this loop would be iterating over all gfns in the p2m rather than over all owned MFNs. As long as needs_iommu gets set first, such a loop could safely be paused and restarted without worrying about concurrent updates. The code sould even stay in this file, though exposing an iterator from the p2m code would be a lot more efficient." Original by Andrew Cooper , using further suggestions from Tim Deegan . Reported-by: Sander Eikelenboom Signed-off-by: Jan Beulich Tested-by: Sander Eikelenboom Acked-by: Tim Deegan Reviewed-by: Andrew Cooper Acked-by: Yang Zhang Acked-by: Suravee Suthikulpanit --- xen/drivers/passthrough/amd/iommu_map.c | 13 ++++++++++--- xen/drivers/passthrough/vtd/iommu.h | 1 - xen/drivers/passthrough/x86/iommu.c | 15 +++++++++++---- xen/include/asm-x86/hvm/iommu.h | 2 ++ xen/include/asm-x86/hvm/svm/amd-iommu-defs.h | 2 -- 5 files changed, 23 insertions(+), 10 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_map.c b/xen/drivers/passthrough/amd/iommu_map.c index 495ff5c..64c5225 100644 --- a/xen/drivers/passthrough/amd/iommu_map.c +++ b/xen/drivers/passthrough/amd/iommu_map.c @@ -557,6 +557,10 @@ static int update_paging_mode(struct domain *d, unsigned long gfn) unsigned long old_root_mfn; struct hvm_iommu *hd = domain_hvm_iommu(d); + if ( gfn == INVALID_MFN ) + return -EADDRNOTAVAIL; + ASSERT(!(gfn >> DEFAULT_DOMAIN_ADDRESS_WIDTH)); + level = hd->arch.paging_mode; old_root = hd->arch.root_table; offset = gfn >> (PTE_PER_TABLE_SHIFT * (level - 1)); @@ -729,12 +733,15 @@ int amd_iommu_unmap_page(struct domain *d, unsigned long gfn) * we might need a deeper page table for lager gfn now */ if ( is_hvm_domain(d) ) { - if ( update_paging_mode(d, gfn) ) + int rc = update_paging_mode(d, gfn); + + if ( rc ) { spin_unlock(&hd->arch.mapping_lock); AMD_IOMMU_DEBUG("Update page mode failed gfn = %lx\n", gfn); - domain_crash(d); - return -EFAULT; + if ( rc != -EADDRNOTAVAIL ) + domain_crash(d); + return rc; } } diff --git a/xen/drivers/passthrough/vtd/iommu.h b/xen/drivers/passthrough/vtd/iommu.h index d6e6520..80f8830 100644 --- a/xen/drivers/passthrough/vtd/iommu.h +++ b/xen/drivers/passthrough/vtd/iommu.h @@ -482,7 +482,6 @@ struct qinval_entry { #define VTD_PAGE_TABLE_LEVEL_3 3 #define VTD_PAGE_TABLE_LEVEL_4 4 -#define DEFAULT_DOMAIN_ADDRESS_WIDTH 48 #define MAX_IOMMU_REGS 0xc0 extern struct list_head acpi_drhd_units; diff --git a/xen/drivers/passthrough/x86/iommu.c b/xen/drivers/passthrough/x86/iommu.c index 9eb8d33..90b78d0 100644 --- a/xen/drivers/passthrough/x86/iommu.c +++ b/xen/drivers/passthrough/x86/iommu.c @@ -59,10 +59,17 @@ int arch_iommu_populate_page_table(struct domain *d) if ( has_hvm_container_domain(d) || (page->u.inuse.type_info & PGT_type_mask) == PGT_writable_page ) { - BUG_ON(SHARED_M2P(mfn_to_gmfn(d, page_to_mfn(page)))); - rc = hd->platform_ops->map_page( - d, mfn_to_gmfn(d, page_to_mfn(page)), page_to_mfn(page), - IOMMUF_readable|IOMMUF_writable); + unsigned long mfn = page_to_mfn(page); + unsigned long gfn = mfn_to_gmfn(d, mfn); + + if ( gfn != INVALID_MFN ) + { + ASSERT(!(gfn >> DEFAULT_DOMAIN_ADDRESS_WIDTH)); + BUG_ON(SHARED_M2P(gfn)); + rc = hd->platform_ops->map_page(d, gfn, mfn, + IOMMUF_readable | + IOMMUF_writable); + } if ( rc ) { page_list_add(page, &d->page_list); diff --git a/xen/include/asm-x86/hvm/iommu.h b/xen/include/asm-x86/hvm/iommu.h index 46cb126..3a4c68a 100644 --- a/xen/include/asm-x86/hvm/iommu.h +++ b/xen/include/asm-x86/hvm/iommu.h @@ -46,6 +46,8 @@ struct g2m_ioport { unsigned int np; }; +#define DEFAULT_DOMAIN_ADDRESS_WIDTH 48 + struct arch_hvm_iommu { u64 pgd_maddr; /* io page directory machine address */ diff --git a/xen/include/asm-x86/hvm/svm/amd-iommu-defs.h b/xen/include/asm-x86/hvm/svm/amd-iommu-defs.h index 2ac6f75..44a2fd9 100644 --- a/xen/include/asm-x86/hvm/svm/amd-iommu-defs.h +++ b/xen/include/asm-x86/hvm/svm/amd-iommu-defs.h @@ -464,8 +464,6 @@ #define IOMMU_CONTROL_DISABLED 0 #define IOMMU_CONTROL_ENABLED 1 -#define DEFAULT_DOMAIN_ADDRESS_WIDTH 48 - /* interrupt remapping table */ #define INT_REMAP_ENTRY_REMAPEN_MASK 0x00000001 #define INT_REMAP_ENTRY_REMAPEN_SHIFT 0 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:13:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:13: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 1YtGMQ-0001We-VH; Fri, 15 May 2015 14:13:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGMP-0001WF-Ii for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:13:09 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id B5/F3-03206-4FEF5555; Fri, 15 May 2015 14:13:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1431699186!13228462!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31578 invoked from network); 15 May 2015 14:13:07 -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; 15 May 2015 14:13:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGMM-0001hJ-OR for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:13:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGMM-0008SC-NV for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:13:06 +0000 Date: Fri, 15 May 2015 14:13:06 +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 7cb37dfaaaafd42df7413c81100a6eb117e047a1 Merge: e78e8b9bb649bf0f18d940fb12a4f6c55be34915 7349efc695852c70b8c5e24d9ecf208757e8b471 Author: Ian Campbell AuthorDate: Wed May 13 15:46:54 2015 +0100 Commit: Ian Campbell CommitDate: Wed May 13 15:46:54 2015 +0100 Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging xen/drivers/passthrough/amd/iommu_map.c | 13 ++++++++++--- xen/drivers/passthrough/vtd/iommu.h | 1 - xen/drivers/passthrough/x86/iommu.c | 15 +++++++++++---- xen/include/asm-x86/hvm/iommu.h | 2 ++ xen/include/asm-x86/hvm/svm/amd-iommu-defs.h | 2 -- 5 files changed, 23 insertions(+), 10 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 Fri May 15 14:13:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:13: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 1YtGMQ-0001We-VH; Fri, 15 May 2015 14:13:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGMP-0001WF-Ii for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:13:09 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id B5/F3-03206-4FEF5555; Fri, 15 May 2015 14:13:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1431699186!13228462!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31578 invoked from network); 15 May 2015 14:13:07 -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; 15 May 2015 14:13:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGMM-0001hJ-OR for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:13:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGMM-0008SC-NV for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:13:06 +0000 Date: Fri, 15 May 2015 14:13:06 +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 7cb37dfaaaafd42df7413c81100a6eb117e047a1 Merge: e78e8b9bb649bf0f18d940fb12a4f6c55be34915 7349efc695852c70b8c5e24d9ecf208757e8b471 Author: Ian Campbell AuthorDate: Wed May 13 15:46:54 2015 +0100 Commit: Ian Campbell CommitDate: Wed May 13 15:46:54 2015 +0100 Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging xen/drivers/passthrough/amd/iommu_map.c | 13 ++++++++++--- xen/drivers/passthrough/vtd/iommu.h | 1 - xen/drivers/passthrough/x86/iommu.c | 15 +++++++++++---- xen/include/asm-x86/hvm/iommu.h | 2 ++ xen/include/asm-x86/hvm/svm/amd-iommu-defs.h | 2 -- 5 files changed, 23 insertions(+), 10 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 Fri May 15 14:13:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:13: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 1YtGMb-0001Z9-5C; Fri, 15 May 2015 14:13:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGMZ-0001Yu-Tt for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:13:20 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id DB/0F-03747-EFEF5555; Fri, 15 May 2015 14:13:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1431699197!3290885!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2000 invoked from network); 15 May 2015 14:13:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 15 May 2015 14:13:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGMX-0001hP-0E for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:13:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGMW-0008TV-R2 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:13:16 +0000 Date: Fri, 15 May 2015 14:13:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenpm: Initialize cputopo pointer X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b315cd9cce5b6da7ca89b2d7bad3fb01e7716044 Author: Boris Ostrovsky AuthorDate: Wed May 13 13:37:35 2015 -0400 Commit: Ian Campbell CommitDate: Thu May 14 09:58:43 2015 +0100 xenpm: Initialize cputopo pointer Commit 250f0b43af1a ("libxl/libxc: Move libxl_get_cpu_topology()'s hypercall buffer management to libxc") broke non-debug compilation: on error path we may have uninitialized cputopo pointer. Signed-off-by: Boris Ostrovsky Reported-by: Olaf Hering Acked-by: Wei Liu Acked-by: Ian Campbell --- tools/misc/xenpm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/misc/xenpm.c b/tools/misc/xenpm.c index 24ee6ef..fe2c001 100644 --- a/tools/misc/xenpm.c +++ b/tools/misc/xenpm.c @@ -355,7 +355,7 @@ static void signal_int_handler(int signo) int i, j, k; struct timeval tv; int cx_cap = 0, px_cap = 0; - xc_cputopo_t *cputopo; + xc_cputopo_t *cputopo = NULL; unsigned max_cpus; if ( xc_cputopoinfo(xc_handle, &max_cpus, NULL) != 0 ) @@ -960,7 +960,7 @@ void scaling_governor_func(int argc, char *argv[]) void cpu_topology_func(int argc, char *argv[]) { - xc_cputopo_t *cputopo; + xc_cputopo_t *cputopo = NULL; unsigned max_cpus; int i, 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 Fri May 15 14:13:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:13: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 1YtGMb-0001Z9-5C; Fri, 15 May 2015 14:13:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGMZ-0001Yu-Tt for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:13:20 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id DB/0F-03747-EFEF5555; Fri, 15 May 2015 14:13:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1431699197!3290885!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2000 invoked from network); 15 May 2015 14:13:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 15 May 2015 14:13:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGMX-0001hP-0E for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:13:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGMW-0008TV-R2 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:13:16 +0000 Date: Fri, 15 May 2015 14:13:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenpm: Initialize cputopo pointer X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b315cd9cce5b6da7ca89b2d7bad3fb01e7716044 Author: Boris Ostrovsky AuthorDate: Wed May 13 13:37:35 2015 -0400 Commit: Ian Campbell CommitDate: Thu May 14 09:58:43 2015 +0100 xenpm: Initialize cputopo pointer Commit 250f0b43af1a ("libxl/libxc: Move libxl_get_cpu_topology()'s hypercall buffer management to libxc") broke non-debug compilation: on error path we may have uninitialized cputopo pointer. Signed-off-by: Boris Ostrovsky Reported-by: Olaf Hering Acked-by: Wei Liu Acked-by: Ian Campbell --- tools/misc/xenpm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/misc/xenpm.c b/tools/misc/xenpm.c index 24ee6ef..fe2c001 100644 --- a/tools/misc/xenpm.c +++ b/tools/misc/xenpm.c @@ -355,7 +355,7 @@ static void signal_int_handler(int signo) int i, j, k; struct timeval tv; int cx_cap = 0, px_cap = 0; - xc_cputopo_t *cputopo; + xc_cputopo_t *cputopo = NULL; unsigned max_cpus; if ( xc_cputopoinfo(xc_handle, &max_cpus, NULL) != 0 ) @@ -960,7 +960,7 @@ void scaling_governor_func(int argc, char *argv[]) void cpu_topology_func(int argc, char *argv[]) { - xc_cputopo_t *cputopo; + xc_cputopo_t *cputopo = NULL; unsigned max_cpus; int i, 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 Fri May 15 14:13:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:13: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 1YtGMl-0001br-84; Fri, 15 May 2015 14:13:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGMj-0001bM-JW for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:13:29 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id DA/08-02919-80FF5555; Fri, 15 May 2015 14:13:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1431699207!10771937!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5457 invoked from network); 15 May 2015 14:13:28 -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; 15 May 2015 14:13:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGMh-0001hV-40 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:13:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGMh-0008U4-37 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:13:27 +0000 Date: Fri, 15 May 2015 14:13:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/migration: Be rather stricter with illformed callers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6abbcd3e380c3c829cf366ff2c0669226356b777 Author: Andrew Cooper AuthorDate: Thu May 14 16:55:03 2015 +0800 Commit: Ian Campbell CommitDate: Thu May 14 12:57:15 2015 +0100 libxc/migration: Be rather stricter with illformed callers The migration code itself should be able to validly assume all mandatory callbacks are set up. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Yang Hongyang Acked-by: Ian Campbell --- tools/libxc/xc_sr_save.c | 4 ++++ tools/libxc/xc_sr_save_x86_hvm.c | 7 ------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/tools/libxc/xc_sr_save.c b/tools/libxc/xc_sr_save.c index 5d9c267..83f0591 100644 --- a/tools/libxc/xc_sr_save.c +++ b/tools/libxc/xc_sr_save.c @@ -738,6 +738,10 @@ int xc_domain_save2(xc_interface *xch, int io_fd, uint32_t dom, ctx.save.max_iterations = 5; ctx.save.dirty_threshold = 50; + /* Sanity checks for callbacks. */ + if ( hvm ) + assert(callbacks->switch_qemu_logdirty); + IPRINTF("In experimental %s", __func__); DPRINTF("fd %d, dom %u, max_iters %u, max_factor %u, flags %u, hvm %d", io_fd, dom, max_iters, max_factor, flags, hvm); diff --git a/tools/libxc/xc_sr_save_x86_hvm.c b/tools/libxc/xc_sr_save_x86_hvm.c index 8baa104..58efdb9 100644 --- a/tools/libxc/xc_sr_save_x86_hvm.c +++ b/tools/libxc/xc_sr_save_x86_hvm.c @@ -166,13 +166,6 @@ static int x86_hvm_setup(struct xc_sr_context *ctx) { xc_interface *xch = ctx->xch; - if ( !ctx->save.callbacks->switch_qemu_logdirty ) - { - ERROR("No switch_qemu_logdirty callback provided"); - errno = EINVAL; - return -1; - } - if ( ctx->save.callbacks->switch_qemu_logdirty( ctx->domid, 1, ctx->save.callbacks->data) ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:13:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:13: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 1YtGMl-0001br-84; Fri, 15 May 2015 14:13:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGMj-0001bM-JW for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:13:29 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id DA/08-02919-80FF5555; Fri, 15 May 2015 14:13:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1431699207!10771937!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5457 invoked from network); 15 May 2015 14:13:28 -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; 15 May 2015 14:13:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGMh-0001hV-40 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:13:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGMh-0008U4-37 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:13:27 +0000 Date: Fri, 15 May 2015 14:13:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/migration: Be rather stricter with illformed callers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6abbcd3e380c3c829cf366ff2c0669226356b777 Author: Andrew Cooper AuthorDate: Thu May 14 16:55:03 2015 +0800 Commit: Ian Campbell CommitDate: Thu May 14 12:57:15 2015 +0100 libxc/migration: Be rather stricter with illformed callers The migration code itself should be able to validly assume all mandatory callbacks are set up. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Yang Hongyang Acked-by: Ian Campbell --- tools/libxc/xc_sr_save.c | 4 ++++ tools/libxc/xc_sr_save_x86_hvm.c | 7 ------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/tools/libxc/xc_sr_save.c b/tools/libxc/xc_sr_save.c index 5d9c267..83f0591 100644 --- a/tools/libxc/xc_sr_save.c +++ b/tools/libxc/xc_sr_save.c @@ -738,6 +738,10 @@ int xc_domain_save2(xc_interface *xch, int io_fd, uint32_t dom, ctx.save.max_iterations = 5; ctx.save.dirty_threshold = 50; + /* Sanity checks for callbacks. */ + if ( hvm ) + assert(callbacks->switch_qemu_logdirty); + IPRINTF("In experimental %s", __func__); DPRINTF("fd %d, dom %u, max_iters %u, max_factor %u, flags %u, hvm %d", io_fd, dom, max_iters, max_factor, flags, hvm); diff --git a/tools/libxc/xc_sr_save_x86_hvm.c b/tools/libxc/xc_sr_save_x86_hvm.c index 8baa104..58efdb9 100644 --- a/tools/libxc/xc_sr_save_x86_hvm.c +++ b/tools/libxc/xc_sr_save_x86_hvm.c @@ -166,13 +166,6 @@ static int x86_hvm_setup(struct xc_sr_context *ctx) { xc_interface *xch = ctx->xch; - if ( !ctx->save.callbacks->switch_qemu_logdirty ) - { - ERROR("No switch_qemu_logdirty callback provided"); - errno = EINVAL; - return -1; - } - if ( ctx->save.callbacks->switch_qemu_logdirty( ctx->domid, 1, ctx->save.callbacks->data) ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:13:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:13:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGMw-0001dr-Af; Fri, 15 May 2015 14:13:42 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGMu-0001di-B1 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:13:40 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id F1/4B-17942-31FF5555; Fri, 15 May 2015 14:13:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1431699217!10913105!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24671 invoked from network); 15 May 2015 14:13:38 -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; 15 May 2015 14:13:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGMr-0001hg-8d for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:13:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGMr-0008Ug-7K for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:13:37 +0000 Date: Fri, 15 May 2015 14:13:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/save: Adjust stream-position callbacks for checkpointed streams X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ae0a3e9bbe37ec90edb3b1cd49cba6d943bfcd4c Author: Andrew Cooper AuthorDate: Thu May 14 16:55:04 2015 +0800 Commit: Ian Campbell CommitDate: Thu May 14 13:00:57 2015 +0100 libxc/save: Adjust stream-position callbacks for checkpointed streams There are some records which should only be sent once in the stream, and not repeated for each checkpoint. {start,end}_of_stream() become per-checkpoint, and a new start_of_stream() is introduced. There is no resulting change record order, but the X86_PV_INFO record is identified as once per stream. Currently the X86_PV_P2M_FRAMES record is as well, but this is because of an implementation bug and can move back to being on an as-needed basis when fixed. In addition, a few minor adjustments of comments and layout. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Yang Hongyang Acked-by: Ian Campbell --- tools/libxc/xc_sr_common.h | 21 +++++++++++++-------- tools/libxc/xc_sr_save.c | 10 +++++++--- tools/libxc/xc_sr_save_x86_hvm.c | 23 +++++++++++++++-------- tools/libxc/xc_sr_save_x86_pv.c | 29 +++++++++++++++++++---------- 4 files changed, 54 insertions(+), 29 deletions(-) diff --git a/tools/libxc/xc_sr_common.h b/tools/libxc/xc_sr_common.h index ef42412..c4fe92c 100644 --- a/tools/libxc/xc_sr_common.h +++ b/tools/libxc/xc_sr_common.h @@ -61,19 +61,24 @@ struct xc_sr_save_ops int (*setup)(struct xc_sr_context *ctx); /** - * Write records which need to be at the start of the stream. This is - * called after the Image and Domain headers are written. (Any records - * which need to be ahead of the memory.) + * Send records which need to be at the start of the stream. This is + * called once, after the Image and Domain headers are written. */ int (*start_of_stream)(struct xc_sr_context *ctx); /** - * Write records which need to be at the end of the stream, following the - * complete memory contents. The caller shall handle writing the END - * record into the stream. (Any records which need to be after the memory - * is complete.) + * Send records which need to be at the start of a checkpoint. This is + * called once, or once per checkpoint in a checkpointed stream, and is + * ahead of memory data. */ - int (*end_of_stream)(struct xc_sr_context *ctx); + int (*start_of_checkpoint)(struct xc_sr_context *ctx); + + /** + * Send records which need to be at the end of the checkpoint. This is + * called once, or once per checkpoint in a checkpointed stream, and is + * after the memory data. + */ + int (*end_of_checkpoint)(struct xc_sr_context *ctx); /** * Clean up the local environment. Will be called exactly once, either diff --git a/tools/libxc/xc_sr_save.c b/tools/libxc/xc_sr_save.c index 83f0591..66fcd3e 100644 --- a/tools/libxc/xc_sr_save.c +++ b/tools/libxc/xc_sr_save.c @@ -662,6 +662,10 @@ static int save(struct xc_sr_context *ctx, uint16_t guest_type) if ( rc ) goto err; + rc = ctx->save.ops.start_of_checkpoint(ctx); + if ( rc ) + goto err; + if ( ctx->save.live ) rc = send_domain_memory_live(ctx); else @@ -678,12 +682,12 @@ static int save(struct xc_sr_context *ctx, uint16_t guest_type) goto err; } - xc_report_progress_single(xch, "End of stream"); - - rc = ctx->save.ops.end_of_stream(ctx); + rc = ctx->save.ops.end_of_checkpoint(ctx); if ( rc ) goto err; + xc_report_progress_single(xch, "End of stream"); + rc = write_end_record(ctx); if ( rc ) goto err; diff --git a/tools/libxc/xc_sr_save_x86_hvm.c b/tools/libxc/xc_sr_save_x86_hvm.c index 58efdb9..f4604db 100644 --- a/tools/libxc/xc_sr_save_x86_hvm.c +++ b/tools/libxc/xc_sr_save_x86_hvm.c @@ -184,7 +184,13 @@ static int x86_hvm_start_of_stream(struct xc_sr_context *ctx) return 0; } -static int x86_hvm_end_of_stream(struct xc_sr_context *ctx) +static int x86_hvm_start_of_checkpoint(struct xc_sr_context *ctx) +{ + /* no-op */ + return 0; +} + +static int x86_hvm_end_of_checkpoint(struct xc_sr_context *ctx) { int rc; @@ -209,7 +215,7 @@ static int x86_hvm_end_of_stream(struct xc_sr_context *ctx) if ( rc ) return rc; - return rc; + return 0; } static int x86_hvm_cleanup(struct xc_sr_context *ctx) @@ -230,12 +236,13 @@ static int x86_hvm_cleanup(struct xc_sr_context *ctx) struct xc_sr_save_ops save_ops_x86_hvm = { - .pfn_to_gfn = x86_hvm_pfn_to_gfn, - .normalise_page = x86_hvm_normalise_page, - .setup = x86_hvm_setup, - .start_of_stream = x86_hvm_start_of_stream, - .end_of_stream = x86_hvm_end_of_stream, - .cleanup = x86_hvm_cleanup, + .pfn_to_gfn = x86_hvm_pfn_to_gfn, + .normalise_page = x86_hvm_normalise_page, + .setup = x86_hvm_setup, + .start_of_stream = x86_hvm_start_of_stream, + .start_of_checkpoint = x86_hvm_start_of_checkpoint, + .end_of_checkpoint = x86_hvm_end_of_checkpoint, + .cleanup = x86_hvm_cleanup, }; /* diff --git a/tools/libxc/xc_sr_save_x86_pv.c b/tools/libxc/xc_sr_save_x86_pv.c index a668221..f63f40b 100644 --- a/tools/libxc/xc_sr_save_x86_pv.c +++ b/tools/libxc/xc_sr_save_x86_pv.c @@ -816,6 +816,12 @@ static int x86_pv_start_of_stream(struct xc_sr_context *ctx) if ( rc ) return rc; + /* + * Ideally should be able to change during migration. Currently + * corruption will occur if the contents or location of the P2M changes + * during the live migration loop. If one is very lucky, the breakage + * will not be subtle. + */ rc = write_x86_pv_p2m_frames(ctx); if ( rc ) return rc; @@ -823,10 +829,12 @@ static int x86_pv_start_of_stream(struct xc_sr_context *ctx) return 0; } -/* - * save_ops function. Writes tail records information into the stream. - */ -static int x86_pv_end_of_stream(struct xc_sr_context *ctx) +static int x86_pv_start_of_checkpoint(struct xc_sr_context *ctx) +{ + return 0; +} + +static int x86_pv_end_of_checkpoint(struct xc_sr_context *ctx) { int rc; @@ -866,12 +874,13 @@ static int x86_pv_cleanup(struct xc_sr_context *ctx) struct xc_sr_save_ops save_ops_x86_pv = { - .pfn_to_gfn = x86_pv_pfn_to_gfn, - .normalise_page = x86_pv_normalise_page, - .setup = x86_pv_setup, - .start_of_stream = x86_pv_start_of_stream, - .end_of_stream = x86_pv_end_of_stream, - .cleanup = x86_pv_cleanup, + .pfn_to_gfn = x86_pv_pfn_to_gfn, + .normalise_page = x86_pv_normalise_page, + .setup = x86_pv_setup, + .start_of_stream = x86_pv_start_of_stream, + .start_of_checkpoint = x86_pv_start_of_checkpoint, + .end_of_checkpoint = x86_pv_end_of_checkpoint, + .cleanup = x86_pv_cleanup, }; /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:13:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:13:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGMw-0001dr-Af; Fri, 15 May 2015 14:13:42 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGMu-0001di-B1 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:13:40 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id F1/4B-17942-31FF5555; Fri, 15 May 2015 14:13:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1431699217!10913105!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24671 invoked from network); 15 May 2015 14:13:38 -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; 15 May 2015 14:13:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGMr-0001hg-8d for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:13:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGMr-0008Ug-7K for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:13:37 +0000 Date: Fri, 15 May 2015 14:13:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/save: Adjust stream-position callbacks for checkpointed streams X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ae0a3e9bbe37ec90edb3b1cd49cba6d943bfcd4c Author: Andrew Cooper AuthorDate: Thu May 14 16:55:04 2015 +0800 Commit: Ian Campbell CommitDate: Thu May 14 13:00:57 2015 +0100 libxc/save: Adjust stream-position callbacks for checkpointed streams There are some records which should only be sent once in the stream, and not repeated for each checkpoint. {start,end}_of_stream() become per-checkpoint, and a new start_of_stream() is introduced. There is no resulting change record order, but the X86_PV_INFO record is identified as once per stream. Currently the X86_PV_P2M_FRAMES record is as well, but this is because of an implementation bug and can move back to being on an as-needed basis when fixed. In addition, a few minor adjustments of comments and layout. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Yang Hongyang Acked-by: Ian Campbell --- tools/libxc/xc_sr_common.h | 21 +++++++++++++-------- tools/libxc/xc_sr_save.c | 10 +++++++--- tools/libxc/xc_sr_save_x86_hvm.c | 23 +++++++++++++++-------- tools/libxc/xc_sr_save_x86_pv.c | 29 +++++++++++++++++++---------- 4 files changed, 54 insertions(+), 29 deletions(-) diff --git a/tools/libxc/xc_sr_common.h b/tools/libxc/xc_sr_common.h index ef42412..c4fe92c 100644 --- a/tools/libxc/xc_sr_common.h +++ b/tools/libxc/xc_sr_common.h @@ -61,19 +61,24 @@ struct xc_sr_save_ops int (*setup)(struct xc_sr_context *ctx); /** - * Write records which need to be at the start of the stream. This is - * called after the Image and Domain headers are written. (Any records - * which need to be ahead of the memory.) + * Send records which need to be at the start of the stream. This is + * called once, after the Image and Domain headers are written. */ int (*start_of_stream)(struct xc_sr_context *ctx); /** - * Write records which need to be at the end of the stream, following the - * complete memory contents. The caller shall handle writing the END - * record into the stream. (Any records which need to be after the memory - * is complete.) + * Send records which need to be at the start of a checkpoint. This is + * called once, or once per checkpoint in a checkpointed stream, and is + * ahead of memory data. */ - int (*end_of_stream)(struct xc_sr_context *ctx); + int (*start_of_checkpoint)(struct xc_sr_context *ctx); + + /** + * Send records which need to be at the end of the checkpoint. This is + * called once, or once per checkpoint in a checkpointed stream, and is + * after the memory data. + */ + int (*end_of_checkpoint)(struct xc_sr_context *ctx); /** * Clean up the local environment. Will be called exactly once, either diff --git a/tools/libxc/xc_sr_save.c b/tools/libxc/xc_sr_save.c index 83f0591..66fcd3e 100644 --- a/tools/libxc/xc_sr_save.c +++ b/tools/libxc/xc_sr_save.c @@ -662,6 +662,10 @@ static int save(struct xc_sr_context *ctx, uint16_t guest_type) if ( rc ) goto err; + rc = ctx->save.ops.start_of_checkpoint(ctx); + if ( rc ) + goto err; + if ( ctx->save.live ) rc = send_domain_memory_live(ctx); else @@ -678,12 +682,12 @@ static int save(struct xc_sr_context *ctx, uint16_t guest_type) goto err; } - xc_report_progress_single(xch, "End of stream"); - - rc = ctx->save.ops.end_of_stream(ctx); + rc = ctx->save.ops.end_of_checkpoint(ctx); if ( rc ) goto err; + xc_report_progress_single(xch, "End of stream"); + rc = write_end_record(ctx); if ( rc ) goto err; diff --git a/tools/libxc/xc_sr_save_x86_hvm.c b/tools/libxc/xc_sr_save_x86_hvm.c index 58efdb9..f4604db 100644 --- a/tools/libxc/xc_sr_save_x86_hvm.c +++ b/tools/libxc/xc_sr_save_x86_hvm.c @@ -184,7 +184,13 @@ static int x86_hvm_start_of_stream(struct xc_sr_context *ctx) return 0; } -static int x86_hvm_end_of_stream(struct xc_sr_context *ctx) +static int x86_hvm_start_of_checkpoint(struct xc_sr_context *ctx) +{ + /* no-op */ + return 0; +} + +static int x86_hvm_end_of_checkpoint(struct xc_sr_context *ctx) { int rc; @@ -209,7 +215,7 @@ static int x86_hvm_end_of_stream(struct xc_sr_context *ctx) if ( rc ) return rc; - return rc; + return 0; } static int x86_hvm_cleanup(struct xc_sr_context *ctx) @@ -230,12 +236,13 @@ static int x86_hvm_cleanup(struct xc_sr_context *ctx) struct xc_sr_save_ops save_ops_x86_hvm = { - .pfn_to_gfn = x86_hvm_pfn_to_gfn, - .normalise_page = x86_hvm_normalise_page, - .setup = x86_hvm_setup, - .start_of_stream = x86_hvm_start_of_stream, - .end_of_stream = x86_hvm_end_of_stream, - .cleanup = x86_hvm_cleanup, + .pfn_to_gfn = x86_hvm_pfn_to_gfn, + .normalise_page = x86_hvm_normalise_page, + .setup = x86_hvm_setup, + .start_of_stream = x86_hvm_start_of_stream, + .start_of_checkpoint = x86_hvm_start_of_checkpoint, + .end_of_checkpoint = x86_hvm_end_of_checkpoint, + .cleanup = x86_hvm_cleanup, }; /* diff --git a/tools/libxc/xc_sr_save_x86_pv.c b/tools/libxc/xc_sr_save_x86_pv.c index a668221..f63f40b 100644 --- a/tools/libxc/xc_sr_save_x86_pv.c +++ b/tools/libxc/xc_sr_save_x86_pv.c @@ -816,6 +816,12 @@ static int x86_pv_start_of_stream(struct xc_sr_context *ctx) if ( rc ) return rc; + /* + * Ideally should be able to change during migration. Currently + * corruption will occur if the contents or location of the P2M changes + * during the live migration loop. If one is very lucky, the breakage + * will not be subtle. + */ rc = write_x86_pv_p2m_frames(ctx); if ( rc ) return rc; @@ -823,10 +829,12 @@ static int x86_pv_start_of_stream(struct xc_sr_context *ctx) return 0; } -/* - * save_ops function. Writes tail records information into the stream. - */ -static int x86_pv_end_of_stream(struct xc_sr_context *ctx) +static int x86_pv_start_of_checkpoint(struct xc_sr_context *ctx) +{ + return 0; +} + +static int x86_pv_end_of_checkpoint(struct xc_sr_context *ctx) { int rc; @@ -866,12 +874,13 @@ static int x86_pv_cleanup(struct xc_sr_context *ctx) struct xc_sr_save_ops save_ops_x86_pv = { - .pfn_to_gfn = x86_pv_pfn_to_gfn, - .normalise_page = x86_pv_normalise_page, - .setup = x86_pv_setup, - .start_of_stream = x86_pv_start_of_stream, - .end_of_stream = x86_pv_end_of_stream, - .cleanup = x86_pv_cleanup, + .pfn_to_gfn = x86_pv_pfn_to_gfn, + .normalise_page = x86_pv_normalise_page, + .setup = x86_pv_setup, + .start_of_stream = x86_pv_start_of_stream, + .start_of_checkpoint = x86_pv_start_of_checkpoint, + .end_of_checkpoint = x86_pv_end_of_checkpoint, + .cleanup = x86_pv_cleanup, }; /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:13:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:13: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 1YtGN6-0001fQ-DN; Fri, 15 May 2015 14:13:52 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGN5-0001fE-76 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:13:51 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 4C/91-02785-E1FF5555; Fri, 15 May 2015 14:13:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1431699227!17873733!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17266 invoked from network); 15 May 2015 14:13:48 -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; 15 May 2015 14:13:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGN1-0001hm-Ds for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:13:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGN1-0008VY-Bi for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:13:47 +0000 Date: Fri, 15 May 2015 14:13:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/migration: Specification update for CHECKPOINT records X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0853659695532a744dd80cd64a942b00cf1aaf33 Author: Andrew Cooper AuthorDate: Thu May 14 16:55:05 2015 +0800 Commit: Ian Campbell CommitDate: Thu May 14 13:01:11 2015 +0100 libxc/migration: Specification update for CHECKPOINT records Checkpointed streams need to signal the end of a consistent view of VM state, and the start of the libxl data. Signed-off-by: Andrew Cooper Signed-off-by: David Vrabel Signed-off-by: Yang Hongyang CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Acked-by: Ian Campbell --- docs/specs/libxc-migration-stream.pandoc | 29 ++++++++++++++++++++++++++--- tools/libxc/xc_sr_common.c | 1 + tools/libxc/xc_sr_stream_format.h | 1 + 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/docs/specs/libxc-migration-stream.pandoc b/docs/specs/libxc-migration-stream.pandoc index 520240f..68fa513 100644 --- a/docs/specs/libxc-migration-stream.pandoc +++ b/docs/specs/libxc-migration-stream.pandoc @@ -37,8 +37,6 @@ Not Yet Included The following features are not yet fully specified and will be included in a future draft. -* Remus - * Page data compression. * ARM @@ -227,7 +225,9 @@ type 0x00000000: END 0x0000000D: VERIFY - 0x0000000E - 0x7FFFFFFF: Reserved for future _mandatory_ + 0x0000000E: CHECKPOINT + + 0x0000000F - 0x7FFFFFFF: Reserved for future _mandatory_ records. 0x80000000 - 0xFFFFFFFF: Reserved for future _optional_ @@ -578,6 +578,29 @@ The verify record contains no fields; its body_length is 0. \clearpage +CHECKPOINT +---------- + +A checkpoint record indicates that all the preceding records in the stream +represent a consistent view of VM state. + + 0 1 2 3 4 5 6 7 octet + +-------------------------------------------------+ + +The checkpoint record contains no fields; its body_length is 0 + +If the stream is embedded in a higher level toolstack stream, the +CHECKPOINT record marks the end of the libxc portion of the stream +and the stream is handed back to the higher level for further +processing. + +The higher level stream may then hand the stream back to libxc to +process another set of records for the next consistent VM state +snapshot. This next set of records may be terminated by another +CHECKPOINT record or an END record. + +\clearpage + Layout ====== diff --git a/tools/libxc/xc_sr_common.c b/tools/libxc/xc_sr_common.c index 59e0c5d..945cfa6 100644 --- a/tools/libxc/xc_sr_common.c +++ b/tools/libxc/xc_sr_common.c @@ -34,6 +34,7 @@ static const char *mandatory_rec_types[] = [REC_TYPE_TOOLSTACK] = "Toolstack", [REC_TYPE_X86_PV_VCPU_MSRS] = "x86 PV vcpu msrs", [REC_TYPE_VERIFY] = "Verify", + [REC_TYPE_CHECKPOINT] = "Checkpoint", }; const char *rec_type_to_str(uint32_t type) diff --git a/tools/libxc/xc_sr_stream_format.h b/tools/libxc/xc_sr_stream_format.h index d116ca6..6d0f8fd 100644 --- a/tools/libxc/xc_sr_stream_format.h +++ b/tools/libxc/xc_sr_stream_format.h @@ -74,6 +74,7 @@ struct xc_sr_rhdr #define REC_TYPE_TOOLSTACK 0x0000000bU #define REC_TYPE_X86_PV_VCPU_MSRS 0x0000000cU #define REC_TYPE_VERIFY 0x0000000dU +#define REC_TYPE_CHECKPOINT 0x0000000eU #define REC_TYPE_OPTIONAL 0x80000000U -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:13:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:13: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 1YtGN6-0001fQ-DN; Fri, 15 May 2015 14:13:52 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGN5-0001fE-76 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:13:51 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 4C/91-02785-E1FF5555; Fri, 15 May 2015 14:13:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1431699227!17873733!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17266 invoked from network); 15 May 2015 14:13:48 -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; 15 May 2015 14:13:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGN1-0001hm-Ds for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:13:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGN1-0008VY-Bi for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:13:47 +0000 Date: Fri, 15 May 2015 14:13:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/migration: Specification update for CHECKPOINT records X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0853659695532a744dd80cd64a942b00cf1aaf33 Author: Andrew Cooper AuthorDate: Thu May 14 16:55:05 2015 +0800 Commit: Ian Campbell CommitDate: Thu May 14 13:01:11 2015 +0100 libxc/migration: Specification update for CHECKPOINT records Checkpointed streams need to signal the end of a consistent view of VM state, and the start of the libxl data. Signed-off-by: Andrew Cooper Signed-off-by: David Vrabel Signed-off-by: Yang Hongyang CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Acked-by: Ian Campbell --- docs/specs/libxc-migration-stream.pandoc | 29 ++++++++++++++++++++++++++--- tools/libxc/xc_sr_common.c | 1 + tools/libxc/xc_sr_stream_format.h | 1 + 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/docs/specs/libxc-migration-stream.pandoc b/docs/specs/libxc-migration-stream.pandoc index 520240f..68fa513 100644 --- a/docs/specs/libxc-migration-stream.pandoc +++ b/docs/specs/libxc-migration-stream.pandoc @@ -37,8 +37,6 @@ Not Yet Included The following features are not yet fully specified and will be included in a future draft. -* Remus - * Page data compression. * ARM @@ -227,7 +225,9 @@ type 0x00000000: END 0x0000000D: VERIFY - 0x0000000E - 0x7FFFFFFF: Reserved for future _mandatory_ + 0x0000000E: CHECKPOINT + + 0x0000000F - 0x7FFFFFFF: Reserved for future _mandatory_ records. 0x80000000 - 0xFFFFFFFF: Reserved for future _optional_ @@ -578,6 +578,29 @@ The verify record contains no fields; its body_length is 0. \clearpage +CHECKPOINT +---------- + +A checkpoint record indicates that all the preceding records in the stream +represent a consistent view of VM state. + + 0 1 2 3 4 5 6 7 octet + +-------------------------------------------------+ + +The checkpoint record contains no fields; its body_length is 0 + +If the stream is embedded in a higher level toolstack stream, the +CHECKPOINT record marks the end of the libxc portion of the stream +and the stream is handed back to the higher level for further +processing. + +The higher level stream may then hand the stream back to libxc to +process another set of records for the next consistent VM state +snapshot. This next set of records may be terminated by another +CHECKPOINT record or an END record. + +\clearpage + Layout ====== diff --git a/tools/libxc/xc_sr_common.c b/tools/libxc/xc_sr_common.c index 59e0c5d..945cfa6 100644 --- a/tools/libxc/xc_sr_common.c +++ b/tools/libxc/xc_sr_common.c @@ -34,6 +34,7 @@ static const char *mandatory_rec_types[] = [REC_TYPE_TOOLSTACK] = "Toolstack", [REC_TYPE_X86_PV_VCPU_MSRS] = "x86 PV vcpu msrs", [REC_TYPE_VERIFY] = "Verify", + [REC_TYPE_CHECKPOINT] = "Checkpoint", }; const char *rec_type_to_str(uint32_t type) diff --git a/tools/libxc/xc_sr_stream_format.h b/tools/libxc/xc_sr_stream_format.h index d116ca6..6d0f8fd 100644 --- a/tools/libxc/xc_sr_stream_format.h +++ b/tools/libxc/xc_sr_stream_format.h @@ -74,6 +74,7 @@ struct xc_sr_rhdr #define REC_TYPE_TOOLSTACK 0x0000000bU #define REC_TYPE_X86_PV_VCPU_MSRS 0x0000000cU #define REC_TYPE_VERIFY 0x0000000dU +#define REC_TYPE_CHECKPOINT 0x0000000eU #define REC_TYPE_OPTIONAL 0x80000000U -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:14:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:14: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 1YtGNE-0001gy-SJ; Fri, 15 May 2015 14:14:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGNE-0001gm-CW for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:14:00 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id D5/45-03206-72FF5555; Fri, 15 May 2015 14:13:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1431699237!17847622!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3166 invoked from network); 15 May 2015 14:13:58 -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; 15 May 2015 14:13:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGNB-0001hz-Kr for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:13:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGNB-0008W7-H2 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:13:57 +0000 Date: Fri, 15 May 2015 14:13:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/migration: Pass checkpoint information into the save algorithm. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e8193d116b19f4808fb9dd778061190752bc715c Author: Andrew Cooper AuthorDate: Thu May 14 16:55:06 2015 +0800 Commit: Ian Campbell CommitDate: Thu May 14 13:01:11 2015 +0100 libxc/migration: Pass checkpoint information into the save algorithm. The old code checks the callbacks "postcopy & checkpoint", if the callbacks exists, it will call them. However this is unreliable, so add this flag to explicitly indicate a checkpointed stream in the new code. This is backward compatible with the legacy migration just don't know this flag and will ignore it. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Yang Hongyang Acked-by: Ian Campbell [ ijc -- added discussion of legacy compat ] --- tools/libxc/include/xenguest.h | 1 + tools/libxc/xc_sr_common.h | 3 +++ tools/libxc/xc_sr_save.c | 3 +++ tools/libxl/libxl_dom.c | 1 + 4 files changed, 8 insertions(+), 0 deletions(-) diff --git a/tools/libxc/include/xenguest.h b/tools/libxc/include/xenguest.h index 8e39075..7581263 100644 --- a/tools/libxc/include/xenguest.h +++ b/tools/libxc/include/xenguest.h @@ -30,6 +30,7 @@ #define XCFLAGS_HVM (1 << 2) #define XCFLAGS_STDVGA (1 << 3) #define XCFLAGS_CHECKPOINT_COMPRESS (1 << 4) +#define XCFLAGS_CHECKPOINTED (1 << 5) #define X86_64_B_SIZE 64 #define X86_32_B_SIZE 32 diff --git a/tools/libxc/xc_sr_common.h b/tools/libxc/xc_sr_common.h index c4fe92c..c0f90d4 100644 --- a/tools/libxc/xc_sr_common.h +++ b/tools/libxc/xc_sr_common.h @@ -174,6 +174,9 @@ struct xc_sr_context /* Live migrate vs non live suspend. */ bool live; + /* Plain VM, or checkpoints over time. */ + bool checkpointed; + /* Further debugging information in the stream. */ bool debug; diff --git a/tools/libxc/xc_sr_save.c b/tools/libxc/xc_sr_save.c index 66fcd3e..caa727d 100644 --- a/tools/libxc/xc_sr_save.c +++ b/tools/libxc/xc_sr_save.c @@ -732,6 +732,7 @@ int xc_domain_save2(xc_interface *xch, int io_fd, uint32_t dom, ctx.save.callbacks = callbacks; ctx.save.live = !!(flags & XCFLAGS_LIVE); ctx.save.debug = !!(flags & XCFLAGS_DEBUG); + ctx.save.checkpointed = !!(flags & XCFLAGS_CHECKPOINTED); /* * TODO: Find some time to better tweak the live migration algorithm. @@ -745,6 +746,8 @@ int xc_domain_save2(xc_interface *xch, int io_fd, uint32_t dom, /* Sanity checks for callbacks. */ if ( hvm ) assert(callbacks->switch_qemu_logdirty); + if ( ctx.save.checkpointed ) + assert(callbacks->checkpoint && callbacks->postcopy); IPRINTF("In experimental %s", __func__); DPRINTF("fd %d, dom %u, max_iters %u, max_factor %u, flags %u, hvm %d", diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index f408646..a0c9850 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -2003,6 +2003,7 @@ void libxl__domain_suspend(libxl__egc *egc, libxl__domain_suspend_state *dss) if (r_info != NULL) { dss->interval = r_info->interval; + dss->xcflags |= XCFLAGS_CHECKPOINTED; if (libxl_defbool_val(r_info->compression)) dss->xcflags |= XCFLAGS_CHECKPOINT_COMPRESS; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:14:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:14: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 1YtGNE-0001gy-SJ; Fri, 15 May 2015 14:14:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGNE-0001gm-CW for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:14:00 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id D5/45-03206-72FF5555; Fri, 15 May 2015 14:13:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1431699237!17847622!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3166 invoked from network); 15 May 2015 14:13:58 -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; 15 May 2015 14:13:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGNB-0001hz-Kr for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:13:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGNB-0008W7-H2 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:13:57 +0000 Date: Fri, 15 May 2015 14:13:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/migration: Pass checkpoint information into the save algorithm. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e8193d116b19f4808fb9dd778061190752bc715c Author: Andrew Cooper AuthorDate: Thu May 14 16:55:06 2015 +0800 Commit: Ian Campbell CommitDate: Thu May 14 13:01:11 2015 +0100 libxc/migration: Pass checkpoint information into the save algorithm. The old code checks the callbacks "postcopy & checkpoint", if the callbacks exists, it will call them. However this is unreliable, so add this flag to explicitly indicate a checkpointed stream in the new code. This is backward compatible with the legacy migration just don't know this flag and will ignore it. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Yang Hongyang Acked-by: Ian Campbell [ ijc -- added discussion of legacy compat ] --- tools/libxc/include/xenguest.h | 1 + tools/libxc/xc_sr_common.h | 3 +++ tools/libxc/xc_sr_save.c | 3 +++ tools/libxl/libxl_dom.c | 1 + 4 files changed, 8 insertions(+), 0 deletions(-) diff --git a/tools/libxc/include/xenguest.h b/tools/libxc/include/xenguest.h index 8e39075..7581263 100644 --- a/tools/libxc/include/xenguest.h +++ b/tools/libxc/include/xenguest.h @@ -30,6 +30,7 @@ #define XCFLAGS_HVM (1 << 2) #define XCFLAGS_STDVGA (1 << 3) #define XCFLAGS_CHECKPOINT_COMPRESS (1 << 4) +#define XCFLAGS_CHECKPOINTED (1 << 5) #define X86_64_B_SIZE 64 #define X86_32_B_SIZE 32 diff --git a/tools/libxc/xc_sr_common.h b/tools/libxc/xc_sr_common.h index c4fe92c..c0f90d4 100644 --- a/tools/libxc/xc_sr_common.h +++ b/tools/libxc/xc_sr_common.h @@ -174,6 +174,9 @@ struct xc_sr_context /* Live migrate vs non live suspend. */ bool live; + /* Plain VM, or checkpoints over time. */ + bool checkpointed; + /* Further debugging information in the stream. */ bool debug; diff --git a/tools/libxc/xc_sr_save.c b/tools/libxc/xc_sr_save.c index 66fcd3e..caa727d 100644 --- a/tools/libxc/xc_sr_save.c +++ b/tools/libxc/xc_sr_save.c @@ -732,6 +732,7 @@ int xc_domain_save2(xc_interface *xch, int io_fd, uint32_t dom, ctx.save.callbacks = callbacks; ctx.save.live = !!(flags & XCFLAGS_LIVE); ctx.save.debug = !!(flags & XCFLAGS_DEBUG); + ctx.save.checkpointed = !!(flags & XCFLAGS_CHECKPOINTED); /* * TODO: Find some time to better tweak the live migration algorithm. @@ -745,6 +746,8 @@ int xc_domain_save2(xc_interface *xch, int io_fd, uint32_t dom, /* Sanity checks for callbacks. */ if ( hvm ) assert(callbacks->switch_qemu_logdirty); + if ( ctx.save.checkpointed ) + assert(callbacks->checkpoint && callbacks->postcopy); IPRINTF("In experimental %s", __func__); DPRINTF("fd %d, dom %u, max_iters %u, max_factor %u, flags %u, hvm %d", diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index f408646..a0c9850 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -2003,6 +2003,7 @@ void libxl__domain_suspend(libxl__egc *egc, libxl__domain_suspend_state *dss) if (r_info != NULL) { dss->interval = r_info->interval; + dss->xcflags |= XCFLAGS_CHECKPOINTED; if (libxl_defbool_val(r_info->compression)) dss->xcflags |= XCFLAGS_CHECKPOINT_COMPRESS; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:14:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:14: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 1YtGNT-0001kU-Ux; Fri, 15 May 2015 14:14:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGNS-0001kB-Rb for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:14:14 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 54/10-03028-53FF5555; Fri, 15 May 2015 14:14:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1431699247!10841485!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3728 invoked from network); 15 May 2015 14:14: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; 15 May 2015 14:14:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGNL-0001ib-Ok for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:14:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGNL-00004z-Nk for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:14:07 +0000 Date: Fri, 15 May 2015 14:14:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: unused attribute in DECLARE_HYPERCALL_BUFFER_SHADOW X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 22c06289dccb2c45ed47ee39d285e7ee24174f1a Author: Yang Hongyang AuthorDate: Thu May 14 16:55:07 2015 +0800 Commit: Ian Campbell CommitDate: Thu May 14 13:01:54 2015 +0100 tools/libxc: unused attribute in DECLARE_HYPERCALL_BUFFER_SHADOW There are cases where we only need to use the hypercall buffer data, and do not use the xc_hypercall_buffer_t struct. DECLARE_HYPERCALL_BUFFER_SHADOW defines a user pointer that can allow us to access the hypercall buffer data but it also defines a xc_hypercall_buffer_t that we don't use, the compiler will report arg unused error. Add __attribute__((unused)) before xc_hypercall_buffer_t to avoid the compiler error. Example cases: In send_all_pages(), we only need to use the hypercall buffer data which is a dirty bitmap, we set the dirty bitmap to all dirty and call send_dirty_pages, we will not use the xc_hypercall_buffer_t and hypercall to retrieve the dirty bitmap. In send_some_pages(), we will also only need to use the dirty_bitmap. the retrieve dirty bitmap hypercall are done by the caller. Signed-off-by: Yang Hongyang CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/include/xenctrl.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 09faa7f..5a9f76a 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -289,6 +289,7 @@ typedef struct xc_hypercall_buffer xc_hypercall_buffer_t; */ #define DECLARE_HYPERCALL_BUFFER_SHADOW(_type, _name, _hbuf) \ _type *(_name) = (_hbuf)->hbuf; \ + __attribute__((unused)) \ xc_hypercall_buffer_t XC__HYPERCALL_BUFFER_NAME(_name) = { \ .hbuf = (void *)-1, \ .param_shadow = (_hbuf), \ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:14:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:14: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 1YtGNT-0001kU-Ux; Fri, 15 May 2015 14:14:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGNS-0001kB-Rb for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:14:14 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 54/10-03028-53FF5555; Fri, 15 May 2015 14:14:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1431699247!10841485!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3728 invoked from network); 15 May 2015 14:14: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; 15 May 2015 14:14:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGNL-0001ib-Ok for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:14:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGNL-00004z-Nk for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:14:07 +0000 Date: Fri, 15 May 2015 14:14:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: unused attribute in DECLARE_HYPERCALL_BUFFER_SHADOW X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 22c06289dccb2c45ed47ee39d285e7ee24174f1a Author: Yang Hongyang AuthorDate: Thu May 14 16:55:07 2015 +0800 Commit: Ian Campbell CommitDate: Thu May 14 13:01:54 2015 +0100 tools/libxc: unused attribute in DECLARE_HYPERCALL_BUFFER_SHADOW There are cases where we only need to use the hypercall buffer data, and do not use the xc_hypercall_buffer_t struct. DECLARE_HYPERCALL_BUFFER_SHADOW defines a user pointer that can allow us to access the hypercall buffer data but it also defines a xc_hypercall_buffer_t that we don't use, the compiler will report arg unused error. Add __attribute__((unused)) before xc_hypercall_buffer_t to avoid the compiler error. Example cases: In send_all_pages(), we only need to use the hypercall buffer data which is a dirty bitmap, we set the dirty bitmap to all dirty and call send_dirty_pages, we will not use the xc_hypercall_buffer_t and hypercall to retrieve the dirty bitmap. In send_some_pages(), we will also only need to use the dirty_bitmap. the retrieve dirty bitmap hypercall are done by the caller. Signed-off-by: Yang Hongyang CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/include/xenctrl.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 09faa7f..5a9f76a 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -289,6 +289,7 @@ typedef struct xc_hypercall_buffer xc_hypercall_buffer_t; */ #define DECLARE_HYPERCALL_BUFFER_SHADOW(_type, _name, _hbuf) \ _type *(_name) = (_hbuf)->hbuf; \ + __attribute__((unused)) \ xc_hypercall_buffer_t XC__HYPERCALL_BUFFER_NAME(_name) = { \ .hbuf = (void *)-1, \ .param_shadow = (_hbuf), \ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:14:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:14: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 1YtGNZ-0001nM-3E; Fri, 15 May 2015 14:14:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGNY-0001mz-Jo for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:14:20 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 87/27-02789-B3FF5555; Fri, 15 May 2015 14:14:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1431699258!10893752!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22720 invoked from network); 15 May 2015 14:14:18 -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; 15 May 2015 14:14:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGNW-0001if-27 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:14:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGNV-000067-RT for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:14:18 +0000 Date: Fri, 15 May 2015 14:14:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: add a check in xc_hypercall_buffer_free_pages macro X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ebbbf9a1fed35105b16cb5dd70501ed3b5fde127 Author: Yang Hongyang AuthorDate: Thu May 14 16:55:08 2015 +0800 Commit: Ian Campbell CommitDate: Thu May 14 13:02:05 2015 +0100 tools/libxc: add a check in xc_hypercall_buffer_free_pages macro When we use a DECLARE_HYPERCALL_BUFFER_SHADOW it defines a user pointer '_name' and a shadow xc_hypercall_buffer_t. When calling xc_hypercall_buffer_free_pages(_xch, _name, _nr), the complier will report '_name' unused error, because xc_hypercall_buffer_free_pages() is a MACRO and '_name' is transparently converted to the hypercall buffer. it confuses the caller because xc_hypercall_buffer_free_pages() looks like a function and takes '_name' as an arg. Add an if check to let the compiler think we are actually using the argument '_name'. Signed-off-by: Yang Hongyang CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Andrew Cooper Acked-by: Ian Campbell [ ijc -- some rewording of the commit message ] --- tools/libxc/include/xenctrl.h | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 5a9f76a..09a7450 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -358,7 +358,12 @@ void xc__hypercall_buffer_free(xc_interface *xch, xc_hypercall_buffer_t *b); void *xc__hypercall_buffer_alloc_pages(xc_interface *xch, xc_hypercall_buffer_t *b, int nr_pages); #define xc_hypercall_buffer_alloc_pages(_xch, _name, _nr) xc__hypercall_buffer_alloc_pages(_xch, HYPERCALL_BUFFER(_name), _nr) void xc__hypercall_buffer_free_pages(xc_interface *xch, xc_hypercall_buffer_t *b, int nr_pages); -#define xc_hypercall_buffer_free_pages(_xch, _name, _nr) xc__hypercall_buffer_free_pages(_xch, HYPERCALL_BUFFER(_name), _nr) +#define xc_hypercall_buffer_free_pages(_xch, _name, _nr) \ + do { \ + if ( _name ) \ + xc__hypercall_buffer_free_pages(_xch, HYPERCALL_BUFFER(_name), \ + _nr); \ + } while (0) /* * Array of hypercall buffers. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:14:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:14: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 1YtGNZ-0001nM-3E; Fri, 15 May 2015 14:14:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGNY-0001mz-Jo for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:14:20 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 87/27-02789-B3FF5555; Fri, 15 May 2015 14:14:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1431699258!10893752!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22720 invoked from network); 15 May 2015 14:14:18 -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; 15 May 2015 14:14:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGNW-0001if-27 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:14:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGNV-000067-RT for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:14:18 +0000 Date: Fri, 15 May 2015 14:14:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: add a check in xc_hypercall_buffer_free_pages macro X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ebbbf9a1fed35105b16cb5dd70501ed3b5fde127 Author: Yang Hongyang AuthorDate: Thu May 14 16:55:08 2015 +0800 Commit: Ian Campbell CommitDate: Thu May 14 13:02:05 2015 +0100 tools/libxc: add a check in xc_hypercall_buffer_free_pages macro When we use a DECLARE_HYPERCALL_BUFFER_SHADOW it defines a user pointer '_name' and a shadow xc_hypercall_buffer_t. When calling xc_hypercall_buffer_free_pages(_xch, _name, _nr), the complier will report '_name' unused error, because xc_hypercall_buffer_free_pages() is a MACRO and '_name' is transparently converted to the hypercall buffer. it confuses the caller because xc_hypercall_buffer_free_pages() looks like a function and takes '_name' as an arg. Add an if check to let the compiler think we are actually using the argument '_name'. Signed-off-by: Yang Hongyang CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Andrew Cooper Acked-by: Ian Campbell [ ijc -- some rewording of the commit message ] --- tools/libxc/include/xenctrl.h | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 5a9f76a..09a7450 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -358,7 +358,12 @@ void xc__hypercall_buffer_free(xc_interface *xch, xc_hypercall_buffer_t *b); void *xc__hypercall_buffer_alloc_pages(xc_interface *xch, xc_hypercall_buffer_t *b, int nr_pages); #define xc_hypercall_buffer_alloc_pages(_xch, _name, _nr) xc__hypercall_buffer_alloc_pages(_xch, HYPERCALL_BUFFER(_name), _nr) void xc__hypercall_buffer_free_pages(xc_interface *xch, xc_hypercall_buffer_t *b, int nr_pages); -#define xc_hypercall_buffer_free_pages(_xch, _name, _nr) xc__hypercall_buffer_free_pages(_xch, HYPERCALL_BUFFER(_name), _nr) +#define xc_hypercall_buffer_free_pages(_xch, _name, _nr) \ + do { \ + if ( _name ) \ + xc__hypercall_buffer_free_pages(_xch, HYPERCALL_BUFFER(_name), \ + _nr); \ + } while (0) /* * Array of hypercall buffers. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:14:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:14: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 1YtGNk-0001tF-68; Fri, 15 May 2015 14:14:32 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGNi-0001sU-M7 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:14:30 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id D0/CC-17942-54FF5555; Fri, 15 May 2015 14:14:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1431699268!8453165!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3578 invoked from network); 15 May 2015 14:14:29 -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; 15 May 2015 14:14:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGNg-0001iv-5Z for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:14:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGNg-00006V-4h for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:14:28 +0000 Date: Fri, 15 May 2015 14:14:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/save: introduce setup() and cleanup() on save X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit aed0d958c28d46af24ba08cb01a8e8e7146b30bb Author: Yang Hongyang AuthorDate: Thu May 14 16:55:09 2015 +0800 Commit: Ian Campbell CommitDate: Thu May 14 13:03:05 2015 +0100 libxc/save: introduce setup() and cleanup() on save introduce setup() and cleanup() which subsume the ctx->save.ops.{setup,cleanup}() calls. The SHADOW_OP_OFF hypercall is also included in the cleanup(). Signed-off-by: Yang Hongyang CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Andrew Cooper Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_sr_save.c | 34 +++++++++++++++++++++++++++------- 1 files changed, 27 insertions(+), 7 deletions(-) diff --git a/tools/libxc/xc_sr_save.c b/tools/libxc/xc_sr_save.c index caa727d..f4ab5c5 100644 --- a/tools/libxc/xc_sr_save.c +++ b/tools/libxc/xc_sr_save.c @@ -637,6 +637,31 @@ static int send_domain_memory_nonlive(struct xc_sr_context *ctx) return rc; } +static int setup(struct xc_sr_context *ctx) +{ + int rc; + + rc = ctx->save.ops.setup(ctx); + if ( rc ) + goto err; + + rc = 0; + + err: + return rc; +} + +static void cleanup(struct xc_sr_context *ctx) +{ + xc_interface *xch = ctx->xch; + + xc_shadow_control(xch, ctx->domid, XEN_DOMCTL_SHADOW_OP_OFF, + NULL, 0, NULL, 0, NULL); + + if ( ctx->save.ops.cleanup(ctx) ) + PERROR("Failed to clean up"); +} + /* * Save a domain. */ @@ -648,7 +673,7 @@ static int save(struct xc_sr_context *ctx, uint16_t guest_type) IPRINTF("Saving domain %d, type %s", ctx->domid, dhdr_type_to_str(guest_type)); - rc = ctx->save.ops.setup(ctx); + rc = setup(ctx); if ( rc ) goto err; @@ -701,12 +726,7 @@ static int save(struct xc_sr_context *ctx, uint16_t guest_type) PERROR("Save failed"); done: - xc_shadow_control(xch, ctx->domid, XEN_DOMCTL_SHADOW_OP_OFF, - NULL, 0, NULL, 0, NULL); - - rc = ctx->save.ops.cleanup(ctx); - if ( rc ) - PERROR("Failed to clean up"); + cleanup(ctx); if ( saved_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 Fri May 15 14:14:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:14: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 1YtGNk-0001tF-68; Fri, 15 May 2015 14:14:32 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGNi-0001sU-M7 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:14:30 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id D0/CC-17942-54FF5555; Fri, 15 May 2015 14:14:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1431699268!8453165!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3578 invoked from network); 15 May 2015 14:14:29 -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; 15 May 2015 14:14:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGNg-0001iv-5Z for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:14:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGNg-00006V-4h for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:14:28 +0000 Date: Fri, 15 May 2015 14:14:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/save: introduce setup() and cleanup() on save X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit aed0d958c28d46af24ba08cb01a8e8e7146b30bb Author: Yang Hongyang AuthorDate: Thu May 14 16:55:09 2015 +0800 Commit: Ian Campbell CommitDate: Thu May 14 13:03:05 2015 +0100 libxc/save: introduce setup() and cleanup() on save introduce setup() and cleanup() which subsume the ctx->save.ops.{setup,cleanup}() calls. The SHADOW_OP_OFF hypercall is also included in the cleanup(). Signed-off-by: Yang Hongyang CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Andrew Cooper Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_sr_save.c | 34 +++++++++++++++++++++++++++------- 1 files changed, 27 insertions(+), 7 deletions(-) diff --git a/tools/libxc/xc_sr_save.c b/tools/libxc/xc_sr_save.c index caa727d..f4ab5c5 100644 --- a/tools/libxc/xc_sr_save.c +++ b/tools/libxc/xc_sr_save.c @@ -637,6 +637,31 @@ static int send_domain_memory_nonlive(struct xc_sr_context *ctx) return rc; } +static int setup(struct xc_sr_context *ctx) +{ + int rc; + + rc = ctx->save.ops.setup(ctx); + if ( rc ) + goto err; + + rc = 0; + + err: + return rc; +} + +static void cleanup(struct xc_sr_context *ctx) +{ + xc_interface *xch = ctx->xch; + + xc_shadow_control(xch, ctx->domid, XEN_DOMCTL_SHADOW_OP_OFF, + NULL, 0, NULL, 0, NULL); + + if ( ctx->save.ops.cleanup(ctx) ) + PERROR("Failed to clean up"); +} + /* * Save a domain. */ @@ -648,7 +673,7 @@ static int save(struct xc_sr_context *ctx, uint16_t guest_type) IPRINTF("Saving domain %d, type %s", ctx->domid, dhdr_type_to_str(guest_type)); - rc = ctx->save.ops.setup(ctx); + rc = setup(ctx); if ( rc ) goto err; @@ -701,12 +726,7 @@ static int save(struct xc_sr_context *ctx, uint16_t guest_type) PERROR("Save failed"); done: - xc_shadow_control(xch, ctx->domid, XEN_DOMCTL_SHADOW_OP_OFF, - NULL, 0, NULL, 0, NULL); - - rc = ctx->save.ops.cleanup(ctx); - if ( rc ) - PERROR("Failed to clean up"); + cleanup(ctx); if ( saved_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 Fri May 15 14:14:42 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:14: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 1YtGNu-0001ww-92; Fri, 15 May 2015 14:14:42 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGNt-0001w9-0B for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:14:41 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 42/51-03026-05FF5555; Fri, 15 May 2015 14:14:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1431699278!10895180!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16814 invoked from network); 15 May 2015 14:14:39 -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; 15 May 2015 14:14:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGNq-0001j4-91 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:14:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGNq-00006v-87 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:14:38 +0000 Date: Fri, 15 May 2015 14:14:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/save: rename to_send to dirty_bitmap X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e3022486b309020bc6306fa0a9be39f59aa5fa34 Author: Yang Hongyang AuthorDate: Thu May 14 16:55:10 2015 +0800 Commit: Ian Campbell CommitDate: Thu May 14 13:03:20 2015 +0100 libxc/save: rename to_send to dirty_bitmap rename to_send to dirty_bitmap. Signed-off-by: Yang Hongyang CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Andrew Cooper Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_sr_save.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tools/libxc/xc_sr_save.c b/tools/libxc/xc_sr_save.c index f4ab5c5..5d08620 100644 --- a/tools/libxc/xc_sr_save.c +++ b/tools/libxc/xc_sr_save.c @@ -475,20 +475,20 @@ static int update_progress_string(struct xc_sr_context *ctx, static int send_domain_memory_live(struct xc_sr_context *ctx) { xc_interface *xch = ctx->xch; - DECLARE_HYPERCALL_BUFFER(unsigned long, to_send); + DECLARE_HYPERCALL_BUFFER(unsigned long, dirty_bitmap); xc_shadow_op_stats_t stats = { 0, ctx->save.p2m_size }; char *progress_str = NULL; unsigned x; int rc = -1; - to_send = xc_hypercall_buffer_alloc_pages( - xch, to_send, NRPAGES(bitmap_size(ctx->save.p2m_size))); + dirty_bitmap = xc_hypercall_buffer_alloc_pages( + xch, dirty_bitmap, NRPAGES(bitmap_size(ctx->save.p2m_size))); ctx->save.batch_pfns = malloc(MAX_BATCH_SIZE * sizeof(*ctx->save.batch_pfns)); ctx->save.deferred_pages = calloc(1, bitmap_size(ctx->save.p2m_size)); - if ( !ctx->save.batch_pfns || !to_send || !ctx->save.deferred_pages ) + if ( !ctx->save.batch_pfns || !dirty_bitmap || !ctx->save.deferred_pages ) { ERROR("Unable to allocate memory for to_{send,fix}/batch bitmaps"); goto out; @@ -512,7 +512,7 @@ static int send_domain_memory_live(struct xc_sr_context *ctx) { if ( xc_shadow_control( xch, ctx->domid, XEN_DOMCTL_SHADOW_OP_CLEAN, - HYPERCALL_BUFFER(to_send), ctx->save.p2m_size, + HYPERCALL_BUFFER(dirty_bitmap), ctx->save.p2m_size, NULL, 0, &stats) != ctx->save.p2m_size ) { PERROR("Failed to retrieve logdirty bitmap"); @@ -527,7 +527,7 @@ static int send_domain_memory_live(struct xc_sr_context *ctx) if ( rc ) goto out; - rc = send_some_pages(ctx, to_send, stats.dirty_count); + rc = send_some_pages(ctx, dirty_bitmap, stats.dirty_count); if ( rc ) goto out; } @@ -538,7 +538,7 @@ static int send_domain_memory_live(struct xc_sr_context *ctx) if ( xc_shadow_control( xch, ctx->domid, XEN_DOMCTL_SHADOW_OP_CLEAN, - HYPERCALL_BUFFER(to_send), ctx->save.p2m_size, + HYPERCALL_BUFFER(dirty_bitmap), ctx->save.p2m_size, NULL, 0, &stats) != ctx->save.p2m_size ) { PERROR("Failed to retrieve logdirty bitmap"); @@ -550,9 +550,9 @@ static int send_domain_memory_live(struct xc_sr_context *ctx) if ( rc ) goto out; - bitmap_or(to_send, ctx->save.deferred_pages, ctx->save.p2m_size); + bitmap_or(dirty_bitmap, ctx->save.deferred_pages, ctx->save.p2m_size); - rc = send_some_pages(ctx, to_send, + rc = send_some_pages(ctx, dirty_bitmap, stats.dirty_count + ctx->save.nr_deferred_pages); if ( rc ) goto out; @@ -578,7 +578,7 @@ static int send_domain_memory_live(struct xc_sr_context *ctx) if ( xc_shadow_control( xch, ctx->domid, XEN_DOMCTL_SHADOW_OP_PEEK, - HYPERCALL_BUFFER(to_send), ctx->save.p2m_size, + HYPERCALL_BUFFER(dirty_bitmap), ctx->save.p2m_size, NULL, 0, &stats) != ctx->save.p2m_size ) { PERROR("Failed to retrieve logdirty bitmap"); @@ -593,7 +593,7 @@ static int send_domain_memory_live(struct xc_sr_context *ctx) out: xc_set_progress_prefix(xch, NULL); free(progress_str); - xc_hypercall_buffer_free_pages(xch, to_send, + xc_hypercall_buffer_free_pages(xch, dirty_bitmap, NRPAGES(bitmap_size(ctx->save.p2m_size))); free(ctx->save.deferred_pages); free(ctx->save.batch_pfns); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:14:42 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:14: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 1YtGNu-0001ww-92; Fri, 15 May 2015 14:14:42 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGNt-0001w9-0B for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:14:41 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 42/51-03026-05FF5555; Fri, 15 May 2015 14:14:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1431699278!10895180!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16814 invoked from network); 15 May 2015 14:14:39 -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; 15 May 2015 14:14:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGNq-0001j4-91 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:14:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGNq-00006v-87 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:14:38 +0000 Date: Fri, 15 May 2015 14:14:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/save: rename to_send to dirty_bitmap X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e3022486b309020bc6306fa0a9be39f59aa5fa34 Author: Yang Hongyang AuthorDate: Thu May 14 16:55:10 2015 +0800 Commit: Ian Campbell CommitDate: Thu May 14 13:03:20 2015 +0100 libxc/save: rename to_send to dirty_bitmap rename to_send to dirty_bitmap. Signed-off-by: Yang Hongyang CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Andrew Cooper Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_sr_save.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tools/libxc/xc_sr_save.c b/tools/libxc/xc_sr_save.c index f4ab5c5..5d08620 100644 --- a/tools/libxc/xc_sr_save.c +++ b/tools/libxc/xc_sr_save.c @@ -475,20 +475,20 @@ static int update_progress_string(struct xc_sr_context *ctx, static int send_domain_memory_live(struct xc_sr_context *ctx) { xc_interface *xch = ctx->xch; - DECLARE_HYPERCALL_BUFFER(unsigned long, to_send); + DECLARE_HYPERCALL_BUFFER(unsigned long, dirty_bitmap); xc_shadow_op_stats_t stats = { 0, ctx->save.p2m_size }; char *progress_str = NULL; unsigned x; int rc = -1; - to_send = xc_hypercall_buffer_alloc_pages( - xch, to_send, NRPAGES(bitmap_size(ctx->save.p2m_size))); + dirty_bitmap = xc_hypercall_buffer_alloc_pages( + xch, dirty_bitmap, NRPAGES(bitmap_size(ctx->save.p2m_size))); ctx->save.batch_pfns = malloc(MAX_BATCH_SIZE * sizeof(*ctx->save.batch_pfns)); ctx->save.deferred_pages = calloc(1, bitmap_size(ctx->save.p2m_size)); - if ( !ctx->save.batch_pfns || !to_send || !ctx->save.deferred_pages ) + if ( !ctx->save.batch_pfns || !dirty_bitmap || !ctx->save.deferred_pages ) { ERROR("Unable to allocate memory for to_{send,fix}/batch bitmaps"); goto out; @@ -512,7 +512,7 @@ static int send_domain_memory_live(struct xc_sr_context *ctx) { if ( xc_shadow_control( xch, ctx->domid, XEN_DOMCTL_SHADOW_OP_CLEAN, - HYPERCALL_BUFFER(to_send), ctx->save.p2m_size, + HYPERCALL_BUFFER(dirty_bitmap), ctx->save.p2m_size, NULL, 0, &stats) != ctx->save.p2m_size ) { PERROR("Failed to retrieve logdirty bitmap"); @@ -527,7 +527,7 @@ static int send_domain_memory_live(struct xc_sr_context *ctx) if ( rc ) goto out; - rc = send_some_pages(ctx, to_send, stats.dirty_count); + rc = send_some_pages(ctx, dirty_bitmap, stats.dirty_count); if ( rc ) goto out; } @@ -538,7 +538,7 @@ static int send_domain_memory_live(struct xc_sr_context *ctx) if ( xc_shadow_control( xch, ctx->domid, XEN_DOMCTL_SHADOW_OP_CLEAN, - HYPERCALL_BUFFER(to_send), ctx->save.p2m_size, + HYPERCALL_BUFFER(dirty_bitmap), ctx->save.p2m_size, NULL, 0, &stats) != ctx->save.p2m_size ) { PERROR("Failed to retrieve logdirty bitmap"); @@ -550,9 +550,9 @@ static int send_domain_memory_live(struct xc_sr_context *ctx) if ( rc ) goto out; - bitmap_or(to_send, ctx->save.deferred_pages, ctx->save.p2m_size); + bitmap_or(dirty_bitmap, ctx->save.deferred_pages, ctx->save.p2m_size); - rc = send_some_pages(ctx, to_send, + rc = send_some_pages(ctx, dirty_bitmap, stats.dirty_count + ctx->save.nr_deferred_pages); if ( rc ) goto out; @@ -578,7 +578,7 @@ static int send_domain_memory_live(struct xc_sr_context *ctx) if ( xc_shadow_control( xch, ctx->domid, XEN_DOMCTL_SHADOW_OP_PEEK, - HYPERCALL_BUFFER(to_send), ctx->save.p2m_size, + HYPERCALL_BUFFER(dirty_bitmap), ctx->save.p2m_size, NULL, 0, &stats) != ctx->save.p2m_size ) { PERROR("Failed to retrieve logdirty bitmap"); @@ -593,7 +593,7 @@ static int send_domain_memory_live(struct xc_sr_context *ctx) out: xc_set_progress_prefix(xch, NULL); free(progress_str); - xc_hypercall_buffer_free_pages(xch, to_send, + xc_hypercall_buffer_free_pages(xch, dirty_bitmap, NRPAGES(bitmap_size(ctx->save.p2m_size))); free(ctx->save.deferred_pages); free(ctx->save.batch_pfns); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:14:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:14:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGO6-00020Q-Bl; Fri, 15 May 2015 14:14:54 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGO5-0001zh-33 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:14:53 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id B1/40-03197-C5FF5555; Fri, 15 May 2015 14:14:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1431699288!7171595!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8835 invoked from network); 15 May 2015 14:14:49 -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; 15 May 2015 14:14:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGO0-0001jA-CV for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:14:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGO0-00007I-Bb for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:14:48 +0000 Date: Fri, 15 May 2015 14:14:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/save: adjust the memory allocation for migration X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9087d0860139c765c69b088da12f3fc0da0cce0a Author: Yang Hongyang AuthorDate: Thu May 14 16:55:11 2015 +0800 Commit: Ian Campbell CommitDate: Thu May 14 13:03:27 2015 +0100 libxc/save: adjust the memory allocation for migration Move the memory allocation before the concrete live/nolive save in order to avoid the free/alloc memory loop when using Remus. Signed-off-by: Yang Hongyang CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Andrew Cooper Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_sr_common.h | 1 + tools/libxc/xc_sr_save.c | 60 ++++++++++++++++++++----------------------- 2 files changed, 29 insertions(+), 32 deletions(-) diff --git a/tools/libxc/xc_sr_common.h b/tools/libxc/xc_sr_common.h index c0f90d4..276d00a 100644 --- a/tools/libxc/xc_sr_common.h +++ b/tools/libxc/xc_sr_common.h @@ -190,6 +190,7 @@ struct xc_sr_context unsigned nr_batch_pfns; unsigned long *deferred_pages; unsigned long nr_deferred_pages; + xc_hypercall_buffer_t dirty_bitmap_hbuf; } save; struct /* Restore data. */ diff --git a/tools/libxc/xc_sr_save.c b/tools/libxc/xc_sr_save.c index 5d08620..beb54c4 100644 --- a/tools/libxc/xc_sr_save.c +++ b/tools/libxc/xc_sr_save.c @@ -475,24 +475,12 @@ static int update_progress_string(struct xc_sr_context *ctx, static int send_domain_memory_live(struct xc_sr_context *ctx) { xc_interface *xch = ctx->xch; - DECLARE_HYPERCALL_BUFFER(unsigned long, dirty_bitmap); xc_shadow_op_stats_t stats = { 0, ctx->save.p2m_size }; char *progress_str = NULL; unsigned x; int rc = -1; - - dirty_bitmap = xc_hypercall_buffer_alloc_pages( - xch, dirty_bitmap, NRPAGES(bitmap_size(ctx->save.p2m_size))); - - ctx->save.batch_pfns = malloc(MAX_BATCH_SIZE * - sizeof(*ctx->save.batch_pfns)); - ctx->save.deferred_pages = calloc(1, bitmap_size(ctx->save.p2m_size)); - - if ( !ctx->save.batch_pfns || !dirty_bitmap || !ctx->save.deferred_pages ) - { - ERROR("Unable to allocate memory for to_{send,fix}/batch bitmaps"); - goto out; - } + DECLARE_HYPERCALL_BUFFER_SHADOW(unsigned long, dirty_bitmap, + &ctx->save.dirty_bitmap_hbuf); rc = enable_logdirty(ctx); if ( rc ) @@ -593,10 +581,6 @@ static int send_domain_memory_live(struct xc_sr_context *ctx) out: xc_set_progress_prefix(xch, NULL); free(progress_str); - xc_hypercall_buffer_free_pages(xch, dirty_bitmap, - NRPAGES(bitmap_size(ctx->save.p2m_size))); - free(ctx->save.deferred_pages); - free(ctx->save.batch_pfns); return rc; } @@ -609,17 +593,6 @@ static int send_domain_memory_nonlive(struct xc_sr_context *ctx) xc_interface *xch = ctx->xch; int rc = -1; - ctx->save.batch_pfns = malloc(MAX_BATCH_SIZE * - sizeof(*ctx->save.batch_pfns)); - ctx->save.deferred_pages = calloc(1, bitmap_size(ctx->save.p2m_size)); - - if ( !ctx->save.batch_pfns || !ctx->save.deferred_pages ) - { - PERROR("Failed to allocate memory for nonlive tracking structures"); - errno = ENOMEM; - goto err; - } - rc = suspend_domain(ctx); if ( rc ) goto err; @@ -631,15 +604,30 @@ static int send_domain_memory_nonlive(struct xc_sr_context *ctx) goto err; err: - free(ctx->save.deferred_pages); - free(ctx->save.batch_pfns); - return rc; } static int setup(struct xc_sr_context *ctx) { + xc_interface *xch = ctx->xch; int rc; + DECLARE_HYPERCALL_BUFFER_SHADOW(unsigned long, dirty_bitmap, + &ctx->save.dirty_bitmap_hbuf); + + dirty_bitmap = xc_hypercall_buffer_alloc_pages( + xch, dirty_bitmap, NRPAGES(bitmap_size(ctx->save.p2m_size))); + ctx->save.batch_pfns = malloc(MAX_BATCH_SIZE * + sizeof(*ctx->save.batch_pfns)); + ctx->save.deferred_pages = calloc(1, bitmap_size(ctx->save.p2m_size)); + + if ( !ctx->save.batch_pfns || !dirty_bitmap || !ctx->save.deferred_pages ) + { + ERROR("Unable to allocate memory for dirty bitmaps, batch pfns and" + " deferred pages"); + rc = -1; + errno = ENOMEM; + goto err; + } rc = ctx->save.ops.setup(ctx); if ( rc ) @@ -654,12 +642,20 @@ static int setup(struct xc_sr_context *ctx) static void cleanup(struct xc_sr_context *ctx) { xc_interface *xch = ctx->xch; + DECLARE_HYPERCALL_BUFFER_SHADOW(unsigned long, dirty_bitmap, + &ctx->save.dirty_bitmap_hbuf); + xc_shadow_control(xch, ctx->domid, XEN_DOMCTL_SHADOW_OP_OFF, NULL, 0, NULL, 0, NULL); if ( ctx->save.ops.cleanup(ctx) ) PERROR("Failed to clean up"); + + xc_hypercall_buffer_free_pages(xch, dirty_bitmap, + NRPAGES(bitmap_size(ctx->save.p2m_size))); + free(ctx->save.deferred_pages); + free(ctx->save.batch_pfns); } /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:14:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:14:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGO6-00020Q-Bl; Fri, 15 May 2015 14:14:54 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGO5-0001zh-33 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:14:53 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id B1/40-03197-C5FF5555; Fri, 15 May 2015 14:14:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1431699288!7171595!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8835 invoked from network); 15 May 2015 14:14:49 -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; 15 May 2015 14:14:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGO0-0001jA-CV for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:14:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGO0-00007I-Bb for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:14:48 +0000 Date: Fri, 15 May 2015 14:14:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/save: adjust the memory allocation for migration X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9087d0860139c765c69b088da12f3fc0da0cce0a Author: Yang Hongyang AuthorDate: Thu May 14 16:55:11 2015 +0800 Commit: Ian Campbell CommitDate: Thu May 14 13:03:27 2015 +0100 libxc/save: adjust the memory allocation for migration Move the memory allocation before the concrete live/nolive save in order to avoid the free/alloc memory loop when using Remus. Signed-off-by: Yang Hongyang CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Andrew Cooper Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_sr_common.h | 1 + tools/libxc/xc_sr_save.c | 60 ++++++++++++++++++++----------------------- 2 files changed, 29 insertions(+), 32 deletions(-) diff --git a/tools/libxc/xc_sr_common.h b/tools/libxc/xc_sr_common.h index c0f90d4..276d00a 100644 --- a/tools/libxc/xc_sr_common.h +++ b/tools/libxc/xc_sr_common.h @@ -190,6 +190,7 @@ struct xc_sr_context unsigned nr_batch_pfns; unsigned long *deferred_pages; unsigned long nr_deferred_pages; + xc_hypercall_buffer_t dirty_bitmap_hbuf; } save; struct /* Restore data. */ diff --git a/tools/libxc/xc_sr_save.c b/tools/libxc/xc_sr_save.c index 5d08620..beb54c4 100644 --- a/tools/libxc/xc_sr_save.c +++ b/tools/libxc/xc_sr_save.c @@ -475,24 +475,12 @@ static int update_progress_string(struct xc_sr_context *ctx, static int send_domain_memory_live(struct xc_sr_context *ctx) { xc_interface *xch = ctx->xch; - DECLARE_HYPERCALL_BUFFER(unsigned long, dirty_bitmap); xc_shadow_op_stats_t stats = { 0, ctx->save.p2m_size }; char *progress_str = NULL; unsigned x; int rc = -1; - - dirty_bitmap = xc_hypercall_buffer_alloc_pages( - xch, dirty_bitmap, NRPAGES(bitmap_size(ctx->save.p2m_size))); - - ctx->save.batch_pfns = malloc(MAX_BATCH_SIZE * - sizeof(*ctx->save.batch_pfns)); - ctx->save.deferred_pages = calloc(1, bitmap_size(ctx->save.p2m_size)); - - if ( !ctx->save.batch_pfns || !dirty_bitmap || !ctx->save.deferred_pages ) - { - ERROR("Unable to allocate memory for to_{send,fix}/batch bitmaps"); - goto out; - } + DECLARE_HYPERCALL_BUFFER_SHADOW(unsigned long, dirty_bitmap, + &ctx->save.dirty_bitmap_hbuf); rc = enable_logdirty(ctx); if ( rc ) @@ -593,10 +581,6 @@ static int send_domain_memory_live(struct xc_sr_context *ctx) out: xc_set_progress_prefix(xch, NULL); free(progress_str); - xc_hypercall_buffer_free_pages(xch, dirty_bitmap, - NRPAGES(bitmap_size(ctx->save.p2m_size))); - free(ctx->save.deferred_pages); - free(ctx->save.batch_pfns); return rc; } @@ -609,17 +593,6 @@ static int send_domain_memory_nonlive(struct xc_sr_context *ctx) xc_interface *xch = ctx->xch; int rc = -1; - ctx->save.batch_pfns = malloc(MAX_BATCH_SIZE * - sizeof(*ctx->save.batch_pfns)); - ctx->save.deferred_pages = calloc(1, bitmap_size(ctx->save.p2m_size)); - - if ( !ctx->save.batch_pfns || !ctx->save.deferred_pages ) - { - PERROR("Failed to allocate memory for nonlive tracking structures"); - errno = ENOMEM; - goto err; - } - rc = suspend_domain(ctx); if ( rc ) goto err; @@ -631,15 +604,30 @@ static int send_domain_memory_nonlive(struct xc_sr_context *ctx) goto err; err: - free(ctx->save.deferred_pages); - free(ctx->save.batch_pfns); - return rc; } static int setup(struct xc_sr_context *ctx) { + xc_interface *xch = ctx->xch; int rc; + DECLARE_HYPERCALL_BUFFER_SHADOW(unsigned long, dirty_bitmap, + &ctx->save.dirty_bitmap_hbuf); + + dirty_bitmap = xc_hypercall_buffer_alloc_pages( + xch, dirty_bitmap, NRPAGES(bitmap_size(ctx->save.p2m_size))); + ctx->save.batch_pfns = malloc(MAX_BATCH_SIZE * + sizeof(*ctx->save.batch_pfns)); + ctx->save.deferred_pages = calloc(1, bitmap_size(ctx->save.p2m_size)); + + if ( !ctx->save.batch_pfns || !dirty_bitmap || !ctx->save.deferred_pages ) + { + ERROR("Unable to allocate memory for dirty bitmaps, batch pfns and" + " deferred pages"); + rc = -1; + errno = ENOMEM; + goto err; + } rc = ctx->save.ops.setup(ctx); if ( rc ) @@ -654,12 +642,20 @@ static int setup(struct xc_sr_context *ctx) static void cleanup(struct xc_sr_context *ctx) { xc_interface *xch = ctx->xch; + DECLARE_HYPERCALL_BUFFER_SHADOW(unsigned long, dirty_bitmap, + &ctx->save.dirty_bitmap_hbuf); + xc_shadow_control(xch, ctx->domid, XEN_DOMCTL_SHADOW_OP_OFF, NULL, 0, NULL, 0, NULL); if ( ctx->save.ops.cleanup(ctx) ) PERROR("Failed to clean up"); + + xc_hypercall_buffer_free_pages(xch, dirty_bitmap, + NRPAGES(bitmap_size(ctx->save.p2m_size))); + free(ctx->save.deferred_pages); + free(ctx->save.batch_pfns); } /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:15:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:15: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 1YtGOF-00022T-3r; Fri, 15 May 2015 14:15:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGOD-000223-5u for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:15:01 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id 89/74-02948-46FF5555; Fri, 15 May 2015 14:15:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1431699298!6458851!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12005 invoked from network); 15 May 2015 14:14:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 15 May 2015 14:14:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGOA-0001jJ-Fx for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:14:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGOA-00007g-F4 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:14:58 +0000 Date: Fri, 15 May 2015 14:14:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/save: remove bitmap param from send_some_pages X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 60d048f2d5225d2e2bb30113be7eac1e218ec2d8 Author: Yang Hongyang AuthorDate: Thu May 14 16:55:12 2015 +0800 Commit: Ian Campbell CommitDate: Thu May 14 13:03:36 2015 +0100 libxc/save: remove bitmap param from send_some_pages In last patch we added dirty bitmap to the save context, we no longer need to pass this param to send_some_pages. We can get dirty bitmap from the save context. 'entries' should stay as it is a useful sanity check. Signed-off-by: Yang Hongyang CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Andrew Cooper Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_sr_save.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/libxc/xc_sr_save.c b/tools/libxc/xc_sr_save.c index beb54c4..adb5cce 100644 --- a/tools/libxc/xc_sr_save.c +++ b/tools/libxc/xc_sr_save.c @@ -374,23 +374,24 @@ static int send_all_pages(struct xc_sr_context *ctx) } /* - * Send a subset of pages in the guests p2m, according to the provided bitmap. + * Send a subset of pages in the guests p2m, according to the dirty bitmap. * Used for each subsequent iteration of the live migration loop. * * Bitmap is bounded by p2m_size. */ static int send_some_pages(struct xc_sr_context *ctx, - unsigned long *bitmap, unsigned long entries) { xc_interface *xch = ctx->xch; xen_pfn_t p; unsigned long written; int rc; + DECLARE_HYPERCALL_BUFFER_SHADOW(unsigned long, dirty_bitmap, + &ctx->save.dirty_bitmap_hbuf); for ( p = 0, written = 0; p < ctx->save.p2m_size; ++p ) { - if ( !test_bit(p, bitmap) ) + if ( !test_bit(p, dirty_bitmap) ) continue; rc = add_to_batch(ctx, p); @@ -515,7 +516,7 @@ static int send_domain_memory_live(struct xc_sr_context *ctx) if ( rc ) goto out; - rc = send_some_pages(ctx, dirty_bitmap, stats.dirty_count); + rc = send_some_pages(ctx, stats.dirty_count); if ( rc ) goto out; } @@ -540,8 +541,7 @@ static int send_domain_memory_live(struct xc_sr_context *ctx) bitmap_or(dirty_bitmap, ctx->save.deferred_pages, ctx->save.p2m_size); - rc = send_some_pages(ctx, dirty_bitmap, - stats.dirty_count + ctx->save.nr_deferred_pages); + rc = send_some_pages(ctx, stats.dirty_count + ctx->save.nr_deferred_pages); if ( rc ) 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 Fri May 15 14:15:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:15: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 1YtGOF-00022T-3r; Fri, 15 May 2015 14:15:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGOD-000223-5u for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:15:01 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id 89/74-02948-46FF5555; Fri, 15 May 2015 14:15:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1431699298!6458851!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12005 invoked from network); 15 May 2015 14:14:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 15 May 2015 14:14:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGOA-0001jJ-Fx for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:14:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGOA-00007g-F4 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:14:58 +0000 Date: Fri, 15 May 2015 14:14:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/save: remove bitmap param from send_some_pages X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 60d048f2d5225d2e2bb30113be7eac1e218ec2d8 Author: Yang Hongyang AuthorDate: Thu May 14 16:55:12 2015 +0800 Commit: Ian Campbell CommitDate: Thu May 14 13:03:36 2015 +0100 libxc/save: remove bitmap param from send_some_pages In last patch we added dirty bitmap to the save context, we no longer need to pass this param to send_some_pages. We can get dirty bitmap from the save context. 'entries' should stay as it is a useful sanity check. Signed-off-by: Yang Hongyang CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Andrew Cooper Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_sr_save.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/libxc/xc_sr_save.c b/tools/libxc/xc_sr_save.c index beb54c4..adb5cce 100644 --- a/tools/libxc/xc_sr_save.c +++ b/tools/libxc/xc_sr_save.c @@ -374,23 +374,24 @@ static int send_all_pages(struct xc_sr_context *ctx) } /* - * Send a subset of pages in the guests p2m, according to the provided bitmap. + * Send a subset of pages in the guests p2m, according to the dirty bitmap. * Used for each subsequent iteration of the live migration loop. * * Bitmap is bounded by p2m_size. */ static int send_some_pages(struct xc_sr_context *ctx, - unsigned long *bitmap, unsigned long entries) { xc_interface *xch = ctx->xch; xen_pfn_t p; unsigned long written; int rc; + DECLARE_HYPERCALL_BUFFER_SHADOW(unsigned long, dirty_bitmap, + &ctx->save.dirty_bitmap_hbuf); for ( p = 0, written = 0; p < ctx->save.p2m_size; ++p ) { - if ( !test_bit(p, bitmap) ) + if ( !test_bit(p, dirty_bitmap) ) continue; rc = add_to_batch(ctx, p); @@ -515,7 +516,7 @@ static int send_domain_memory_live(struct xc_sr_context *ctx) if ( rc ) goto out; - rc = send_some_pages(ctx, dirty_bitmap, stats.dirty_count); + rc = send_some_pages(ctx, stats.dirty_count); if ( rc ) goto out; } @@ -540,8 +541,7 @@ static int send_domain_memory_live(struct xc_sr_context *ctx) bitmap_or(dirty_bitmap, ctx->save.deferred_pages, ctx->save.p2m_size); - rc = send_some_pages(ctx, dirty_bitmap, - stats.dirty_count + ctx->save.nr_deferred_pages); + rc = send_some_pages(ctx, stats.dirty_count + ctx->save.nr_deferred_pages); if ( rc ) 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 Fri May 15 14:15:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:15: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 1YtGOT-00025x-8H; Fri, 15 May 2015 14:15:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGOS-00025g-JF for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:15:16 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 75/8E-02797-37FF5555; Fri, 15 May 2015 14:15:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1431699314!10930271!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7481 invoked from network); 15 May 2015 14:15:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 15 May 2015 14:15:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGOK-0001kJ-JM for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:15:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGOK-00008M-IW for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:15:08 +0000 Date: Fri, 15 May 2015 14:15:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/save: rename send_some_pages to send_dirty_pages X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e21361d30a15e02e757f1e48f06bb2eb6b32c995 Author: Yang Hongyang AuthorDate: Thu May 14 16:55:13 2015 +0800 Commit: Ian Campbell CommitDate: Thu May 14 13:03:45 2015 +0100 libxc/save: rename send_some_pages to send_dirty_pages rename send_some_pages to send_dirty_pages, no functional change. Signed-off-by: Yang Hongyang CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Andrew Cooper Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_sr_save.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/libxc/xc_sr_save.c b/tools/libxc/xc_sr_save.c index adb5cce..3768bda 100644 --- a/tools/libxc/xc_sr_save.c +++ b/tools/libxc/xc_sr_save.c @@ -379,8 +379,8 @@ static int send_all_pages(struct xc_sr_context *ctx) * * Bitmap is bounded by p2m_size. */ -static int send_some_pages(struct xc_sr_context *ctx, - unsigned long entries) +static int send_dirty_pages(struct xc_sr_context *ctx, + unsigned long entries) { xc_interface *xch = ctx->xch; xen_pfn_t p; @@ -516,7 +516,7 @@ static int send_domain_memory_live(struct xc_sr_context *ctx) if ( rc ) goto out; - rc = send_some_pages(ctx, stats.dirty_count); + rc = send_dirty_pages(ctx, stats.dirty_count); if ( rc ) goto out; } @@ -541,7 +541,7 @@ static int send_domain_memory_live(struct xc_sr_context *ctx) bitmap_or(dirty_bitmap, ctx->save.deferred_pages, ctx->save.p2m_size); - rc = send_some_pages(ctx, stats.dirty_count + ctx->save.nr_deferred_pages); + rc = send_dirty_pages(ctx, stats.dirty_count + ctx->save.nr_deferred_pages); if ( rc ) 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 Fri May 15 14:15:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:15: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 1YtGOT-00025x-8H; Fri, 15 May 2015 14:15:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGOS-00025g-JF for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:15:16 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 75/8E-02797-37FF5555; Fri, 15 May 2015 14:15:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1431699314!10930271!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7481 invoked from network); 15 May 2015 14:15:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 15 May 2015 14:15:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGOK-0001kJ-JM for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:15:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGOK-00008M-IW for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:15:08 +0000 Date: Fri, 15 May 2015 14:15:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/save: rename send_some_pages to send_dirty_pages X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e21361d30a15e02e757f1e48f06bb2eb6b32c995 Author: Yang Hongyang AuthorDate: Thu May 14 16:55:13 2015 +0800 Commit: Ian Campbell CommitDate: Thu May 14 13:03:45 2015 +0100 libxc/save: rename send_some_pages to send_dirty_pages rename send_some_pages to send_dirty_pages, no functional change. Signed-off-by: Yang Hongyang CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Andrew Cooper Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_sr_save.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/libxc/xc_sr_save.c b/tools/libxc/xc_sr_save.c index adb5cce..3768bda 100644 --- a/tools/libxc/xc_sr_save.c +++ b/tools/libxc/xc_sr_save.c @@ -379,8 +379,8 @@ static int send_all_pages(struct xc_sr_context *ctx) * * Bitmap is bounded by p2m_size. */ -static int send_some_pages(struct xc_sr_context *ctx, - unsigned long entries) +static int send_dirty_pages(struct xc_sr_context *ctx, + unsigned long entries) { xc_interface *xch = ctx->xch; xen_pfn_t p; @@ -516,7 +516,7 @@ static int send_domain_memory_live(struct xc_sr_context *ctx) if ( rc ) goto out; - rc = send_some_pages(ctx, stats.dirty_count); + rc = send_dirty_pages(ctx, stats.dirty_count); if ( rc ) goto out; } @@ -541,7 +541,7 @@ static int send_domain_memory_live(struct xc_sr_context *ctx) bitmap_or(dirty_bitmap, ctx->save.deferred_pages, ctx->save.p2m_size); - rc = send_some_pages(ctx, stats.dirty_count + ctx->save.nr_deferred_pages); + rc = send_dirty_pages(ctx, stats.dirty_count + ctx->save.nr_deferred_pages); if ( rc ) 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 Fri May 15 14:15:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:15: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 1YtGOd-00028t-D2; Fri, 15 May 2015 14:15:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGOc-00028m-K5 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:15:26 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id DD/4B-02680-D7FF5555; Fri, 15 May 2015 14:15:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1431699324!17863636!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10098 invoked from network); 15 May 2015 14:15:24 -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; 15 May 2015 14:15:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGOZ-0001kT-UW for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:15:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGOZ-00009o-Ss for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:15:23 +0000 Date: Fri, 15 May 2015 14:15:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/save: reuse send_dirty_pages() in send_all_pages() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1238640c9e700819732d42c7e611f8dfa508eb60 Author: Yang Hongyang AuthorDate: Thu May 14 16:55:14 2015 +0800 Commit: Ian Campbell CommitDate: Thu May 14 13:03:57 2015 +0100 libxc/save: reuse send_dirty_pages() in send_all_pages() introduce bitmap_set() to set the entire bitmap. in send_all_pages(), set the entire bitmap and call send_dirty_pages(). Signed-off-by: Yang Hongyang CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Andrew Cooper Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_bitops.h | 5 +++++ tools/libxc/xc_sr_save.c | 44 ++++++++++++++------------------------------ 2 files changed, 19 insertions(+), 30 deletions(-) diff --git a/tools/libxc/xc_bitops.h b/tools/libxc/xc_bitops.h index dfce3b8..cd749f4 100644 --- a/tools/libxc/xc_bitops.h +++ b/tools/libxc/xc_bitops.h @@ -26,6 +26,11 @@ static inline unsigned long *bitmap_alloc(int nr_bits) return calloc(1, bitmap_size(nr_bits)); } +static inline void bitmap_set(unsigned long *addr, int nr_bits) +{ + memset(addr, 0xff, bitmap_size(nr_bits)); +} + static inline void bitmap_clear(unsigned long *addr, int nr_bits) { memset(addr, 0, bitmap_size(nr_bits)); diff --git a/tools/libxc/xc_sr_save.c b/tools/libxc/xc_sr_save.c index 3768bda..1d0a46d 100644 --- a/tools/libxc/xc_sr_save.c +++ b/tools/libxc/xc_sr_save.c @@ -344,36 +344,6 @@ static int suspend_domain(struct xc_sr_context *ctx) } /* - * Send all pages in the guests p2m. Used as the first iteration of the live - * migration loop, and for a non-live save. - */ -static int send_all_pages(struct xc_sr_context *ctx) -{ - xc_interface *xch = ctx->xch; - xen_pfn_t p; - int rc; - - for ( p = 0; p < ctx->save.p2m_size; ++p ) - { - rc = add_to_batch(ctx, p); - if ( rc ) - return rc; - - /* Update progress every 4MB worth of memory sent. */ - if ( (p & ((1U << (22 - 12)) - 1)) == 0 ) - xc_report_progress_step(xch, p, ctx->save.p2m_size); - } - - rc = flush_batch(ctx); - if ( rc ) - return rc; - - xc_report_progress_step(xch, ctx->save.p2m_size, - ctx->save.p2m_size); - return 0; -} - -/* * Send a subset of pages in the guests p2m, according to the dirty bitmap. * Used for each subsequent iteration of the live migration loop. * @@ -416,6 +386,20 @@ static int send_dirty_pages(struct xc_sr_context *ctx, return 0; } +/* + * Send all pages in the guests p2m. Used as the first iteration of the live + * migration loop, and for a non-live save. + */ +static int send_all_pages(struct xc_sr_context *ctx) +{ + DECLARE_HYPERCALL_BUFFER_SHADOW(unsigned long, dirty_bitmap, + &ctx->save.dirty_bitmap_hbuf); + + bitmap_set(dirty_bitmap, ctx->save.p2m_size); + + return send_dirty_pages(ctx, ctx->save.p2m_size); +} + static int enable_logdirty(struct xc_sr_context *ctx) { xc_interface *xch = ctx->xch; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:15:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:15: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 1YtGOd-00028t-D2; Fri, 15 May 2015 14:15:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGOc-00028m-K5 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:15:26 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id DD/4B-02680-D7FF5555; Fri, 15 May 2015 14:15:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1431699324!17863636!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10098 invoked from network); 15 May 2015 14:15:24 -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; 15 May 2015 14:15:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGOZ-0001kT-UW for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:15:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGOZ-00009o-Ss for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:15:23 +0000 Date: Fri, 15 May 2015 14:15:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/save: reuse send_dirty_pages() in send_all_pages() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1238640c9e700819732d42c7e611f8dfa508eb60 Author: Yang Hongyang AuthorDate: Thu May 14 16:55:14 2015 +0800 Commit: Ian Campbell CommitDate: Thu May 14 13:03:57 2015 +0100 libxc/save: reuse send_dirty_pages() in send_all_pages() introduce bitmap_set() to set the entire bitmap. in send_all_pages(), set the entire bitmap and call send_dirty_pages(). Signed-off-by: Yang Hongyang CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Andrew Cooper Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_bitops.h | 5 +++++ tools/libxc/xc_sr_save.c | 44 ++++++++++++++------------------------------ 2 files changed, 19 insertions(+), 30 deletions(-) diff --git a/tools/libxc/xc_bitops.h b/tools/libxc/xc_bitops.h index dfce3b8..cd749f4 100644 --- a/tools/libxc/xc_bitops.h +++ b/tools/libxc/xc_bitops.h @@ -26,6 +26,11 @@ static inline unsigned long *bitmap_alloc(int nr_bits) return calloc(1, bitmap_size(nr_bits)); } +static inline void bitmap_set(unsigned long *addr, int nr_bits) +{ + memset(addr, 0xff, bitmap_size(nr_bits)); +} + static inline void bitmap_clear(unsigned long *addr, int nr_bits) { memset(addr, 0, bitmap_size(nr_bits)); diff --git a/tools/libxc/xc_sr_save.c b/tools/libxc/xc_sr_save.c index 3768bda..1d0a46d 100644 --- a/tools/libxc/xc_sr_save.c +++ b/tools/libxc/xc_sr_save.c @@ -344,36 +344,6 @@ static int suspend_domain(struct xc_sr_context *ctx) } /* - * Send all pages in the guests p2m. Used as the first iteration of the live - * migration loop, and for a non-live save. - */ -static int send_all_pages(struct xc_sr_context *ctx) -{ - xc_interface *xch = ctx->xch; - xen_pfn_t p; - int rc; - - for ( p = 0; p < ctx->save.p2m_size; ++p ) - { - rc = add_to_batch(ctx, p); - if ( rc ) - return rc; - - /* Update progress every 4MB worth of memory sent. */ - if ( (p & ((1U << (22 - 12)) - 1)) == 0 ) - xc_report_progress_step(xch, p, ctx->save.p2m_size); - } - - rc = flush_batch(ctx); - if ( rc ) - return rc; - - xc_report_progress_step(xch, ctx->save.p2m_size, - ctx->save.p2m_size); - return 0; -} - -/* * Send a subset of pages in the guests p2m, according to the dirty bitmap. * Used for each subsequent iteration of the live migration loop. * @@ -416,6 +386,20 @@ static int send_dirty_pages(struct xc_sr_context *ctx, return 0; } +/* + * Send all pages in the guests p2m. Used as the first iteration of the live + * migration loop, and for a non-live save. + */ +static int send_all_pages(struct xc_sr_context *ctx) +{ + DECLARE_HYPERCALL_BUFFER_SHADOW(unsigned long, dirty_bitmap, + &ctx->save.dirty_bitmap_hbuf); + + bitmap_set(dirty_bitmap, ctx->save.p2m_size); + + return send_dirty_pages(ctx, ctx->save.p2m_size); +} + static int enable_logdirty(struct xc_sr_context *ctx) { xc_interface *xch = ctx->xch; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:15:37 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:15: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 1YtGOn-0002AT-FY; Fri, 15 May 2015 14:15:37 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGOm-0002AL-P7 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:15:36 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id A1/F2-03204-78FF5555; Fri, 15 May 2015 14:15:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1431699334!17775146!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10108 invoked from network); 15 May 2015 14:15:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 May 2015 14:15:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGOk-0001kb-3K for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:15:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGOk-0000AL-15 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:15:34 +0000 Date: Fri, 15 May 2015 14:15:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/restore: introduce process_record() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9ab42c93ae865e73d694abec7e07286ddbdf0eef Author: Yang Hongyang AuthorDate: Thu May 14 16:55:15 2015 +0800 Commit: Ian Campbell CommitDate: Thu May 14 13:04:08 2015 +0100 libxc/restore: introduce process_record() Move record handle codes into a function process_record(). It will be used multiple times by Remus. No functional change. Signed-off-by: Yang Hongyang CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Andrew Cooper Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_sr_restore.c | 77 ++++++++++++++++++++++++------------------- 1 files changed, 43 insertions(+), 34 deletions(-) diff --git a/tools/libxc/xc_sr_restore.c b/tools/libxc/xc_sr_restore.c index 0bf4bae..53bd674 100644 --- a/tools/libxc/xc_sr_restore.c +++ b/tools/libxc/xc_sr_restore.c @@ -468,6 +468,48 @@ static int handle_page_data(struct xc_sr_context *ctx, struct xc_sr_record *rec) return rc; } +static int process_record(struct xc_sr_context *ctx, struct xc_sr_record *rec) +{ + xc_interface *xch = ctx->xch; + int rc = 0; + + switch ( rec->type ) + { + case REC_TYPE_END: + break; + + case REC_TYPE_PAGE_DATA: + rc = handle_page_data(ctx, rec); + break; + + case REC_TYPE_VERIFY: + DPRINTF("Verify mode enabled"); + ctx->restore.verify = true; + break; + + default: + rc = ctx->restore.ops.process_record(ctx, rec); + break; + } + + free(rec->data); + + if ( rc == RECORD_NOT_PROCESSED ) + { + if ( rec->type & REC_TYPE_OPTIONAL ) + DPRINTF("Ignoring optional record %#x (%s)", + rec->type, rec_type_to_str(rec->type)); + else + { + ERROR("Mandatory record %#x (%s) not handled", + rec->type, rec_type_to_str(rec->type)); + rc = -1; + } + } + + return rc; +} + /* * Restore a domain. */ @@ -498,40 +540,7 @@ static int restore(struct xc_sr_context *ctx) if ( rc ) goto err; - switch ( rec.type ) - { - case REC_TYPE_END: - break; - - case REC_TYPE_PAGE_DATA: - rc = handle_page_data(ctx, &rec); - break; - - case REC_TYPE_VERIFY: - DPRINTF("Verify mode enabled"); - ctx->restore.verify = true; - break; - - default: - rc = ctx->restore.ops.process_record(ctx, &rec); - break; - } - - free(rec.data); - - if ( rc == RECORD_NOT_PROCESSED ) - { - if ( rec.type & REC_TYPE_OPTIONAL ) - DPRINTF("Ignoring optional record %#x (%s)", - rec.type, rec_type_to_str(rec.type)); - else - { - ERROR("Mandatory record %#x (%s) not handled", - rec.type, rec_type_to_str(rec.type)); - rc = -1; - } - } - + rc = process_record(ctx, &rec); if ( rc ) goto err; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:15:37 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:15: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 1YtGOn-0002AT-FY; Fri, 15 May 2015 14:15:37 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGOm-0002AL-P7 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:15:36 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id A1/F2-03204-78FF5555; Fri, 15 May 2015 14:15:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1431699334!17775146!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10108 invoked from network); 15 May 2015 14:15:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 May 2015 14:15:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGOk-0001kb-3K for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:15:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGOk-0000AL-15 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:15:34 +0000 Date: Fri, 15 May 2015 14:15:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/restore: introduce process_record() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9ab42c93ae865e73d694abec7e07286ddbdf0eef Author: Yang Hongyang AuthorDate: Thu May 14 16:55:15 2015 +0800 Commit: Ian Campbell CommitDate: Thu May 14 13:04:08 2015 +0100 libxc/restore: introduce process_record() Move record handle codes into a function process_record(). It will be used multiple times by Remus. No functional change. Signed-off-by: Yang Hongyang CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Andrew Cooper Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_sr_restore.c | 77 ++++++++++++++++++++++++------------------- 1 files changed, 43 insertions(+), 34 deletions(-) diff --git a/tools/libxc/xc_sr_restore.c b/tools/libxc/xc_sr_restore.c index 0bf4bae..53bd674 100644 --- a/tools/libxc/xc_sr_restore.c +++ b/tools/libxc/xc_sr_restore.c @@ -468,6 +468,48 @@ static int handle_page_data(struct xc_sr_context *ctx, struct xc_sr_record *rec) return rc; } +static int process_record(struct xc_sr_context *ctx, struct xc_sr_record *rec) +{ + xc_interface *xch = ctx->xch; + int rc = 0; + + switch ( rec->type ) + { + case REC_TYPE_END: + break; + + case REC_TYPE_PAGE_DATA: + rc = handle_page_data(ctx, rec); + break; + + case REC_TYPE_VERIFY: + DPRINTF("Verify mode enabled"); + ctx->restore.verify = true; + break; + + default: + rc = ctx->restore.ops.process_record(ctx, rec); + break; + } + + free(rec->data); + + if ( rc == RECORD_NOT_PROCESSED ) + { + if ( rec->type & REC_TYPE_OPTIONAL ) + DPRINTF("Ignoring optional record %#x (%s)", + rec->type, rec_type_to_str(rec->type)); + else + { + ERROR("Mandatory record %#x (%s) not handled", + rec->type, rec_type_to_str(rec->type)); + rc = -1; + } + } + + return rc; +} + /* * Restore a domain. */ @@ -498,40 +540,7 @@ static int restore(struct xc_sr_context *ctx) if ( rc ) goto err; - switch ( rec.type ) - { - case REC_TYPE_END: - break; - - case REC_TYPE_PAGE_DATA: - rc = handle_page_data(ctx, &rec); - break; - - case REC_TYPE_VERIFY: - DPRINTF("Verify mode enabled"); - ctx->restore.verify = true; - break; - - default: - rc = ctx->restore.ops.process_record(ctx, &rec); - break; - } - - free(rec.data); - - if ( rc == RECORD_NOT_PROCESSED ) - { - if ( rec.type & REC_TYPE_OPTIONAL ) - DPRINTF("Ignoring optional record %#x (%s)", - rec.type, rec_type_to_str(rec.type)); - else - { - ERROR("Mandatory record %#x (%s) not handled", - rec.type, rec_type_to_str(rec.type)); - rc = -1; - } - } - + rc = process_record(ctx, &rec); if ( rc ) goto err; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:15:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:15: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 1YtGOz-0002CI-IO; Fri, 15 May 2015 14:15:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGOy-0002C9-28 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:15:48 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id 4F/6C-03245-39FF5555; Fri, 15 May 2015 14:15:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1431699344!17775212!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11530 invoked from network); 15 May 2015 14:15:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 May 2015 14:15:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGOu-0001kh-F4 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:15:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGOu-0000Aj-6H for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:15:44 +0000 Date: Fri, 15 May 2015 14:15:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/restore: split read/handle qemu info X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c5c5a040947730049074a9eed643e913d4eaaa66 Author: Yang Hongyang AuthorDate: Thu May 14 16:55:16 2015 +0800 Commit: Ian Campbell CommitDate: Thu May 14 13:04:15 2015 +0100 libxc/restore: split read/handle qemu info Split read/handle qemu info. The receiving of qemu info should be done while we receive the migration stream, handle_qemu will be called when the stream complete. Otherwise, it will break Remus because read_record() won't read qemu info and stream_complete will be called at failover. Signed-off-by: Yang Hongyang CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_sr_common.h | 5 +++++ tools/libxc/xc_sr_restore.c | 12 ++++++++++++ tools/libxc/xc_sr_restore_x86_hvm.c | 28 +++++++++++++++++++++++++--- 3 files changed, 42 insertions(+), 3 deletions(-) diff --git a/tools/libxc/xc_sr_common.h b/tools/libxc/xc_sr_common.h index 276d00a..0ba9728 100644 --- a/tools/libxc/xc_sr_common.h +++ b/tools/libxc/xc_sr_common.h @@ -288,6 +288,11 @@ struct xc_sr_context /* HVM context blob. */ void *context; size_t contextsz; + +#ifdef XG_LIBXL_HVM_COMPAT + uint32_t qlen; + void *qbuf; +#endif } restore; }; } x86_hvm; diff --git a/tools/libxc/xc_sr_restore.c b/tools/libxc/xc_sr_restore.c index 53bd674..8022c3d 100644 --- a/tools/libxc/xc_sr_restore.c +++ b/tools/libxc/xc_sr_restore.c @@ -510,6 +510,9 @@ static int process_record(struct xc_sr_context *ctx, struct xc_sr_record *rec) return rc; } +#ifdef XG_LIBXL_HVM_COMPAT +extern int read_qemu(struct xc_sr_context *ctx); +#endif /* * Restore a domain. */ @@ -546,6 +549,15 @@ static int restore(struct xc_sr_context *ctx) } while ( rec.type != REC_TYPE_END ); +#ifdef XG_LIBXL_HVM_COMPAT + if ( ctx->dominfo.hvm ) + { + rc = read_qemu(ctx); + if ( rc ) + goto err; + } +#endif + rc = ctx->restore.ops.stream_complete(ctx); if ( rc ) goto err; diff --git a/tools/libxc/xc_sr_restore_x86_hvm.c b/tools/libxc/xc_sr_restore_x86_hvm.c index 6e9b318..6f5af0e 100644 --- a/tools/libxc/xc_sr_restore_x86_hvm.c +++ b/tools/libxc/xc_sr_restore_x86_hvm.c @@ -94,14 +94,14 @@ static int handle_hvm_params(struct xc_sr_context *ctx, } #ifdef XG_LIBXL_HVM_COMPAT -static int handle_qemu(struct xc_sr_context *ctx) +int read_qemu(struct xc_sr_context *ctx); +int read_qemu(struct xc_sr_context *ctx) { xc_interface *xch = ctx->xch; - char qemusig[21], path[256]; + char qemusig[21]; uint32_t qlen; void *qbuf = NULL; int rc = -1; - FILE *fp = NULL; if ( read_exact(ctx->fd, qemusig, sizeof(qemusig)) ) { @@ -137,6 +137,28 @@ static int handle_qemu(struct xc_sr_context *ctx) goto out; } + /* With Remus, this could be read many times */ + if ( ctx->x86_hvm.restore.qbuf ) + free(ctx->x86_hvm.restore.qbuf); + ctx->x86_hvm.restore.qbuf = qbuf; + ctx->x86_hvm.restore.qlen = qlen; + rc = 0; + +out: + if (rc) + free(qbuf); + return rc; +} + +static int handle_qemu(struct xc_sr_context *ctx) +{ + xc_interface *xch = ctx->xch; + char path[256]; + uint32_t qlen = ctx->x86_hvm.restore.qlen; + void *qbuf = ctx->x86_hvm.restore.qbuf; + int rc = -1; + FILE *fp = NULL; + sprintf(path, XC_DEVICE_MODEL_RESTORE_FILE".%u", ctx->domid); fp = fopen(path, "wb"); if ( !fp ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:15:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:15: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 1YtGOz-0002CI-IO; Fri, 15 May 2015 14:15:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGOy-0002C9-28 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:15:48 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id 4F/6C-03245-39FF5555; Fri, 15 May 2015 14:15:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1431699344!17775212!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11530 invoked from network); 15 May 2015 14:15:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 May 2015 14:15:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGOu-0001kh-F4 for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:15:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGOu-0000Aj-6H for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:15:44 +0000 Date: Fri, 15 May 2015 14:15:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/restore: split read/handle qemu info X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c5c5a040947730049074a9eed643e913d4eaaa66 Author: Yang Hongyang AuthorDate: Thu May 14 16:55:16 2015 +0800 Commit: Ian Campbell CommitDate: Thu May 14 13:04:15 2015 +0100 libxc/restore: split read/handle qemu info Split read/handle qemu info. The receiving of qemu info should be done while we receive the migration stream, handle_qemu will be called when the stream complete. Otherwise, it will break Remus because read_record() won't read qemu info and stream_complete will be called at failover. Signed-off-by: Yang Hongyang CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_sr_common.h | 5 +++++ tools/libxc/xc_sr_restore.c | 12 ++++++++++++ tools/libxc/xc_sr_restore_x86_hvm.c | 28 +++++++++++++++++++++++++--- 3 files changed, 42 insertions(+), 3 deletions(-) diff --git a/tools/libxc/xc_sr_common.h b/tools/libxc/xc_sr_common.h index 276d00a..0ba9728 100644 --- a/tools/libxc/xc_sr_common.h +++ b/tools/libxc/xc_sr_common.h @@ -288,6 +288,11 @@ struct xc_sr_context /* HVM context blob. */ void *context; size_t contextsz; + +#ifdef XG_LIBXL_HVM_COMPAT + uint32_t qlen; + void *qbuf; +#endif } restore; }; } x86_hvm; diff --git a/tools/libxc/xc_sr_restore.c b/tools/libxc/xc_sr_restore.c index 53bd674..8022c3d 100644 --- a/tools/libxc/xc_sr_restore.c +++ b/tools/libxc/xc_sr_restore.c @@ -510,6 +510,9 @@ static int process_record(struct xc_sr_context *ctx, struct xc_sr_record *rec) return rc; } +#ifdef XG_LIBXL_HVM_COMPAT +extern int read_qemu(struct xc_sr_context *ctx); +#endif /* * Restore a domain. */ @@ -546,6 +549,15 @@ static int restore(struct xc_sr_context *ctx) } while ( rec.type != REC_TYPE_END ); +#ifdef XG_LIBXL_HVM_COMPAT + if ( ctx->dominfo.hvm ) + { + rc = read_qemu(ctx); + if ( rc ) + goto err; + } +#endif + rc = ctx->restore.ops.stream_complete(ctx); if ( rc ) goto err; diff --git a/tools/libxc/xc_sr_restore_x86_hvm.c b/tools/libxc/xc_sr_restore_x86_hvm.c index 6e9b318..6f5af0e 100644 --- a/tools/libxc/xc_sr_restore_x86_hvm.c +++ b/tools/libxc/xc_sr_restore_x86_hvm.c @@ -94,14 +94,14 @@ static int handle_hvm_params(struct xc_sr_context *ctx, } #ifdef XG_LIBXL_HVM_COMPAT -static int handle_qemu(struct xc_sr_context *ctx) +int read_qemu(struct xc_sr_context *ctx); +int read_qemu(struct xc_sr_context *ctx) { xc_interface *xch = ctx->xch; - char qemusig[21], path[256]; + char qemusig[21]; uint32_t qlen; void *qbuf = NULL; int rc = -1; - FILE *fp = NULL; if ( read_exact(ctx->fd, qemusig, sizeof(qemusig)) ) { @@ -137,6 +137,28 @@ static int handle_qemu(struct xc_sr_context *ctx) goto out; } + /* With Remus, this could be read many times */ + if ( ctx->x86_hvm.restore.qbuf ) + free(ctx->x86_hvm.restore.qbuf); + ctx->x86_hvm.restore.qbuf = qbuf; + ctx->x86_hvm.restore.qlen = qlen; + rc = 0; + +out: + if (rc) + free(qbuf); + return rc; +} + +static int handle_qemu(struct xc_sr_context *ctx) +{ + xc_interface *xch = ctx->xch; + char path[256]; + uint32_t qlen = ctx->x86_hvm.restore.qlen; + void *qbuf = ctx->x86_hvm.restore.qbuf; + int rc = -1; + FILE *fp = NULL; + sprintf(path, XC_DEVICE_MODEL_RESTORE_FILE".%u", ctx->domid); fp = fopen(path, "wb"); if ( !fp ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:15:58 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:15: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 1YtGP8-0002Dv-LD; Fri, 15 May 2015 14:15:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGP7-0002Di-GJ for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:15:57 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 62/3D-02919-C9FF5555; Fri, 15 May 2015 14:15:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1431699354!8453681!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31710 invoked from network); 15 May 2015 14:15:55 -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; 15 May 2015 14:15:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGP4-0001ko-NQ for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:15:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGP4-0000BK-Hi for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:15:54 +0000 Date: Fri, 15 May 2015 14:15:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/restore: introduce setup() and cleanup() on 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 ce44b40387d787f3c608c2bd0c39285971b8aea3 Author: Yang Hongyang AuthorDate: Thu May 14 16:55:17 2015 +0800 Commit: Ian Campbell CommitDate: Thu May 14 13:04:23 2015 +0100 libxc/restore: introduce setup() and cleanup() on restore introduce setup() and cleanup() which subsume the ctx->restore.ops.{setup,cleanup}() calls and also do memory alloc/free. Signed-off-by: Yang Hongyang CC: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_sr_restore.c | 48 ++++++++++++++++++++++++++++++------------ 1 files changed, 34 insertions(+), 14 deletions(-) diff --git a/tools/libxc/xc_sr_restore.c b/tools/libxc/xc_sr_restore.c index 8022c3d..2345f66 100644 --- a/tools/libxc/xc_sr_restore.c +++ b/tools/libxc/xc_sr_restore.c @@ -510,6 +510,38 @@ static int process_record(struct xc_sr_context *ctx, struct xc_sr_record *rec) return rc; } +static int setup(struct xc_sr_context *ctx) +{ + xc_interface *xch = ctx->xch; + int rc; + + rc = ctx->restore.ops.setup(ctx); + if ( rc ) + goto err; + + ctx->restore.max_populated_pfn = (32 * 1024 / 4) - 1; + ctx->restore.populated_pfns = bitmap_alloc( + ctx->restore.max_populated_pfn + 1); + if ( !ctx->restore.populated_pfns ) + { + ERROR("Unable to allocate memory for populated_pfns bitmap"); + rc = -1; + goto err; + } + + err: + return rc; +} + +static void cleanup(struct xc_sr_context *ctx) +{ + xc_interface *xch = ctx->xch; + + free(ctx->restore.populated_pfns); + if ( ctx->restore.ops.cleanup(ctx) ) + PERROR("Failed to clean up"); +} + #ifdef XG_LIBXL_HVM_COMPAT extern int read_qemu(struct xc_sr_context *ctx); #endif @@ -524,19 +556,10 @@ static int restore(struct xc_sr_context *ctx) IPRINTF("Restoring domain"); - rc = ctx->restore.ops.setup(ctx); + rc = setup(ctx); if ( rc ) goto err; - ctx->restore.max_populated_pfn = (32 * 1024 / 4) - 1; - ctx->restore.populated_pfns = bitmap_alloc( - ctx->restore.max_populated_pfn + 1); - if ( !ctx->restore.populated_pfns ) - { - ERROR("Unable to allocate memory for populated_pfns bitmap"); - goto err; - } - do { rc = read_record(ctx, &rec); @@ -571,10 +594,7 @@ static int restore(struct xc_sr_context *ctx) PERROR("Restore failed"); done: - free(ctx->restore.populated_pfns); - rc = ctx->restore.ops.cleanup(ctx); - if ( rc ) - PERROR("Failed to clean up"); + cleanup(ctx); if ( saved_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 Fri May 15 14:15:58 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:15: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 1YtGP8-0002Dv-LD; Fri, 15 May 2015 14:15:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGP7-0002Di-GJ for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:15:57 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 62/3D-02919-C9FF5555; Fri, 15 May 2015 14:15:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1431699354!8453681!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31710 invoked from network); 15 May 2015 14:15:55 -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; 15 May 2015 14:15:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGP4-0001ko-NQ for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:15:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGP4-0000BK-Hi for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:15:54 +0000 Date: Fri, 15 May 2015 14:15:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/restore: introduce setup() and cleanup() on 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 ce44b40387d787f3c608c2bd0c39285971b8aea3 Author: Yang Hongyang AuthorDate: Thu May 14 16:55:17 2015 +0800 Commit: Ian Campbell CommitDate: Thu May 14 13:04:23 2015 +0100 libxc/restore: introduce setup() and cleanup() on restore introduce setup() and cleanup() which subsume the ctx->restore.ops.{setup,cleanup}() calls and also do memory alloc/free. Signed-off-by: Yang Hongyang CC: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_sr_restore.c | 48 ++++++++++++++++++++++++++++++------------ 1 files changed, 34 insertions(+), 14 deletions(-) diff --git a/tools/libxc/xc_sr_restore.c b/tools/libxc/xc_sr_restore.c index 8022c3d..2345f66 100644 --- a/tools/libxc/xc_sr_restore.c +++ b/tools/libxc/xc_sr_restore.c @@ -510,6 +510,38 @@ static int process_record(struct xc_sr_context *ctx, struct xc_sr_record *rec) return rc; } +static int setup(struct xc_sr_context *ctx) +{ + xc_interface *xch = ctx->xch; + int rc; + + rc = ctx->restore.ops.setup(ctx); + if ( rc ) + goto err; + + ctx->restore.max_populated_pfn = (32 * 1024 / 4) - 1; + ctx->restore.populated_pfns = bitmap_alloc( + ctx->restore.max_populated_pfn + 1); + if ( !ctx->restore.populated_pfns ) + { + ERROR("Unable to allocate memory for populated_pfns bitmap"); + rc = -1; + goto err; + } + + err: + return rc; +} + +static void cleanup(struct xc_sr_context *ctx) +{ + xc_interface *xch = ctx->xch; + + free(ctx->restore.populated_pfns); + if ( ctx->restore.ops.cleanup(ctx) ) + PERROR("Failed to clean up"); +} + #ifdef XG_LIBXL_HVM_COMPAT extern int read_qemu(struct xc_sr_context *ctx); #endif @@ -524,19 +556,10 @@ static int restore(struct xc_sr_context *ctx) IPRINTF("Restoring domain"); - rc = ctx->restore.ops.setup(ctx); + rc = setup(ctx); if ( rc ) goto err; - ctx->restore.max_populated_pfn = (32 * 1024 / 4) - 1; - ctx->restore.populated_pfns = bitmap_alloc( - ctx->restore.max_populated_pfn + 1); - if ( !ctx->restore.populated_pfns ) - { - ERROR("Unable to allocate memory for populated_pfns bitmap"); - goto err; - } - do { rc = read_record(ctx, &rec); @@ -571,10 +594,7 @@ static int restore(struct xc_sr_context *ctx) PERROR("Restore failed"); done: - free(ctx->restore.populated_pfns); - rc = ctx->restore.ops.cleanup(ctx); - if ( rc ) - PERROR("Failed to clean up"); + cleanup(ctx); if ( saved_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 Fri May 15 14:16:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:16: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 1YtGPJ-0002FZ-Nm; Fri, 15 May 2015 14:16:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGPI-0002FK-7V for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:16:08 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id 2B/34-02819-7AFF5555; Fri, 15 May 2015 14:16:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1431699365!10870097!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22556 invoked from network); 15 May 2015 14:16: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; 15 May 2015 14:16:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGPF-0001lO-6x for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:16:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGPE-0000Bq-QI for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:16:05 +0000 Date: Fri, 15 May 2015 14:16:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/restore: add checkpointed flag to the restore context X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e13013dbf1d5997915548a3b5f1c39594d8c1d7b Author: Yang Hongyang AuthorDate: Thu May 14 16:55:18 2015 +0800 Commit: Ian Campbell CommitDate: Thu May 14 13:04:38 2015 +0100 libxc/restore: add checkpointed flag to the restore context add checkpointed flag to the restore context. Signed-off-by: Yang Hongyang CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Andrew Cooper Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_sr_common.h | 3 +++ tools/libxc/xc_sr_restore.c | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xc_sr_common.h b/tools/libxc/xc_sr_common.h index 0ba9728..f8121e7 100644 --- a/tools/libxc/xc_sr_common.h +++ b/tools/libxc/xc_sr_common.h @@ -205,6 +205,9 @@ struct xc_sr_context uint32_t guest_type; uint32_t guest_page_size; + /* Plain VM, or checkpoints over time. */ + bool checkpointed; + /* * Xenstore and Console parameters. * INPUT: evtchn & domid diff --git a/tools/libxc/xc_sr_restore.c b/tools/libxc/xc_sr_restore.c index 2345f66..9ab5760 100644 --- a/tools/libxc/xc_sr_restore.c +++ b/tools/libxc/xc_sr_restore.c @@ -624,6 +624,7 @@ int xc_domain_restore2(xc_interface *xch, int io_fd, uint32_t dom, ctx.restore.console_domid = console_domid; ctx.restore.xenstore_evtchn = store_evtchn; ctx.restore.xenstore_domid = store_domid; + ctx.restore.checkpointed = checkpointed_stream; ctx.restore.callbacks = callbacks; IPRINTF("In experimental %s", __func__); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 15 14:16:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2015 14:16: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 1YtGPJ-0002FZ-Nm; Fri, 15 May 2015 14:16:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGPI-0002FK-7V for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:16:08 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id 2B/34-02819-7AFF5555; Fri, 15 May 2015 14:16:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1431699365!10870097!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22556 invoked from network); 15 May 2015 14:16: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; 15 May 2015 14:16:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YtGPF-0001lO-6x for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:16:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YtGPE-0000Bq-QI for xen-changelog@lists.xensource.com; Fri, 15 May 2015 14:16:05 +0000 Date: Fri, 15 May 2015 14:16:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/restore: add checkpointed flag to the restore context X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e13013dbf1d5997915548a3b5f1c39594d8c1d7b Author: Yang Hongyang AuthorDate: Thu May 14 16:55:18 2015 +0800 Commit: Ian Campbell CommitDate: Thu May 14 13:04:38 2015 +0100 libxc/restore: add checkpointed flag to the restore context add checkpointed flag to the restore context. Signed-off-by: Yang Hongyang CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Andrew Cooper Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_sr_common.h | 3 +++ tools/libxc/xc_sr_restore.c | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xc_sr_common.h b/tools/libxc/xc_sr_common.h index 0ba9728..f8121e7 100644 --- a/tools/libxc/xc_sr_common.h +++ b/tools/libxc/xc_sr_common.h @@ -205,6 +205,9 @@ struct xc_sr_context uint32_t guest_type; uint32_t guest_page_size; + /* Plain VM, or checkpoints over time. */ + bool checkpointed; + /* * Xenstore and Console parameters. * INPUT: evtchn & domid diff --git a/tools/libxc/xc_sr_restore.c b/tools/libxc/xc_sr_restore.c index 2345f66..9ab5760 100644 --- a/tools/libxc/xc_sr_restore.c +++ b/tools/libxc/xc_sr_restore.c @@ -624,6 +624,7 @@ int xc_domain_restore2(xc_interface *xch, int io_fd, uint32_t dom, ctx.restore.console_domid = console_domid; ctx.restore.xenstore_evtchn = store_evtchn; ctx.restore.xenstore_domid = store_domid; + ctx.restore.checkpointed = checkpointed_stream; ctx.restore.callbacks = callbacks; IPRINTF("In experimental %s", __func__); -- 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 May 19 23:44:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 May 2015 23: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 1YurB8-0005Ff-KL; Tue, 19 May 2015 23:44:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YurB7-0005Fa-Gl for xen-changelog@lists.xensource.com; Tue, 19 May 2015 23:44:05 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 79/DF-02785-4CACB555; Tue, 19 May 2015 23:44:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1432079043!11357695!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.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27103 invoked from network); 19 May 2015 23:44:04 -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; 19 May 2015 23:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YurB4-0005YD-Uw for xen-changelog@lists.xensource.com; Tue, 19 May 2015 23:44:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YurB4-0000S7-J1 for xen-changelog@lists.xensource.com; Tue, 19 May 2015 23:44:02 +0000 Date: Tue, 19 May 2015 23:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] update Xen version to 4.5.1-rc1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0c4e0ef608c98abef6220b0b027d9ce8ec65fd5f Author: Jan Beulich AuthorDate: Mon May 18 16:18:42 2015 +0200 Commit: Jan Beulich CommitDate: Mon May 18 16:18:42 2015 +0200 update Xen version to 4.5.1-rc1 --- Config.mk | 4 ++-- xen/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 08df07d..b9a89a1 100644 --- a/Config.mk +++ b/Config.mk @@ -252,7 +252,7 @@ QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-4.5-testing.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.5.1-rc1 SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 # Thu May 22 16:59:16 2014 -0400 # python3 fixes for vgabios and csm builds. @@ -260,7 +260,7 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= 62e41581f69c3fd4a8f829a773015eb4c17f1f3e +QEMU_TRADITIONAL_REVISION ?= xen-4.5.1-rc1 # Tue Mar 31 16:27:45 2015 +0100 # xen: limit guest control of PCI command register diff --git a/xen/Makefile b/xen/Makefile index 7625ddc..5720393 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 = 5 -export XEN_EXTRAVERSION ?= .1-pre$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .1-rc1$(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.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue May 19 23:44:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 May 2015 23: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 1YurB8-0005Ff-KL; Tue, 19 May 2015 23:44:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YurB7-0005Fa-Gl for xen-changelog@lists.xensource.com; Tue, 19 May 2015 23:44:05 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 79/DF-02785-4CACB555; Tue, 19 May 2015 23:44:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1432079043!11357695!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.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27103 invoked from network); 19 May 2015 23:44:04 -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; 19 May 2015 23:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YurB4-0005YD-Uw for xen-changelog@lists.xensource.com; Tue, 19 May 2015 23:44:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YurB4-0000S7-J1 for xen-changelog@lists.xensource.com; Tue, 19 May 2015 23:44:02 +0000 Date: Tue, 19 May 2015 23:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] update Xen version to 4.5.1-rc1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0c4e0ef608c98abef6220b0b027d9ce8ec65fd5f Author: Jan Beulich AuthorDate: Mon May 18 16:18:42 2015 +0200 Commit: Jan Beulich CommitDate: Mon May 18 16:18:42 2015 +0200 update Xen version to 4.5.1-rc1 --- Config.mk | 4 ++-- xen/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 08df07d..b9a89a1 100644 --- a/Config.mk +++ b/Config.mk @@ -252,7 +252,7 @@ QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-4.5-testing.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.5.1-rc1 SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 # Thu May 22 16:59:16 2014 -0400 # python3 fixes for vgabios and csm builds. @@ -260,7 +260,7 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= 62e41581f69c3fd4a8f829a773015eb4c17f1f3e +QEMU_TRADITIONAL_REVISION ?= xen-4.5.1-rc1 # Tue Mar 31 16:27:45 2015 +0100 # xen: limit guest control of PCI command register diff --git a/xen/Makefile b/xen/Makefile index 7625ddc..5720393 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 = 5 -export XEN_EXTRAVERSION ?= .1-pre$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .1-rc1$(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.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed May 20 21:44:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2015 21: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 1YvBmc-00070c-5i; Wed, 20 May 2015 21:44:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YvBmb-00070W-Ej for xen-changelog@lists.xensource.com; Wed, 20 May 2015 21:44:09 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 82/CE-02812-8200D555; Wed, 20 May 2015 21:44:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1432158245!11670141!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9621 invoked from network); 20 May 2015 21:44:05 -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; 20 May 2015 21:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YvBmV-0003e5-M1 for xen-changelog@lists.xensource.com; Wed, 20 May 2015 21:44:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YvBmU-0000Aj-VR for xen-changelog@lists.xensource.com; Wed, 20 May 2015 21:44:03 +0000 Date: Wed, 20 May 2015 21:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86: don't change affinity with interrupt unmasked X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 718f183bf43ffd8d0bea7179d7aa28d9671d18a4 Author: Jan Beulich AuthorDate: Tue May 19 11:54:12 2015 +0200 Commit: Jan Beulich CommitDate: Tue May 19 11:54:12 2015 +0200 x86: don't change affinity with interrupt unmasked With ->startup unmasking the IRQ, setting the affinity afterwards without masking the IRQ again is invalid namely for MSI (address and data can't be updated atomically and may - at least for MSI-X - be cached while unmasked). Signed-off-by: Jan Beulich Reviewed-by: Konrad Rzeszutek Wilk Reviewed-by: Andrew Cooper AMD IOMMU: only translate remapped IO-APIC RTEs 1aeb1156fa ("x86 don't change affinity with interrupt unmasked") introducing RTE reads prior to the respective interrupt having got enabled for the first time uncovered a bug in 2ca9fbd739 ("AMD IOMMU: allocate IRTE entries instead of using a static mapping"): We obviously shouldn't be translating RTEs for which remapping didn't get set up yet. Reported-by: Sander Eikelenboom Signed-off-by: Jan Beulich Acked-by: Suravee Suthikulpanit master commit: 1aeb1156fa43fe2cd2b5003995b20466cd19a622 master date: 2015-03-26 11:18:28 +0100 master commit: c33c51b81c82a51515bf4fa2a9717098c03e5013 master date: 2015-04-24 12:06:26 +0200 --- xen/arch/x86/irq.c | 5 +++-- xen/drivers/passthrough/amd/iommu_intr.c | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index fd5e7a7..194d508 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -1605,12 +1605,13 @@ int pirq_guest_bind(struct vcpu *v, struct pirq *pirq, int will_share) init_timer(&action->eoi_timer, irq_guest_eoi_timer_fn, desc, 0); desc->status |= IRQ_GUEST; - desc->status &= ~IRQ_DISABLED; - desc->handler->startup(desc); /* Attempt to bind the interrupt target to the correct CPU. */ if ( !opt_noirqbalance && (desc->handler->set_affinity != NULL) ) desc->handler->set_affinity(desc, cpumask_of(v->processor)); + + desc->status &= ~IRQ_DISABLED; + desc->handler->startup(desc); } else if ( !will_share || !action->shareable ) { diff --git a/xen/drivers/passthrough/amd/iommu_intr.c b/xen/drivers/passthrough/amd/iommu_intr.c index c1b76fb..18d8b5f 100644 --- a/xen/drivers/passthrough/amd/iommu_intr.c +++ b/xen/drivers/passthrough/amd/iommu_intr.c @@ -365,15 +365,17 @@ unsigned int amd_iommu_read_ioapic_from_ire( unsigned int apic, unsigned int reg) { unsigned int val = __io_apic_read(apic, reg); + unsigned int pin = (reg - 0x10) / 2; + unsigned int offset = ioapic_sbdf[IO_APIC_ID(apic)].pin_2_idx[pin]; - if ( !(reg & 1) ) + if ( !(reg & 1) && offset < INTREMAP_ENTRIES ) { - unsigned int offset = val & (INTREMAP_ENTRIES - 1); u16 bdf = ioapic_sbdf[IO_APIC_ID(apic)].bdf; u16 seg = ioapic_sbdf[IO_APIC_ID(apic)].seg; u16 req_id = get_intremap_requestor_id(seg, bdf); const u32 *entry = get_intremap_entry(seg, req_id, offset); + ASSERT(offset == (val & (INTREMAP_ENTRIES - 1))); val &= ~(INTREMAP_ENTRIES - 1); val |= get_field_from_reg_u32(*entry, INT_REMAP_ENTRY_INTTYPE_MASK, -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed May 20 21:44:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2015 21: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 1YvBmc-00070c-5i; Wed, 20 May 2015 21:44:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YvBmb-00070W-Ej for xen-changelog@lists.xensource.com; Wed, 20 May 2015 21:44:09 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 82/CE-02812-8200D555; Wed, 20 May 2015 21:44:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1432158245!11670141!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9621 invoked from network); 20 May 2015 21:44:05 -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; 20 May 2015 21:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YvBmV-0003e5-M1 for xen-changelog@lists.xensource.com; Wed, 20 May 2015 21:44:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YvBmU-0000Aj-VR for xen-changelog@lists.xensource.com; Wed, 20 May 2015 21:44:03 +0000 Date: Wed, 20 May 2015 21:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86: don't change affinity with interrupt unmasked X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 718f183bf43ffd8d0bea7179d7aa28d9671d18a4 Author: Jan Beulich AuthorDate: Tue May 19 11:54:12 2015 +0200 Commit: Jan Beulich CommitDate: Tue May 19 11:54:12 2015 +0200 x86: don't change affinity with interrupt unmasked With ->startup unmasking the IRQ, setting the affinity afterwards without masking the IRQ again is invalid namely for MSI (address and data can't be updated atomically and may - at least for MSI-X - be cached while unmasked). Signed-off-by: Jan Beulich Reviewed-by: Konrad Rzeszutek Wilk Reviewed-by: Andrew Cooper AMD IOMMU: only translate remapped IO-APIC RTEs 1aeb1156fa ("x86 don't change affinity with interrupt unmasked") introducing RTE reads prior to the respective interrupt having got enabled for the first time uncovered a bug in 2ca9fbd739 ("AMD IOMMU: allocate IRTE entries instead of using a static mapping"): We obviously shouldn't be translating RTEs for which remapping didn't get set up yet. Reported-by: Sander Eikelenboom Signed-off-by: Jan Beulich Acked-by: Suravee Suthikulpanit master commit: 1aeb1156fa43fe2cd2b5003995b20466cd19a622 master date: 2015-03-26 11:18:28 +0100 master commit: c33c51b81c82a51515bf4fa2a9717098c03e5013 master date: 2015-04-24 12:06:26 +0200 --- xen/arch/x86/irq.c | 5 +++-- xen/drivers/passthrough/amd/iommu_intr.c | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index fd5e7a7..194d508 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -1605,12 +1605,13 @@ int pirq_guest_bind(struct vcpu *v, struct pirq *pirq, int will_share) init_timer(&action->eoi_timer, irq_guest_eoi_timer_fn, desc, 0); desc->status |= IRQ_GUEST; - desc->status &= ~IRQ_DISABLED; - desc->handler->startup(desc); /* Attempt to bind the interrupt target to the correct CPU. */ if ( !opt_noirqbalance && (desc->handler->set_affinity != NULL) ) desc->handler->set_affinity(desc, cpumask_of(v->processor)); + + desc->status &= ~IRQ_DISABLED; + desc->handler->startup(desc); } else if ( !will_share || !action->shareable ) { diff --git a/xen/drivers/passthrough/amd/iommu_intr.c b/xen/drivers/passthrough/amd/iommu_intr.c index c1b76fb..18d8b5f 100644 --- a/xen/drivers/passthrough/amd/iommu_intr.c +++ b/xen/drivers/passthrough/amd/iommu_intr.c @@ -365,15 +365,17 @@ unsigned int amd_iommu_read_ioapic_from_ire( unsigned int apic, unsigned int reg) { unsigned int val = __io_apic_read(apic, reg); + unsigned int pin = (reg - 0x10) / 2; + unsigned int offset = ioapic_sbdf[IO_APIC_ID(apic)].pin_2_idx[pin]; - if ( !(reg & 1) ) + if ( !(reg & 1) && offset < INTREMAP_ENTRIES ) { - unsigned int offset = val & (INTREMAP_ENTRIES - 1); u16 bdf = ioapic_sbdf[IO_APIC_ID(apic)].bdf; u16 seg = ioapic_sbdf[IO_APIC_ID(apic)].seg; u16 req_id = get_intremap_requestor_id(seg, bdf); const u32 *entry = get_intremap_entry(seg, req_id, offset); + ASSERT(offset == (val & (INTREMAP_ENTRIES - 1))); val &= ~(INTREMAP_ENTRIES - 1); val |= get_field_from_reg_u32(*entry, INT_REMAP_ENTRY_INTTYPE_MASK, -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed May 20 21:44:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2015 21: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 1YvBml-00071I-87; Wed, 20 May 2015 21:44:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YvBmk-000715-0h for xen-changelog@lists.xensource.com; Wed, 20 May 2015 21:44:18 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id B9/6B-02796-1300D555; Wed, 20 May 2015 21:44:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1432158255!19365527!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19557 invoked from network); 20 May 2015 21:44:16 -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; 20 May 2015 21:44:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YvBmh-0003e8-6D for xen-changelog@lists.xensource.com; Wed, 20 May 2015 21:44:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YvBmg-0000Bz-Ut for xen-changelog@lists.xensource.com; Wed, 20 May 2015 21:44:14 +0000 Date: Wed, 20 May 2015 21:44:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/efi: reserve SMBIOS table region when EFI booting X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 21a06bfa5c7f56ff5860d792770033250f44e696 Author: Ross Lagerwall AuthorDate: Tue May 19 11:55:46 2015 +0200 Commit: Jan Beulich CommitDate: Tue May 19 11:55:46 2015 +0200 x86/efi: reserve SMBIOS table region when EFI booting Some EFI firmware implementations may place the SMBIOS table in RAM marked as BootServicesData, which Xen does not consider as reserved. When dom0 tries to access the SMBIOS, the region is not contained in the initial P2M and it crashes with a page fault. To fix this, reserve the SMBIOS region. Also, fix the memcmp checks for existence of the SMBIOS. Signed-off-by: Ross Lagerwall Reviewed-by: Jan Beulich master commit: bf68adcadaa2b0885c5d2f1c8e2e068e209eb041 master date: 2015-04-17 10:44:48 +0200 --- xen/arch/x86/dmi_scan.c | 67 +++++++++++++++++++++++++++++----------------- xen/arch/x86/e820.c | 18 +++++++++--- xen/include/xen/dmi.h | 2 +- 3 files changed, 56 insertions(+), 31 deletions(-) diff --git a/xen/arch/x86/dmi_scan.c b/xen/arch/x86/dmi_scan.c index 9d4348b..379af29 100644 --- a/xen/arch/x86/dmi_scan.c +++ b/xen/arch/x86/dmi_scan.c @@ -127,6 +127,8 @@ static inline bool_t __init dmi_checksum(const void __iomem *buf, static u32 __initdata efi_dmi_address; static u32 __initdata efi_dmi_size; +static u32 __initdata efi_smbios_address; +static u32 __initdata efi_smbios_size; /* * Important: This function gets called while still in EFI @@ -136,39 +138,54 @@ void __init dmi_efi_get_table(void *smbios) { struct smbios_eps *eps = smbios; - if (memcmp(eps->anchor, "_SM_", 4) && - dmi_checksum(eps, eps->length) && - memcmp(eps->dmi.anchor, "_DMI_", 5) == 0 && - dmi_checksum(&eps->dmi, sizeof(eps->dmi))) { - efi_dmi_address = eps->dmi.address; - efi_dmi_size = eps->dmi.size; + if (memcmp(eps->anchor, "_SM_", 4) == 0 && + eps->length >= sizeof(*eps) && + dmi_checksum(eps, eps->length)) { + efi_smbios_address = (u32)(long)eps; + efi_smbios_size = eps->length; + + if (memcmp(eps->dmi.anchor, "_DMI_", 5) == 0 && + dmi_checksum(&eps->dmi, sizeof(eps->dmi))) { + efi_dmi_address = eps->dmi.address; + efi_dmi_size = eps->dmi.size; + } } } -int __init dmi_get_table(u32 *base, u32 *len) +const char *__init dmi_get_table(paddr_t *base, u32 *len) { - struct dmi_eps eps; - char __iomem *p, *q; + static unsigned int __initdata instance; if (efi_enabled) { - if (!efi_dmi_size) - return -1; - *base = efi_dmi_address; - *len = efi_dmi_size; - return 0; - } - - p = maddr_to_virt(0xF0000); - for (q = p; q < p + 0x10000; q += 16) { - memcpy_fromio(&eps, q, 15); - if (memcmp(eps.anchor, "_DMI_", 5) == 0 && - dmi_checksum(&eps, sizeof(eps))) { - *base = eps.address; - *len = eps.size; - return 0; + if (efi_dmi_size && !(instance & 2)) { + *base = efi_dmi_address; + *len = efi_dmi_size; + instance |= 2; + return "DMI"; + } + if (efi_smbios_size && !(instance & 4)) { + *base = efi_smbios_address; + *len = efi_smbios_size; + instance |= 4; + return "SMBIOS"; + } + } else { + char __iomem *p = maddr_to_virt(0xF0000), *q; + struct dmi_eps eps; + + for (q = p; q <= p + 0x10000 - sizeof(eps); q += 16) { + memcpy_fromio(&eps, q, sizeof(eps)); + if (!(instance & 1) && + memcmp(eps.anchor, "_DMI_", 5) == 0 && + dmi_checksum(&eps, sizeof(eps))) { + *base = eps.address; + *len = eps.size; + instance |= 1; + return "DMI"; + } } } - return -1; + return NULL; } static int __init _dmi_iterate(const struct dmi_eps *dmi, diff --git a/xen/arch/x86/e820.c b/xen/arch/x86/e820.c index 55fe0d6..1362bbd 100644 --- a/xen/arch/x86/e820.c +++ b/xen/arch/x86/e820.c @@ -504,11 +504,19 @@ static uint64_t __init mtrr_top_of_ram(void) static void __init reserve_dmi_region(void) { - u32 base, len; - if ( (dmi_get_table(&base, &len) == 0) && ((base + len) > base) && - reserve_e820_ram(&e820, base, base + len) ) - printk("WARNING: DMI table located in E820 RAM %08x-%08x. Fixed.\n", - base, base+len); + for ( ; ; ) + { + paddr_t base; + u32 len; + const char *what = dmi_get_table(&base, &len); + + if ( !what ) + break; + if ( ((base + len) > base) && + reserve_e820_ram(&e820, base, base + len) ) + printk("WARNING: %s table located in E820 RAM %"PRIpaddr"-%"PRIpaddr". Fixed.\n", + what, base, base + len); + } } static void __init machine_specific_memory_setup( diff --git a/xen/include/xen/dmi.h b/xen/include/xen/dmi.h index 8205893..e2fc76d 100644 --- a/xen/include/xen/dmi.h +++ b/xen/include/xen/dmi.h @@ -34,7 +34,7 @@ struct dmi_system_id { extern int dmi_check_system(struct dmi_system_id *list); extern void dmi_scan_machine(void); -extern int dmi_get_table(u32 *base, u32 *len); +extern const char *dmi_get_table(paddr_t *base, u32 *len); extern void dmi_efi_get_table(void *); bool_t dmi_get_date(int field, int *yearp, int *monthp, int *dayp); extern void dmi_end_boot(void); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed May 20 21:44:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2015 21: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 1YvBml-00071I-87; Wed, 20 May 2015 21:44:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YvBmk-000715-0h for xen-changelog@lists.xensource.com; Wed, 20 May 2015 21:44:18 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id B9/6B-02796-1300D555; Wed, 20 May 2015 21:44:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1432158255!19365527!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19557 invoked from network); 20 May 2015 21:44:16 -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; 20 May 2015 21:44:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YvBmh-0003e8-6D for xen-changelog@lists.xensource.com; Wed, 20 May 2015 21:44:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YvBmg-0000Bz-Ut for xen-changelog@lists.xensource.com; Wed, 20 May 2015 21:44:14 +0000 Date: Wed, 20 May 2015 21:44:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/efi: reserve SMBIOS table region when EFI booting X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 21a06bfa5c7f56ff5860d792770033250f44e696 Author: Ross Lagerwall AuthorDate: Tue May 19 11:55:46 2015 +0200 Commit: Jan Beulich CommitDate: Tue May 19 11:55:46 2015 +0200 x86/efi: reserve SMBIOS table region when EFI booting Some EFI firmware implementations may place the SMBIOS table in RAM marked as BootServicesData, which Xen does not consider as reserved. When dom0 tries to access the SMBIOS, the region is not contained in the initial P2M and it crashes with a page fault. To fix this, reserve the SMBIOS region. Also, fix the memcmp checks for existence of the SMBIOS. Signed-off-by: Ross Lagerwall Reviewed-by: Jan Beulich master commit: bf68adcadaa2b0885c5d2f1c8e2e068e209eb041 master date: 2015-04-17 10:44:48 +0200 --- xen/arch/x86/dmi_scan.c | 67 +++++++++++++++++++++++++++++----------------- xen/arch/x86/e820.c | 18 +++++++++--- xen/include/xen/dmi.h | 2 +- 3 files changed, 56 insertions(+), 31 deletions(-) diff --git a/xen/arch/x86/dmi_scan.c b/xen/arch/x86/dmi_scan.c index 9d4348b..379af29 100644 --- a/xen/arch/x86/dmi_scan.c +++ b/xen/arch/x86/dmi_scan.c @@ -127,6 +127,8 @@ static inline bool_t __init dmi_checksum(const void __iomem *buf, static u32 __initdata efi_dmi_address; static u32 __initdata efi_dmi_size; +static u32 __initdata efi_smbios_address; +static u32 __initdata efi_smbios_size; /* * Important: This function gets called while still in EFI @@ -136,39 +138,54 @@ void __init dmi_efi_get_table(void *smbios) { struct smbios_eps *eps = smbios; - if (memcmp(eps->anchor, "_SM_", 4) && - dmi_checksum(eps, eps->length) && - memcmp(eps->dmi.anchor, "_DMI_", 5) == 0 && - dmi_checksum(&eps->dmi, sizeof(eps->dmi))) { - efi_dmi_address = eps->dmi.address; - efi_dmi_size = eps->dmi.size; + if (memcmp(eps->anchor, "_SM_", 4) == 0 && + eps->length >= sizeof(*eps) && + dmi_checksum(eps, eps->length)) { + efi_smbios_address = (u32)(long)eps; + efi_smbios_size = eps->length; + + if (memcmp(eps->dmi.anchor, "_DMI_", 5) == 0 && + dmi_checksum(&eps->dmi, sizeof(eps->dmi))) { + efi_dmi_address = eps->dmi.address; + efi_dmi_size = eps->dmi.size; + } } } -int __init dmi_get_table(u32 *base, u32 *len) +const char *__init dmi_get_table(paddr_t *base, u32 *len) { - struct dmi_eps eps; - char __iomem *p, *q; + static unsigned int __initdata instance; if (efi_enabled) { - if (!efi_dmi_size) - return -1; - *base = efi_dmi_address; - *len = efi_dmi_size; - return 0; - } - - p = maddr_to_virt(0xF0000); - for (q = p; q < p + 0x10000; q += 16) { - memcpy_fromio(&eps, q, 15); - if (memcmp(eps.anchor, "_DMI_", 5) == 0 && - dmi_checksum(&eps, sizeof(eps))) { - *base = eps.address; - *len = eps.size; - return 0; + if (efi_dmi_size && !(instance & 2)) { + *base = efi_dmi_address; + *len = efi_dmi_size; + instance |= 2; + return "DMI"; + } + if (efi_smbios_size && !(instance & 4)) { + *base = efi_smbios_address; + *len = efi_smbios_size; + instance |= 4; + return "SMBIOS"; + } + } else { + char __iomem *p = maddr_to_virt(0xF0000), *q; + struct dmi_eps eps; + + for (q = p; q <= p + 0x10000 - sizeof(eps); q += 16) { + memcpy_fromio(&eps, q, sizeof(eps)); + if (!(instance & 1) && + memcmp(eps.anchor, "_DMI_", 5) == 0 && + dmi_checksum(&eps, sizeof(eps))) { + *base = eps.address; + *len = eps.size; + instance |= 1; + return "DMI"; + } } } - return -1; + return NULL; } static int __init _dmi_iterate(const struct dmi_eps *dmi, diff --git a/xen/arch/x86/e820.c b/xen/arch/x86/e820.c index 55fe0d6..1362bbd 100644 --- a/xen/arch/x86/e820.c +++ b/xen/arch/x86/e820.c @@ -504,11 +504,19 @@ static uint64_t __init mtrr_top_of_ram(void) static void __init reserve_dmi_region(void) { - u32 base, len; - if ( (dmi_get_table(&base, &len) == 0) && ((base + len) > base) && - reserve_e820_ram(&e820, base, base + len) ) - printk("WARNING: DMI table located in E820 RAM %08x-%08x. Fixed.\n", - base, base+len); + for ( ; ; ) + { + paddr_t base; + u32 len; + const char *what = dmi_get_table(&base, &len); + + if ( !what ) + break; + if ( ((base + len) > base) && + reserve_e820_ram(&e820, base, base + len) ) + printk("WARNING: %s table located in E820 RAM %"PRIpaddr"-%"PRIpaddr". Fixed.\n", + what, base, base + len); + } } static void __init machine_specific_memory_setup( diff --git a/xen/include/xen/dmi.h b/xen/include/xen/dmi.h index 8205893..e2fc76d 100644 --- a/xen/include/xen/dmi.h +++ b/xen/include/xen/dmi.h @@ -34,7 +34,7 @@ struct dmi_system_id { extern int dmi_check_system(struct dmi_system_id *list); extern void dmi_scan_machine(void); -extern int dmi_get_table(u32 *base, u32 *len); +extern const char *dmi_get_table(paddr_t *base, u32 *len); extern void dmi_efi_get_table(void *); bool_t dmi_get_date(int field, int *yearp, int *monthp, int *dayp); extern void dmi_end_boot(void); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed May 20 21:44:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2015 21:44: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 1YvBmv-00072f-Ah; Wed, 20 May 2015 21:44:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YvBmt-00072U-SR for xen-changelog@lists.xensource.com; Wed, 20 May 2015 21:44:27 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id A1/69-03275-B300D555; Wed, 20 May 2015 21:44:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1432158265!7346946!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2933 invoked from network); 20 May 2015 21:44:26 -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; 20 May 2015 21:44:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YvBmr-0003eH-C1 for xen-changelog@lists.xensource.com; Wed, 20 May 2015 21:44:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YvBmr-0000Cf-A6 for xen-changelog@lists.xensource.com; Wed, 20 May 2015 21:44:25 +0000 Date: Wed, 20 May 2015 21:44:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86_emulate: fix EFLAGS setting of CMPXCHG 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 6cd44b0be52cf00bfb26ea606187b046f166fcee Author: Eugene Korenevsky AuthorDate: Tue May 19 11:57:31 2015 +0200 Commit: Jan Beulich CommitDate: Tue May 19 11:57:31 2015 +0200 x86_emulate: fix EFLAGS setting of CMPXCHG emulation CMPXCHG sets CF, PF, AF, SF, and OF flags according to the results of the comparison the rAX with the operand of the instruction. rAX must be the first argument of the comparison (a minuend), the operand must be the second one (a subtrahend). Due to improper order of comparison arguments, CF, PF, AF, SF and OF flags were set incorrectly in the case of inequality. Need to swap them. Signed-off-by: Eugene Korenevsky test_x86_emulate: extend EFLAGS check of CMPXCHG test CMPXCHG: in the case of inequality of the rAX and the operand, need to check CF, PF, AF, SF and OF flags as well. This adjustment covers the fix of incorrect comparison during CMPXCHG emulation. Signed-off-by: Eugene Korenevsky master commit: 2232628ecbab42e7700287204daad71a3ce2208c master date: 2015-05-04 11:55:41 +0200 master commit: 20fd4b70a7647656812b8f276510e09b252db9f7 master date: 2015-05-04 12:03:19 +0200 --- tools/tests/x86_emulator/test_x86_emulator.c | 2 +- xen/arch/x86/x86_emulate/x86_emulate.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index 3166674..906fc6f 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -286,7 +286,7 @@ int main(int argc, char **argv) rc = x86_emulate(&ctxt, &emulops); if ( (rc != X86EMUL_OKAY) || (*res != 0x923456AA) || - ((regs.eflags&0x240) != 0x200) || + ((regs.eflags&0xad5) != 0xa91) || (regs.eax != 0xAABBCCAA) || (regs.ecx != 0xFF) || (regs.eip != (unsigned long)&instr[4]) ) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 219e143..4c90101 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -4257,7 +4257,8 @@ x86_emulate( /* Save real source value, then compare EAX against destination. */ src.orig_val = src.val; src.val = _regs.eax; - emulate_2op_SrcV("cmp", src, dst, _regs.eflags); + /* cmp: %%eax - dst ==> dst and src swapped for macro invocation */ + emulate_2op_SrcV("cmp", dst, src, _regs.eflags); if ( _regs.eflags & EFLG_ZF ) { /* Success: write back to memory. */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed May 20 21:44:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2015 21:44: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 1YvBmv-00072f-Ah; Wed, 20 May 2015 21:44:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YvBmt-00072U-SR for xen-changelog@lists.xensource.com; Wed, 20 May 2015 21:44:27 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id A1/69-03275-B300D555; Wed, 20 May 2015 21:44:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1432158265!7346946!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2933 invoked from network); 20 May 2015 21:44:26 -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; 20 May 2015 21:44:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YvBmr-0003eH-C1 for xen-changelog@lists.xensource.com; Wed, 20 May 2015 21:44:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YvBmr-0000Cf-A6 for xen-changelog@lists.xensource.com; Wed, 20 May 2015 21:44:25 +0000 Date: Wed, 20 May 2015 21:44:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86_emulate: fix EFLAGS setting of CMPXCHG 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 6cd44b0be52cf00bfb26ea606187b046f166fcee Author: Eugene Korenevsky AuthorDate: Tue May 19 11:57:31 2015 +0200 Commit: Jan Beulich CommitDate: Tue May 19 11:57:31 2015 +0200 x86_emulate: fix EFLAGS setting of CMPXCHG emulation CMPXCHG sets CF, PF, AF, SF, and OF flags according to the results of the comparison the rAX with the operand of the instruction. rAX must be the first argument of the comparison (a minuend), the operand must be the second one (a subtrahend). Due to improper order of comparison arguments, CF, PF, AF, SF and OF flags were set incorrectly in the case of inequality. Need to swap them. Signed-off-by: Eugene Korenevsky test_x86_emulate: extend EFLAGS check of CMPXCHG test CMPXCHG: in the case of inequality of the rAX and the operand, need to check CF, PF, AF, SF and OF flags as well. This adjustment covers the fix of incorrect comparison during CMPXCHG emulation. Signed-off-by: Eugene Korenevsky master commit: 2232628ecbab42e7700287204daad71a3ce2208c master date: 2015-05-04 11:55:41 +0200 master commit: 20fd4b70a7647656812b8f276510e09b252db9f7 master date: 2015-05-04 12:03:19 +0200 --- tools/tests/x86_emulator/test_x86_emulator.c | 2 +- xen/arch/x86/x86_emulate/x86_emulate.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index 3166674..906fc6f 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -286,7 +286,7 @@ int main(int argc, char **argv) rc = x86_emulate(&ctxt, &emulops); if ( (rc != X86EMUL_OKAY) || (*res != 0x923456AA) || - ((regs.eflags&0x240) != 0x200) || + ((regs.eflags&0xad5) != 0xa91) || (regs.eax != 0xAABBCCAA) || (regs.ecx != 0xFF) || (regs.eip != (unsigned long)&instr[4]) ) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 219e143..4c90101 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -4257,7 +4257,8 @@ x86_emulate( /* Save real source value, then compare EAX against destination. */ src.orig_val = src.val; src.val = _regs.eax; - emulate_2op_SrcV("cmp", src, dst, _regs.eflags); + /* cmp: %%eax - dst ==> dst and src swapped for macro invocation */ + emulate_2op_SrcV("cmp", dst, src, _regs.eflags); if ( _regs.eflags & EFLG_ZF ) { /* Success: write back to memory. */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed May 20 21:44:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2015 21:44: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 1YvBn6-00074Q-E5; Wed, 20 May 2015 21:44:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YvBn5-00074H-9d for xen-changelog@lists.xensource.com; Wed, 20 May 2015 21:44:39 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id C0/27-02788-6400D555; Wed, 20 May 2015 21:44:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1432158276!14719986!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4295 invoked from network); 20 May 2015 21:44:37 -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; 20 May 2015 21:44:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YvBn1-0003eP-NW for xen-changelog@lists.xensource.com; Wed, 20 May 2015 21:44:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YvBn1-0000DN-G5 for xen-changelog@lists.xensource.com; Wed, 20 May 2015 21:44:35 +0000 Date: Wed, 20 May 2015 21:44:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86: don't clear high 32 bits of RAX on sub-word guest I/O port 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 226059859e6f5a80a5a1728e5dc8ccde50e25f80 Author: Jan Beulich AuthorDate: Tue May 19 11:58:37 2015 +0200 Commit: Jan Beulich CommitDate: Tue May 19 11:58:37 2015 +0200 x86: don't clear high 32 bits of RAX on sub-word guest I/O port reads 1- or 2-byte operations never alter the high halves of registers. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 1191aa9d1988c469844eb4545689617a8b13eae1 master date: 2015-05-11 10:37:58 +0200 --- xen/arch/x86/traps.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 9b03c17..e44cd2d 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -2126,7 +2126,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) if ( op_bytes == 4 ) regs->eax = 0; else - regs->eax &= ~((1u << (op_bytes * 8)) - 1); + regs->eax &= ~((1 << (op_bytes * 8)) - 1); regs->eax |= guest_io_read(port, op_bytes, v, regs); } bpmatch = check_guest_io_breakpoint(v, port, op_bytes); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed May 20 21:44:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2015 21:44: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 1YvBn6-00074Q-E5; Wed, 20 May 2015 21:44:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YvBn5-00074H-9d for xen-changelog@lists.xensource.com; Wed, 20 May 2015 21:44:39 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id C0/27-02788-6400D555; Wed, 20 May 2015 21:44:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1432158276!14719986!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4295 invoked from network); 20 May 2015 21:44:37 -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; 20 May 2015 21:44:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YvBn1-0003eP-NW for xen-changelog@lists.xensource.com; Wed, 20 May 2015 21:44:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YvBn1-0000DN-G5 for xen-changelog@lists.xensource.com; Wed, 20 May 2015 21:44:35 +0000 Date: Wed, 20 May 2015 21:44:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86: don't clear high 32 bits of RAX on sub-word guest I/O port 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 226059859e6f5a80a5a1728e5dc8ccde50e25f80 Author: Jan Beulich AuthorDate: Tue May 19 11:58:37 2015 +0200 Commit: Jan Beulich CommitDate: Tue May 19 11:58:37 2015 +0200 x86: don't clear high 32 bits of RAX on sub-word guest I/O port reads 1- or 2-byte operations never alter the high halves of registers. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 1191aa9d1988c469844eb4545689617a8b13eae1 master date: 2015-05-11 10:37:58 +0200 --- xen/arch/x86/traps.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 9b03c17..e44cd2d 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -2126,7 +2126,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) if ( op_bytes == 4 ) regs->eax = 0; else - regs->eax &= ~((1u << (op_bytes * 8)) - 1); + regs->eax &= ~((1 << (op_bytes * 8)) - 1); regs->eax |= guest_io_read(port, op_bytes, v, regs); } bpmatch = check_guest_io_breakpoint(v, port, op_bytes); -- 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 Fri May 22 09:55:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 May 2015 09:55:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yvjfj-00052j-31; Fri, 22 May 2015 09:55:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yvjfi-00052c-CO for xen-changelog@lists.xensource.com; Fri, 22 May 2015 09:55:18 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id BE/CC-02948-50DFE555; Fri, 22 May 2015 09:55:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1432288516!11659996!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10328 invoked from network); 22 May 2015 09:55:17 -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; 22 May 2015 09:55:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yvjff-0002IA-RJ for xen-changelog@lists.xensource.com; Fri, 22 May 2015 09:55:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yvjff-0000TR-D3 for xen-changelog@lists.xensource.com; Fri, 22 May 2015 09:55:15 +0000 Date: Fri, 22 May 2015 09:55:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/hvm: actually release ioreq server pages X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8dbdcc391001e50fad177400c85f11a2739b9e25 Author: Paul Durrant AuthorDate: Tue May 19 11:44:59 2015 +0200 Commit: Jan Beulich CommitDate: Tue May 19 11:44:59 2015 +0200 x86/hvm: actually release ioreq server pages hvm_free_ioreq_gmfn has the sense of the ioreq_gmfn mask inverted; it needs to set a bit to release the gmfn, not clear it. Signed-off-by: Paul Durrant Reviewed-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: cb791b84e7c0adce14194647912c4c3d28cddc4a master date: 2015-04-24 12:13:48 +0200 --- xen/arch/x86/hvm/hvm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 55077f9..f835f7a 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -486,7 +486,7 @@ static void hvm_free_ioreq_gmfn(struct domain *d, unsigned long gmfn) { unsigned int i = gmfn - d->arch.hvm_domain.ioreq_gmfn.base; - clear_bit(i, &d->arch.hvm_domain.ioreq_gmfn.mask); + set_bit(i, &d->arch.hvm_domain.ioreq_gmfn.mask); } static void hvm_unmap_ioreq_page(struct hvm_ioreq_server *s, bool_t buf) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 22 09:55:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 May 2015 09:55:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yvjfj-00052j-31; Fri, 22 May 2015 09:55:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yvjfi-00052c-CO for xen-changelog@lists.xensource.com; Fri, 22 May 2015 09:55:18 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id BE/CC-02948-50DFE555; Fri, 22 May 2015 09:55:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1432288516!11659996!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10328 invoked from network); 22 May 2015 09:55:17 -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; 22 May 2015 09:55:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yvjff-0002IA-RJ for xen-changelog@lists.xensource.com; Fri, 22 May 2015 09:55:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yvjff-0000TR-D3 for xen-changelog@lists.xensource.com; Fri, 22 May 2015 09:55:15 +0000 Date: Fri, 22 May 2015 09:55:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/hvm: actually release ioreq server pages X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8dbdcc391001e50fad177400c85f11a2739b9e25 Author: Paul Durrant AuthorDate: Tue May 19 11:44:59 2015 +0200 Commit: Jan Beulich CommitDate: Tue May 19 11:44:59 2015 +0200 x86/hvm: actually release ioreq server pages hvm_free_ioreq_gmfn has the sense of the ioreq_gmfn mask inverted; it needs to set a bit to release the gmfn, not clear it. Signed-off-by: Paul Durrant Reviewed-by: Andrew Cooper Reviewed-by: Jan Beulich master commit: cb791b84e7c0adce14194647912c4c3d28cddc4a master date: 2015-04-24 12:13:48 +0200 --- xen/arch/x86/hvm/hvm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 55077f9..f835f7a 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -486,7 +486,7 @@ static void hvm_free_ioreq_gmfn(struct domain *d, unsigned long gmfn) { unsigned int i = gmfn - d->arch.hvm_domain.ioreq_gmfn.base; - clear_bit(i, &d->arch.hvm_domain.ioreq_gmfn.mask); + set_bit(i, &d->arch.hvm_domain.ioreq_gmfn.mask); } static void hvm_unmap_ioreq_page(struct hvm_ioreq_server *s, bool_t buf) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 22 09:55:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 May 2015 09:55:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yvjfg-00052X-0k; Fri, 22 May 2015 09:55:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yvjfe-00052S-SV for xen-changelog@lists.xensource.com; Fri, 22 May 2015 09:55:15 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id E1/84-02782-20DFE555; Fri, 22 May 2015 09:55:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1432288505!12068918!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21463 invoked from network); 22 May 2015 09:55:06 -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; 22 May 2015 09:55:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YvjfT-0002I7-9H for xen-changelog@lists.xensource.com; Fri, 22 May 2015 09:55:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YvjfT-0000Su-6O for xen-changelog@lists.xensource.com; Fri, 22 May 2015 09:55:03 +0000 Date: Fri, 22 May 2015 09:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/efi: reserve SMBIOS table region when EFI booting X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d0725109f73c1a400e39862c7eceac72b407b1b5 Author: Ross Lagerwall AuthorDate: Tue May 19 11:43:35 2015 +0200 Commit: Jan Beulich CommitDate: Tue May 19 11:43:35 2015 +0200 x86/efi: reserve SMBIOS table region when EFI booting Some EFI firmware implementations may place the SMBIOS table in RAM marked as BootServicesData, which Xen does not consider as reserved. When dom0 tries to access the SMBIOS, the region is not contained in the initial P2M and it crashes with a page fault. To fix this, reserve the SMBIOS region. Also, fix the memcmp checks for existence of the SMBIOS. Signed-off-by: Ross Lagerwall Reviewed-by: Jan Beulich master commit: bf68adcadaa2b0885c5d2f1c8e2e068e209eb041 master date: 2015-04-17 10:44:48 +0200 --- xen/arch/x86/dmi_scan.c | 67 +++++++++++++++++++++++++++++----------------- xen/arch/x86/e820.c | 18 +++++++++--- xen/include/xen/dmi.h | 2 +- 3 files changed, 56 insertions(+), 31 deletions(-) diff --git a/xen/arch/x86/dmi_scan.c b/xen/arch/x86/dmi_scan.c index 500133a..aaba5e7 100644 --- a/xen/arch/x86/dmi_scan.c +++ b/xen/arch/x86/dmi_scan.c @@ -127,6 +127,8 @@ static inline bool_t __init dmi_checksum(const void __iomem *buf, static u32 __initdata efi_dmi_address; static u32 __initdata efi_dmi_size; +static u32 __initdata efi_smbios_address; +static u32 __initdata efi_smbios_size; /* * Important: This function gets called while still in EFI @@ -136,39 +138,54 @@ void __init dmi_efi_get_table(void *smbios) { struct smbios_eps *eps = smbios; - if (memcmp(eps->anchor, "_SM_", 4) && - dmi_checksum(eps, eps->length) && - memcmp(eps->dmi.anchor, "_DMI_", 5) == 0 && - dmi_checksum(&eps->dmi, sizeof(eps->dmi))) { - efi_dmi_address = eps->dmi.address; - efi_dmi_size = eps->dmi.size; + if (memcmp(eps->anchor, "_SM_", 4) == 0 && + eps->length >= sizeof(*eps) && + dmi_checksum(eps, eps->length)) { + efi_smbios_address = (u32)(long)eps; + efi_smbios_size = eps->length; + + if (memcmp(eps->dmi.anchor, "_DMI_", 5) == 0 && + dmi_checksum(&eps->dmi, sizeof(eps->dmi))) { + efi_dmi_address = eps->dmi.address; + efi_dmi_size = eps->dmi.size; + } } } -int __init dmi_get_table(u32 *base, u32 *len) +const char *__init dmi_get_table(paddr_t *base, u32 *len) { - struct dmi_eps eps; - char __iomem *p, *q; + static unsigned int __initdata instance; if (efi_enabled) { - if (!efi_dmi_size) - return -1; - *base = efi_dmi_address; - *len = efi_dmi_size; - return 0; - } - - p = maddr_to_virt(0xF0000); - for (q = p; q < p + 0x10000; q += 16) { - memcpy_fromio(&eps, q, 15); - if (memcmp(eps.anchor, "_DMI_", 5) == 0 && - dmi_checksum(&eps, sizeof(eps))) { - *base = eps.address; - *len = eps.size; - return 0; + if (efi_dmi_size && !(instance & 2)) { + *base = efi_dmi_address; + *len = efi_dmi_size; + instance |= 2; + return "DMI"; + } + if (efi_smbios_size && !(instance & 4)) { + *base = efi_smbios_address; + *len = efi_smbios_size; + instance |= 4; + return "SMBIOS"; + } + } else { + char __iomem *p = maddr_to_virt(0xF0000), *q; + struct dmi_eps eps; + + for (q = p; q <= p + 0x10000 - sizeof(eps); q += 16) { + memcpy_fromio(&eps, q, sizeof(eps)); + if (!(instance & 1) && + memcmp(eps.anchor, "_DMI_", 5) == 0 && + dmi_checksum(&eps, sizeof(eps))) { + *base = eps.address; + *len = eps.size; + instance |= 1; + return "DMI"; + } } } - return -1; + return NULL; } static int __init _dmi_iterate(const struct dmi_eps *dmi, diff --git a/xen/arch/x86/e820.c b/xen/arch/x86/e820.c index bf84bae..743a375 100644 --- a/xen/arch/x86/e820.c +++ b/xen/arch/x86/e820.c @@ -504,11 +504,19 @@ static uint64_t __init mtrr_top_of_ram(void) static void __init reserve_dmi_region(void) { - u32 base, len; - if ( (dmi_get_table(&base, &len) == 0) && ((base + len) > base) && - reserve_e820_ram(&e820, base, base + len) ) - printk("WARNING: DMI table located in E820 RAM %08x-%08x. Fixed.\n", - base, base+len); + for ( ; ; ) + { + paddr_t base; + u32 len; + const char *what = dmi_get_table(&base, &len); + + if ( !what ) + break; + if ( ((base + len) > base) && + reserve_e820_ram(&e820, base, base + len) ) + printk("WARNING: %s table located in E820 RAM %"PRIpaddr"-%"PRIpaddr". Fixed.\n", + what, base, base + len); + } } static void __init machine_specific_memory_setup( diff --git a/xen/include/xen/dmi.h b/xen/include/xen/dmi.h index 8205893..e2fc76d 100644 --- a/xen/include/xen/dmi.h +++ b/xen/include/xen/dmi.h @@ -34,7 +34,7 @@ struct dmi_system_id { extern int dmi_check_system(struct dmi_system_id *list); extern void dmi_scan_machine(void); -extern int dmi_get_table(u32 *base, u32 *len); +extern const char *dmi_get_table(paddr_t *base, u32 *len); extern void dmi_efi_get_table(void *); bool_t dmi_get_date(int field, int *yearp, int *monthp, int *dayp); extern void dmi_end_boot(void); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 22 09:55:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 May 2015 09:55:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yvjfg-00052X-0k; Fri, 22 May 2015 09:55:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yvjfe-00052S-SV for xen-changelog@lists.xensource.com; Fri, 22 May 2015 09:55:15 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id E1/84-02782-20DFE555; Fri, 22 May 2015 09:55:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1432288505!12068918!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21463 invoked from network); 22 May 2015 09:55:06 -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; 22 May 2015 09:55:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YvjfT-0002I7-9H for xen-changelog@lists.xensource.com; Fri, 22 May 2015 09:55:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YvjfT-0000Su-6O for xen-changelog@lists.xensource.com; Fri, 22 May 2015 09:55:03 +0000 Date: Fri, 22 May 2015 09:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/efi: reserve SMBIOS table region when EFI booting X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d0725109f73c1a400e39862c7eceac72b407b1b5 Author: Ross Lagerwall AuthorDate: Tue May 19 11:43:35 2015 +0200 Commit: Jan Beulich CommitDate: Tue May 19 11:43:35 2015 +0200 x86/efi: reserve SMBIOS table region when EFI booting Some EFI firmware implementations may place the SMBIOS table in RAM marked as BootServicesData, which Xen does not consider as reserved. When dom0 tries to access the SMBIOS, the region is not contained in the initial P2M and it crashes with a page fault. To fix this, reserve the SMBIOS region. Also, fix the memcmp checks for existence of the SMBIOS. Signed-off-by: Ross Lagerwall Reviewed-by: Jan Beulich master commit: bf68adcadaa2b0885c5d2f1c8e2e068e209eb041 master date: 2015-04-17 10:44:48 +0200 --- xen/arch/x86/dmi_scan.c | 67 +++++++++++++++++++++++++++++----------------- xen/arch/x86/e820.c | 18 +++++++++--- xen/include/xen/dmi.h | 2 +- 3 files changed, 56 insertions(+), 31 deletions(-) diff --git a/xen/arch/x86/dmi_scan.c b/xen/arch/x86/dmi_scan.c index 500133a..aaba5e7 100644 --- a/xen/arch/x86/dmi_scan.c +++ b/xen/arch/x86/dmi_scan.c @@ -127,6 +127,8 @@ static inline bool_t __init dmi_checksum(const void __iomem *buf, static u32 __initdata efi_dmi_address; static u32 __initdata efi_dmi_size; +static u32 __initdata efi_smbios_address; +static u32 __initdata efi_smbios_size; /* * Important: This function gets called while still in EFI @@ -136,39 +138,54 @@ void __init dmi_efi_get_table(void *smbios) { struct smbios_eps *eps = smbios; - if (memcmp(eps->anchor, "_SM_", 4) && - dmi_checksum(eps, eps->length) && - memcmp(eps->dmi.anchor, "_DMI_", 5) == 0 && - dmi_checksum(&eps->dmi, sizeof(eps->dmi))) { - efi_dmi_address = eps->dmi.address; - efi_dmi_size = eps->dmi.size; + if (memcmp(eps->anchor, "_SM_", 4) == 0 && + eps->length >= sizeof(*eps) && + dmi_checksum(eps, eps->length)) { + efi_smbios_address = (u32)(long)eps; + efi_smbios_size = eps->length; + + if (memcmp(eps->dmi.anchor, "_DMI_", 5) == 0 && + dmi_checksum(&eps->dmi, sizeof(eps->dmi))) { + efi_dmi_address = eps->dmi.address; + efi_dmi_size = eps->dmi.size; + } } } -int __init dmi_get_table(u32 *base, u32 *len) +const char *__init dmi_get_table(paddr_t *base, u32 *len) { - struct dmi_eps eps; - char __iomem *p, *q; + static unsigned int __initdata instance; if (efi_enabled) { - if (!efi_dmi_size) - return -1; - *base = efi_dmi_address; - *len = efi_dmi_size; - return 0; - } - - p = maddr_to_virt(0xF0000); - for (q = p; q < p + 0x10000; q += 16) { - memcpy_fromio(&eps, q, 15); - if (memcmp(eps.anchor, "_DMI_", 5) == 0 && - dmi_checksum(&eps, sizeof(eps))) { - *base = eps.address; - *len = eps.size; - return 0; + if (efi_dmi_size && !(instance & 2)) { + *base = efi_dmi_address; + *len = efi_dmi_size; + instance |= 2; + return "DMI"; + } + if (efi_smbios_size && !(instance & 4)) { + *base = efi_smbios_address; + *len = efi_smbios_size; + instance |= 4; + return "SMBIOS"; + } + } else { + char __iomem *p = maddr_to_virt(0xF0000), *q; + struct dmi_eps eps; + + for (q = p; q <= p + 0x10000 - sizeof(eps); q += 16) { + memcpy_fromio(&eps, q, sizeof(eps)); + if (!(instance & 1) && + memcmp(eps.anchor, "_DMI_", 5) == 0 && + dmi_checksum(&eps, sizeof(eps))) { + *base = eps.address; + *len = eps.size; + instance |= 1; + return "DMI"; + } } } - return -1; + return NULL; } static int __init _dmi_iterate(const struct dmi_eps *dmi, diff --git a/xen/arch/x86/e820.c b/xen/arch/x86/e820.c index bf84bae..743a375 100644 --- a/xen/arch/x86/e820.c +++ b/xen/arch/x86/e820.c @@ -504,11 +504,19 @@ static uint64_t __init mtrr_top_of_ram(void) static void __init reserve_dmi_region(void) { - u32 base, len; - if ( (dmi_get_table(&base, &len) == 0) && ((base + len) > base) && - reserve_e820_ram(&e820, base, base + len) ) - printk("WARNING: DMI table located in E820 RAM %08x-%08x. Fixed.\n", - base, base+len); + for ( ; ; ) + { + paddr_t base; + u32 len; + const char *what = dmi_get_table(&base, &len); + + if ( !what ) + break; + if ( ((base + len) > base) && + reserve_e820_ram(&e820, base, base + len) ) + printk("WARNING: %s table located in E820 RAM %"PRIpaddr"-%"PRIpaddr". Fixed.\n", + what, base, base + len); + } } static void __init machine_specific_memory_setup( diff --git a/xen/include/xen/dmi.h b/xen/include/xen/dmi.h index 8205893..e2fc76d 100644 --- a/xen/include/xen/dmi.h +++ b/xen/include/xen/dmi.h @@ -34,7 +34,7 @@ struct dmi_system_id { extern int dmi_check_system(struct dmi_system_id *list); extern void dmi_scan_machine(void); -extern int dmi_get_table(u32 *base, u32 *len); +extern const char *dmi_get_table(paddr_t *base, u32 *len); extern void dmi_efi_get_table(void *); bool_t dmi_get_date(int field, int *yearp, int *monthp, int *dayp); extern void dmi_end_boot(void); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 22 09:55:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 May 2015 09: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 1Yvjfu-00054O-5c; Fri, 22 May 2015 09:55:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yvjfs-000546-Ib for xen-changelog@lists.xensource.com; Fri, 22 May 2015 09:55:28 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id A1/5A-02795-F0DFE555; Fri, 22 May 2015 09:55:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1432288526!19868522!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32336 invoked from network); 22 May 2015 09:55:27 -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; 22 May 2015 09:55:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yvjfp-0002IJ-Vl for xen-changelog@lists.xensource.com; Fri, 22 May 2015 09:55:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yvjfp-0000UC-Uk for xen-changelog@lists.xensource.com; Fri, 22 May 2015 09:55:25 +0000 Date: Fri, 22 May 2015 09:55:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/hvm: implicitly disable an ioreq server when it is destroyed X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f653b7fd6a876195ee99f021d735d5d1ae6bc330 Author: Paul Durrant AuthorDate: Tue May 19 11:45:34 2015 +0200 Commit: Jan Beulich CommitDate: Tue May 19 11:45:34 2015 +0200 x86/hvm: implicitly disable an ioreq server when it is destroyed Currently, unless a (non-default) ioreq server is explicitly disabled before being destroyed, its gmfns will not be placed back into the p2m but still released back into the ioreq_gmfn mask. This is somewhat counter-intuitive and easily remedied by this small patch. Signed-off-by: Paul Durrant Reviewed-by: Andrew Cooper master commit: ebd41901b96565b392e8d434a4c4ab543d5fb52b master date: 2015-04-24 12:14:23 +0200 --- xen/arch/x86/hvm/hvm.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index f835f7a..7d53c6c 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -960,6 +960,7 @@ static int hvm_ioreq_server_init(struct hvm_ioreq_server *s, struct domain *d, static void hvm_ioreq_server_deinit(struct hvm_ioreq_server *s, bool_t is_default) { + ASSERT(!s->enabled); hvm_ioreq_server_remove_all_vcpus(s); hvm_ioreq_server_unmap_pages(s, is_default); hvm_ioreq_server_free_rangesets(s, is_default); @@ -1062,6 +1063,8 @@ static int hvm_destroy_ioreq_server(struct domain *d, ioservid_t id) domain_pause(d); + hvm_ioreq_server_disable(s, 0); + list_del(&s->list_entry); hvm_ioreq_server_deinit(s, 0); @@ -1320,11 +1323,10 @@ static void hvm_destroy_all_ioreq_servers(struct domain *d) { bool_t is_default = (s == d->arch.hvm_domain.default_ioreq_server); + hvm_ioreq_server_disable(s, is_default); + if ( is_default ) - { - hvm_ioreq_server_disable(s, 1); d->arch.hvm_domain.default_ioreq_server = NULL; - } list_del(&s->list_entry); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 22 09:55:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 May 2015 09: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 1Yvjfu-00054O-5c; Fri, 22 May 2015 09:55:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yvjfs-000546-Ib for xen-changelog@lists.xensource.com; Fri, 22 May 2015 09:55:28 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id A1/5A-02795-F0DFE555; Fri, 22 May 2015 09:55:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1432288526!19868522!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32336 invoked from network); 22 May 2015 09:55:27 -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; 22 May 2015 09:55:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yvjfp-0002IJ-Vl for xen-changelog@lists.xensource.com; Fri, 22 May 2015 09:55:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yvjfp-0000UC-Uk for xen-changelog@lists.xensource.com; Fri, 22 May 2015 09:55:25 +0000 Date: Fri, 22 May 2015 09:55:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/hvm: implicitly disable an ioreq server when it is destroyed X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f653b7fd6a876195ee99f021d735d5d1ae6bc330 Author: Paul Durrant AuthorDate: Tue May 19 11:45:34 2015 +0200 Commit: Jan Beulich CommitDate: Tue May 19 11:45:34 2015 +0200 x86/hvm: implicitly disable an ioreq server when it is destroyed Currently, unless a (non-default) ioreq server is explicitly disabled before being destroyed, its gmfns will not be placed back into the p2m but still released back into the ioreq_gmfn mask. This is somewhat counter-intuitive and easily remedied by this small patch. Signed-off-by: Paul Durrant Reviewed-by: Andrew Cooper master commit: ebd41901b96565b392e8d434a4c4ab543d5fb52b master date: 2015-04-24 12:14:23 +0200 --- xen/arch/x86/hvm/hvm.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index f835f7a..7d53c6c 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -960,6 +960,7 @@ static int hvm_ioreq_server_init(struct hvm_ioreq_server *s, struct domain *d, static void hvm_ioreq_server_deinit(struct hvm_ioreq_server *s, bool_t is_default) { + ASSERT(!s->enabled); hvm_ioreq_server_remove_all_vcpus(s); hvm_ioreq_server_unmap_pages(s, is_default); hvm_ioreq_server_free_rangesets(s, is_default); @@ -1062,6 +1063,8 @@ static int hvm_destroy_ioreq_server(struct domain *d, ioservid_t id) domain_pause(d); + hvm_ioreq_server_disable(s, 0); + list_del(&s->list_entry); hvm_ioreq_server_deinit(s, 0); @@ -1320,11 +1323,10 @@ static void hvm_destroy_all_ioreq_servers(struct domain *d) { bool_t is_default = (s == d->arch.hvm_domain.default_ioreq_server); + hvm_ioreq_server_disable(s, is_default); + if ( is_default ) - { - hvm_ioreq_server_disable(s, 1); d->arch.hvm_domain.default_ioreq_server = NULL; - } list_del(&s->list_entry); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 22 09:55:46 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 May 2015 09:55:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YvjgA-00057I-N8; Fri, 22 May 2015 09:55:46 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yvjg9-00056i-GS for xen-changelog@lists.xensource.com; Fri, 22 May 2015 09:55:45 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id 1E/BD-02948-02DFE555; Fri, 22 May 2015 09:55:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1432288536!11551358!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10640 invoked from network); 22 May 2015 09:55:37 -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; 22 May 2015 09:55:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yvjg0-0002IU-4J for xen-changelog@lists.xensource.com; Fri, 22 May 2015 09:55:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yvjg0-0000Ue-2t for xen-changelog@lists.xensource.com; Fri, 22 May 2015 09:55:36 +0000 Date: Fri, 22 May 2015 09:55:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86_emulate: fix EFLAGS setting of CMPXCHG 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 a824bf9daff246d8b6a269028fb7c391917cad24 Author: Eugene Korenevsky AuthorDate: Tue May 19 11:46:31 2015 +0200 Commit: Jan Beulich CommitDate: Tue May 19 11:46:31 2015 +0200 x86_emulate: fix EFLAGS setting of CMPXCHG emulation CMPXCHG sets CF, PF, AF, SF, and OF flags according to the results of the comparison the rAX with the operand of the instruction. rAX must be the first argument of the comparison (a minuend), the operand must be the second one (a subtrahend). Due to improper order of comparison arguments, CF, PF, AF, SF and OF flags were set incorrectly in the case of inequality. Need to swap them. Signed-off-by: Eugene Korenevsky # Commit 20fd4b70a7647656812b8f276510e09b252db9f7 # Date 2015-05-04 12:03:19 +0200 # Author Eugene Korenevsky # Committer Jan Beulich test_x86_emulate: extend EFLAGS check of CMPXCHG test CMPXCHG: in the case of inequality of the rAX and the operand, need to check CF, PF, AF, SF and OF flags as well. This adjustment covers the fix of incorrect comparison during CMPXCHG emulation. Signed-off-by: Eugene Korenevsky master commit: 2232628ecbab42e7700287204daad71a3ce2208c master date: 2015-05-04 11:55:41 +0200 master commit: 20fd4b70a7647656812b8f276510e09b252db9f7 master date: 2015-05-04 12:03:19 +0200 --- tools/tests/x86_emulator/test_x86_emulator.c | 2 +- xen/arch/x86/x86_emulate/x86_emulate.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index 6f67fc7..347d5f9 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -288,7 +288,7 @@ int main(int argc, char **argv) rc = x86_emulate(&ctxt, &emulops); if ( (rc != X86EMUL_OKAY) || (*res != 0x923456AA) || - ((regs.eflags&0x240) != 0x200) || + ((regs.eflags&0xad5) != 0xa91) || (regs.eax != 0xAABBCCAA) || (regs.ecx != 0xFF) || (regs.eip != (unsigned long)&instr[4]) ) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 656a06f..3e8335e 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -4346,7 +4346,8 @@ x86_emulate( /* Save real source value, then compare EAX against destination. */ src.orig_val = src.val; src.val = _regs.eax; - emulate_2op_SrcV("cmp", src, dst, _regs.eflags); + /* cmp: %%eax - dst ==> dst and src swapped for macro invocation */ + emulate_2op_SrcV("cmp", dst, src, _regs.eflags); if ( _regs.eflags & EFLG_ZF ) { /* Success: write back to memory. */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 22 09:55:46 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 May 2015 09:55:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YvjgA-00057I-N8; Fri, 22 May 2015 09:55:46 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yvjg9-00056i-GS for xen-changelog@lists.xensource.com; Fri, 22 May 2015 09:55:45 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id 1E/BD-02948-02DFE555; Fri, 22 May 2015 09:55:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1432288536!11551358!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10640 invoked from network); 22 May 2015 09:55:37 -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; 22 May 2015 09:55:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yvjg0-0002IU-4J for xen-changelog@lists.xensource.com; Fri, 22 May 2015 09:55:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yvjg0-0000Ue-2t for xen-changelog@lists.xensource.com; Fri, 22 May 2015 09:55:36 +0000 Date: Fri, 22 May 2015 09:55:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86_emulate: fix EFLAGS setting of CMPXCHG 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 a824bf9daff246d8b6a269028fb7c391917cad24 Author: Eugene Korenevsky AuthorDate: Tue May 19 11:46:31 2015 +0200 Commit: Jan Beulich CommitDate: Tue May 19 11:46:31 2015 +0200 x86_emulate: fix EFLAGS setting of CMPXCHG emulation CMPXCHG sets CF, PF, AF, SF, and OF flags according to the results of the comparison the rAX with the operand of the instruction. rAX must be the first argument of the comparison (a minuend), the operand must be the second one (a subtrahend). Due to improper order of comparison arguments, CF, PF, AF, SF and OF flags were set incorrectly in the case of inequality. Need to swap them. Signed-off-by: Eugene Korenevsky # Commit 20fd4b70a7647656812b8f276510e09b252db9f7 # Date 2015-05-04 12:03:19 +0200 # Author Eugene Korenevsky # Committer Jan Beulich test_x86_emulate: extend EFLAGS check of CMPXCHG test CMPXCHG: in the case of inequality of the rAX and the operand, need to check CF, PF, AF, SF and OF flags as well. This adjustment covers the fix of incorrect comparison during CMPXCHG emulation. Signed-off-by: Eugene Korenevsky master commit: 2232628ecbab42e7700287204daad71a3ce2208c master date: 2015-05-04 11:55:41 +0200 master commit: 20fd4b70a7647656812b8f276510e09b252db9f7 master date: 2015-05-04 12:03:19 +0200 --- tools/tests/x86_emulator/test_x86_emulator.c | 2 +- xen/arch/x86/x86_emulate/x86_emulate.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index 6f67fc7..347d5f9 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -288,7 +288,7 @@ int main(int argc, char **argv) rc = x86_emulate(&ctxt, &emulops); if ( (rc != X86EMUL_OKAY) || (*res != 0x923456AA) || - ((regs.eflags&0x240) != 0x200) || + ((regs.eflags&0xad5) != 0xa91) || (regs.eax != 0xAABBCCAA) || (regs.ecx != 0xFF) || (regs.eip != (unsigned long)&instr[4]) ) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 656a06f..3e8335e 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -4346,7 +4346,8 @@ x86_emulate( /* Save real source value, then compare EAX against destination. */ src.orig_val = src.val; src.val = _regs.eax; - emulate_2op_SrcV("cmp", src, dst, _regs.eflags); + /* cmp: %%eax - dst ==> dst and src swapped for macro invocation */ + emulate_2op_SrcV("cmp", dst, src, _regs.eflags); if ( _regs.eflags & EFLG_ZF ) { /* Success: write back to memory. */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 22 09:55:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 May 2015 09: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 1YvjgD-00058R-QI; Fri, 22 May 2015 09: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 1YvjgC-000582-Kc for xen-changelog@lists.xensource.com; Fri, 22 May 2015 09:55:48 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 89/38-02776-32DFE555; Fri, 22 May 2015 09:55:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1432288546!7178689!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13712 invoked from network); 22 May 2015 09:55:47 -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; 22 May 2015 09:55:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YvjgA-0002IX-9f for xen-changelog@lists.xensource.com; Fri, 22 May 2015 09:55:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YvjgA-0000V2-6v for xen-changelog@lists.xensource.com; Fri, 22 May 2015 09:55:46 +0000 Date: Fri, 22 May 2015 09:55:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86: don't clear high 32 bits of RAX on sub-word guest I/O port 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 bf30232bf17ad2cdf55d50a98759ee45c0ad00e0 Author: Jan Beulich AuthorDate: Tue May 19 11:47:13 2015 +0200 Commit: Jan Beulich CommitDate: Tue May 19 11:47:13 2015 +0200 x86: don't clear high 32 bits of RAX on sub-word guest I/O port reads 1- or 2-byte operations never alter the high halves of registers. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 1191aa9d1988c469844eb4545689617a8b13eae1 master date: 2015-05-11 10:37:58 +0200 --- xen/arch/x86/traps.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 61316ba..c037b00 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -2174,7 +2174,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) if ( op_bytes == 4 ) regs->eax = 0; else - regs->eax &= ~((1u << (op_bytes * 8)) - 1); + regs->eax &= ~((1 << (op_bytes * 8)) - 1); regs->eax |= guest_io_read(port, op_bytes, v, regs); } bpmatch = check_guest_io_breakpoint(v, port, op_bytes); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 22 09:55:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 May 2015 09: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 1YvjgD-00058R-QI; Fri, 22 May 2015 09: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 1YvjgC-000582-Kc for xen-changelog@lists.xensource.com; Fri, 22 May 2015 09:55:48 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 89/38-02776-32DFE555; Fri, 22 May 2015 09:55:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1432288546!7178689!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13712 invoked from network); 22 May 2015 09:55:47 -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; 22 May 2015 09:55:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YvjgA-0002IX-9f for xen-changelog@lists.xensource.com; Fri, 22 May 2015 09:55:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YvjgA-0000V2-6v for xen-changelog@lists.xensource.com; Fri, 22 May 2015 09:55:46 +0000 Date: Fri, 22 May 2015 09:55:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86: don't clear high 32 bits of RAX on sub-word guest I/O port 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 bf30232bf17ad2cdf55d50a98759ee45c0ad00e0 Author: Jan Beulich AuthorDate: Tue May 19 11:47:13 2015 +0200 Commit: Jan Beulich CommitDate: Tue May 19 11:47:13 2015 +0200 x86: don't clear high 32 bits of RAX on sub-word guest I/O port reads 1- or 2-byte operations never alter the high halves of registers. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 1191aa9d1988c469844eb4545689617a8b13eae1 master date: 2015-05-11 10:37:58 +0200 --- xen/arch/x86/traps.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 61316ba..c037b00 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -2174,7 +2174,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) if ( op_bytes == 4 ) regs->eax = 0; else - regs->eax &= ~((1u << (op_bytes * 8)) - 1); + regs->eax &= ~((1 << (op_bytes * 8)) - 1); regs->eax |= guest_io_read(port, op_bytes, v, regs); } bpmatch = check_guest_io_breakpoint(v, port, op_bytes); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 22 09:56:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 May 2015 09: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 1YvjgO-0005BB-TK; Fri, 22 May 2015 09:56:00 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YvjgM-0005At-US for xen-changelog@lists.xensource.com; Fri, 22 May 2015 09:55:59 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id CC/CD-02797-E2DFE555; Fri, 22 May 2015 09:55:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1432288556!11611752!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17909 invoked from network); 22 May 2015 09:55:57 -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; 22 May 2015 09:55:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YvjgK-0002Ij-DN for xen-changelog@lists.xensource.com; Fri, 22 May 2015 09:55:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YvjgK-0000WB-CV for xen-changelog@lists.xensource.com; Fri, 22 May 2015 09:55:56 +0000 Date: Fri, 22 May 2015 09:55:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86: don't change affinity with interrupt unmasked X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ddfe333aef87e6c5f52b84c8beb3277be4663313 Author: Jan Beulich AuthorDate: Tue May 19 12:00:09 2015 +0200 Commit: Jan Beulich CommitDate: Tue May 19 12:00:09 2015 +0200 x86: don't change affinity with interrupt unmasked With ->startup unmasking the IRQ, setting the affinity afterwards without masking the IRQ again is invalid namely for MSI (address and data can't be updated atomically and may - at least for MSI-X - be cached while unmasked). Signed-off-by: Jan Beulich Reviewed-by: Konrad Rzeszutek Wilk Reviewed-by: Andrew Cooper AMD IOMMU: only translate remapped IO-APIC RTEs 1aeb1156fa ("x86 don't change affinity with interrupt unmasked") introducing RTE reads prior to the respective interrupt having got enabled for the first time uncovered a bug in 2ca9fbd739 ("AMD IOMMU: allocate IRTE entries instead of using a static mapping"): We obviously shouldn't be translating RTEs for which remapping didn't get set up yet. Reported-by: Sander Eikelenboom Signed-off-by: Jan Beulich Acked-by: Suravee Suthikulpanit master commit: 1aeb1156fa43fe2cd2b5003995b20466cd19a622 master date: 2015-03-26 11:18:28 +0100 master commit: c33c51b81c82a51515bf4fa2a9717098c03e5013 master date: 2015-04-24 12:06:26 +0200 --- xen/arch/x86/irq.c | 5 +++-- xen/drivers/passthrough/amd/iommu_intr.c | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 84738e5..3cf6777 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -1608,12 +1608,13 @@ int pirq_guest_bind(struct vcpu *v, struct pirq *pirq, int will_share) init_timer(&action->eoi_timer, irq_guest_eoi_timer_fn, desc, 0); desc->status |= IRQ_GUEST; - desc->status &= ~IRQ_DISABLED; - desc->handler->startup(desc); /* Attempt to bind the interrupt target to the correct CPU. */ if ( !opt_noirqbalance && (desc->handler->set_affinity != NULL) ) desc->handler->set_affinity(desc, cpumask_of(v->processor)); + + desc->status &= ~IRQ_DISABLED; + desc->handler->startup(desc); } else if ( !will_share || !action->shareable ) { diff --git a/xen/drivers/passthrough/amd/iommu_intr.c b/xen/drivers/passthrough/amd/iommu_intr.c index c1b76fb..18d8b5f 100644 --- a/xen/drivers/passthrough/amd/iommu_intr.c +++ b/xen/drivers/passthrough/amd/iommu_intr.c @@ -365,15 +365,17 @@ unsigned int amd_iommu_read_ioapic_from_ire( unsigned int apic, unsigned int reg) { unsigned int val = __io_apic_read(apic, reg); + unsigned int pin = (reg - 0x10) / 2; + unsigned int offset = ioapic_sbdf[IO_APIC_ID(apic)].pin_2_idx[pin]; - if ( !(reg & 1) ) + if ( !(reg & 1) && offset < INTREMAP_ENTRIES ) { - unsigned int offset = val & (INTREMAP_ENTRIES - 1); u16 bdf = ioapic_sbdf[IO_APIC_ID(apic)].bdf; u16 seg = ioapic_sbdf[IO_APIC_ID(apic)].seg; u16 req_id = get_intremap_requestor_id(seg, bdf); const u32 *entry = get_intremap_entry(seg, req_id, offset); + ASSERT(offset == (val & (INTREMAP_ENTRIES - 1))); val &= ~(INTREMAP_ENTRIES - 1); val |= get_field_from_reg_u32(*entry, INT_REMAP_ENTRY_INTTYPE_MASK, -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 22 09:56:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 May 2015 09: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 1YvjgO-0005BB-TK; Fri, 22 May 2015 09:56:00 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YvjgM-0005At-US for xen-changelog@lists.xensource.com; Fri, 22 May 2015 09:55:59 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id CC/CD-02797-E2DFE555; Fri, 22 May 2015 09:55:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1432288556!11611752!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17909 invoked from network); 22 May 2015 09:55:57 -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; 22 May 2015 09:55:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YvjgK-0002Ij-DN for xen-changelog@lists.xensource.com; Fri, 22 May 2015 09:55:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YvjgK-0000WB-CV for xen-changelog@lists.xensource.com; Fri, 22 May 2015 09:55:56 +0000 Date: Fri, 22 May 2015 09:55:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86: don't change affinity with interrupt unmasked X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ddfe333aef87e6c5f52b84c8beb3277be4663313 Author: Jan Beulich AuthorDate: Tue May 19 12:00:09 2015 +0200 Commit: Jan Beulich CommitDate: Tue May 19 12:00:09 2015 +0200 x86: don't change affinity with interrupt unmasked With ->startup unmasking the IRQ, setting the affinity afterwards without masking the IRQ again is invalid namely for MSI (address and data can't be updated atomically and may - at least for MSI-X - be cached while unmasked). Signed-off-by: Jan Beulich Reviewed-by: Konrad Rzeszutek Wilk Reviewed-by: Andrew Cooper AMD IOMMU: only translate remapped IO-APIC RTEs 1aeb1156fa ("x86 don't change affinity with interrupt unmasked") introducing RTE reads prior to the respective interrupt having got enabled for the first time uncovered a bug in 2ca9fbd739 ("AMD IOMMU: allocate IRTE entries instead of using a static mapping"): We obviously shouldn't be translating RTEs for which remapping didn't get set up yet. Reported-by: Sander Eikelenboom Signed-off-by: Jan Beulich Acked-by: Suravee Suthikulpanit master commit: 1aeb1156fa43fe2cd2b5003995b20466cd19a622 master date: 2015-03-26 11:18:28 +0100 master commit: c33c51b81c82a51515bf4fa2a9717098c03e5013 master date: 2015-04-24 12:06:26 +0200 --- xen/arch/x86/irq.c | 5 +++-- xen/drivers/passthrough/amd/iommu_intr.c | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 84738e5..3cf6777 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -1608,12 +1608,13 @@ int pirq_guest_bind(struct vcpu *v, struct pirq *pirq, int will_share) init_timer(&action->eoi_timer, irq_guest_eoi_timer_fn, desc, 0); desc->status |= IRQ_GUEST; - desc->status &= ~IRQ_DISABLED; - desc->handler->startup(desc); /* Attempt to bind the interrupt target to the correct CPU. */ if ( !opt_noirqbalance && (desc->handler->set_affinity != NULL) ) desc->handler->set_affinity(desc, cpumask_of(v->processor)); + + desc->status &= ~IRQ_DISABLED; + desc->handler->startup(desc); } else if ( !will_share || !action->shareable ) { diff --git a/xen/drivers/passthrough/amd/iommu_intr.c b/xen/drivers/passthrough/amd/iommu_intr.c index c1b76fb..18d8b5f 100644 --- a/xen/drivers/passthrough/amd/iommu_intr.c +++ b/xen/drivers/passthrough/amd/iommu_intr.c @@ -365,15 +365,17 @@ unsigned int amd_iommu_read_ioapic_from_ire( unsigned int apic, unsigned int reg) { unsigned int val = __io_apic_read(apic, reg); + unsigned int pin = (reg - 0x10) / 2; + unsigned int offset = ioapic_sbdf[IO_APIC_ID(apic)].pin_2_idx[pin]; - if ( !(reg & 1) ) + if ( !(reg & 1) && offset < INTREMAP_ENTRIES ) { - unsigned int offset = val & (INTREMAP_ENTRIES - 1); u16 bdf = ioapic_sbdf[IO_APIC_ID(apic)].bdf; u16 seg = ioapic_sbdf[IO_APIC_ID(apic)].seg; u16 req_id = get_intremap_requestor_id(seg, bdf); const u32 *entry = get_intremap_entry(seg, req_id, offset); + ASSERT(offset == (val & (INTREMAP_ENTRIES - 1))); val &= ~(INTREMAP_ENTRIES - 1); val |= get_field_from_reg_u32(*entry, INT_REMAP_ENTRY_INTTYPE_MASK, -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed May 27 15:55:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 27 May 2015 15:55: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 1Yxdfh-00046W-Mm; Wed, 27 May 2015 15: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 1Yxdff-00046O-Vk for xen-changelog@lists.xensource.com; Wed, 27 May 2015 15:55:08 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 17/7B-23832-BD8E5655; Wed, 27 May 2015 15:55:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1432742105!13108503!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6323 invoked from network); 27 May 2015 15:55:06 -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; 27 May 2015 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 1Yxdfb-0001rh-Gl for xen-changelog@lists.xensource.com; Wed, 27 May 2015 15:55:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yxdfa-0002X1-Mp for xen-changelog@lists.xensource.com; Wed, 27 May 2015 15:55:02 +0000 Date: Wed, 27 May 2015 15:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] fdc: force the fifo access to be in bounds of the allocated buffer X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4de1422ea306832b6ef2cba34e9febb73dd139a7 Author: Petr Matousek AuthorDate: Wed May 6 09:48:59 2015 +0200 Commit: Ian Jackson CommitDate: Wed May 27 16:47:38 2015 +0100 fdc: force the fifo access to be in bounds of the allocated buffer During processing of certain commands such as FD_CMD_READ_ID and FD_CMD_DRIVE_SPECIFICATION_COMMAND the fifo memory access could get out of bounds leading to memory corruption with values coming from the guest. Fix this by making sure that the index is always bounded by the allocated memory. This is XSA-133 / CVE-2015-3456. Signed-off-by: Petr Matousek Reviewed-by: John Snow --- hw/fdc.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index b00a4ec..aba02e4 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -1318,7 +1318,7 @@ static uint32_t fdctrl_read_data (fdctrl_t *fdctrl) { fdrive_t *cur_drv; uint32_t retval = 0; - int pos; + uint32_t pos; cur_drv = get_cur_drv(fdctrl); fdctrl->dsr &= ~FD_DSR_PWRDOWN; @@ -1327,8 +1327,8 @@ static uint32_t fdctrl_read_data (fdctrl_t *fdctrl) return 0; } pos = fdctrl->data_pos; + pos %= FD_SECTOR_LEN; if (fdctrl->msr & FD_MSR_NONDMA) { - pos %= FD_SECTOR_LEN; if (pos == 0) { if (fdctrl->data_pos != 0) if (!fdctrl_seek_to_next_sect(fdctrl, cur_drv)) { @@ -1673,10 +1673,13 @@ static void fdctrl_handle_option (fdctrl_t *fdctrl, int direction) static void fdctrl_handle_drive_specification_command (fdctrl_t *fdctrl, int direction) { fdrive_t *cur_drv = get_cur_drv(fdctrl); + uint32_t pos; - if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x80) { + pos = fdctrl->data_pos - 1; + pos %= FD_SECTOR_LEN; + if (fdctrl->fifo[pos] & 0x80) { /* Command parameters done */ - if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x40) { + if (fdctrl->fifo[pos] & 0x40) { fdctrl->fifo[0] = fdctrl->fifo[1]; fdctrl->fifo[2] = 0; fdctrl->fifo[3] = 0; @@ -1771,7 +1774,7 @@ static uint8_t command_to_handler[256]; static void fdctrl_write_data (fdctrl_t *fdctrl, uint32_t value) { fdrive_t *cur_drv; - int pos; + uint32_t pos; /* Reset mode */ if (!(fdctrl->dor & FD_DOR_nRESET)) { @@ -1817,7 +1820,9 @@ static void fdctrl_write_data (fdctrl_t *fdctrl, uint32_t value) } FLOPPY_DPRINTF("%s: %02x\n", __func__, value); - fdctrl->fifo[fdctrl->data_pos++] = value; + pos = fdctrl->data_pos++; + pos %= FD_SECTOR_LEN; + fdctrl->fifo[pos] = value; if (fdctrl->data_pos == fdctrl->data_len) { /* We now have all parameters * and will be able to treat the command -- generated by git-patchbot for /home/xen/git/qemu-xen-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed May 27 15:55:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 27 May 2015 15:55: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 1Yxdfh-00046W-Mm; Wed, 27 May 2015 15: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 1Yxdff-00046O-Vk for xen-changelog@lists.xensource.com; Wed, 27 May 2015 15:55:08 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 17/7B-23832-BD8E5655; Wed, 27 May 2015 15:55:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1432742105!13108503!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6323 invoked from network); 27 May 2015 15:55:06 -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; 27 May 2015 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 1Yxdfb-0001rh-Gl for xen-changelog@lists.xensource.com; Wed, 27 May 2015 15:55:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yxdfa-0002X1-Mp for xen-changelog@lists.xensource.com; Wed, 27 May 2015 15:55:02 +0000 Date: Wed, 27 May 2015 15:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] fdc: force the fifo access to be in bounds of the allocated buffer X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4de1422ea306832b6ef2cba34e9febb73dd139a7 Author: Petr Matousek AuthorDate: Wed May 6 09:48:59 2015 +0200 Commit: Ian Jackson CommitDate: Wed May 27 16:47:38 2015 +0100 fdc: force the fifo access to be in bounds of the allocated buffer During processing of certain commands such as FD_CMD_READ_ID and FD_CMD_DRIVE_SPECIFICATION_COMMAND the fifo memory access could get out of bounds leading to memory corruption with values coming from the guest. Fix this by making sure that the index is always bounded by the allocated memory. This is XSA-133 / CVE-2015-3456. Signed-off-by: Petr Matousek Reviewed-by: John Snow --- hw/fdc.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index b00a4ec..aba02e4 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -1318,7 +1318,7 @@ static uint32_t fdctrl_read_data (fdctrl_t *fdctrl) { fdrive_t *cur_drv; uint32_t retval = 0; - int pos; + uint32_t pos; cur_drv = get_cur_drv(fdctrl); fdctrl->dsr &= ~FD_DSR_PWRDOWN; @@ -1327,8 +1327,8 @@ static uint32_t fdctrl_read_data (fdctrl_t *fdctrl) return 0; } pos = fdctrl->data_pos; + pos %= FD_SECTOR_LEN; if (fdctrl->msr & FD_MSR_NONDMA) { - pos %= FD_SECTOR_LEN; if (pos == 0) { if (fdctrl->data_pos != 0) if (!fdctrl_seek_to_next_sect(fdctrl, cur_drv)) { @@ -1673,10 +1673,13 @@ static void fdctrl_handle_option (fdctrl_t *fdctrl, int direction) static void fdctrl_handle_drive_specification_command (fdctrl_t *fdctrl, int direction) { fdrive_t *cur_drv = get_cur_drv(fdctrl); + uint32_t pos; - if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x80) { + pos = fdctrl->data_pos - 1; + pos %= FD_SECTOR_LEN; + if (fdctrl->fifo[pos] & 0x80) { /* Command parameters done */ - if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x40) { + if (fdctrl->fifo[pos] & 0x40) { fdctrl->fifo[0] = fdctrl->fifo[1]; fdctrl->fifo[2] = 0; fdctrl->fifo[3] = 0; @@ -1771,7 +1774,7 @@ static uint8_t command_to_handler[256]; static void fdctrl_write_data (fdctrl_t *fdctrl, uint32_t value) { fdrive_t *cur_drv; - int pos; + uint32_t pos; /* Reset mode */ if (!(fdctrl->dor & FD_DOR_nRESET)) { @@ -1817,7 +1820,9 @@ static void fdctrl_write_data (fdctrl_t *fdctrl, uint32_t value) } FLOPPY_DPRINTF("%s: %02x\n", __func__, value); - fdctrl->fifo[fdctrl->data_pos++] = value; + pos = fdctrl->data_pos++; + pos %= FD_SECTOR_LEN; + fdctrl->fifo[pos] = value; if (fdctrl->data_pos == fdctrl->data_len) { /* We now have all parameters * and will be able to treat the command -- generated by git-patchbot for /home/xen/git/qemu-xen-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed May 27 16:00:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 27 May 2015 16:00: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 1Yxdka-0005lh-BC; Wed, 27 May 2015 16:00:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YxdkY-0005lc-Gw for xen-changelog@lists.xensource.com; Wed, 27 May 2015 16:00:10 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 47/0E-03026-90AE5655; Wed, 27 May 2015 16:00:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1432742408!13177543!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15155 invoked from network); 27 May 2015 16:00:09 -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; 27 May 2015 16:00:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YxdkV-0002Fc-SB for xen-changelog@lists.xensource.com; Wed, 27 May 2015 16:00:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YxdkU-0002pT-Nl for xen-changelog@lists.xensource.com; Wed, 27 May 2015 16:00:07 +0000 Date: Wed, 27 May 2015 16:00:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.2-testing] fdc: force the fifo access to be in bounds of the allocated buffer X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 63a2748f7a97462c9d967daaabaeb5749aee24ea Author: Petr Matousek AuthorDate: Wed May 6 09:48:59 2015 +0200 Commit: Ian Jackson CommitDate: Wed May 27 16:57:06 2015 +0100 fdc: force the fifo access to be in bounds of the allocated buffer During processing of certain commands such as FD_CMD_READ_ID and FD_CMD_DRIVE_SPECIFICATION_COMMAND the fifo memory access could get out of bounds leading to memory corruption with values coming from the guest. Fix this by making sure that the index is always bounded by the allocated memory. This is XSA-133 / CVE-2015-3456. Signed-off-by: Petr Matousek Reviewed-by: John Snow (cherry picked from commit 4de1422ea306832b6ef2cba34e9febb73dd139a7) (cherry picked from commit e42b84cf1c524d017208b981c7749dc5945dda72) (cherry picked from commit c8c6ba08684f2fb8600df479b49c5511d6fed41a) (cherry picked from commit c545d0dfcc5ab5e69d0eabc14ec101293236055c) --- hw/fdc.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index b00a4ec..aba02e4 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -1318,7 +1318,7 @@ static uint32_t fdctrl_read_data (fdctrl_t *fdctrl) { fdrive_t *cur_drv; uint32_t retval = 0; - int pos; + uint32_t pos; cur_drv = get_cur_drv(fdctrl); fdctrl->dsr &= ~FD_DSR_PWRDOWN; @@ -1327,8 +1327,8 @@ static uint32_t fdctrl_read_data (fdctrl_t *fdctrl) return 0; } pos = fdctrl->data_pos; + pos %= FD_SECTOR_LEN; if (fdctrl->msr & FD_MSR_NONDMA) { - pos %= FD_SECTOR_LEN; if (pos == 0) { if (fdctrl->data_pos != 0) if (!fdctrl_seek_to_next_sect(fdctrl, cur_drv)) { @@ -1673,10 +1673,13 @@ static void fdctrl_handle_option (fdctrl_t *fdctrl, int direction) static void fdctrl_handle_drive_specification_command (fdctrl_t *fdctrl, int direction) { fdrive_t *cur_drv = get_cur_drv(fdctrl); + uint32_t pos; - if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x80) { + pos = fdctrl->data_pos - 1; + pos %= FD_SECTOR_LEN; + if (fdctrl->fifo[pos] & 0x80) { /* Command parameters done */ - if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x40) { + if (fdctrl->fifo[pos] & 0x40) { fdctrl->fifo[0] = fdctrl->fifo[1]; fdctrl->fifo[2] = 0; fdctrl->fifo[3] = 0; @@ -1771,7 +1774,7 @@ static uint8_t command_to_handler[256]; static void fdctrl_write_data (fdctrl_t *fdctrl, uint32_t value) { fdrive_t *cur_drv; - int pos; + uint32_t pos; /* Reset mode */ if (!(fdctrl->dor & FD_DOR_nRESET)) { @@ -1817,7 +1820,9 @@ static void fdctrl_write_data (fdctrl_t *fdctrl, uint32_t value) } FLOPPY_DPRINTF("%s: %02x\n", __func__, value); - fdctrl->fifo[fdctrl->data_pos++] = value; + pos = fdctrl->data_pos++; + pos %= FD_SECTOR_LEN; + fdctrl->fifo[pos] = value; if (fdctrl->data_pos == fdctrl->data_len) { /* We now have all parameters * and will be able to treat the command -- generated by git-patchbot for /home/xen/git/qemu-xen-4.2-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed May 27 16:00:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 27 May 2015 16:00: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 1Yxdka-0005lh-BC; Wed, 27 May 2015 16:00:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YxdkY-0005lc-Gw for xen-changelog@lists.xensource.com; Wed, 27 May 2015 16:00:10 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 47/0E-03026-90AE5655; Wed, 27 May 2015 16:00:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1432742408!13177543!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15155 invoked from network); 27 May 2015 16:00:09 -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; 27 May 2015 16:00:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YxdkV-0002Fc-SB for xen-changelog@lists.xensource.com; Wed, 27 May 2015 16:00:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YxdkU-0002pT-Nl for xen-changelog@lists.xensource.com; Wed, 27 May 2015 16:00:07 +0000 Date: Wed, 27 May 2015 16:00:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.2-testing] fdc: force the fifo access to be in bounds of the allocated buffer X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 63a2748f7a97462c9d967daaabaeb5749aee24ea Author: Petr Matousek AuthorDate: Wed May 6 09:48:59 2015 +0200 Commit: Ian Jackson CommitDate: Wed May 27 16:57:06 2015 +0100 fdc: force the fifo access to be in bounds of the allocated buffer During processing of certain commands such as FD_CMD_READ_ID and FD_CMD_DRIVE_SPECIFICATION_COMMAND the fifo memory access could get out of bounds leading to memory corruption with values coming from the guest. Fix this by making sure that the index is always bounded by the allocated memory. This is XSA-133 / CVE-2015-3456. Signed-off-by: Petr Matousek Reviewed-by: John Snow (cherry picked from commit 4de1422ea306832b6ef2cba34e9febb73dd139a7) (cherry picked from commit e42b84cf1c524d017208b981c7749dc5945dda72) (cherry picked from commit c8c6ba08684f2fb8600df479b49c5511d6fed41a) (cherry picked from commit c545d0dfcc5ab5e69d0eabc14ec101293236055c) --- hw/fdc.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index b00a4ec..aba02e4 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -1318,7 +1318,7 @@ static uint32_t fdctrl_read_data (fdctrl_t *fdctrl) { fdrive_t *cur_drv; uint32_t retval = 0; - int pos; + uint32_t pos; cur_drv = get_cur_drv(fdctrl); fdctrl->dsr &= ~FD_DSR_PWRDOWN; @@ -1327,8 +1327,8 @@ static uint32_t fdctrl_read_data (fdctrl_t *fdctrl) return 0; } pos = fdctrl->data_pos; + pos %= FD_SECTOR_LEN; if (fdctrl->msr & FD_MSR_NONDMA) { - pos %= FD_SECTOR_LEN; if (pos == 0) { if (fdctrl->data_pos != 0) if (!fdctrl_seek_to_next_sect(fdctrl, cur_drv)) { @@ -1673,10 +1673,13 @@ static void fdctrl_handle_option (fdctrl_t *fdctrl, int direction) static void fdctrl_handle_drive_specification_command (fdctrl_t *fdctrl, int direction) { fdrive_t *cur_drv = get_cur_drv(fdctrl); + uint32_t pos; - if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x80) { + pos = fdctrl->data_pos - 1; + pos %= FD_SECTOR_LEN; + if (fdctrl->fifo[pos] & 0x80) { /* Command parameters done */ - if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x40) { + if (fdctrl->fifo[pos] & 0x40) { fdctrl->fifo[0] = fdctrl->fifo[1]; fdctrl->fifo[2] = 0; fdctrl->fifo[3] = 0; @@ -1771,7 +1774,7 @@ static uint8_t command_to_handler[256]; static void fdctrl_write_data (fdctrl_t *fdctrl, uint32_t value) { fdrive_t *cur_drv; - int pos; + uint32_t pos; /* Reset mode */ if (!(fdctrl->dor & FD_DOR_nRESET)) { @@ -1817,7 +1820,9 @@ static void fdctrl_write_data (fdctrl_t *fdctrl, uint32_t value) } FLOPPY_DPRINTF("%s: %02x\n", __func__, value); - fdctrl->fifo[fdctrl->data_pos++] = value; + pos = fdctrl->data_pos++; + pos %= FD_SECTOR_LEN; + fdctrl->fifo[pos] = value; if (fdctrl->data_pos == fdctrl->data_len) { /* We now have all parameters * and will be able to treat the command -- generated by git-patchbot for /home/xen/git/qemu-xen-4.2-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed May 27 16:00:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 27 May 2015 16:00: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 1Yxdkl-0005mc-Em; Wed, 27 May 2015 16:00:23 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yxdkj-0005mU-Hy for xen-changelog@lists.xensource.com; Wed, 27 May 2015 16:00:21 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id C0/4C-02812-41AE5655; Wed, 27 May 2015 16:00:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1432742419!13177747!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4177 invoked from network); 27 May 2015 16:00:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 27 May 2015 16:00:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yxdkg-0002LB-UT for xen-changelog@lists.xensource.com; Wed, 27 May 2015 16:00:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yxdkg-0002qd-MK for xen-changelog@lists.xensource.com; Wed, 27 May 2015 16:00:18 +0000 Date: Wed, 27 May 2015 16:00:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.3-testing] fdc: force the fifo access to be in bounds of the allocated buffer X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c545d0dfcc5ab5e69d0eabc14ec101293236055c Author: Petr Matousek AuthorDate: Wed May 6 09:48:59 2015 +0200 Commit: Ian Jackson CommitDate: Wed May 27 16:56:33 2015 +0100 fdc: force the fifo access to be in bounds of the allocated buffer During processing of certain commands such as FD_CMD_READ_ID and FD_CMD_DRIVE_SPECIFICATION_COMMAND the fifo memory access could get out of bounds leading to memory corruption with values coming from the guest. Fix this by making sure that the index is always bounded by the allocated memory. This is XSA-133 / CVE-2015-3456. Signed-off-by: Petr Matousek Reviewed-by: John Snow (cherry picked from commit 4de1422ea306832b6ef2cba34e9febb73dd139a7) (cherry picked from commit e42b84cf1c524d017208b981c7749dc5945dda72) (cherry picked from commit c8c6ba08684f2fb8600df479b49c5511d6fed41a) --- hw/fdc.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index b00a4ec..aba02e4 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -1318,7 +1318,7 @@ static uint32_t fdctrl_read_data (fdctrl_t *fdctrl) { fdrive_t *cur_drv; uint32_t retval = 0; - int pos; + uint32_t pos; cur_drv = get_cur_drv(fdctrl); fdctrl->dsr &= ~FD_DSR_PWRDOWN; @@ -1327,8 +1327,8 @@ static uint32_t fdctrl_read_data (fdctrl_t *fdctrl) return 0; } pos = fdctrl->data_pos; + pos %= FD_SECTOR_LEN; if (fdctrl->msr & FD_MSR_NONDMA) { - pos %= FD_SECTOR_LEN; if (pos == 0) { if (fdctrl->data_pos != 0) if (!fdctrl_seek_to_next_sect(fdctrl, cur_drv)) { @@ -1673,10 +1673,13 @@ static void fdctrl_handle_option (fdctrl_t *fdctrl, int direction) static void fdctrl_handle_drive_specification_command (fdctrl_t *fdctrl, int direction) { fdrive_t *cur_drv = get_cur_drv(fdctrl); + uint32_t pos; - if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x80) { + pos = fdctrl->data_pos - 1; + pos %= FD_SECTOR_LEN; + if (fdctrl->fifo[pos] & 0x80) { /* Command parameters done */ - if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x40) { + if (fdctrl->fifo[pos] & 0x40) { fdctrl->fifo[0] = fdctrl->fifo[1]; fdctrl->fifo[2] = 0; fdctrl->fifo[3] = 0; @@ -1771,7 +1774,7 @@ static uint8_t command_to_handler[256]; static void fdctrl_write_data (fdctrl_t *fdctrl, uint32_t value) { fdrive_t *cur_drv; - int pos; + uint32_t pos; /* Reset mode */ if (!(fdctrl->dor & FD_DOR_nRESET)) { @@ -1817,7 +1820,9 @@ static void fdctrl_write_data (fdctrl_t *fdctrl, uint32_t value) } FLOPPY_DPRINTF("%s: %02x\n", __func__, value); - fdctrl->fifo[fdctrl->data_pos++] = value; + pos = fdctrl->data_pos++; + pos %= FD_SECTOR_LEN; + fdctrl->fifo[pos] = value; if (fdctrl->data_pos == fdctrl->data_len) { /* We now have all parameters * and will be able to treat the command -- generated by git-patchbot for /home/xen/git/qemu-xen-4.3-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed May 27 16:00:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 27 May 2015 16:00: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 1Yxdkl-0005mc-Em; Wed, 27 May 2015 16:00:23 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yxdkj-0005mU-Hy for xen-changelog@lists.xensource.com; Wed, 27 May 2015 16:00:21 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id C0/4C-02812-41AE5655; Wed, 27 May 2015 16:00:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1432742419!13177747!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4177 invoked from network); 27 May 2015 16:00:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 27 May 2015 16:00:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yxdkg-0002LB-UT for xen-changelog@lists.xensource.com; Wed, 27 May 2015 16:00:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yxdkg-0002qd-MK for xen-changelog@lists.xensource.com; Wed, 27 May 2015 16:00:18 +0000 Date: Wed, 27 May 2015 16:00:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.3-testing] fdc: force the fifo access to be in bounds of the allocated buffer X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c545d0dfcc5ab5e69d0eabc14ec101293236055c Author: Petr Matousek AuthorDate: Wed May 6 09:48:59 2015 +0200 Commit: Ian Jackson CommitDate: Wed May 27 16:56:33 2015 +0100 fdc: force the fifo access to be in bounds of the allocated buffer During processing of certain commands such as FD_CMD_READ_ID and FD_CMD_DRIVE_SPECIFICATION_COMMAND the fifo memory access could get out of bounds leading to memory corruption with values coming from the guest. Fix this by making sure that the index is always bounded by the allocated memory. This is XSA-133 / CVE-2015-3456. Signed-off-by: Petr Matousek Reviewed-by: John Snow (cherry picked from commit 4de1422ea306832b6ef2cba34e9febb73dd139a7) (cherry picked from commit e42b84cf1c524d017208b981c7749dc5945dda72) (cherry picked from commit c8c6ba08684f2fb8600df479b49c5511d6fed41a) --- hw/fdc.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index b00a4ec..aba02e4 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -1318,7 +1318,7 @@ static uint32_t fdctrl_read_data (fdctrl_t *fdctrl) { fdrive_t *cur_drv; uint32_t retval = 0; - int pos; + uint32_t pos; cur_drv = get_cur_drv(fdctrl); fdctrl->dsr &= ~FD_DSR_PWRDOWN; @@ -1327,8 +1327,8 @@ static uint32_t fdctrl_read_data (fdctrl_t *fdctrl) return 0; } pos = fdctrl->data_pos; + pos %= FD_SECTOR_LEN; if (fdctrl->msr & FD_MSR_NONDMA) { - pos %= FD_SECTOR_LEN; if (pos == 0) { if (fdctrl->data_pos != 0) if (!fdctrl_seek_to_next_sect(fdctrl, cur_drv)) { @@ -1673,10 +1673,13 @@ static void fdctrl_handle_option (fdctrl_t *fdctrl, int direction) static void fdctrl_handle_drive_specification_command (fdctrl_t *fdctrl, int direction) { fdrive_t *cur_drv = get_cur_drv(fdctrl); + uint32_t pos; - if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x80) { + pos = fdctrl->data_pos - 1; + pos %= FD_SECTOR_LEN; + if (fdctrl->fifo[pos] & 0x80) { /* Command parameters done */ - if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x40) { + if (fdctrl->fifo[pos] & 0x40) { fdctrl->fifo[0] = fdctrl->fifo[1]; fdctrl->fifo[2] = 0; fdctrl->fifo[3] = 0; @@ -1771,7 +1774,7 @@ static uint8_t command_to_handler[256]; static void fdctrl_write_data (fdctrl_t *fdctrl, uint32_t value) { fdrive_t *cur_drv; - int pos; + uint32_t pos; /* Reset mode */ if (!(fdctrl->dor & FD_DOR_nRESET)) { @@ -1817,7 +1820,9 @@ static void fdctrl_write_data (fdctrl_t *fdctrl, uint32_t value) } FLOPPY_DPRINTF("%s: %02x\n", __func__, value); - fdctrl->fifo[fdctrl->data_pos++] = value; + pos = fdctrl->data_pos++; + pos %= FD_SECTOR_LEN; + fdctrl->fifo[pos] = value; if (fdctrl->data_pos == fdctrl->data_len) { /* We now have all parameters * and will be able to treat the command -- generated by git-patchbot for /home/xen/git/qemu-xen-4.3-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed May 27 16:00:35 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 27 May 2015 16:00:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yxdkx-0005nl-HO; Wed, 27 May 2015 16:00:35 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yxdkv-0005nY-KK for xen-changelog@lists.xensource.com; Wed, 27 May 2015 16:00:33 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id 6E/D0-02796-02AE5655; Wed, 27 May 2015 16:00:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1432742431!17566403!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20130 invoked from network); 27 May 2015 16:00:31 -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; 27 May 2015 16:00:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yxdks-0002LJ-S4 for xen-changelog@lists.xensource.com; Wed, 27 May 2015 16:00:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yxdks-0002rS-DP for xen-changelog@lists.xensource.com; Wed, 27 May 2015 16:00:30 +0000 Date: Wed, 27 May 2015 16:00:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.4-testing] fdc: force the fifo access to be in bounds of the allocated buffer X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c8c6ba08684f2fb8600df479b49c5511d6fed41a Author: Petr Matousek AuthorDate: Wed May 6 09:48:59 2015 +0200 Commit: Ian Jackson CommitDate: Wed May 27 16:56:01 2015 +0100 fdc: force the fifo access to be in bounds of the allocated buffer During processing of certain commands such as FD_CMD_READ_ID and FD_CMD_DRIVE_SPECIFICATION_COMMAND the fifo memory access could get out of bounds leading to memory corruption with values coming from the guest. Fix this by making sure that the index is always bounded by the allocated memory. This is XSA-133 / CVE-2015-3456. Signed-off-by: Petr Matousek Reviewed-by: John Snow (cherry picked from commit 4de1422ea306832b6ef2cba34e9febb73dd139a7) (cherry picked from commit e42b84cf1c524d017208b981c7749dc5945dda72) --- hw/fdc.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index b00a4ec..aba02e4 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -1318,7 +1318,7 @@ static uint32_t fdctrl_read_data (fdctrl_t *fdctrl) { fdrive_t *cur_drv; uint32_t retval = 0; - int pos; + uint32_t pos; cur_drv = get_cur_drv(fdctrl); fdctrl->dsr &= ~FD_DSR_PWRDOWN; @@ -1327,8 +1327,8 @@ static uint32_t fdctrl_read_data (fdctrl_t *fdctrl) return 0; } pos = fdctrl->data_pos; + pos %= FD_SECTOR_LEN; if (fdctrl->msr & FD_MSR_NONDMA) { - pos %= FD_SECTOR_LEN; if (pos == 0) { if (fdctrl->data_pos != 0) if (!fdctrl_seek_to_next_sect(fdctrl, cur_drv)) { @@ -1673,10 +1673,13 @@ static void fdctrl_handle_option (fdctrl_t *fdctrl, int direction) static void fdctrl_handle_drive_specification_command (fdctrl_t *fdctrl, int direction) { fdrive_t *cur_drv = get_cur_drv(fdctrl); + uint32_t pos; - if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x80) { + pos = fdctrl->data_pos - 1; + pos %= FD_SECTOR_LEN; + if (fdctrl->fifo[pos] & 0x80) { /* Command parameters done */ - if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x40) { + if (fdctrl->fifo[pos] & 0x40) { fdctrl->fifo[0] = fdctrl->fifo[1]; fdctrl->fifo[2] = 0; fdctrl->fifo[3] = 0; @@ -1771,7 +1774,7 @@ static uint8_t command_to_handler[256]; static void fdctrl_write_data (fdctrl_t *fdctrl, uint32_t value) { fdrive_t *cur_drv; - int pos; + uint32_t pos; /* Reset mode */ if (!(fdctrl->dor & FD_DOR_nRESET)) { @@ -1817,7 +1820,9 @@ static void fdctrl_write_data (fdctrl_t *fdctrl, uint32_t value) } FLOPPY_DPRINTF("%s: %02x\n", __func__, value); - fdctrl->fifo[fdctrl->data_pos++] = value; + pos = fdctrl->data_pos++; + pos %= FD_SECTOR_LEN; + fdctrl->fifo[pos] = value; if (fdctrl->data_pos == fdctrl->data_len) { /* We now have all parameters * and will be able to treat the command -- generated by git-patchbot for /home/xen/git/qemu-xen-4.4-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed May 27 16:00:35 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 27 May 2015 16:00:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yxdkx-0005nl-HO; Wed, 27 May 2015 16:00:35 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yxdkv-0005nY-KK for xen-changelog@lists.xensource.com; Wed, 27 May 2015 16:00:33 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id 6E/D0-02796-02AE5655; Wed, 27 May 2015 16:00:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1432742431!17566403!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20130 invoked from network); 27 May 2015 16:00:31 -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; 27 May 2015 16:00:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yxdks-0002LJ-S4 for xen-changelog@lists.xensource.com; Wed, 27 May 2015 16:00:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yxdks-0002rS-DP for xen-changelog@lists.xensource.com; Wed, 27 May 2015 16:00:30 +0000 Date: Wed, 27 May 2015 16:00:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.4-testing] fdc: force the fifo access to be in bounds of the allocated buffer X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c8c6ba08684f2fb8600df479b49c5511d6fed41a Author: Petr Matousek AuthorDate: Wed May 6 09:48:59 2015 +0200 Commit: Ian Jackson CommitDate: Wed May 27 16:56:01 2015 +0100 fdc: force the fifo access to be in bounds of the allocated buffer During processing of certain commands such as FD_CMD_READ_ID and FD_CMD_DRIVE_SPECIFICATION_COMMAND the fifo memory access could get out of bounds leading to memory corruption with values coming from the guest. Fix this by making sure that the index is always bounded by the allocated memory. This is XSA-133 / CVE-2015-3456. Signed-off-by: Petr Matousek Reviewed-by: John Snow (cherry picked from commit 4de1422ea306832b6ef2cba34e9febb73dd139a7) (cherry picked from commit e42b84cf1c524d017208b981c7749dc5945dda72) --- hw/fdc.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index b00a4ec..aba02e4 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -1318,7 +1318,7 @@ static uint32_t fdctrl_read_data (fdctrl_t *fdctrl) { fdrive_t *cur_drv; uint32_t retval = 0; - int pos; + uint32_t pos; cur_drv = get_cur_drv(fdctrl); fdctrl->dsr &= ~FD_DSR_PWRDOWN; @@ -1327,8 +1327,8 @@ static uint32_t fdctrl_read_data (fdctrl_t *fdctrl) return 0; } pos = fdctrl->data_pos; + pos %= FD_SECTOR_LEN; if (fdctrl->msr & FD_MSR_NONDMA) { - pos %= FD_SECTOR_LEN; if (pos == 0) { if (fdctrl->data_pos != 0) if (!fdctrl_seek_to_next_sect(fdctrl, cur_drv)) { @@ -1673,10 +1673,13 @@ static void fdctrl_handle_option (fdctrl_t *fdctrl, int direction) static void fdctrl_handle_drive_specification_command (fdctrl_t *fdctrl, int direction) { fdrive_t *cur_drv = get_cur_drv(fdctrl); + uint32_t pos; - if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x80) { + pos = fdctrl->data_pos - 1; + pos %= FD_SECTOR_LEN; + if (fdctrl->fifo[pos] & 0x80) { /* Command parameters done */ - if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x40) { + if (fdctrl->fifo[pos] & 0x40) { fdctrl->fifo[0] = fdctrl->fifo[1]; fdctrl->fifo[2] = 0; fdctrl->fifo[3] = 0; @@ -1771,7 +1774,7 @@ static uint8_t command_to_handler[256]; static void fdctrl_write_data (fdctrl_t *fdctrl, uint32_t value) { fdrive_t *cur_drv; - int pos; + uint32_t pos; /* Reset mode */ if (!(fdctrl->dor & FD_DOR_nRESET)) { @@ -1817,7 +1820,9 @@ static void fdctrl_write_data (fdctrl_t *fdctrl, uint32_t value) } FLOPPY_DPRINTF("%s: %02x\n", __func__, value); - fdctrl->fifo[fdctrl->data_pos++] = value; + pos = fdctrl->data_pos++; + pos %= FD_SECTOR_LEN; + fdctrl->fifo[pos] = value; if (fdctrl->data_pos == fdctrl->data_len) { /* We now have all parameters * and will be able to treat the command -- generated by git-patchbot for /home/xen/git/qemu-xen-4.4-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed May 27 16:00:46 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 27 May 2015 16:00:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yxdl8-0005pJ-KF; Wed, 27 May 2015 16:00:46 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yxdl6-0005p5-Ok for xen-changelog@lists.xensource.com; Wed, 27 May 2015 16:00:44 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 8B/AF-03561-C2AE5655; Wed, 27 May 2015 16:00:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1432742442!13218982!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13196 invoked from network); 27 May 2015 16:00:43 -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; 27 May 2015 16:00:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yxdl4-0002LN-2d for xen-changelog@lists.xensource.com; Wed, 27 May 2015 16:00:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yxdl3-0002sP-PM for xen-changelog@lists.xensource.com; Wed, 27 May 2015 16:00:41 +0000 Date: Wed, 27 May 2015 16:00:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.5-testing] fdc: force the fifo access to be in bounds of the allocated buffer X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e42b84cf1c524d017208b981c7749dc5945dda72 Author: Petr Matousek AuthorDate: Wed May 6 09:48:59 2015 +0200 Commit: Ian Jackson CommitDate: Wed May 27 16:49:55 2015 +0100 fdc: force the fifo access to be in bounds of the allocated buffer During processing of certain commands such as FD_CMD_READ_ID and FD_CMD_DRIVE_SPECIFICATION_COMMAND the fifo memory access could get out of bounds leading to memory corruption with values coming from the guest. Fix this by making sure that the index is always bounded by the allocated memory. This is XSA-133 / CVE-2015-3456. Signed-off-by: Petr Matousek Reviewed-by: John Snow (cherry picked from commit 4de1422ea306832b6ef2cba34e9febb73dd139a7) --- hw/fdc.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index b00a4ec..aba02e4 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -1318,7 +1318,7 @@ static uint32_t fdctrl_read_data (fdctrl_t *fdctrl) { fdrive_t *cur_drv; uint32_t retval = 0; - int pos; + uint32_t pos; cur_drv = get_cur_drv(fdctrl); fdctrl->dsr &= ~FD_DSR_PWRDOWN; @@ -1327,8 +1327,8 @@ static uint32_t fdctrl_read_data (fdctrl_t *fdctrl) return 0; } pos = fdctrl->data_pos; + pos %= FD_SECTOR_LEN; if (fdctrl->msr & FD_MSR_NONDMA) { - pos %= FD_SECTOR_LEN; if (pos == 0) { if (fdctrl->data_pos != 0) if (!fdctrl_seek_to_next_sect(fdctrl, cur_drv)) { @@ -1673,10 +1673,13 @@ static void fdctrl_handle_option (fdctrl_t *fdctrl, int direction) static void fdctrl_handle_drive_specification_command (fdctrl_t *fdctrl, int direction) { fdrive_t *cur_drv = get_cur_drv(fdctrl); + uint32_t pos; - if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x80) { + pos = fdctrl->data_pos - 1; + pos %= FD_SECTOR_LEN; + if (fdctrl->fifo[pos] & 0x80) { /* Command parameters done */ - if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x40) { + if (fdctrl->fifo[pos] & 0x40) { fdctrl->fifo[0] = fdctrl->fifo[1]; fdctrl->fifo[2] = 0; fdctrl->fifo[3] = 0; @@ -1771,7 +1774,7 @@ static uint8_t command_to_handler[256]; static void fdctrl_write_data (fdctrl_t *fdctrl, uint32_t value) { fdrive_t *cur_drv; - int pos; + uint32_t pos; /* Reset mode */ if (!(fdctrl->dor & FD_DOR_nRESET)) { @@ -1817,7 +1820,9 @@ static void fdctrl_write_data (fdctrl_t *fdctrl, uint32_t value) } FLOPPY_DPRINTF("%s: %02x\n", __func__, value); - fdctrl->fifo[fdctrl->data_pos++] = value; + pos = fdctrl->data_pos++; + pos %= FD_SECTOR_LEN; + fdctrl->fifo[pos] = value; if (fdctrl->data_pos == fdctrl->data_len) { /* We now have all parameters * and will be able to treat the command -- generated by git-patchbot for /home/xen/git/qemu-xen-4.5-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed May 27 16:00:46 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 27 May 2015 16:00:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yxdl8-0005pJ-KF; Wed, 27 May 2015 16:00:46 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yxdl6-0005p5-Ok for xen-changelog@lists.xensource.com; Wed, 27 May 2015 16:00:44 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 8B/AF-03561-C2AE5655; Wed, 27 May 2015 16:00:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1432742442!13218982!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13196 invoked from network); 27 May 2015 16:00:43 -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; 27 May 2015 16:00:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yxdl4-0002LN-2d for xen-changelog@lists.xensource.com; Wed, 27 May 2015 16:00:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yxdl3-0002sP-PM for xen-changelog@lists.xensource.com; Wed, 27 May 2015 16:00:41 +0000 Date: Wed, 27 May 2015 16:00:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.5-testing] fdc: force the fifo access to be in bounds of the allocated buffer X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e42b84cf1c524d017208b981c7749dc5945dda72 Author: Petr Matousek AuthorDate: Wed May 6 09:48:59 2015 +0200 Commit: Ian Jackson CommitDate: Wed May 27 16:49:55 2015 +0100 fdc: force the fifo access to be in bounds of the allocated buffer During processing of certain commands such as FD_CMD_READ_ID and FD_CMD_DRIVE_SPECIFICATION_COMMAND the fifo memory access could get out of bounds leading to memory corruption with values coming from the guest. Fix this by making sure that the index is always bounded by the allocated memory. This is XSA-133 / CVE-2015-3456. Signed-off-by: Petr Matousek Reviewed-by: John Snow (cherry picked from commit 4de1422ea306832b6ef2cba34e9febb73dd139a7) --- hw/fdc.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index b00a4ec..aba02e4 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -1318,7 +1318,7 @@ static uint32_t fdctrl_read_data (fdctrl_t *fdctrl) { fdrive_t *cur_drv; uint32_t retval = 0; - int pos; + uint32_t pos; cur_drv = get_cur_drv(fdctrl); fdctrl->dsr &= ~FD_DSR_PWRDOWN; @@ -1327,8 +1327,8 @@ static uint32_t fdctrl_read_data (fdctrl_t *fdctrl) return 0; } pos = fdctrl->data_pos; + pos %= FD_SECTOR_LEN; if (fdctrl->msr & FD_MSR_NONDMA) { - pos %= FD_SECTOR_LEN; if (pos == 0) { if (fdctrl->data_pos != 0) if (!fdctrl_seek_to_next_sect(fdctrl, cur_drv)) { @@ -1673,10 +1673,13 @@ static void fdctrl_handle_option (fdctrl_t *fdctrl, int direction) static void fdctrl_handle_drive_specification_command (fdctrl_t *fdctrl, int direction) { fdrive_t *cur_drv = get_cur_drv(fdctrl); + uint32_t pos; - if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x80) { + pos = fdctrl->data_pos - 1; + pos %= FD_SECTOR_LEN; + if (fdctrl->fifo[pos] & 0x80) { /* Command parameters done */ - if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x40) { + if (fdctrl->fifo[pos] & 0x40) { fdctrl->fifo[0] = fdctrl->fifo[1]; fdctrl->fifo[2] = 0; fdctrl->fifo[3] = 0; @@ -1771,7 +1774,7 @@ static uint8_t command_to_handler[256]; static void fdctrl_write_data (fdctrl_t *fdctrl, uint32_t value) { fdrive_t *cur_drv; - int pos; + uint32_t pos; /* Reset mode */ if (!(fdctrl->dor & FD_DOR_nRESET)) { @@ -1817,7 +1820,9 @@ static void fdctrl_write_data (fdctrl_t *fdctrl, uint32_t value) } FLOPPY_DPRINTF("%s: %02x\n", __func__, value); - fdctrl->fifo[fdctrl->data_pos++] = value; + pos = fdctrl->data_pos++; + pos %= FD_SECTOR_LEN; + fdctrl->fifo[pos] = value; if (fdctrl->data_pos == fdctrl->data_len) { /* We now have all parameters * and will be able to treat the command -- generated by git-patchbot for /home/xen/git/qemu-xen-4.5-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu May 28 18:44:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18: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 1Yy2mo-0003xp-17; Thu, 28 May 2015 18:44:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2mm-0003xh-JI for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:44:08 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id 4B/6F-16518-7F167655; Thu, 28 May 2015 18:44:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1432838645!11049195!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24303 invoked from network); 28 May 2015 18:44:06 -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; 28 May 2015 18:44:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2mj-00035l-K8 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2mi-00030W-LM for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:44:04 +0000 Date: Thu, 28 May 2015 18:44:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] use ticket locks for spin locks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 45fcc4568c5162b00fb3907fb158af82dd484a3d Author: David Vrabel AuthorDate: Fri May 15 09:49:12 2015 +0200 Commit: Jan Beulich CommitDate: Fri May 15 09:49:12 2015 +0200 use ticket locks for spin locks Replace the byte locks with ticket locks. Ticket locks are: a) fair; and b) peform better when contented since they spin without an atomic operation. The lock is split into two ticket values: head and tail. A locker acquires a ticket by (atomically) increasing tail and using the previous tail value. A CPU holds the lock if its ticket == head. The lock is released by increasing head. spin_lock_irq() and spin_lock_irqsave() now spin with irqs disabled (previously, they would spin with irqs enabled if possible). This is required to prevent deadlocks when the irq handler tries to take the same lock with a higher ticket. Architectures need only provide arch_fetch_and_add() and two barriers: arch_lock_acquire_barrier() and arch_lock_release_barrier(). Signed-off-by: David Vrabel Reviewed-by: Tim Deegan Reviewed-by: Jan Beulich --- xen/common/spinlock.c | 116 ++++++++++++++++++++++++------------------ xen/include/asm-arm/system.h | 3 + xen/include/asm-x86/system.h | 11 ++++ xen/include/xen/spinlock.h | 16 ++++-- 4 files changed, 92 insertions(+), 54 deletions(-) diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c index 5fd8b1c..c8dc8ba 100644 --- a/xen/common/spinlock.c +++ b/xen/common/spinlock.c @@ -115,125 +115,134 @@ void spin_debug_disable(void) #endif +static always_inline spinlock_tickets_t observe_lock(spinlock_tickets_t *t) +{ + spinlock_tickets_t v; + + smp_rmb(); + v.head_tail = read_atomic(&t->head_tail); + return v; +} + +static always_inline u16 observe_head(spinlock_tickets_t *t) +{ + smp_rmb(); + return read_atomic(&t->head); +} + void _spin_lock(spinlock_t *lock) { + spinlock_tickets_t tickets = { .tail = 1, }; LOCK_PROFILE_VAR; check_lock(&lock->debug); - while ( unlikely(!_raw_spin_trylock(&lock->raw)) ) + tickets.head_tail = arch_fetch_and_add(&lock->tickets.head_tail, + tickets.head_tail); + while ( tickets.tail != observe_head(&lock->tickets) ) { LOCK_PROFILE_BLOCK; - while ( likely(_raw_spin_is_locked(&lock->raw)) ) - cpu_relax(); + cpu_relax(); } LOCK_PROFILE_GOT; preempt_disable(); + arch_lock_acquire_barrier(); } void _spin_lock_irq(spinlock_t *lock) { - LOCK_PROFILE_VAR; - ASSERT(local_irq_is_enabled()); local_irq_disable(); - check_lock(&lock->debug); - while ( unlikely(!_raw_spin_trylock(&lock->raw)) ) - { - LOCK_PROFILE_BLOCK; - local_irq_enable(); - while ( likely(_raw_spin_is_locked(&lock->raw)) ) - cpu_relax(); - local_irq_disable(); - } - LOCK_PROFILE_GOT; - preempt_disable(); + _spin_lock(lock); } unsigned long _spin_lock_irqsave(spinlock_t *lock) { unsigned long flags; - LOCK_PROFILE_VAR; local_irq_save(flags); - check_lock(&lock->debug); - while ( unlikely(!_raw_spin_trylock(&lock->raw)) ) - { - LOCK_PROFILE_BLOCK; - local_irq_restore(flags); - while ( likely(_raw_spin_is_locked(&lock->raw)) ) - cpu_relax(); - local_irq_disable(); - } - LOCK_PROFILE_GOT; - preempt_disable(); + _spin_lock(lock); return flags; } void _spin_unlock(spinlock_t *lock) { + arch_lock_release_barrier(); preempt_enable(); LOCK_PROFILE_REL; - _raw_spin_unlock(&lock->raw); + add_sized(&lock->tickets.head, 1); } void _spin_unlock_irq(spinlock_t *lock) { - preempt_enable(); - LOCK_PROFILE_REL; - _raw_spin_unlock(&lock->raw); + _spin_unlock(lock); local_irq_enable(); } void _spin_unlock_irqrestore(spinlock_t *lock, unsigned long flags) { - preempt_enable(); - LOCK_PROFILE_REL; - _raw_spin_unlock(&lock->raw); + _spin_unlock(lock); local_irq_restore(flags); } int _spin_is_locked(spinlock_t *lock) { check_lock(&lock->debug); - return _raw_spin_is_locked(&lock->raw); + return lock->tickets.head != lock->tickets.tail; } int _spin_trylock(spinlock_t *lock) { + spinlock_tickets_t old, new; + check_lock(&lock->debug); - if ( !_raw_spin_trylock(&lock->raw) ) + old = observe_lock(&lock->tickets); + if ( old.head != old.tail ) + return 0; + new = old; + new.tail++; + if ( cmpxchg(&lock->tickets.head_tail, + old.head_tail, new.head_tail) != old.head_tail ) return 0; #ifdef LOCK_PROFILE if (lock->profile) lock->profile->time_locked = NOW(); #endif preempt_disable(); + /* + * cmpxchg() is a full barrier so no need for an + * arch_lock_acquire_barrier(). + */ return 1; } void _spin_barrier(spinlock_t *lock) { + spinlock_tickets_t sample; #ifdef LOCK_PROFILE s_time_t block = NOW(); - u64 loop = 0; +#endif check_barrier(&lock->debug); - do { smp_mb(); loop++;} while ( _raw_spin_is_locked(&lock->raw) ); - if ((loop > 1) && lock->profile) + smp_mb(); + sample = observe_lock(&lock->tickets); + if ( sample.head != sample.tail ) { - lock->profile->time_block += NOW() - block; - lock->profile->block_cnt++; - } -#else - check_barrier(&lock->debug); - do { smp_mb(); } while ( _raw_spin_is_locked(&lock->raw) ); + while ( observe_head(&lock->tickets) == sample.head ) + cpu_relax(); +#ifdef LOCK_PROFILE + if ( lock->profile ) + { + lock->profile->time_block += NOW() - block; + lock->profile->block_cnt++; + } #endif + } smp_mb(); } int _spin_trylock_recursive(spinlock_t *lock) { - int cpu = smp_processor_id(); + unsigned int cpu = smp_processor_id(); /* Don't allow overflow of recurse_cpu field. */ BUILD_BUG_ON(NR_CPUS > 0xfffu); @@ -256,8 +265,17 @@ int _spin_trylock_recursive(spinlock_t *lock) void _spin_lock_recursive(spinlock_t *lock) { - while ( !spin_trylock_recursive(lock) ) - cpu_relax(); + unsigned int cpu = smp_processor_id(); + + if ( likely(lock->recurse_cpu != cpu) ) + { + _spin_lock(lock); + lock->recurse_cpu = cpu; + } + + /* We support only fairly shallow recursion, else the counter overflows. */ + ASSERT(lock->recurse_cnt < 0xfu); + lock->recurse_cnt++; } void _spin_unlock_recursive(spinlock_t *lock) diff --git a/xen/include/asm-arm/system.h b/xen/include/asm-arm/system.h index 2eb96e8..f0e222f 100644 --- a/xen/include/asm-arm/system.h +++ b/xen/include/asm-arm/system.h @@ -53,6 +53,9 @@ #define arch_fetch_and_add(x, v) __sync_fetch_and_add(x, v) +#define arch_lock_acquire_barrier() smp_mb() +#define arch_lock_release_barrier() smp_mb() + extern struct vcpu *__context_switch(struct vcpu *prev, struct vcpu *next); #endif diff --git a/xen/include/asm-x86/system.h b/xen/include/asm-x86/system.h index 9fb70f5..25a6a2a 100644 --- a/xen/include/asm-x86/system.h +++ b/xen/include/asm-x86/system.h @@ -185,6 +185,17 @@ static always_inline unsigned long __xadd( #define set_mb(var, value) do { xchg(&var, value); } while (0) #define set_wmb(var, value) do { var = value; wmb(); } while (0) +/* + * On x86 the only reordering is of reads with older writes. In the + * lock case, the read in observe_head() can only be reordered with + * writes that precede it, and moving a write _into_ a locked section + * is OK. In the release case, the write in add_sized() can only be + * reordered with reads that follow it, and hoisting a read _into_ a + * locked region is OK. + */ +#define arch_lock_acquire_barrier() barrier() +#define arch_lock_release_barrier() barrier() + #define local_irq_disable() asm volatile ( "cli" : : : "memory" ) #define local_irq_enable() asm volatile ( "sti" : : : "memory" ) diff --git a/xen/include/xen/spinlock.h b/xen/include/xen/spinlock.h index eda9b2e..bafbc74 100644 --- a/xen/include/xen/spinlock.h +++ b/xen/include/xen/spinlock.h @@ -80,8 +80,7 @@ struct lock_profile_qhead { static struct lock_profile *__lock_profile_##name \ __used_section(".lockprofile.data") = \ &__lock_profile_data_##name -#define _SPIN_LOCK_UNLOCKED(x) { _RAW_SPIN_LOCK_UNLOCKED, 0xfffu, 0, \ - _LOCK_DEBUG, x } +#define _SPIN_LOCK_UNLOCKED(x) { { 0 }, 0xfffu, 0, _LOCK_DEBUG, x } #define SPIN_LOCK_UNLOCKED _SPIN_LOCK_UNLOCKED(NULL) #define DEFINE_SPINLOCK(l) \ spinlock_t l = _SPIN_LOCK_UNLOCKED(NULL); \ @@ -117,8 +116,7 @@ extern void spinlock_profile_reset(unsigned char key); struct lock_profile_qhead { }; -#define SPIN_LOCK_UNLOCKED \ - { _RAW_SPIN_LOCK_UNLOCKED, 0xfffu, 0, _LOCK_DEBUG } +#define SPIN_LOCK_UNLOCKED { { 0 }, 0xfffu, 0, _LOCK_DEBUG } #define DEFINE_SPINLOCK(l) spinlock_t l = SPIN_LOCK_UNLOCKED #define spin_lock_init_prof(s, l) spin_lock_init(&((s)->l)) @@ -127,8 +125,16 @@ struct lock_profile_qhead { }; #endif +typedef union { + u32 head_tail; + struct { + u16 head; + u16 tail; + }; +} spinlock_tickets_t; + typedef struct spinlock { - raw_spinlock_t raw; + spinlock_tickets_t tickets; u16 recurse_cpu:12; u16 recurse_cnt:4; struct lock_debug debug; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu May 28 18:44:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18: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 1Yy2mo-0003xp-17; Thu, 28 May 2015 18:44:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2mm-0003xh-JI for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:44:08 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id 4B/6F-16518-7F167655; Thu, 28 May 2015 18:44:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1432838645!11049195!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24303 invoked from network); 28 May 2015 18:44:06 -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; 28 May 2015 18:44:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2mj-00035l-K8 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2mi-00030W-LM for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:44:04 +0000 Date: Thu, 28 May 2015 18:44:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] use ticket locks for spin locks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 45fcc4568c5162b00fb3907fb158af82dd484a3d Author: David Vrabel AuthorDate: Fri May 15 09:49:12 2015 +0200 Commit: Jan Beulich CommitDate: Fri May 15 09:49:12 2015 +0200 use ticket locks for spin locks Replace the byte locks with ticket locks. Ticket locks are: a) fair; and b) peform better when contented since they spin without an atomic operation. The lock is split into two ticket values: head and tail. A locker acquires a ticket by (atomically) increasing tail and using the previous tail value. A CPU holds the lock if its ticket == head. The lock is released by increasing head. spin_lock_irq() and spin_lock_irqsave() now spin with irqs disabled (previously, they would spin with irqs enabled if possible). This is required to prevent deadlocks when the irq handler tries to take the same lock with a higher ticket. Architectures need only provide arch_fetch_and_add() and two barriers: arch_lock_acquire_barrier() and arch_lock_release_barrier(). Signed-off-by: David Vrabel Reviewed-by: Tim Deegan Reviewed-by: Jan Beulich --- xen/common/spinlock.c | 116 ++++++++++++++++++++++++------------------ xen/include/asm-arm/system.h | 3 + xen/include/asm-x86/system.h | 11 ++++ xen/include/xen/spinlock.h | 16 ++++-- 4 files changed, 92 insertions(+), 54 deletions(-) diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c index 5fd8b1c..c8dc8ba 100644 --- a/xen/common/spinlock.c +++ b/xen/common/spinlock.c @@ -115,125 +115,134 @@ void spin_debug_disable(void) #endif +static always_inline spinlock_tickets_t observe_lock(spinlock_tickets_t *t) +{ + spinlock_tickets_t v; + + smp_rmb(); + v.head_tail = read_atomic(&t->head_tail); + return v; +} + +static always_inline u16 observe_head(spinlock_tickets_t *t) +{ + smp_rmb(); + return read_atomic(&t->head); +} + void _spin_lock(spinlock_t *lock) { + spinlock_tickets_t tickets = { .tail = 1, }; LOCK_PROFILE_VAR; check_lock(&lock->debug); - while ( unlikely(!_raw_spin_trylock(&lock->raw)) ) + tickets.head_tail = arch_fetch_and_add(&lock->tickets.head_tail, + tickets.head_tail); + while ( tickets.tail != observe_head(&lock->tickets) ) { LOCK_PROFILE_BLOCK; - while ( likely(_raw_spin_is_locked(&lock->raw)) ) - cpu_relax(); + cpu_relax(); } LOCK_PROFILE_GOT; preempt_disable(); + arch_lock_acquire_barrier(); } void _spin_lock_irq(spinlock_t *lock) { - LOCK_PROFILE_VAR; - ASSERT(local_irq_is_enabled()); local_irq_disable(); - check_lock(&lock->debug); - while ( unlikely(!_raw_spin_trylock(&lock->raw)) ) - { - LOCK_PROFILE_BLOCK; - local_irq_enable(); - while ( likely(_raw_spin_is_locked(&lock->raw)) ) - cpu_relax(); - local_irq_disable(); - } - LOCK_PROFILE_GOT; - preempt_disable(); + _spin_lock(lock); } unsigned long _spin_lock_irqsave(spinlock_t *lock) { unsigned long flags; - LOCK_PROFILE_VAR; local_irq_save(flags); - check_lock(&lock->debug); - while ( unlikely(!_raw_spin_trylock(&lock->raw)) ) - { - LOCK_PROFILE_BLOCK; - local_irq_restore(flags); - while ( likely(_raw_spin_is_locked(&lock->raw)) ) - cpu_relax(); - local_irq_disable(); - } - LOCK_PROFILE_GOT; - preempt_disable(); + _spin_lock(lock); return flags; } void _spin_unlock(spinlock_t *lock) { + arch_lock_release_barrier(); preempt_enable(); LOCK_PROFILE_REL; - _raw_spin_unlock(&lock->raw); + add_sized(&lock->tickets.head, 1); } void _spin_unlock_irq(spinlock_t *lock) { - preempt_enable(); - LOCK_PROFILE_REL; - _raw_spin_unlock(&lock->raw); + _spin_unlock(lock); local_irq_enable(); } void _spin_unlock_irqrestore(spinlock_t *lock, unsigned long flags) { - preempt_enable(); - LOCK_PROFILE_REL; - _raw_spin_unlock(&lock->raw); + _spin_unlock(lock); local_irq_restore(flags); } int _spin_is_locked(spinlock_t *lock) { check_lock(&lock->debug); - return _raw_spin_is_locked(&lock->raw); + return lock->tickets.head != lock->tickets.tail; } int _spin_trylock(spinlock_t *lock) { + spinlock_tickets_t old, new; + check_lock(&lock->debug); - if ( !_raw_spin_trylock(&lock->raw) ) + old = observe_lock(&lock->tickets); + if ( old.head != old.tail ) + return 0; + new = old; + new.tail++; + if ( cmpxchg(&lock->tickets.head_tail, + old.head_tail, new.head_tail) != old.head_tail ) return 0; #ifdef LOCK_PROFILE if (lock->profile) lock->profile->time_locked = NOW(); #endif preempt_disable(); + /* + * cmpxchg() is a full barrier so no need for an + * arch_lock_acquire_barrier(). + */ return 1; } void _spin_barrier(spinlock_t *lock) { + spinlock_tickets_t sample; #ifdef LOCK_PROFILE s_time_t block = NOW(); - u64 loop = 0; +#endif check_barrier(&lock->debug); - do { smp_mb(); loop++;} while ( _raw_spin_is_locked(&lock->raw) ); - if ((loop > 1) && lock->profile) + smp_mb(); + sample = observe_lock(&lock->tickets); + if ( sample.head != sample.tail ) { - lock->profile->time_block += NOW() - block; - lock->profile->block_cnt++; - } -#else - check_barrier(&lock->debug); - do { smp_mb(); } while ( _raw_spin_is_locked(&lock->raw) ); + while ( observe_head(&lock->tickets) == sample.head ) + cpu_relax(); +#ifdef LOCK_PROFILE + if ( lock->profile ) + { + lock->profile->time_block += NOW() - block; + lock->profile->block_cnt++; + } #endif + } smp_mb(); } int _spin_trylock_recursive(spinlock_t *lock) { - int cpu = smp_processor_id(); + unsigned int cpu = smp_processor_id(); /* Don't allow overflow of recurse_cpu field. */ BUILD_BUG_ON(NR_CPUS > 0xfffu); @@ -256,8 +265,17 @@ int _spin_trylock_recursive(spinlock_t *lock) void _spin_lock_recursive(spinlock_t *lock) { - while ( !spin_trylock_recursive(lock) ) - cpu_relax(); + unsigned int cpu = smp_processor_id(); + + if ( likely(lock->recurse_cpu != cpu) ) + { + _spin_lock(lock); + lock->recurse_cpu = cpu; + } + + /* We support only fairly shallow recursion, else the counter overflows. */ + ASSERT(lock->recurse_cnt < 0xfu); + lock->recurse_cnt++; } void _spin_unlock_recursive(spinlock_t *lock) diff --git a/xen/include/asm-arm/system.h b/xen/include/asm-arm/system.h index 2eb96e8..f0e222f 100644 --- a/xen/include/asm-arm/system.h +++ b/xen/include/asm-arm/system.h @@ -53,6 +53,9 @@ #define arch_fetch_and_add(x, v) __sync_fetch_and_add(x, v) +#define arch_lock_acquire_barrier() smp_mb() +#define arch_lock_release_barrier() smp_mb() + extern struct vcpu *__context_switch(struct vcpu *prev, struct vcpu *next); #endif diff --git a/xen/include/asm-x86/system.h b/xen/include/asm-x86/system.h index 9fb70f5..25a6a2a 100644 --- a/xen/include/asm-x86/system.h +++ b/xen/include/asm-x86/system.h @@ -185,6 +185,17 @@ static always_inline unsigned long __xadd( #define set_mb(var, value) do { xchg(&var, value); } while (0) #define set_wmb(var, value) do { var = value; wmb(); } while (0) +/* + * On x86 the only reordering is of reads with older writes. In the + * lock case, the read in observe_head() can only be reordered with + * writes that precede it, and moving a write _into_ a locked section + * is OK. In the release case, the write in add_sized() can only be + * reordered with reads that follow it, and hoisting a read _into_ a + * locked region is OK. + */ +#define arch_lock_acquire_barrier() barrier() +#define arch_lock_release_barrier() barrier() + #define local_irq_disable() asm volatile ( "cli" : : : "memory" ) #define local_irq_enable() asm volatile ( "sti" : : : "memory" ) diff --git a/xen/include/xen/spinlock.h b/xen/include/xen/spinlock.h index eda9b2e..bafbc74 100644 --- a/xen/include/xen/spinlock.h +++ b/xen/include/xen/spinlock.h @@ -80,8 +80,7 @@ struct lock_profile_qhead { static struct lock_profile *__lock_profile_##name \ __used_section(".lockprofile.data") = \ &__lock_profile_data_##name -#define _SPIN_LOCK_UNLOCKED(x) { _RAW_SPIN_LOCK_UNLOCKED, 0xfffu, 0, \ - _LOCK_DEBUG, x } +#define _SPIN_LOCK_UNLOCKED(x) { { 0 }, 0xfffu, 0, _LOCK_DEBUG, x } #define SPIN_LOCK_UNLOCKED _SPIN_LOCK_UNLOCKED(NULL) #define DEFINE_SPINLOCK(l) \ spinlock_t l = _SPIN_LOCK_UNLOCKED(NULL); \ @@ -117,8 +116,7 @@ extern void spinlock_profile_reset(unsigned char key); struct lock_profile_qhead { }; -#define SPIN_LOCK_UNLOCKED \ - { _RAW_SPIN_LOCK_UNLOCKED, 0xfffu, 0, _LOCK_DEBUG } +#define SPIN_LOCK_UNLOCKED { { 0 }, 0xfffu, 0, _LOCK_DEBUG } #define DEFINE_SPINLOCK(l) spinlock_t l = SPIN_LOCK_UNLOCKED #define spin_lock_init_prof(s, l) spin_lock_init(&((s)->l)) @@ -127,8 +125,16 @@ struct lock_profile_qhead { }; #endif +typedef union { + u32 head_tail; + struct { + u16 head; + u16 tail; + }; +} spinlock_tickets_t; + typedef struct spinlock { - raw_spinlock_t raw; + spinlock_tickets_t tickets; u16 recurse_cpu:12; u16 recurse_cnt:4; struct lock_debug debug; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu May 28 18:44:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:44:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2n0-0003yZ-3k; Thu, 28 May 2015 18:44:22 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2my-0003yN-8M for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:44:20 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 4E/F3-02785-30267655; Thu, 28 May 2015 18:44:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1432838657!13528560!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14775 invoked from network); 28 May 2015 18:44:18 -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; 28 May 2015 18:44:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2mu-00035p-KT for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:44:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2mt-00031P-Od for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:44:15 +0000 Date: Thu, 28 May 2015 18:44:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86, arm: remove asm/spinlock.h from all architectures X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e62e49e6d5d4e8d22f3df0b75443ede65a812435 Author: David Vrabel AuthorDate: Fri May 15 09:52:25 2015 +0200 Commit: Jan Beulich CommitDate: Fri May 15 09:52:25 2015 +0200 x86,arm: remove asm/spinlock.h from all architectures Now that all architecture use a common ticket lock implementation for spinlocks, remove the architecture specific byte lock implementations. Signed-off-by: David Vrabel Reviewed-by: Tim Deegan Acked-by: Jan Beulich Acked-by: Ian Campbell --- xen/arch/arm/README.LinuxPrimitives | 28 -------------- xen/include/asm-arm/arm32/spinlock.h | 66 ---------------------------------- xen/include/asm-arm/arm64/spinlock.h | 63 -------------------------------- xen/include/asm-arm/spinlock.h | 23 ------------ xen/include/asm-x86/spinlock.h | 37 ------------------- xen/include/xen/spinlock.h | 1 - 6 files changed, 0 insertions(+), 218 deletions(-) diff --git a/xen/arch/arm/README.LinuxPrimitives b/xen/arch/arm/README.LinuxPrimitives index 7f33fc7..3115f51 100644 --- a/xen/arch/arm/README.LinuxPrimitives +++ b/xen/arch/arm/README.LinuxPrimitives @@ -25,16 +25,6 @@ linux/arch/arm64/include/asm/atomic.h xen/include/asm-arm/arm64/atomic.h --------------------------------------------------------------------- -spinlocks: last sync @ v3.16-rc6 (last commit: 95c4189689f9) - -linux/arch/arm64/include/asm/spinlock.h xen/include/asm-arm/arm64/spinlock.h - -Skipped: - 5686b06 arm64: lockref: add support for lockless lockrefs using cmpxchg - 52ea2a5 arm64: locks: introduce ticket-based spinlock implementation - ---------------------------------------------------------------------- - mem*: last sync @ v3.16-rc6 (last commit: d875c9b37240) linux/arch/arm64/lib/memchr.S xen/arch/arm/arm64/lib/memchr.S @@ -103,24 +93,6 @@ linux/arch/arm/include/asm/atomic.h xen/include/asm-arm/arm32/atomic.h --------------------------------------------------------------------- -spinlocks: last sync: 15e7e5c1ebf5 - -linux/arch/arm/include/asm/spinlock.h xen/include/asm-arm/arm32/spinlock.h - -*** Linux has switched to ticket locks but we still use bitlocks. - -resync to v3.14-rc7: - - 7c8746a ARM: 7955/1: spinlock: ensure we have a compiler barrier before sev - 0cbad9c ARM: 7854/1: lockref: add support for lockless lockrefs using cmpxchg64 - 9bb17be ARM: locks: prefetch the destination word for write prior to strex - 27a8479 ARM: smp_on_up: move inline asm ALT_SMP patching macro out of spinlock. - 00efaa0 ARM: 7812/1: rwlocks: retry trylock operation if strex fails on free lo - afa31d8 ARM: 7811/1: locks: use early clobber in arch_spin_trylock - 73a6fdc ARM: spinlock: use inner-shareable dsb variant prior to sev instruction - ---------------------------------------------------------------------- - mem*: last sync @ v3.16-rc6 (last commit: d98b90ea22b0) linux/arch/arm/lib/copy_template.S xen/arch/arm/arm32/lib/copy_template.S diff --git a/xen/include/asm-arm/arm32/spinlock.h b/xen/include/asm-arm/arm32/spinlock.h deleted file mode 100644 index bc0343c..0000000 --- a/xen/include/asm-arm/arm32/spinlock.h +++ /dev/null @@ -1,66 +0,0 @@ -#ifndef __ASM_ARM32_SPINLOCK_H -#define __ASM_ARM32_SPINLOCK_H - -static inline void dsb_sev(void) -{ - __asm__ __volatile__ ( - "dsb\n" - "sev\n" - ); -} - -typedef struct { - volatile unsigned int lock; -} raw_spinlock_t; - -#define _RAW_SPIN_LOCK_UNLOCKED { 0 } - -#define _raw_spin_is_locked(x) ((x)->lock != 0) - -static always_inline void _raw_spin_unlock(raw_spinlock_t *lock) -{ - ASSERT(_raw_spin_is_locked(lock)); - - smp_mb(); - - __asm__ __volatile__( -" str %1, [%0]\n" - : - : "r" (&lock->lock), "r" (0) - : "cc"); - - dsb_sev(); -} - -static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) -{ - unsigned long contended, res; - - do { - __asm__ __volatile__( - " ldrex %0, [%2]\n" - " teq %0, #0\n" - " strexeq %1, %3, [%2]\n" - " movne %1, #0\n" - : "=&r" (contended), "=r" (res) - : "r" (&lock->lock), "r" (1) - : "cc"); - } while (res); - - if (!contended) { - smp_mb(); - return 1; - } else { - return 0; - } -} - -#endif /* __ASM_SPINLOCK_H */ -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/include/asm-arm/arm64/spinlock.h b/xen/include/asm-arm/arm64/spinlock.h deleted file mode 100644 index 5ae034d..0000000 --- a/xen/include/asm-arm/arm64/spinlock.h +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Derived from Linux arch64 spinlock.h which is: - * Copyright (C) 2012 ARM Ltd. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef __ASM_ARM64_SPINLOCK_H -#define __ASM_ARM64_SPINLOCK_H - -typedef struct { - volatile unsigned int lock; -} raw_spinlock_t; - -#define _RAW_SPIN_LOCK_UNLOCKED { 0 } - -#define _raw_spin_is_locked(x) ((x)->lock != 0) - -static always_inline void _raw_spin_unlock(raw_spinlock_t *lock) -{ - ASSERT(_raw_spin_is_locked(lock)); - - asm volatile( - " stlr %w1, %0\n" - : "=Q" (lock->lock) : "r" (0) : "memory"); -} - -static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) -{ - unsigned int tmp; - - asm volatile( - "2: ldaxr %w0, %1\n" - " cbnz %w0, 1f\n" - " stxr %w0, %w2, %1\n" - " cbnz %w0, 2b\n" - "1:\n" - : "=&r" (tmp), "+Q" (lock->lock) - : "r" (1) - : "cc", "memory"); - - return !tmp; -} - -#endif /* __ASM_SPINLOCK_H */ -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/include/asm-arm/spinlock.h b/xen/include/asm-arm/spinlock.h deleted file mode 100644 index a064f73..0000000 --- a/xen/include/asm-arm/spinlock.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef __ASM_SPINLOCK_H -#define __ASM_SPINLOCK_H - -#include -#include - -#if defined(CONFIG_ARM_32) -# include -#elif defined(CONFIG_ARM_64) -# include -#else -# error "unknown ARM variant" -#endif - -#endif /* __ASM_SPINLOCK_H */ -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/include/asm-x86/spinlock.h b/xen/include/asm-x86/spinlock.h deleted file mode 100644 index 757e20b..0000000 --- a/xen/include/asm-x86/spinlock.h +++ /dev/null @@ -1,37 +0,0 @@ -#ifndef __ASM_SPINLOCK_H -#define __ASM_SPINLOCK_H - -#include -#include -#include - -typedef struct { - volatile s16 lock; -} raw_spinlock_t; - -#define _RAW_SPIN_LOCK_UNLOCKED /*(raw_spinlock_t)*/ { 1 } - -#define _raw_spin_is_locked(x) ((x)->lock <= 0) - -static always_inline void _raw_spin_unlock(raw_spinlock_t *lock) -{ - ASSERT(_raw_spin_is_locked(lock)); - asm volatile ( - "movw $1,%0" - : "=m" (lock->lock) : : "memory" ); -} - -static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) -{ - s16 oldval; - asm volatile ( - "xchgw %w0,%1" - :"=r" (oldval), "=m" (lock->lock) - :"0" ((s16)0) : "memory" ); - return (oldval > 0); -} - -#define _raw_read_unlock(l) \ - asm volatile ( "lock; dec%z0 %0" : "+m" ((l)->lock) :: "memory" ) - -#endif /* __ASM_SPINLOCK_H */ diff --git a/xen/include/xen/spinlock.h b/xen/include/xen/spinlock.h index bafbc74..311685a 100644 --- a/xen/include/xen/spinlock.h +++ b/xen/include/xen/spinlock.h @@ -2,7 +2,6 @@ #define __SPINLOCK_H__ #include -#include #ifndef NDEBUG struct lock_debug { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu May 28 18:44:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:44:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2n0-0003yZ-3k; Thu, 28 May 2015 18:44:22 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2my-0003yN-8M for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:44:20 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 4E/F3-02785-30267655; Thu, 28 May 2015 18:44:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1432838657!13528560!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14775 invoked from network); 28 May 2015 18:44:18 -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; 28 May 2015 18:44:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2mu-00035p-KT for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:44:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2mt-00031P-Od for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:44:15 +0000 Date: Thu, 28 May 2015 18:44:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86, arm: remove asm/spinlock.h from all architectures X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e62e49e6d5d4e8d22f3df0b75443ede65a812435 Author: David Vrabel AuthorDate: Fri May 15 09:52:25 2015 +0200 Commit: Jan Beulich CommitDate: Fri May 15 09:52:25 2015 +0200 x86,arm: remove asm/spinlock.h from all architectures Now that all architecture use a common ticket lock implementation for spinlocks, remove the architecture specific byte lock implementations. Signed-off-by: David Vrabel Reviewed-by: Tim Deegan Acked-by: Jan Beulich Acked-by: Ian Campbell --- xen/arch/arm/README.LinuxPrimitives | 28 -------------- xen/include/asm-arm/arm32/spinlock.h | 66 ---------------------------------- xen/include/asm-arm/arm64/spinlock.h | 63 -------------------------------- xen/include/asm-arm/spinlock.h | 23 ------------ xen/include/asm-x86/spinlock.h | 37 ------------------- xen/include/xen/spinlock.h | 1 - 6 files changed, 0 insertions(+), 218 deletions(-) diff --git a/xen/arch/arm/README.LinuxPrimitives b/xen/arch/arm/README.LinuxPrimitives index 7f33fc7..3115f51 100644 --- a/xen/arch/arm/README.LinuxPrimitives +++ b/xen/arch/arm/README.LinuxPrimitives @@ -25,16 +25,6 @@ linux/arch/arm64/include/asm/atomic.h xen/include/asm-arm/arm64/atomic.h --------------------------------------------------------------------- -spinlocks: last sync @ v3.16-rc6 (last commit: 95c4189689f9) - -linux/arch/arm64/include/asm/spinlock.h xen/include/asm-arm/arm64/spinlock.h - -Skipped: - 5686b06 arm64: lockref: add support for lockless lockrefs using cmpxchg - 52ea2a5 arm64: locks: introduce ticket-based spinlock implementation - ---------------------------------------------------------------------- - mem*: last sync @ v3.16-rc6 (last commit: d875c9b37240) linux/arch/arm64/lib/memchr.S xen/arch/arm/arm64/lib/memchr.S @@ -103,24 +93,6 @@ linux/arch/arm/include/asm/atomic.h xen/include/asm-arm/arm32/atomic.h --------------------------------------------------------------------- -spinlocks: last sync: 15e7e5c1ebf5 - -linux/arch/arm/include/asm/spinlock.h xen/include/asm-arm/arm32/spinlock.h - -*** Linux has switched to ticket locks but we still use bitlocks. - -resync to v3.14-rc7: - - 7c8746a ARM: 7955/1: spinlock: ensure we have a compiler barrier before sev - 0cbad9c ARM: 7854/1: lockref: add support for lockless lockrefs using cmpxchg64 - 9bb17be ARM: locks: prefetch the destination word for write prior to strex - 27a8479 ARM: smp_on_up: move inline asm ALT_SMP patching macro out of spinlock. - 00efaa0 ARM: 7812/1: rwlocks: retry trylock operation if strex fails on free lo - afa31d8 ARM: 7811/1: locks: use early clobber in arch_spin_trylock - 73a6fdc ARM: spinlock: use inner-shareable dsb variant prior to sev instruction - ---------------------------------------------------------------------- - mem*: last sync @ v3.16-rc6 (last commit: d98b90ea22b0) linux/arch/arm/lib/copy_template.S xen/arch/arm/arm32/lib/copy_template.S diff --git a/xen/include/asm-arm/arm32/spinlock.h b/xen/include/asm-arm/arm32/spinlock.h deleted file mode 100644 index bc0343c..0000000 --- a/xen/include/asm-arm/arm32/spinlock.h +++ /dev/null @@ -1,66 +0,0 @@ -#ifndef __ASM_ARM32_SPINLOCK_H -#define __ASM_ARM32_SPINLOCK_H - -static inline void dsb_sev(void) -{ - __asm__ __volatile__ ( - "dsb\n" - "sev\n" - ); -} - -typedef struct { - volatile unsigned int lock; -} raw_spinlock_t; - -#define _RAW_SPIN_LOCK_UNLOCKED { 0 } - -#define _raw_spin_is_locked(x) ((x)->lock != 0) - -static always_inline void _raw_spin_unlock(raw_spinlock_t *lock) -{ - ASSERT(_raw_spin_is_locked(lock)); - - smp_mb(); - - __asm__ __volatile__( -" str %1, [%0]\n" - : - : "r" (&lock->lock), "r" (0) - : "cc"); - - dsb_sev(); -} - -static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) -{ - unsigned long contended, res; - - do { - __asm__ __volatile__( - " ldrex %0, [%2]\n" - " teq %0, #0\n" - " strexeq %1, %3, [%2]\n" - " movne %1, #0\n" - : "=&r" (contended), "=r" (res) - : "r" (&lock->lock), "r" (1) - : "cc"); - } while (res); - - if (!contended) { - smp_mb(); - return 1; - } else { - return 0; - } -} - -#endif /* __ASM_SPINLOCK_H */ -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/include/asm-arm/arm64/spinlock.h b/xen/include/asm-arm/arm64/spinlock.h deleted file mode 100644 index 5ae034d..0000000 --- a/xen/include/asm-arm/arm64/spinlock.h +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Derived from Linux arch64 spinlock.h which is: - * Copyright (C) 2012 ARM Ltd. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef __ASM_ARM64_SPINLOCK_H -#define __ASM_ARM64_SPINLOCK_H - -typedef struct { - volatile unsigned int lock; -} raw_spinlock_t; - -#define _RAW_SPIN_LOCK_UNLOCKED { 0 } - -#define _raw_spin_is_locked(x) ((x)->lock != 0) - -static always_inline void _raw_spin_unlock(raw_spinlock_t *lock) -{ - ASSERT(_raw_spin_is_locked(lock)); - - asm volatile( - " stlr %w1, %0\n" - : "=Q" (lock->lock) : "r" (0) : "memory"); -} - -static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) -{ - unsigned int tmp; - - asm volatile( - "2: ldaxr %w0, %1\n" - " cbnz %w0, 1f\n" - " stxr %w0, %w2, %1\n" - " cbnz %w0, 2b\n" - "1:\n" - : "=&r" (tmp), "+Q" (lock->lock) - : "r" (1) - : "cc", "memory"); - - return !tmp; -} - -#endif /* __ASM_SPINLOCK_H */ -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/include/asm-arm/spinlock.h b/xen/include/asm-arm/spinlock.h deleted file mode 100644 index a064f73..0000000 --- a/xen/include/asm-arm/spinlock.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef __ASM_SPINLOCK_H -#define __ASM_SPINLOCK_H - -#include -#include - -#if defined(CONFIG_ARM_32) -# include -#elif defined(CONFIG_ARM_64) -# include -#else -# error "unknown ARM variant" -#endif - -#endif /* __ASM_SPINLOCK_H */ -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/include/asm-x86/spinlock.h b/xen/include/asm-x86/spinlock.h deleted file mode 100644 index 757e20b..0000000 --- a/xen/include/asm-x86/spinlock.h +++ /dev/null @@ -1,37 +0,0 @@ -#ifndef __ASM_SPINLOCK_H -#define __ASM_SPINLOCK_H - -#include -#include -#include - -typedef struct { - volatile s16 lock; -} raw_spinlock_t; - -#define _RAW_SPIN_LOCK_UNLOCKED /*(raw_spinlock_t)*/ { 1 } - -#define _raw_spin_is_locked(x) ((x)->lock <= 0) - -static always_inline void _raw_spin_unlock(raw_spinlock_t *lock) -{ - ASSERT(_raw_spin_is_locked(lock)); - asm volatile ( - "movw $1,%0" - : "=m" (lock->lock) : : "memory" ); -} - -static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) -{ - s16 oldval; - asm volatile ( - "xchgw %w0,%1" - :"=r" (oldval), "=m" (lock->lock) - :"0" ((s16)0) : "memory" ); - return (oldval > 0); -} - -#define _raw_read_unlock(l) \ - asm volatile ( "lock; dec%z0 %0" : "+m" ((l)->lock) :: "memory" ) - -#endif /* __ASM_SPINLOCK_H */ diff --git a/xen/include/xen/spinlock.h b/xen/include/xen/spinlock.h index bafbc74..311685a 100644 --- a/xen/include/xen/spinlock.h +++ b/xen/include/xen/spinlock.h @@ -2,7 +2,6 @@ #define __SPINLOCK_H__ #include -#include #ifndef NDEBUG struct lock_debug { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu May 28 18:44:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:44: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 1Yy2n9-0003zh-6d; Thu, 28 May 2015 18:44:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2n7-0003zV-Lx for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:44:29 +0000 Content-Length: 4724 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id FA/93-03195-D0267655; Thu, 28 May 2015 18:44:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1432838667!13533276!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11328 invoked from network); 28 May 2015 18:44:27 -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; 28 May 2015 18:44:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2n4-00035x-Py for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:44:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2n4-00032P-OY for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:44:26 +0000 Date: Thu, 28 May 2015 18:44:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] introduce a helper to allocate non-contiguous 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: multipart/mixed; boundary="===============1178564200590404355==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============1178564200590404355== Content-Length: 4412 Content-Transfer-Encoding: quoted-printable commit f278fcf19ce15f7b7ee69181560b5884a5e12b66 Author: Roger Pau Monn=C3=A9 AuthorDate: Fri May 15 10:06:04 2015 +0200 Commit: Jan Beulich CommitDate: Fri May 15 10:06:04 2015 +0200 introduce a helper to allocate non-contiguous memory The allocator uses independent calls to alloc_domheap_pages in order to get the desired amount of memory and then maps all the independent physical addresses into a contiguous virtual address space. Signed-off-by: Roger Pau Monn=C3=A9 Tested-by: Julien Grall (ARM) Reviewed-by: Tim Deegan --- xen/common/vmap.c | 67 ++++++++++++++++++++++++++++++++++++++++++++ xen/include/asm-arm/mm.h | 2 + xen/include/asm-x86/page.h | 2 + xen/include/xen/vmap.h | 3 ++ 4 files changed, 74 insertions(+), 0 deletions(-) diff --git a/xen/common/vmap.c b/xen/common/vmap.c index 739d468..8752595 100644 --- a/xen/common/vmap.c +++ b/xen/common/vmap.c @@ -215,4 +215,71 @@ void vunmap(const void *va) #endif vm_free(va); } + +void *vmalloc(size_t size) +{ + unsigned long *mfn; + size_t pages, i; + struct page_info *pg; + void *va; + + ASSERT(size); + + pages =3D PFN_UP(size); + mfn =3D xmalloc_array(unsigned long, pages); + if ( mfn =3D=3D NULL ) + return NULL; + + for ( i =3D 0; i < pages; i++ ) + { + pg =3D alloc_domheap_page(NULL, 0); + if ( pg =3D=3D NULL ) + goto error; + mfn[i] =3D page_to_mfn(pg); + } + + va =3D vmap(mfn, pages); + if ( va =3D=3D NULL ) + goto error; + + xfree(mfn); + return va; + + error: + while ( i-- ) + free_domheap_page(mfn_to_page(mfn[i])); + xfree(mfn); + return NULL; +} + +void *vzalloc(size_t size) +{ + void *p =3D vmalloc(size); + int i; + + if ( p =3D=3D NULL ) + return NULL; + + for ( i =3D 0; i < size; i +=3D PAGE_SIZE ) + clear_page(p + i); + + return p; +} + +void vfree(void *va) +{ + unsigned int i, pages =3D vm_size(va); + struct page_info *pg; + PAGE_LIST_HEAD(pg_list); + + ASSERT(pages); + + for ( i =3D 0; i < pages; i++ ) + page_list_add(vmap_to_page(va + i * PAGE_SIZE), &pg_list); + + vunmap(va); + + while ( (pg =3D page_list_remove_head(&pg_list)) !=3D NULL ) + free_domheap_page(pg); +} #endif diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index d25e485..c0afcec 100644 --- a/xen/include/asm-arm/mm.h +++ b/xen/include/asm-arm/mm.h @@ -208,6 +208,8 @@ static inline void __iomem *ioremap_wc(paddr_t start, size_t len) #define pfn_to_paddr(pfn) ((paddr_t)(pfn) << PAGE_SHIFT) #define paddr_to_pfn(pa) ((unsigned long)((pa) >> PAGE_SHIFT)) #define paddr_to_pdx(pa) pfn_to_pdx(paddr_to_pfn(pa)) +#define vmap_to_mfn(va) paddr_to_pfn(virt_to_maddr((vaddr_t)va)) +#define vmap_to_page(va) mfn_to_page(vmap_to_mfn(va)) /* Page-align address and convert to frame number format */ #define paddr_to_pfn_aligned(paddr) paddr_to_pfn(PAGE_ALIGN(paddr)) diff --git a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h index a8bc999..8977a76 100644 --- a/xen/include/asm-x86/page.h +++ b/xen/include/asm-x86/page.h @@ -262,6 +262,8 @@ void copy_page_sse2(void *, const void *); #define pfn_to_paddr(pfn) __pfn_to_paddr(pfn) #define paddr_to_pfn(pa) __paddr_to_pfn(pa) #define paddr_to_pdx(pa) pfn_to_pdx(paddr_to_pfn(pa)) +#define vmap_to_mfn(va) l1e_get_pfn(*virt_to_xen_l1e((unsigned long)(va))) +#define vmap_to_page(va) mfn_to_page(vmap_to_mfn(va)) #endif /* !defined(__ASSEMBLY__) */ diff --git a/xen/include/xen/vmap.h b/xen/include/xen/vmap.h index b1923dd..a13591d 100644 --- a/xen/include/xen/vmap.h +++ b/xen/include/xen/vmap.h @@ -11,6 +11,9 @@ void *__vmap(const unsigned long *mfn, unsigned int granularity, unsigned int nr, unsigned int align, unsigned int flags); void *vmap(const unsigned long *mfn, unsigned int nr); void vunmap(const void *); +void *vmalloc(size_t size); +void *vzalloc(size_t size); +void vfree(void *va); void __iomem *ioremap(paddr_t, size_t); -- generated by git-patchbot for /home/xen/git/xen.git#master --===============1178564200590404355== 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 --===============1178564200590404355==-- From xen-changelog-bounces@lists.xen.org Thu May 28 18:44:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:44: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 1Yy2n9-0003zh-6d; Thu, 28 May 2015 18:44:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2n7-0003zV-Lx for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:44:29 +0000 Content-Length: 4724 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id FA/93-03195-D0267655; Thu, 28 May 2015 18:44:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1432838667!13533276!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11328 invoked from network); 28 May 2015 18:44:27 -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; 28 May 2015 18:44:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2n4-00035x-Py for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:44:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2n4-00032P-OY for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:44:26 +0000 Date: Thu, 28 May 2015 18:44:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] introduce a helper to allocate non-contiguous 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: multipart/mixed; boundary="===============1178564200590404355==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============1178564200590404355== Content-Length: 4412 Content-Transfer-Encoding: quoted-printable commit f278fcf19ce15f7b7ee69181560b5884a5e12b66 Author: Roger Pau Monn=C3=A9 AuthorDate: Fri May 15 10:06:04 2015 +0200 Commit: Jan Beulich CommitDate: Fri May 15 10:06:04 2015 +0200 introduce a helper to allocate non-contiguous memory The allocator uses independent calls to alloc_domheap_pages in order to get the desired amount of memory and then maps all the independent physical addresses into a contiguous virtual address space. Signed-off-by: Roger Pau Monn=C3=A9 Tested-by: Julien Grall (ARM) Reviewed-by: Tim Deegan --- xen/common/vmap.c | 67 ++++++++++++++++++++++++++++++++++++++++++++ xen/include/asm-arm/mm.h | 2 + xen/include/asm-x86/page.h | 2 + xen/include/xen/vmap.h | 3 ++ 4 files changed, 74 insertions(+), 0 deletions(-) diff --git a/xen/common/vmap.c b/xen/common/vmap.c index 739d468..8752595 100644 --- a/xen/common/vmap.c +++ b/xen/common/vmap.c @@ -215,4 +215,71 @@ void vunmap(const void *va) #endif vm_free(va); } + +void *vmalloc(size_t size) +{ + unsigned long *mfn; + size_t pages, i; + struct page_info *pg; + void *va; + + ASSERT(size); + + pages =3D PFN_UP(size); + mfn =3D xmalloc_array(unsigned long, pages); + if ( mfn =3D=3D NULL ) + return NULL; + + for ( i =3D 0; i < pages; i++ ) + { + pg =3D alloc_domheap_page(NULL, 0); + if ( pg =3D=3D NULL ) + goto error; + mfn[i] =3D page_to_mfn(pg); + } + + va =3D vmap(mfn, pages); + if ( va =3D=3D NULL ) + goto error; + + xfree(mfn); + return va; + + error: + while ( i-- ) + free_domheap_page(mfn_to_page(mfn[i])); + xfree(mfn); + return NULL; +} + +void *vzalloc(size_t size) +{ + void *p =3D vmalloc(size); + int i; + + if ( p =3D=3D NULL ) + return NULL; + + for ( i =3D 0; i < size; i +=3D PAGE_SIZE ) + clear_page(p + i); + + return p; +} + +void vfree(void *va) +{ + unsigned int i, pages =3D vm_size(va); + struct page_info *pg; + PAGE_LIST_HEAD(pg_list); + + ASSERT(pages); + + for ( i =3D 0; i < pages; i++ ) + page_list_add(vmap_to_page(va + i * PAGE_SIZE), &pg_list); + + vunmap(va); + + while ( (pg =3D page_list_remove_head(&pg_list)) !=3D NULL ) + free_domheap_page(pg); +} #endif diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index d25e485..c0afcec 100644 --- a/xen/include/asm-arm/mm.h +++ b/xen/include/asm-arm/mm.h @@ -208,6 +208,8 @@ static inline void __iomem *ioremap_wc(paddr_t start, size_t len) #define pfn_to_paddr(pfn) ((paddr_t)(pfn) << PAGE_SHIFT) #define paddr_to_pfn(pa) ((unsigned long)((pa) >> PAGE_SHIFT)) #define paddr_to_pdx(pa) pfn_to_pdx(paddr_to_pfn(pa)) +#define vmap_to_mfn(va) paddr_to_pfn(virt_to_maddr((vaddr_t)va)) +#define vmap_to_page(va) mfn_to_page(vmap_to_mfn(va)) /* Page-align address and convert to frame number format */ #define paddr_to_pfn_aligned(paddr) paddr_to_pfn(PAGE_ALIGN(paddr)) diff --git a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h index a8bc999..8977a76 100644 --- a/xen/include/asm-x86/page.h +++ b/xen/include/asm-x86/page.h @@ -262,6 +262,8 @@ void copy_page_sse2(void *, const void *); #define pfn_to_paddr(pfn) __pfn_to_paddr(pfn) #define paddr_to_pfn(pa) __paddr_to_pfn(pa) #define paddr_to_pdx(pa) pfn_to_pdx(paddr_to_pfn(pa)) +#define vmap_to_mfn(va) l1e_get_pfn(*virt_to_xen_l1e((unsigned long)(va))) +#define vmap_to_page(va) mfn_to_page(vmap_to_mfn(va)) #endif /* !defined(__ASSEMBLY__) */ diff --git a/xen/include/xen/vmap.h b/xen/include/xen/vmap.h index b1923dd..a13591d 100644 --- a/xen/include/xen/vmap.h +++ b/xen/include/xen/vmap.h @@ -11,6 +11,9 @@ void *__vmap(const unsigned long *mfn, unsigned int granularity, unsigned int nr, unsigned int align, unsigned int flags); void *vmap(const unsigned long *mfn, unsigned int nr); void vunmap(const void *); +void *vmalloc(size_t size); +void *vzalloc(size_t size); +void vfree(void *va); void __iomem *ioremap(paddr_t, size_t); -- generated by git-patchbot for /home/xen/git/xen.git#master --===============1178564200590404355== 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 --===============1178564200590404355==-- From xen-changelog-bounces@lists.xen.org Thu May 28 18:44:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:44: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 1Yy2nJ-00040s-9o; Thu, 28 May 2015 18:44:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2nH-00040f-E5 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:44:39 +0000 Content-Length: 5005 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 71/C1-03041-61267655; Thu, 28 May 2015 18:44:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1432838677!13530829!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5183 invoked from network); 28 May 2015 18:44:38 -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; 28 May 2015 18:44:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2nE-000366-VY for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:44:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2nE-00033a-U1 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:44:36 +0000 Date: Thu, 28 May 2015 18:44:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: fix shadow_track_dirty_vram to work on hvm guests X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8410598296163481417==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============8410598296163481417== Content-Length: 4671 Content-Transfer-Encoding: quoted-printable commit bd1b4a71b325933a08099676515a7cc8235d7144 Author: Roger Pau Monn=C3=A9 AuthorDate: Fri May 15 10:07:20 2015 +0200 Commit: Jan Beulich CommitDate: Fri May 15 10:07:20 2015 +0200 x86/shadow: fix shadow_track_dirty_vram to work on hvm guests Modify shadow_track_dirty_vram to use a local buffer and then flush to the guest without the paging_lock held. This is modeled after hap_track_dirty_vram. Signed-off-by: Roger Pau Monn=C3=A9 Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 49 +++++++++++++++++++++++--------------- 1 files changed, 30 insertions(+), 19 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 2e43d6d..9e9d19f 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3516,7 +3516,7 @@ static void sh_clean_dirty_bitmap(struct domain *d) int shadow_track_dirty_vram(struct domain *d, unsigned long begin_pfn, unsigned long nr, - XEN_GUEST_HANDLE_64(uint8) dirty_bitmap) + XEN_GUEST_HANDLE_64(uint8) guest_dirty_bitmap) { int rc; unsigned long end_pfn =3D begin_pfn + nr; @@ -3526,6 +3526,7 @@ int shadow_track_dirty_vram(struct domain *d, p2m_type_t t; struct sh_dirty_vram *dirty_vram; struct p2m_domain *p2m =3D p2m_get_hostp2m(d); + uint8_t *dirty_bitmap =3D NULL; if ( end_pfn < begin_pfn || end_pfn > p2m->max_mapped_pfn + 1 ) return -EINVAL; @@ -3554,6 +3555,12 @@ int shadow_track_dirty_vram(struct domain *d, goto out; } + dirty_bitmap =3D vzalloc(dirty_size); + if ( dirty_bitmap =3D=3D NULL ) + { + rc =3D -ENOMEM; + goto out; + } /* This should happen seldomly (Video mode change), * no need to be careful. */ if ( !dirty_vram ) @@ -3584,12 +3591,8 @@ int shadow_track_dirty_vram(struct domain *d, rc =3D -ENODATA; } else if (dirty_vram->last_dirty =3D=3D -1) - { /* still completely clean, just copy our empty bitmap */ - rc =3D -EFAULT; - if ( copy_to_guest(dirty_bitmap, dirty_vram->dirty_bitmap, dirty_size) =3D=3D 0 ) - rc =3D 0; - } + memcpy(dirty_bitmap, dirty_vram->dirty_bitmap, dirty_size); else { unsigned long map_mfn =3D INVALID_MFN; @@ -3668,21 +3671,19 @@ int shadow_track_dirty_vram(struct domain *d, if ( map_sl1p ) sh_unmap_domain_page(map_sl1p); - rc =3D -EFAULT; - if ( copy_to_guest(dirty_bitmap, dirty_vram->dirty_bitmap, dirty_size) =3D=3D 0 ) { - memset(dirty_vram->dirty_bitmap, 0, dirty_size); - if (dirty_vram->last_dirty + SECONDS(2) < NOW()) + memcpy(dirty_bitmap, dirty_vram->dirty_bitmap, dirty_size); + memset(dirty_vram->dirty_bitmap, 0, dirty_size); + if ( dirty_vram->last_dirty + SECONDS(2) < NOW() ) + { + /* was clean for more than two seconds, try to disable guest + * write access */ + for ( i =3D begin_pfn; i < end_pfn; i++ ) { - /* was clean for more than two seconds, try to disable guest - * write access */ - for ( i =3D begin_pfn; i < end_pfn; i++ ) { - mfn_t mfn =3D get_gfn_query_unlocked(d, i, &t); - if (mfn_x(mfn) !=3D INVALID_MFN) - flush_tlb |=3D sh_remove_write_access(d, mfn, 1, 0); - } - dirty_vram->last_dirty =3D -1; + mfn_t mfn =3D get_gfn_query_unlocked(d, i, &t); + if ( mfn_x(mfn) !=3D INVALID_MFN ) + flush_tlb |=3D sh_remove_write_access(d, mfn, 1, 0); } - rc =3D 0; + dirty_vram->last_dirty =3D -1; } } if ( flush_tlb ) @@ -3697,6 +3698,16 @@ out_dirty_vram: out: paging_unlock(d); + if ( rc =3D=3D 0 && dirty_bitmap !=3D NULL && + copy_to_guest(guest_dirty_bitmap, dirty_bitmap, dirty_size) ) + { + paging_lock(d); + for ( i =3D 0; i < dirty_size; i++ ) + dirty_vram->dirty_bitmap[i] |=3D dirty_bitmap[i]; + paging_unlock(d); + rc =3D -EFAULT; + } + vfree(dirty_bitmap); p2m_unlock(p2m_get_hostp2m(d)); return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#master --===============8410598296163481417== 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 --===============8410598296163481417==-- From xen-changelog-bounces@lists.xen.org Thu May 28 18:44:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:44: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 1Yy2nJ-00040s-9o; Thu, 28 May 2015 18:44:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2nH-00040f-E5 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:44:39 +0000 Content-Length: 5005 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 71/C1-03041-61267655; Thu, 28 May 2015 18:44:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1432838677!13530829!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5183 invoked from network); 28 May 2015 18:44:38 -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; 28 May 2015 18:44:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2nE-000366-VY for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:44:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2nE-00033a-U1 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:44:36 +0000 Date: Thu, 28 May 2015 18:44:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: fix shadow_track_dirty_vram to work on hvm guests X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8410598296163481417==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============8410598296163481417== Content-Length: 4671 Content-Transfer-Encoding: quoted-printable commit bd1b4a71b325933a08099676515a7cc8235d7144 Author: Roger Pau Monn=C3=A9 AuthorDate: Fri May 15 10:07:20 2015 +0200 Commit: Jan Beulich CommitDate: Fri May 15 10:07:20 2015 +0200 x86/shadow: fix shadow_track_dirty_vram to work on hvm guests Modify shadow_track_dirty_vram to use a local buffer and then flush to the guest without the paging_lock held. This is modeled after hap_track_dirty_vram. Signed-off-by: Roger Pau Monn=C3=A9 Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 49 +++++++++++++++++++++++--------------- 1 files changed, 30 insertions(+), 19 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 2e43d6d..9e9d19f 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3516,7 +3516,7 @@ static void sh_clean_dirty_bitmap(struct domain *d) int shadow_track_dirty_vram(struct domain *d, unsigned long begin_pfn, unsigned long nr, - XEN_GUEST_HANDLE_64(uint8) dirty_bitmap) + XEN_GUEST_HANDLE_64(uint8) guest_dirty_bitmap) { int rc; unsigned long end_pfn =3D begin_pfn + nr; @@ -3526,6 +3526,7 @@ int shadow_track_dirty_vram(struct domain *d, p2m_type_t t; struct sh_dirty_vram *dirty_vram; struct p2m_domain *p2m =3D p2m_get_hostp2m(d); + uint8_t *dirty_bitmap =3D NULL; if ( end_pfn < begin_pfn || end_pfn > p2m->max_mapped_pfn + 1 ) return -EINVAL; @@ -3554,6 +3555,12 @@ int shadow_track_dirty_vram(struct domain *d, goto out; } + dirty_bitmap =3D vzalloc(dirty_size); + if ( dirty_bitmap =3D=3D NULL ) + { + rc =3D -ENOMEM; + goto out; + } /* This should happen seldomly (Video mode change), * no need to be careful. */ if ( !dirty_vram ) @@ -3584,12 +3591,8 @@ int shadow_track_dirty_vram(struct domain *d, rc =3D -ENODATA; } else if (dirty_vram->last_dirty =3D=3D -1) - { /* still completely clean, just copy our empty bitmap */ - rc =3D -EFAULT; - if ( copy_to_guest(dirty_bitmap, dirty_vram->dirty_bitmap, dirty_size) =3D=3D 0 ) - rc =3D 0; - } + memcpy(dirty_bitmap, dirty_vram->dirty_bitmap, dirty_size); else { unsigned long map_mfn =3D INVALID_MFN; @@ -3668,21 +3671,19 @@ int shadow_track_dirty_vram(struct domain *d, if ( map_sl1p ) sh_unmap_domain_page(map_sl1p); - rc =3D -EFAULT; - if ( copy_to_guest(dirty_bitmap, dirty_vram->dirty_bitmap, dirty_size) =3D=3D 0 ) { - memset(dirty_vram->dirty_bitmap, 0, dirty_size); - if (dirty_vram->last_dirty + SECONDS(2) < NOW()) + memcpy(dirty_bitmap, dirty_vram->dirty_bitmap, dirty_size); + memset(dirty_vram->dirty_bitmap, 0, dirty_size); + if ( dirty_vram->last_dirty + SECONDS(2) < NOW() ) + { + /* was clean for more than two seconds, try to disable guest + * write access */ + for ( i =3D begin_pfn; i < end_pfn; i++ ) { - /* was clean for more than two seconds, try to disable guest - * write access */ - for ( i =3D begin_pfn; i < end_pfn; i++ ) { - mfn_t mfn =3D get_gfn_query_unlocked(d, i, &t); - if (mfn_x(mfn) !=3D INVALID_MFN) - flush_tlb |=3D sh_remove_write_access(d, mfn, 1, 0); - } - dirty_vram->last_dirty =3D -1; + mfn_t mfn =3D get_gfn_query_unlocked(d, i, &t); + if ( mfn_x(mfn) !=3D INVALID_MFN ) + flush_tlb |=3D sh_remove_write_access(d, mfn, 1, 0); } - rc =3D 0; + dirty_vram->last_dirty =3D -1; } } if ( flush_tlb ) @@ -3697,6 +3698,16 @@ out_dirty_vram: out: paging_unlock(d); + if ( rc =3D=3D 0 && dirty_bitmap !=3D NULL && + copy_to_guest(guest_dirty_bitmap, dirty_bitmap, dirty_size) ) + { + paging_lock(d); + for ( i =3D 0; i < dirty_size; i++ ) + dirty_vram->dirty_bitmap[i] |=3D dirty_bitmap[i]; + paging_unlock(d); + rc =3D -EFAULT; + } + vfree(dirty_bitmap); p2m_unlock(p2m_get_hostp2m(d)); return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#master --===============8410598296163481417== 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 --===============8410598296163481417==-- From xen-changelog-bounces@lists.xen.org Thu May 28 18:44:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:44:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2nS-00042c-Ga; Thu, 28 May 2015 18:44:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2nR-00042O-D0 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:44:49 +0000 Content-Length: 1777 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 86/B4-10437-02267655; Thu, 28 May 2015 18:44:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1432838687!10995057!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14247 invoked from network); 28 May 2015 18:44:48 -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; 28 May 2015 18:44:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2nP-00036C-4d for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:44:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2nP-000357-3P for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:44:47 +0000 Date: Thu, 28 May 2015 18:44:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hap: make hap_track_dirty_vram use non-contiguous memory for temporary map X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============2587724351805735014==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============2587724351805735014== Content-Length: 1366 Content-Transfer-Encoding: quoted-printable commit acc0899ef41e763c665c542beca6809049fac11c Author: Roger Pau Monn=C3=A9 AuthorDate: Fri May 15 10:07:50 2015 +0200 Commit: Jan Beulich CommitDate: Fri May 15 10:07:50 2015 +0200 x86/hap: make hap_track_dirty_vram use non-contiguous memory for temporary map Just like it's done for shadow_track_dirty_vram allocate the temporary buffer using non-contiguous memory. Signed-off-by: Roger Pau Monn=C3=A9 Reviewed-by: Tim Deegan --- xen/arch/x86/mm/hap/hap.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index c28a6e3..cea7990 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -87,7 +87,7 @@ int hap_track_dirty_vram(struct domain *d, } rc =3D -ENOMEM; - dirty_bitmap =3D xzalloc_bytes(size); + dirty_bitmap =3D vzalloc(size); if ( !dirty_bitmap ) goto out; @@ -174,7 +174,7 @@ int hap_track_dirty_vram(struct domain *d, p2m_ram_logdirty, p2m_ram_rw); } out: - xfree(dirty_bitmap); + vfree(dirty_bitmap); return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#master --===============2587724351805735014== 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 --===============2587724351805735014==-- From xen-changelog-bounces@lists.xen.org Thu May 28 18:44:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:44:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2nS-00042c-Ga; Thu, 28 May 2015 18:44:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2nR-00042O-D0 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:44:49 +0000 Content-Length: 1777 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 86/B4-10437-02267655; Thu, 28 May 2015 18:44:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1432838687!10995057!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14247 invoked from network); 28 May 2015 18:44:48 -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; 28 May 2015 18:44:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2nP-00036C-4d for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:44:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2nP-000357-3P for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:44:47 +0000 Date: Thu, 28 May 2015 18:44:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hap: make hap_track_dirty_vram use non-contiguous memory for temporary map X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============2587724351805735014==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============2587724351805735014== Content-Length: 1366 Content-Transfer-Encoding: quoted-printable commit acc0899ef41e763c665c542beca6809049fac11c Author: Roger Pau Monn=C3=A9 AuthorDate: Fri May 15 10:07:50 2015 +0200 Commit: Jan Beulich CommitDate: Fri May 15 10:07:50 2015 +0200 x86/hap: make hap_track_dirty_vram use non-contiguous memory for temporary map Just like it's done for shadow_track_dirty_vram allocate the temporary buffer using non-contiguous memory. Signed-off-by: Roger Pau Monn=C3=A9 Reviewed-by: Tim Deegan --- xen/arch/x86/mm/hap/hap.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index c28a6e3..cea7990 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -87,7 +87,7 @@ int hap_track_dirty_vram(struct domain *d, } rc =3D -ENOMEM; - dirty_bitmap =3D xzalloc_bytes(size); + dirty_bitmap =3D vzalloc(size); if ( !dirty_bitmap ) goto out; @@ -174,7 +174,7 @@ int hap_track_dirty_vram(struct domain *d, p2m_ram_logdirty, p2m_ram_rw); } out: - xfree(dirty_bitmap); + vfree(dirty_bitmap); return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#master --===============2587724351805735014== 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 --===============2587724351805735014==-- From xen-changelog-bounces@lists.xen.org Thu May 28 18:45:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:45:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2nd-00044X-Ji; Thu, 28 May 2015 18:45:01 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2nc-00044D-30 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:45:00 +0000 Content-Length: 8666 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 00/C8-02812-B2267655; Thu, 28 May 2015 18:44:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1432838697!13580185!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14557 invoked from network); 28 May 2015 18:44:58 -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; 28 May 2015 18:44:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2nZ-00036L-Ag for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:44:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2nZ-00035v-92 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:44:57 +0000 Date: Thu, 28 May 2015 18:44:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: rework paging_log_dirty_op to work with hvm guests X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2158407291596587265==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============2158407291596587265== Content-Length: 8431 Content-Transfer-Encoding: quoted-printable commit a809eeea06d20b115d78f12e473502bcb6209844 Author: Roger Pau Monn=C3=A9 AuthorDate: Fri May 15 10:08:33 2015 +0200 Commit: Jan Beulich CommitDate: Fri May 15 10:08:33 2015 +0200 x86: rework paging_log_dirty_op to work with hvm guests When the caller of paging_log_dirty_op is a hvm guest Xen would choke when trying to copy the dirty bitmap to the guest because the paging lock is already held. Fix this by independently mapping each page of the guest bitmap as needed without the paging lock held. Signed-off-by: Roger Pau Monn=C3=A9 Reviewed-by: Tim Deegan --- xen/arch/x86/mm/paging.c | 97 +++++++++++++++++++++++++++++++++++++----- xen/include/asm-x86/domain.h | 1 + 2 files changed, 87 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index 59d4720..5eee88c 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -408,6 +408,51 @@ int paging_mfn_is_dirty(struct domain *d, mfn_t gmfn) return rv; } +static inline void *map_dirty_bitmap(XEN_GUEST_HANDLE_64(uint8) dirty_bitmap, + unsigned long pages, + struct page_info **page) +{ + uint32_t pfec =3D PFEC_page_present | PFEC_write_access; + unsigned long gfn; + p2m_type_t p2mt; + + gfn =3D paging_gva_to_gfn(current, + (unsigned long)(dirty_bitmap.p + (pages >> 3)), + &pfec); + if ( gfn =3D=3D INVALID_GFN ) + return NULL; + + *page =3D get_page_from_gfn(current->domain, gfn, &p2mt, P2M_UNSHARE); + + if ( !p2m_is_ram(p2mt) ) + { + put_page(*page); + return NULL; + } + if ( p2m_is_paging(p2mt) ) + { + put_page(*page); + p2m_mem_paging_populate(current->domain, gfn); + return NULL; + } + if ( p2m_is_shared(p2mt) || p2m_is_discard_write(p2mt) ) + { + put_page(*page); + return NULL; + } + + return __map_domain_page(*page); +} + +static inline void unmap_dirty_bitmap(void *addr, struct page_info *page) +{ + if ( addr !=3D NULL ) + { + unmap_domain_page(addr); + put_page(page); + } +} + /* Read a domain's log-dirty bitmap and stats. If the operation is a CLEAN, * clear the bitmap and stats as well. */ @@ -420,7 +465,11 @@ static int paging_log_dirty_op(struct domain *d, mfn_t *l4 =3D NULL, *l3 =3D NULL, *l2 =3D NULL; unsigned long *l1 =3D NULL; int i4, i3, i2; + uint8_t *dirty_bitmap; + struct page_info *page; + unsigned long index_mapped; + again: if ( !resuming ) { domain_pause(d); @@ -433,6 +482,14 @@ static int paging_log_dirty_op(struct domain *d, p2m_flush_hardware_cached_dirty(d); } + index_mapped =3D resuming =3F d->arch.paging.preempt.log_dirty.done : 0; + dirty_bitmap =3D map_dirty_bitmap(sc->dirty_bitmap, index_mapped, &page); + if ( dirty_bitmap =3D=3D NULL ) + { + domain_unpause(d); + return -EFAULT; + } + paging_lock(d); if ( !d->arch.paging.preempt.dom ) @@ -472,18 +529,18 @@ static int paging_log_dirty_op(struct domain *d, l4 =3D paging_map_log_dirty_bitmap(d); i4 =3D d->arch.paging.preempt.log_dirty.i4; i3 =3D d->arch.paging.preempt.log_dirty.i3; + i2 =3D d->arch.paging.preempt.log_dirty.i2; pages =3D d->arch.paging.preempt.log_dirty.done; for ( ; (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); i4++, i3 =3D 0 ) { l3 =3D (l4 && mfn_valid(l4[i4])) =3F map_domain_page(mfn_x(l4[i4])) : NULL; - for ( ; (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); i3++ ) + for ( ; (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); + i3++, i2 =3D 0 ) { l2 =3D ((l3 && mfn_valid(l3[i3])) =3F map_domain_page(mfn_x(l3[i3])) : NULL); - for ( i2 =3D 0; - (pages < sc->pages) && (i2 < LOGDIRTY_NODE_ENTRIES); - i2++ ) + for ( ; (pages < sc->pages) && (i2 < LOGDIRTY_NODE_ENTRIES); i2++ ) { unsigned int bytes =3D PAGE_SIZE; l1 =3D ((l2 && mfn_valid(l2[i2])) =3F @@ -492,15 +549,28 @@ static int paging_log_dirty_op(struct domain *d, bytes =3D (unsigned int)((sc->pages - pages + 7) >> 3); if ( likely(peek) ) { - if ( (l1 =3F copy_to_guest_offset(sc->dirty_bitmap, - pages >> 3, (uint8_t *)l1, - bytes) - : clear_guest_offset(sc->dirty_bitmap, - pages >> 3, bytes)) !=3D 0 ) + if ( pages >> (3 + PAGE_SHIFT) !=3D + index_mapped >> (3 + PAGE_SHIFT) ) { - rv =3D -EFAULT; - goto out; + /* We need to map next page */ + d->arch.paging.preempt.log_dirty.i4 =3D i4; + d->arch.paging.preempt.log_dirty.i3 =3D i3; + d->arch.paging.preempt.log_dirty.i2 =3D i2; + d->arch.paging.preempt.log_dirty.done =3D pages; + d->arch.paging.preempt.dom =3D current->domain; + d->arch.paging.preempt.op =3D sc->op; + resuming =3D 1; + paging_unlock(d); + unmap_dirty_bitmap(dirty_bitmap, page); + goto again; } + ASSERT(((pages >> 3) % PAGE_SIZE) + bytes <=3D PAGE_SIZE); + if ( l1 ) + memcpy(dirty_bitmap + ((pages >> 3) % PAGE_SIZE), l1, + bytes); + else + memset(dirty_bitmap + ((pages >> 3) % PAGE_SIZE), 0, + bytes); } pages +=3D bytes << 3; if ( l1 ) @@ -517,6 +587,7 @@ static int paging_log_dirty_op(struct domain *d, { d->arch.paging.preempt.log_dirty.i4 =3D i4; d->arch.paging.preempt.log_dirty.i3 =3D i3 + 1; + d->arch.paging.preempt.log_dirty.i2 =3D 0; rv =3D -ERESTART; break; } @@ -529,6 +600,7 @@ static int paging_log_dirty_op(struct domain *d, { d->arch.paging.preempt.log_dirty.i4 =3D i4 + 1; d->arch.paging.preempt.log_dirty.i3 =3D 0; + d->arch.paging.preempt.log_dirty.i2 =3D 0; rv =3D -ERESTART; } if ( rv ) @@ -558,6 +630,7 @@ static int paging_log_dirty_op(struct domain *d, if ( rv ) { /* Never leave the domain paused on real errors. */ + unmap_dirty_bitmap(dirty_bitmap, page); ASSERT(rv =3D=3D -ERESTART); return rv; } @@ -570,12 +643,14 @@ static int paging_log_dirty_op(struct domain *d, * paging modes (shadow or hap). Safe because the domain is paused. */ d->arch.paging.log_dirty.clean_dirty_bitmap(d); } + unmap_dirty_bitmap(dirty_bitmap, page); domain_unpause(d); return rv; out: d->arch.paging.preempt.dom =3D NULL; paging_unlock(d); + unmap_dirty_bitmap(dirty_bitmap, page); domain_unpause(d); if ( l1 ) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 45b5283..f4375c2 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -204,6 +204,7 @@ struct paging_domain { unsigned long done:PADDR_BITS - PAGE_SHIFT; unsigned long i4:PAGETABLE_ORDER; unsigned long i3:PAGETABLE_ORDER; + unsigned long i2:PAGETABLE_ORDER; } log_dirty; }; } preempt; -- generated by git-patchbot for /home/xen/git/xen.git#master --===============2158407291596587265== 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 --===============2158407291596587265==-- From xen-changelog-bounces@lists.xen.org Thu May 28 18:45:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:45:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2nd-00044X-Ji; Thu, 28 May 2015 18:45:01 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2nc-00044D-30 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:45:00 +0000 Content-Length: 8666 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 00/C8-02812-B2267655; Thu, 28 May 2015 18:44:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1432838697!13580185!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14557 invoked from network); 28 May 2015 18:44:58 -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; 28 May 2015 18:44:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2nZ-00036L-Ag for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:44:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2nZ-00035v-92 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:44:57 +0000 Date: Thu, 28 May 2015 18:44:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: rework paging_log_dirty_op to work with hvm guests X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2158407291596587265==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============2158407291596587265== Content-Length: 8431 Content-Transfer-Encoding: quoted-printable commit a809eeea06d20b115d78f12e473502bcb6209844 Author: Roger Pau Monn=C3=A9 AuthorDate: Fri May 15 10:08:33 2015 +0200 Commit: Jan Beulich CommitDate: Fri May 15 10:08:33 2015 +0200 x86: rework paging_log_dirty_op to work with hvm guests When the caller of paging_log_dirty_op is a hvm guest Xen would choke when trying to copy the dirty bitmap to the guest because the paging lock is already held. Fix this by independently mapping each page of the guest bitmap as needed without the paging lock held. Signed-off-by: Roger Pau Monn=C3=A9 Reviewed-by: Tim Deegan --- xen/arch/x86/mm/paging.c | 97 +++++++++++++++++++++++++++++++++++++----- xen/include/asm-x86/domain.h | 1 + 2 files changed, 87 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index 59d4720..5eee88c 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -408,6 +408,51 @@ int paging_mfn_is_dirty(struct domain *d, mfn_t gmfn) return rv; } +static inline void *map_dirty_bitmap(XEN_GUEST_HANDLE_64(uint8) dirty_bitmap, + unsigned long pages, + struct page_info **page) +{ + uint32_t pfec =3D PFEC_page_present | PFEC_write_access; + unsigned long gfn; + p2m_type_t p2mt; + + gfn =3D paging_gva_to_gfn(current, + (unsigned long)(dirty_bitmap.p + (pages >> 3)), + &pfec); + if ( gfn =3D=3D INVALID_GFN ) + return NULL; + + *page =3D get_page_from_gfn(current->domain, gfn, &p2mt, P2M_UNSHARE); + + if ( !p2m_is_ram(p2mt) ) + { + put_page(*page); + return NULL; + } + if ( p2m_is_paging(p2mt) ) + { + put_page(*page); + p2m_mem_paging_populate(current->domain, gfn); + return NULL; + } + if ( p2m_is_shared(p2mt) || p2m_is_discard_write(p2mt) ) + { + put_page(*page); + return NULL; + } + + return __map_domain_page(*page); +} + +static inline void unmap_dirty_bitmap(void *addr, struct page_info *page) +{ + if ( addr !=3D NULL ) + { + unmap_domain_page(addr); + put_page(page); + } +} + /* Read a domain's log-dirty bitmap and stats. If the operation is a CLEAN, * clear the bitmap and stats as well. */ @@ -420,7 +465,11 @@ static int paging_log_dirty_op(struct domain *d, mfn_t *l4 =3D NULL, *l3 =3D NULL, *l2 =3D NULL; unsigned long *l1 =3D NULL; int i4, i3, i2; + uint8_t *dirty_bitmap; + struct page_info *page; + unsigned long index_mapped; + again: if ( !resuming ) { domain_pause(d); @@ -433,6 +482,14 @@ static int paging_log_dirty_op(struct domain *d, p2m_flush_hardware_cached_dirty(d); } + index_mapped =3D resuming =3F d->arch.paging.preempt.log_dirty.done : 0; + dirty_bitmap =3D map_dirty_bitmap(sc->dirty_bitmap, index_mapped, &page); + if ( dirty_bitmap =3D=3D NULL ) + { + domain_unpause(d); + return -EFAULT; + } + paging_lock(d); if ( !d->arch.paging.preempt.dom ) @@ -472,18 +529,18 @@ static int paging_log_dirty_op(struct domain *d, l4 =3D paging_map_log_dirty_bitmap(d); i4 =3D d->arch.paging.preempt.log_dirty.i4; i3 =3D d->arch.paging.preempt.log_dirty.i3; + i2 =3D d->arch.paging.preempt.log_dirty.i2; pages =3D d->arch.paging.preempt.log_dirty.done; for ( ; (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); i4++, i3 =3D 0 ) { l3 =3D (l4 && mfn_valid(l4[i4])) =3F map_domain_page(mfn_x(l4[i4])) : NULL; - for ( ; (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); i3++ ) + for ( ; (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); + i3++, i2 =3D 0 ) { l2 =3D ((l3 && mfn_valid(l3[i3])) =3F map_domain_page(mfn_x(l3[i3])) : NULL); - for ( i2 =3D 0; - (pages < sc->pages) && (i2 < LOGDIRTY_NODE_ENTRIES); - i2++ ) + for ( ; (pages < sc->pages) && (i2 < LOGDIRTY_NODE_ENTRIES); i2++ ) { unsigned int bytes =3D PAGE_SIZE; l1 =3D ((l2 && mfn_valid(l2[i2])) =3F @@ -492,15 +549,28 @@ static int paging_log_dirty_op(struct domain *d, bytes =3D (unsigned int)((sc->pages - pages + 7) >> 3); if ( likely(peek) ) { - if ( (l1 =3F copy_to_guest_offset(sc->dirty_bitmap, - pages >> 3, (uint8_t *)l1, - bytes) - : clear_guest_offset(sc->dirty_bitmap, - pages >> 3, bytes)) !=3D 0 ) + if ( pages >> (3 + PAGE_SHIFT) !=3D + index_mapped >> (3 + PAGE_SHIFT) ) { - rv =3D -EFAULT; - goto out; + /* We need to map next page */ + d->arch.paging.preempt.log_dirty.i4 =3D i4; + d->arch.paging.preempt.log_dirty.i3 =3D i3; + d->arch.paging.preempt.log_dirty.i2 =3D i2; + d->arch.paging.preempt.log_dirty.done =3D pages; + d->arch.paging.preempt.dom =3D current->domain; + d->arch.paging.preempt.op =3D sc->op; + resuming =3D 1; + paging_unlock(d); + unmap_dirty_bitmap(dirty_bitmap, page); + goto again; } + ASSERT(((pages >> 3) % PAGE_SIZE) + bytes <=3D PAGE_SIZE); + if ( l1 ) + memcpy(dirty_bitmap + ((pages >> 3) % PAGE_SIZE), l1, + bytes); + else + memset(dirty_bitmap + ((pages >> 3) % PAGE_SIZE), 0, + bytes); } pages +=3D bytes << 3; if ( l1 ) @@ -517,6 +587,7 @@ static int paging_log_dirty_op(struct domain *d, { d->arch.paging.preempt.log_dirty.i4 =3D i4; d->arch.paging.preempt.log_dirty.i3 =3D i3 + 1; + d->arch.paging.preempt.log_dirty.i2 =3D 0; rv =3D -ERESTART; break; } @@ -529,6 +600,7 @@ static int paging_log_dirty_op(struct domain *d, { d->arch.paging.preempt.log_dirty.i4 =3D i4 + 1; d->arch.paging.preempt.log_dirty.i3 =3D 0; + d->arch.paging.preempt.log_dirty.i2 =3D 0; rv =3D -ERESTART; } if ( rv ) @@ -558,6 +630,7 @@ static int paging_log_dirty_op(struct domain *d, if ( rv ) { /* Never leave the domain paused on real errors. */ + unmap_dirty_bitmap(dirty_bitmap, page); ASSERT(rv =3D=3D -ERESTART); return rv; } @@ -570,12 +643,14 @@ static int paging_log_dirty_op(struct domain *d, * paging modes (shadow or hap). Safe because the domain is paused. */ d->arch.paging.log_dirty.clean_dirty_bitmap(d); } + unmap_dirty_bitmap(dirty_bitmap, page); domain_unpause(d); return rv; out: d->arch.paging.preempt.dom =3D NULL; paging_unlock(d); + unmap_dirty_bitmap(dirty_bitmap, page); domain_unpause(d); if ( l1 ) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 45b5283..f4375c2 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -204,6 +204,7 @@ struct paging_domain { unsigned long done:PADDR_BITS - PAGE_SHIFT; unsigned long i4:PAGETABLE_ORDER; unsigned long i3:PAGETABLE_ORDER; + unsigned long i2:PAGETABLE_ORDER; } log_dirty; }; } preempt; -- generated by git-patchbot for /home/xen/git/xen.git#master --===============2158407291596587265== 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 --===============2158407291596587265==-- From xen-changelog-bounces@lists.xen.org Thu May 28 18:45:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:45: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 1Yy2no-000467-N5; Thu, 28 May 2015 18:45:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2nn-00045u-G0 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:45:11 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id E1/52-02819-63267655; Thu, 28 May 2015 18:45:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1432838708!8126869!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=WEIRD_QUOTING X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14136 invoked from network); 28 May 2015 18:45:09 -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; 28 May 2015 18:45:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2nk-00037J-Ky for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:45:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2nj-00036m-El for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:45:08 +0000 Date: Thu, 28 May 2015 18:45:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xentrace: Implement cpu mask range parsing of human values (-c). X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e4ad2836842ac114e7791963d56ebd02dd4c384f Author: Konrad Rzeszutek Wilk AuthorDate: Fri May 15 16:12:22 2015 -0400 Commit: Konrad Rzeszutek Wilk CommitDate: Fri May 15 16:13:27 2015 -0400 xentrace: Implement cpu mask range parsing of human values (-c). Instead of just using -c 0x we can also use: -c -, -c ,, or a combination of them, or 'all' for all cpus. This new format can include just singular CPUs: -c , or ranges without an start or end (and xentrace will figure out the values), such as: -c - (which will include cpu0, cpu1, and cpu2) or -c - (which will include cpu2 and up to MAX_CPUS). That should make it easier to trace the right CPU if using this along with 'xl vcpu-list'. The code has been lifted from the Linux kernel, see file lib/bitmap.c, function __bitmap_parselist. To make the old behavior and the new function work, we check to see if the arguments have '0x' in them. If they do we use the old style parsing (limited to 32 CPUs). If that does not exist we use the new parsing. Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: George Dunlap --- tools/xentrace/xentrace.8 | 34 ++++++++- tools/xentrace/xentrace.c | 181 ++++++++++++++++++++++++++++++++++++-------- 2 files changed, 180 insertions(+), 35 deletions(-) diff --git a/tools/xentrace/xentrace.8 b/tools/xentrace/xentrace.8 index ac18e9f..7b3172b 100644 --- a/tools/xentrace/xentrace.8 +++ b/tools/xentrace/xentrace.8 @@ -36,8 +36,38 @@ all new records to the output set the time, p, (in milliseconds) to sleep between polling the buffers for new data. .TP -.B -c, --cpu-mask=c -set bitmask of CPUs to trace. It is limited to 32-bits. +.B -c, --cpu-mask=[\fIc\fP|\fICPU-LIST\fP|\fIall\fP] +This can be: a hex value (of the form 0xNNNN...), or a set of cpu +ranges as described below, or the string \fIall\fP. Hex values are limited +to 32 bits. If not specified, the cpu-mask as set during bootup will be +constructed. If using the \fICPU-LIST\fP it expects decimal numbers, which +may be specified as follows: + +.RS 4 +.ie n .IP """0-3""" 4 +.el .IP "``0-3''" 4 +.IX Item "0-3" +Trace only on CPUs 0 through 3 +.ie n .IP """0,2,5-7""" 4 +.el .IP "``0,2,5-7''" 4 +.IX Item "0,2,5-7" +Trace only on CPUs 0, 2, and 5 through 7. +.ie n .IP """-3""" 4 +.el .IP "``-3''" 4 +.IX Item "-3" +Trace only on CPUs 0 through 3 +.ie n .IP """-3,7""" 4 +.el .IP "``-3,7''" 4 +.IX Item "-3,7" +Trace only on CPUs 0 through 3 and 7 +.ie n .IP """3-""" 4 +.el .IP "``3-''" 4 +.IX Item "-3-" +Trace only on CPUs 3 up to maximum numbers of CPUs the host has. +.RE +.Sp + +If using \fIall\fP it will use all of the CPUs the host has. .TP .B -e, --evt-mask=e set event capture mask. If not specified the TRC_ALL will be used. diff --git a/tools/xentrace/xentrace.c b/tools/xentrace/xentrace.c index 8b40e88..4ee1458 100644 --- a/tools/xentrace/xentrace.c +++ b/tools/xentrace/xentrace.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -52,7 +53,7 @@ typedef struct settings_st { char *outfile; unsigned long poll_sleep; /* milliseconds to sleep between polls */ uint32_t evt_mask; - uint32_t cpu_mask; + char *cpu_mask_str; unsigned long tbuf_size; unsigned long disk_rsvd; unsigned long timeout; @@ -542,33 +543,17 @@ void print_cpu_mask(xc_cpumap_t map) fprintf(stderr, "\n"); } -static void set_cpu_mask(uint32_t mask) +static int set_cpu_mask(xc_cpumap_t map) { - int i, ret = 0; - xc_cpumap_t map; - - map = xc_cpumap_alloc(xc_handle); - if ( !map ) - goto out; + int ret = xc_tbuf_set_cpu_mask(xc_handle, map); - /* - * If mask is set, copy the bits out of it. This still works for - * systems with more than 32 cpus, as the shift will just shift - * mask down to zero. - */ - for ( i = 0; i < xc_get_cpumap_size(xc_handle); i++ ) - map[i] = (mask >> (i * 8)) & 0xff; - - ret = xc_tbuf_set_cpu_mask(xc_handle, map); - if ( ret != 0 ) - goto out; - - print_cpu_mask(map); - free(map); - return; -out: + if ( ret == 0 ) + { + print_cpu_mask(map); + return 0; + } PERROR("Failure to get trace buffer pointer from Xen and set the new mask"); - exit(EXIT_FAILURE); + return EXIT_FAILURE; } /** @@ -819,7 +804,8 @@ static void usage(void) "Usage: xentrace [OPTION...] [output file]\n" \ "Tool to capture Xen trace buffer data\n" \ "\n" \ -" -c, --cpu-mask=c Set cpu-mask\n" \ +" -c, --cpu-mask=c Set cpu-mask, using either hex, CPU ranges, or\n" \ +" for all CPUs\n" \ " -e, --evt-mask=e Set evt-mask\n" \ " -s, --poll-sleep=p Set sleep time, p, in milliseconds between\n" \ " polling the trace buffer for new data\n" \ @@ -951,6 +937,134 @@ static int parse_evtmask(char *arg) return 0; } +#define ZERO_DIGIT '0' + +#define is_terminator(c) ((c)=='\0' || (c)==',') + +static int parse_cpumask_range(const char *mask_str, xc_cpumap_t map) +{ + unsigned int a, b; + int nmaskbits; + char c; + int in_range; + const char *s; + + nmaskbits = xc_get_max_cpus(xc_handle); + if ( nmaskbits <= 0 ) + { + fprintf(stderr, "Failed to get max number of CPUs! rc: %d\n", nmaskbits); + return EXIT_FAILURE; + } + + c = 0; + s = mask_str; + do { + in_range = 0; + a = b = 0; + + /* Process until we find a range terminator */ + for ( c=*s++; !is_terminator(c); c=*s++ ) + { + if ( c == '-' ) + { + if ( in_range ) + goto err_out; + b = 0; + in_range = 1; + continue; + } + + if ( !isdigit(c) ) + { + fprintf(stderr, "Invalid character in cpumask: %s\n", mask_str); + goto err_out; + } + + b = b * 10 + (c - ZERO_DIGIT); + if ( !in_range ) + a = b; + } + + /* Syntax: -[,] - expand to number of CPUs. */ + if ( b == 0 && in_range ) + b = nmaskbits-1; + + if ( a > b ) + { + fprintf(stderr, "Wrong order of %d and %d\n", a, b); + goto err_out; + } + + if ( b >= nmaskbits ) + { + fprintf(stderr, "Specified higher value then there are CPUS!\n"); + goto err_out; + } + + while ( a <= b ) + { + xc_cpumap_setcpu(a, map); + a++; + } + } while ( c ); + + return 0; + err_out: + errno = EINVAL; + return EXIT_FAILURE; +} + +/** + * Figure out which of the CPU types the user has provided - either the hex + * variant, the cpu-list, or 'all'. Once done set the CPU mask. + */ +static int parse_cpu_mask(void) +{ + int i, ret = EXIT_FAILURE; + xc_cpumap_t map; + + map = xc_cpumap_alloc(xc_handle); + if ( !map ) + goto out; + + if ( strlen(opts.cpu_mask_str) < 1 ) + { + errno = ENOSPC; + goto out; + } + + ret = 0; + if ( strncmp("0x", opts.cpu_mask_str, 2) == 0 ) + { + uint32_t v; + + v = argtol(opts.cpu_mask_str, 0); + /* + * If mask is set, copy the bits out of it. This still works for + * systems with more than 32 cpus, as the shift will just shift + * mask down to zero. + */ + for ( i = 0; i < sizeof(uint32_t); i++ ) + map[i] = (v >> (i * 8)) & 0xff; + } + else if ( strcmp("all", opts.cpu_mask_str) == 0 ) + { + for ( i = 0; i < xc_get_cpumap_size(xc_handle); i++ ) + map[i] = 0xff; + } + else + ret = parse_cpumask_range(opts.cpu_mask_str, map); + + if ( !ret ) + ret = set_cpu_mask(map); + out: + /* We don't use them pass this point. */ + free(map); + free(opts.cpu_mask_str); + opts.cpu_mask_str = NULL; + return ret; +} + /* parse command line arguments */ static void parse_args(int argc, char **argv) { @@ -981,10 +1095,9 @@ static void parse_args(int argc, char **argv) opts.poll_sleep = argtol(optarg, 0); break; - case 'c': /* set new cpu mask for filtering*/ - opts.cpu_mask = argtol(optarg, 0); + case 'c': /* set new cpu mask for filtering (when xch is set). */ + opts.cpu_mask_str = strdup(optarg); break; - case 'e': /* set new event mask for filtering*/ parse_evtmask(optarg); break; @@ -1047,7 +1160,7 @@ int main(int argc, char **argv) opts.outfile = 0; opts.poll_sleep = POLL_SLEEP_MILLIS; opts.evt_mask = 0; - opts.cpu_mask = 0; + opts.cpu_mask_str = NULL; opts.disk_rsvd = 0; opts.disable_tracing = 1; opts.start_disabled = 0; @@ -1065,9 +1178,11 @@ int main(int argc, char **argv) if ( opts.evt_mask != 0 ) set_evt_mask(opts.evt_mask); - - if ( opts.cpu_mask != 0 ) - set_cpu_mask(opts.cpu_mask); + if ( opts.cpu_mask_str ) + { + if ( parse_cpu_mask() ) + exit(EXIT_FAILURE); + } if ( opts.timeout != 0 ) alarm(opts.timeout); -- 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 May 28 18:45:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:45: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 1Yy2no-000467-N5; Thu, 28 May 2015 18:45:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2nn-00045u-G0 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:45:11 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id E1/52-02819-63267655; Thu, 28 May 2015 18:45:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1432838708!8126869!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=WEIRD_QUOTING X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14136 invoked from network); 28 May 2015 18:45:09 -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; 28 May 2015 18:45:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2nk-00037J-Ky for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:45:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2nj-00036m-El for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:45:08 +0000 Date: Thu, 28 May 2015 18:45:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xentrace: Implement cpu mask range parsing of human values (-c). X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e4ad2836842ac114e7791963d56ebd02dd4c384f Author: Konrad Rzeszutek Wilk AuthorDate: Fri May 15 16:12:22 2015 -0400 Commit: Konrad Rzeszutek Wilk CommitDate: Fri May 15 16:13:27 2015 -0400 xentrace: Implement cpu mask range parsing of human values (-c). Instead of just using -c 0x we can also use: -c -, -c ,, or a combination of them, or 'all' for all cpus. This new format can include just singular CPUs: -c , or ranges without an start or end (and xentrace will figure out the values), such as: -c - (which will include cpu0, cpu1, and cpu2) or -c - (which will include cpu2 and up to MAX_CPUS). That should make it easier to trace the right CPU if using this along with 'xl vcpu-list'. The code has been lifted from the Linux kernel, see file lib/bitmap.c, function __bitmap_parselist. To make the old behavior and the new function work, we check to see if the arguments have '0x' in them. If they do we use the old style parsing (limited to 32 CPUs). If that does not exist we use the new parsing. Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: George Dunlap --- tools/xentrace/xentrace.8 | 34 ++++++++- tools/xentrace/xentrace.c | 181 ++++++++++++++++++++++++++++++++++++-------- 2 files changed, 180 insertions(+), 35 deletions(-) diff --git a/tools/xentrace/xentrace.8 b/tools/xentrace/xentrace.8 index ac18e9f..7b3172b 100644 --- a/tools/xentrace/xentrace.8 +++ b/tools/xentrace/xentrace.8 @@ -36,8 +36,38 @@ all new records to the output set the time, p, (in milliseconds) to sleep between polling the buffers for new data. .TP -.B -c, --cpu-mask=c -set bitmask of CPUs to trace. It is limited to 32-bits. +.B -c, --cpu-mask=[\fIc\fP|\fICPU-LIST\fP|\fIall\fP] +This can be: a hex value (of the form 0xNNNN...), or a set of cpu +ranges as described below, or the string \fIall\fP. Hex values are limited +to 32 bits. If not specified, the cpu-mask as set during bootup will be +constructed. If using the \fICPU-LIST\fP it expects decimal numbers, which +may be specified as follows: + +.RS 4 +.ie n .IP """0-3""" 4 +.el .IP "``0-3''" 4 +.IX Item "0-3" +Trace only on CPUs 0 through 3 +.ie n .IP """0,2,5-7""" 4 +.el .IP "``0,2,5-7''" 4 +.IX Item "0,2,5-7" +Trace only on CPUs 0, 2, and 5 through 7. +.ie n .IP """-3""" 4 +.el .IP "``-3''" 4 +.IX Item "-3" +Trace only on CPUs 0 through 3 +.ie n .IP """-3,7""" 4 +.el .IP "``-3,7''" 4 +.IX Item "-3,7" +Trace only on CPUs 0 through 3 and 7 +.ie n .IP """3-""" 4 +.el .IP "``3-''" 4 +.IX Item "-3-" +Trace only on CPUs 3 up to maximum numbers of CPUs the host has. +.RE +.Sp + +If using \fIall\fP it will use all of the CPUs the host has. .TP .B -e, --evt-mask=e set event capture mask. If not specified the TRC_ALL will be used. diff --git a/tools/xentrace/xentrace.c b/tools/xentrace/xentrace.c index 8b40e88..4ee1458 100644 --- a/tools/xentrace/xentrace.c +++ b/tools/xentrace/xentrace.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -52,7 +53,7 @@ typedef struct settings_st { char *outfile; unsigned long poll_sleep; /* milliseconds to sleep between polls */ uint32_t evt_mask; - uint32_t cpu_mask; + char *cpu_mask_str; unsigned long tbuf_size; unsigned long disk_rsvd; unsigned long timeout; @@ -542,33 +543,17 @@ void print_cpu_mask(xc_cpumap_t map) fprintf(stderr, "\n"); } -static void set_cpu_mask(uint32_t mask) +static int set_cpu_mask(xc_cpumap_t map) { - int i, ret = 0; - xc_cpumap_t map; - - map = xc_cpumap_alloc(xc_handle); - if ( !map ) - goto out; + int ret = xc_tbuf_set_cpu_mask(xc_handle, map); - /* - * If mask is set, copy the bits out of it. This still works for - * systems with more than 32 cpus, as the shift will just shift - * mask down to zero. - */ - for ( i = 0; i < xc_get_cpumap_size(xc_handle); i++ ) - map[i] = (mask >> (i * 8)) & 0xff; - - ret = xc_tbuf_set_cpu_mask(xc_handle, map); - if ( ret != 0 ) - goto out; - - print_cpu_mask(map); - free(map); - return; -out: + if ( ret == 0 ) + { + print_cpu_mask(map); + return 0; + } PERROR("Failure to get trace buffer pointer from Xen and set the new mask"); - exit(EXIT_FAILURE); + return EXIT_FAILURE; } /** @@ -819,7 +804,8 @@ static void usage(void) "Usage: xentrace [OPTION...] [output file]\n" \ "Tool to capture Xen trace buffer data\n" \ "\n" \ -" -c, --cpu-mask=c Set cpu-mask\n" \ +" -c, --cpu-mask=c Set cpu-mask, using either hex, CPU ranges, or\n" \ +" for all CPUs\n" \ " -e, --evt-mask=e Set evt-mask\n" \ " -s, --poll-sleep=p Set sleep time, p, in milliseconds between\n" \ " polling the trace buffer for new data\n" \ @@ -951,6 +937,134 @@ static int parse_evtmask(char *arg) return 0; } +#define ZERO_DIGIT '0' + +#define is_terminator(c) ((c)=='\0' || (c)==',') + +static int parse_cpumask_range(const char *mask_str, xc_cpumap_t map) +{ + unsigned int a, b; + int nmaskbits; + char c; + int in_range; + const char *s; + + nmaskbits = xc_get_max_cpus(xc_handle); + if ( nmaskbits <= 0 ) + { + fprintf(stderr, "Failed to get max number of CPUs! rc: %d\n", nmaskbits); + return EXIT_FAILURE; + } + + c = 0; + s = mask_str; + do { + in_range = 0; + a = b = 0; + + /* Process until we find a range terminator */ + for ( c=*s++; !is_terminator(c); c=*s++ ) + { + if ( c == '-' ) + { + if ( in_range ) + goto err_out; + b = 0; + in_range = 1; + continue; + } + + if ( !isdigit(c) ) + { + fprintf(stderr, "Invalid character in cpumask: %s\n", mask_str); + goto err_out; + } + + b = b * 10 + (c - ZERO_DIGIT); + if ( !in_range ) + a = b; + } + + /* Syntax: -[,] - expand to number of CPUs. */ + if ( b == 0 && in_range ) + b = nmaskbits-1; + + if ( a > b ) + { + fprintf(stderr, "Wrong order of %d and %d\n", a, b); + goto err_out; + } + + if ( b >= nmaskbits ) + { + fprintf(stderr, "Specified higher value then there are CPUS!\n"); + goto err_out; + } + + while ( a <= b ) + { + xc_cpumap_setcpu(a, map); + a++; + } + } while ( c ); + + return 0; + err_out: + errno = EINVAL; + return EXIT_FAILURE; +} + +/** + * Figure out which of the CPU types the user has provided - either the hex + * variant, the cpu-list, or 'all'. Once done set the CPU mask. + */ +static int parse_cpu_mask(void) +{ + int i, ret = EXIT_FAILURE; + xc_cpumap_t map; + + map = xc_cpumap_alloc(xc_handle); + if ( !map ) + goto out; + + if ( strlen(opts.cpu_mask_str) < 1 ) + { + errno = ENOSPC; + goto out; + } + + ret = 0; + if ( strncmp("0x", opts.cpu_mask_str, 2) == 0 ) + { + uint32_t v; + + v = argtol(opts.cpu_mask_str, 0); + /* + * If mask is set, copy the bits out of it. This still works for + * systems with more than 32 cpus, as the shift will just shift + * mask down to zero. + */ + for ( i = 0; i < sizeof(uint32_t); i++ ) + map[i] = (v >> (i * 8)) & 0xff; + } + else if ( strcmp("all", opts.cpu_mask_str) == 0 ) + { + for ( i = 0; i < xc_get_cpumap_size(xc_handle); i++ ) + map[i] = 0xff; + } + else + ret = parse_cpumask_range(opts.cpu_mask_str, map); + + if ( !ret ) + ret = set_cpu_mask(map); + out: + /* We don't use them pass this point. */ + free(map); + free(opts.cpu_mask_str); + opts.cpu_mask_str = NULL; + return ret; +} + /* parse command line arguments */ static void parse_args(int argc, char **argv) { @@ -981,10 +1095,9 @@ static void parse_args(int argc, char **argv) opts.poll_sleep = argtol(optarg, 0); break; - case 'c': /* set new cpu mask for filtering*/ - opts.cpu_mask = argtol(optarg, 0); + case 'c': /* set new cpu mask for filtering (when xch is set). */ + opts.cpu_mask_str = strdup(optarg); break; - case 'e': /* set new event mask for filtering*/ parse_evtmask(optarg); break; @@ -1047,7 +1160,7 @@ int main(int argc, char **argv) opts.outfile = 0; opts.poll_sleep = POLL_SLEEP_MILLIS; opts.evt_mask = 0; - opts.cpu_mask = 0; + opts.cpu_mask_str = NULL; opts.disk_rsvd = 0; opts.disable_tracing = 1; opts.start_disabled = 0; @@ -1065,9 +1178,11 @@ int main(int argc, char **argv) if ( opts.evt_mask != 0 ) set_evt_mask(opts.evt_mask); - - if ( opts.cpu_mask != 0 ) - set_cpu_mask(opts.cpu_mask); + if ( opts.cpu_mask_str ) + { + if ( parse_cpu_mask() ) + exit(EXIT_FAILURE); + } if ( opts.timeout != 0 ) alarm(opts.timeout); -- 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 May 28 18:45:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:45:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2ny-00047i-Q7; Thu, 28 May 2015 18:45:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2nx-00047S-CC for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:45:21 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id B3/FC-24518-04267655; Thu, 28 May 2015 18:45:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1432838719!10924009!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29008 invoked from network); 28 May 2015 18:45:19 -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; 28 May 2015 18:45:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2nu-00037R-Ro for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:45:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2nu-00037A-QS for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:45:18 +0000 Date: Thu, 28 May 2015 18:45:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86emul: also put_fpu() 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 08c902a39f5f7aa0e1d5fe664b2b8db458d4fb73 Author: Jan Beulich AuthorDate: Mon May 18 12:11:31 2015 +0200 Commit: Jan Beulich CommitDate: Mon May 18 12:11:31 2015 +0200 x86emul: also put_fpu() on error paths fail_if() and generate_exception_if() could theoretically bypass the normal flow reaching put_fpu(), and not invoking it would leave the fpu_exception_callback pointer in place, allowing for the callback to be called at an unexpected time. Luckily the two generate_exception_if()-s that would actually trigger this are currently commented out, so this is not (yet) a (security) issue. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/x86_emulate/x86_emulate.c | 12 +++++++++--- xen/arch/x86/x86_emulate/x86_emulate.h | 6 +++++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 6c6c58a..d43ca4e 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -670,10 +670,14 @@ do{ (_fic)->exn_raised = 0; \ rc = ops->get_fpu(fpu_handle_exception, _fic, _type, ctxt); \ if ( rc ) goto done; \ } while (0) -#define put_fpu(_fic) \ -do{ \ +#define _put_fpu() \ +do { \ if ( ops->put_fpu != NULL ) \ - ops->put_fpu(ctxt); \ + (ops->put_fpu)(ctxt); \ +} while (0) +#define put_fpu(_fic) \ +do { \ + _put_fpu(); \ generate_exception_if((_fic)->exn_raised, EXC_MF, -1); \ } while (0) @@ -3787,6 +3791,7 @@ x86_emulate( *ctxt->regs = _regs; done: + _put_fpu(); return rc; twobyte_insn: @@ -4632,5 +4637,6 @@ x86_emulate( goto writeback; cannot_emulate: + _put_fpu(); return X86EMUL_UNHANDLEABLE; } diff --git a/xen/arch/x86/x86_emulate/x86_emulate.h b/xen/arch/x86/x86_emulate/x86_emulate.h index 593b31e..c55063d 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.h +++ b/xen/arch/x86/x86_emulate/x86_emulate.h @@ -384,7 +384,11 @@ struct x86_emulate_ops enum x86_emulate_fpu_type type, struct x86_emulate_ctxt *ctxt); - /* put_fpu: Relinquish the FPU. Unhook from FPU/SIMD exception handlers. */ + /* + * put_fpu: Relinquish the FPU. Unhook from FPU/SIMD exception handlers. + * The handler, if installed, must be prepared to get called without + * the get_fpu one having got called before! + */ void (*put_fpu)( struct x86_emulate_ctxt *ctxt); -- 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 May 28 18:45:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:45:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2ny-00047i-Q7; Thu, 28 May 2015 18:45:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2nx-00047S-CC for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:45:21 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id B3/FC-24518-04267655; Thu, 28 May 2015 18:45:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1432838719!10924009!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29008 invoked from network); 28 May 2015 18:45:19 -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; 28 May 2015 18:45:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2nu-00037R-Ro for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:45:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2nu-00037A-QS for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:45:18 +0000 Date: Thu, 28 May 2015 18:45:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86emul: also put_fpu() 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 08c902a39f5f7aa0e1d5fe664b2b8db458d4fb73 Author: Jan Beulich AuthorDate: Mon May 18 12:11:31 2015 +0200 Commit: Jan Beulich CommitDate: Mon May 18 12:11:31 2015 +0200 x86emul: also put_fpu() on error paths fail_if() and generate_exception_if() could theoretically bypass the normal flow reaching put_fpu(), and not invoking it would leave the fpu_exception_callback pointer in place, allowing for the callback to be called at an unexpected time. Luckily the two generate_exception_if()-s that would actually trigger this are currently commented out, so this is not (yet) a (security) issue. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/x86_emulate/x86_emulate.c | 12 +++++++++--- xen/arch/x86/x86_emulate/x86_emulate.h | 6 +++++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 6c6c58a..d43ca4e 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -670,10 +670,14 @@ do{ (_fic)->exn_raised = 0; \ rc = ops->get_fpu(fpu_handle_exception, _fic, _type, ctxt); \ if ( rc ) goto done; \ } while (0) -#define put_fpu(_fic) \ -do{ \ +#define _put_fpu() \ +do { \ if ( ops->put_fpu != NULL ) \ - ops->put_fpu(ctxt); \ + (ops->put_fpu)(ctxt); \ +} while (0) +#define put_fpu(_fic) \ +do { \ + _put_fpu(); \ generate_exception_if((_fic)->exn_raised, EXC_MF, -1); \ } while (0) @@ -3787,6 +3791,7 @@ x86_emulate( *ctxt->regs = _regs; done: + _put_fpu(); return rc; twobyte_insn: @@ -4632,5 +4637,6 @@ x86_emulate( goto writeback; cannot_emulate: + _put_fpu(); return X86EMUL_UNHANDLEABLE; } diff --git a/xen/arch/x86/x86_emulate/x86_emulate.h b/xen/arch/x86/x86_emulate/x86_emulate.h index 593b31e..c55063d 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.h +++ b/xen/arch/x86/x86_emulate/x86_emulate.h @@ -384,7 +384,11 @@ struct x86_emulate_ops enum x86_emulate_fpu_type type, struct x86_emulate_ctxt *ctxt); - /* put_fpu: Relinquish the FPU. Unhook from FPU/SIMD exception handlers. */ + /* + * put_fpu: Relinquish the FPU. Unhook from FPU/SIMD exception handlers. + * The handler, if installed, must be prepared to get called without + * the get_fpu one having got called before! + */ void (*put_fpu)( struct x86_emulate_ctxt *ctxt); -- 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 May 28 18:45:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:45:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2o9-00049S-1m; Thu, 28 May 2015 18:45:33 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2o7-00049E-LM for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:45:31 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 01/92-03041-B4267655; Thu, 28 May 2015 18:45:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1432838729!13559848!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22404 invoked from network); 28 May 2015 18:45:30 -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; 28 May 2015 18:45:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2o5-00037Z-1m for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:45:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2o4-00037o-W3 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:45:29 +0000 Date: Thu, 28 May 2015 18:45:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "x86: rework paging_log_dirty_op to work with hvm guests" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0d7a599afff0665c74f328f6af85e556688d7908 Author: Jan Beulich AuthorDate: Mon May 18 12:34:44 2015 +0200 Commit: Jan Beulich CommitDate: Mon May 18 12:34:44 2015 +0200 Revert "x86: rework paging_log_dirty_op to work with hvm guests" This reverts commit a809eeea06d20b115d78f12e473502bcb6209844, as it breaks PV log dirty mode handling. --- xen/arch/x86/mm/paging.c | 97 +++++------------------------------------- xen/include/asm-x86/domain.h | 1 - 2 files changed, 11 insertions(+), 87 deletions(-) diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index 5eee88c..59d4720 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -408,51 +408,6 @@ int paging_mfn_is_dirty(struct domain *d, mfn_t gmfn) return rv; } -static inline void *map_dirty_bitmap(XEN_GUEST_HANDLE_64(uint8) dirty_bitmap, - unsigned long pages, - struct page_info **page) -{ - uint32_t pfec = PFEC_page_present | PFEC_write_access; - unsigned long gfn; - p2m_type_t p2mt; - - gfn = paging_gva_to_gfn(current, - (unsigned long)(dirty_bitmap.p + (pages >> 3)), - &pfec); - if ( gfn == INVALID_GFN ) - return NULL; - - *page = get_page_from_gfn(current->domain, gfn, &p2mt, P2M_UNSHARE); - - if ( !p2m_is_ram(p2mt) ) - { - put_page(*page); - return NULL; - } - if ( p2m_is_paging(p2mt) ) - { - put_page(*page); - p2m_mem_paging_populate(current->domain, gfn); - return NULL; - } - if ( p2m_is_shared(p2mt) || p2m_is_discard_write(p2mt) ) - { - put_page(*page); - return NULL; - } - - return __map_domain_page(*page); -} - -static inline void unmap_dirty_bitmap(void *addr, struct page_info *page) -{ - if ( addr != NULL ) - { - unmap_domain_page(addr); - put_page(page); - } -} - /* Read a domain's log-dirty bitmap and stats. If the operation is a CLEAN, * clear the bitmap and stats as well. */ @@ -465,11 +420,7 @@ static int paging_log_dirty_op(struct domain *d, mfn_t *l4 = NULL, *l3 = NULL, *l2 = NULL; unsigned long *l1 = NULL; int i4, i3, i2; - uint8_t *dirty_bitmap; - struct page_info *page; - unsigned long index_mapped; - again: if ( !resuming ) { domain_pause(d); @@ -482,14 +433,6 @@ static int paging_log_dirty_op(struct domain *d, p2m_flush_hardware_cached_dirty(d); } - index_mapped = resuming ? d->arch.paging.preempt.log_dirty.done : 0; - dirty_bitmap = map_dirty_bitmap(sc->dirty_bitmap, index_mapped, &page); - if ( dirty_bitmap == NULL ) - { - domain_unpause(d); - return -EFAULT; - } - paging_lock(d); if ( !d->arch.paging.preempt.dom ) @@ -529,18 +472,18 @@ static int paging_log_dirty_op(struct domain *d, l4 = paging_map_log_dirty_bitmap(d); i4 = d->arch.paging.preempt.log_dirty.i4; i3 = d->arch.paging.preempt.log_dirty.i3; - i2 = d->arch.paging.preempt.log_dirty.i2; pages = d->arch.paging.preempt.log_dirty.done; for ( ; (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); i4++, i3 = 0 ) { l3 = (l4 && mfn_valid(l4[i4])) ? map_domain_page(mfn_x(l4[i4])) : NULL; - for ( ; (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); - i3++, i2 = 0 ) + for ( ; (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); i3++ ) { l2 = ((l3 && mfn_valid(l3[i3])) ? map_domain_page(mfn_x(l3[i3])) : NULL); - for ( ; (pages < sc->pages) && (i2 < LOGDIRTY_NODE_ENTRIES); i2++ ) + for ( i2 = 0; + (pages < sc->pages) && (i2 < LOGDIRTY_NODE_ENTRIES); + i2++ ) { unsigned int bytes = PAGE_SIZE; l1 = ((l2 && mfn_valid(l2[i2])) ? @@ -549,28 +492,15 @@ static int paging_log_dirty_op(struct domain *d, bytes = (unsigned int)((sc->pages - pages + 7) >> 3); if ( likely(peek) ) { - if ( pages >> (3 + PAGE_SHIFT) != - index_mapped >> (3 + PAGE_SHIFT) ) + if ( (l1 ? copy_to_guest_offset(sc->dirty_bitmap, + pages >> 3, (uint8_t *)l1, + bytes) + : clear_guest_offset(sc->dirty_bitmap, + pages >> 3, bytes)) != 0 ) { - /* We need to map next page */ - d->arch.paging.preempt.log_dirty.i4 = i4; - d->arch.paging.preempt.log_dirty.i3 = i3; - d->arch.paging.preempt.log_dirty.i2 = i2; - d->arch.paging.preempt.log_dirty.done = pages; - d->arch.paging.preempt.dom = current->domain; - d->arch.paging.preempt.op = sc->op; - resuming = 1; - paging_unlock(d); - unmap_dirty_bitmap(dirty_bitmap, page); - goto again; + rv = -EFAULT; + goto out; } - ASSERT(((pages >> 3) % PAGE_SIZE) + bytes <= PAGE_SIZE); - if ( l1 ) - memcpy(dirty_bitmap + ((pages >> 3) % PAGE_SIZE), l1, - bytes); - else - memset(dirty_bitmap + ((pages >> 3) % PAGE_SIZE), 0, - bytes); } pages += bytes << 3; if ( l1 ) @@ -587,7 +517,6 @@ static int paging_log_dirty_op(struct domain *d, { d->arch.paging.preempt.log_dirty.i4 = i4; d->arch.paging.preempt.log_dirty.i3 = i3 + 1; - d->arch.paging.preempt.log_dirty.i2 = 0; rv = -ERESTART; break; } @@ -600,7 +529,6 @@ static int paging_log_dirty_op(struct domain *d, { d->arch.paging.preempt.log_dirty.i4 = i4 + 1; d->arch.paging.preempt.log_dirty.i3 = 0; - d->arch.paging.preempt.log_dirty.i2 = 0; rv = -ERESTART; } if ( rv ) @@ -630,7 +558,6 @@ static int paging_log_dirty_op(struct domain *d, if ( rv ) { /* Never leave the domain paused on real errors. */ - unmap_dirty_bitmap(dirty_bitmap, page); ASSERT(rv == -ERESTART); return rv; } @@ -643,14 +570,12 @@ static int paging_log_dirty_op(struct domain *d, * paging modes (shadow or hap). Safe because the domain is paused. */ d->arch.paging.log_dirty.clean_dirty_bitmap(d); } - unmap_dirty_bitmap(dirty_bitmap, page); domain_unpause(d); return rv; out: d->arch.paging.preempt.dom = NULL; paging_unlock(d); - unmap_dirty_bitmap(dirty_bitmap, page); domain_unpause(d); if ( l1 ) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index f4375c2..45b5283 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -204,7 +204,6 @@ struct paging_domain { unsigned long done:PADDR_BITS - PAGE_SHIFT; unsigned long i4:PAGETABLE_ORDER; unsigned long i3:PAGETABLE_ORDER; - unsigned long i2:PAGETABLE_ORDER; } log_dirty; }; } preempt; -- 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 May 28 18:45:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:45:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2o9-00049S-1m; Thu, 28 May 2015 18:45:33 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2o7-00049E-LM for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:45:31 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 01/92-03041-B4267655; Thu, 28 May 2015 18:45:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1432838729!13559848!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22404 invoked from network); 28 May 2015 18:45:30 -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; 28 May 2015 18:45:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2o5-00037Z-1m for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:45:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2o4-00037o-W3 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:45:29 +0000 Date: Thu, 28 May 2015 18:45:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "x86: rework paging_log_dirty_op to work with hvm guests" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0d7a599afff0665c74f328f6af85e556688d7908 Author: Jan Beulich AuthorDate: Mon May 18 12:34:44 2015 +0200 Commit: Jan Beulich CommitDate: Mon May 18 12:34:44 2015 +0200 Revert "x86: rework paging_log_dirty_op to work with hvm guests" This reverts commit a809eeea06d20b115d78f12e473502bcb6209844, as it breaks PV log dirty mode handling. --- xen/arch/x86/mm/paging.c | 97 +++++------------------------------------- xen/include/asm-x86/domain.h | 1 - 2 files changed, 11 insertions(+), 87 deletions(-) diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index 5eee88c..59d4720 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -408,51 +408,6 @@ int paging_mfn_is_dirty(struct domain *d, mfn_t gmfn) return rv; } -static inline void *map_dirty_bitmap(XEN_GUEST_HANDLE_64(uint8) dirty_bitmap, - unsigned long pages, - struct page_info **page) -{ - uint32_t pfec = PFEC_page_present | PFEC_write_access; - unsigned long gfn; - p2m_type_t p2mt; - - gfn = paging_gva_to_gfn(current, - (unsigned long)(dirty_bitmap.p + (pages >> 3)), - &pfec); - if ( gfn == INVALID_GFN ) - return NULL; - - *page = get_page_from_gfn(current->domain, gfn, &p2mt, P2M_UNSHARE); - - if ( !p2m_is_ram(p2mt) ) - { - put_page(*page); - return NULL; - } - if ( p2m_is_paging(p2mt) ) - { - put_page(*page); - p2m_mem_paging_populate(current->domain, gfn); - return NULL; - } - if ( p2m_is_shared(p2mt) || p2m_is_discard_write(p2mt) ) - { - put_page(*page); - return NULL; - } - - return __map_domain_page(*page); -} - -static inline void unmap_dirty_bitmap(void *addr, struct page_info *page) -{ - if ( addr != NULL ) - { - unmap_domain_page(addr); - put_page(page); - } -} - /* Read a domain's log-dirty bitmap and stats. If the operation is a CLEAN, * clear the bitmap and stats as well. */ @@ -465,11 +420,7 @@ static int paging_log_dirty_op(struct domain *d, mfn_t *l4 = NULL, *l3 = NULL, *l2 = NULL; unsigned long *l1 = NULL; int i4, i3, i2; - uint8_t *dirty_bitmap; - struct page_info *page; - unsigned long index_mapped; - again: if ( !resuming ) { domain_pause(d); @@ -482,14 +433,6 @@ static int paging_log_dirty_op(struct domain *d, p2m_flush_hardware_cached_dirty(d); } - index_mapped = resuming ? d->arch.paging.preempt.log_dirty.done : 0; - dirty_bitmap = map_dirty_bitmap(sc->dirty_bitmap, index_mapped, &page); - if ( dirty_bitmap == NULL ) - { - domain_unpause(d); - return -EFAULT; - } - paging_lock(d); if ( !d->arch.paging.preempt.dom ) @@ -529,18 +472,18 @@ static int paging_log_dirty_op(struct domain *d, l4 = paging_map_log_dirty_bitmap(d); i4 = d->arch.paging.preempt.log_dirty.i4; i3 = d->arch.paging.preempt.log_dirty.i3; - i2 = d->arch.paging.preempt.log_dirty.i2; pages = d->arch.paging.preempt.log_dirty.done; for ( ; (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); i4++, i3 = 0 ) { l3 = (l4 && mfn_valid(l4[i4])) ? map_domain_page(mfn_x(l4[i4])) : NULL; - for ( ; (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); - i3++, i2 = 0 ) + for ( ; (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); i3++ ) { l2 = ((l3 && mfn_valid(l3[i3])) ? map_domain_page(mfn_x(l3[i3])) : NULL); - for ( ; (pages < sc->pages) && (i2 < LOGDIRTY_NODE_ENTRIES); i2++ ) + for ( i2 = 0; + (pages < sc->pages) && (i2 < LOGDIRTY_NODE_ENTRIES); + i2++ ) { unsigned int bytes = PAGE_SIZE; l1 = ((l2 && mfn_valid(l2[i2])) ? @@ -549,28 +492,15 @@ static int paging_log_dirty_op(struct domain *d, bytes = (unsigned int)((sc->pages - pages + 7) >> 3); if ( likely(peek) ) { - if ( pages >> (3 + PAGE_SHIFT) != - index_mapped >> (3 + PAGE_SHIFT) ) + if ( (l1 ? copy_to_guest_offset(sc->dirty_bitmap, + pages >> 3, (uint8_t *)l1, + bytes) + : clear_guest_offset(sc->dirty_bitmap, + pages >> 3, bytes)) != 0 ) { - /* We need to map next page */ - d->arch.paging.preempt.log_dirty.i4 = i4; - d->arch.paging.preempt.log_dirty.i3 = i3; - d->arch.paging.preempt.log_dirty.i2 = i2; - d->arch.paging.preempt.log_dirty.done = pages; - d->arch.paging.preempt.dom = current->domain; - d->arch.paging.preempt.op = sc->op; - resuming = 1; - paging_unlock(d); - unmap_dirty_bitmap(dirty_bitmap, page); - goto again; + rv = -EFAULT; + goto out; } - ASSERT(((pages >> 3) % PAGE_SIZE) + bytes <= PAGE_SIZE); - if ( l1 ) - memcpy(dirty_bitmap + ((pages >> 3) % PAGE_SIZE), l1, - bytes); - else - memset(dirty_bitmap + ((pages >> 3) % PAGE_SIZE), 0, - bytes); } pages += bytes << 3; if ( l1 ) @@ -587,7 +517,6 @@ static int paging_log_dirty_op(struct domain *d, { d->arch.paging.preempt.log_dirty.i4 = i4; d->arch.paging.preempt.log_dirty.i3 = i3 + 1; - d->arch.paging.preempt.log_dirty.i2 = 0; rv = -ERESTART; break; } @@ -600,7 +529,6 @@ static int paging_log_dirty_op(struct domain *d, { d->arch.paging.preempt.log_dirty.i4 = i4 + 1; d->arch.paging.preempt.log_dirty.i3 = 0; - d->arch.paging.preempt.log_dirty.i2 = 0; rv = -ERESTART; } if ( rv ) @@ -630,7 +558,6 @@ static int paging_log_dirty_op(struct domain *d, if ( rv ) { /* Never leave the domain paused on real errors. */ - unmap_dirty_bitmap(dirty_bitmap, page); ASSERT(rv == -ERESTART); return rv; } @@ -643,14 +570,12 @@ static int paging_log_dirty_op(struct domain *d, * paging modes (shadow or hap). Safe because the domain is paused. */ d->arch.paging.log_dirty.clean_dirty_bitmap(d); } - unmap_dirty_bitmap(dirty_bitmap, page); domain_unpause(d); return rv; out: d->arch.paging.preempt.dom = NULL; paging_unlock(d); - unmap_dirty_bitmap(dirty_bitmap, page); domain_unpause(d); if ( l1 ) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index f4375c2..45b5283 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -204,7 +204,6 @@ struct paging_domain { unsigned long done:PADDR_BITS - PAGE_SHIFT; unsigned long i4:PAGETABLE_ORDER; unsigned long i3:PAGETABLE_ORDER; - unsigned long i2:PAGETABLE_ORDER; } log_dirty; }; } preempt; -- 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 May 28 18:45:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:45:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2oK-0004B6-4f; Thu, 28 May 2015 18:45:44 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2oI-0004Am-JD for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:45:42 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id 63/BE-16276-55267655; Thu, 28 May 2015 18:45:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1432838739!10995232!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27827 invoked from network); 28 May 2015 18:45:40 -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; 28 May 2015 18:45:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2oF-00037f-8J for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:45:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2oF-000395-6Y for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:45:39 +0000 Date: Thu, 28 May 2015 18:45:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/EFI: keep EFI runtime services top level page tables up-to-date X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit db83975f0fcd30370392ed288a7bd2420624ed4e Author: Jan Beulich AuthorDate: Tue May 19 11:35:30 2015 +0200 Commit: Jan Beulich CommitDate: Tue May 19 11:39:09 2015 +0200 x86/EFI: keep EFI runtime services top level page tables up-to-date Updates to idle_pg_table[] need to be mirrored into the page tables used for invoking EFI runtime services. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/efi/runtime.h | 7 +++++++ xen/arch/x86/efi/stub.c | 3 +++ xen/arch/x86/mm.c | 5 ++++- xen/include/asm-x86/page.h | 1 + 4 files changed, 15 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/efi/runtime.h b/xen/arch/x86/efi/runtime.h index 0eb2fb9..d9eb8f5 100644 --- a/xen/arch/x86/efi/runtime.h +++ b/xen/arch/x86/efi/runtime.h @@ -1,5 +1,12 @@ +#include #include #ifndef COMPAT l4_pgentry_t *__read_mostly efi_l4_pgtable; + +void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t l4e) +{ + if ( efi_l4_pgtable ) + l4e_write(efi_l4_pgtable + l4idx, l4e); +} #endif diff --git a/xen/arch/x86/efi/stub.c b/xen/arch/x86/efi/stub.c index b8f49f8..627009f 100644 --- a/xen/arch/x86/efi/stub.c +++ b/xen/arch/x86/efi/stub.c @@ -2,6 +2,7 @@ #include #include #include +#include #ifndef efi_enabled const bool_t efi_enabled = 0; @@ -9,6 +10,8 @@ const bool_t efi_enabled = 0; void __init efi_init_memory(void) { } +void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t l4e) { } + paddr_t efi_rs_page_table(void) { BUG(); diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 034de22..5fe08df 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -5311,7 +5311,10 @@ static l3_pgentry_t *virt_to_xen_l3e(unsigned long v) spin_lock(&map_pgdir_lock); if ( !(l4e_get_flags(*pl4e) & _PAGE_PRESENT) ) { - l4e_write(pl4e, l4e_from_paddr(__pa(pl3e), __PAGE_HYPERVISOR)); + l4_pgentry_t l4e = l4e_from_paddr(__pa(pl3e), __PAGE_HYPERVISOR); + + l4e_write(pl4e, l4e); + efi_update_l4_pgtable(l4_table_offset(v), l4e); pl3e = NULL; } if ( locking ) diff --git a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h index 8977a76..27c2ae7 100644 --- a/xen/include/asm-x86/page.h +++ b/xen/include/asm-x86/page.h @@ -288,6 +288,7 @@ extern l2_pgentry_t l2_identmap[4*L2_PAGETABLE_ENTRIES]; extern l1_pgentry_t l1_identmap[L1_PAGETABLE_ENTRIES], l1_fixmap[L1_PAGETABLE_ENTRIES]; void paging_init(void); +void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t); #endif /* !defined(__ASSEMBLY__) */ #define _PAGE_NONE _AC(0x000,U) -- 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 May 28 18:45:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:45:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2oK-0004B6-4f; Thu, 28 May 2015 18:45:44 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2oI-0004Am-JD for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:45:42 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id 63/BE-16276-55267655; Thu, 28 May 2015 18:45:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1432838739!10995232!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27827 invoked from network); 28 May 2015 18:45:40 -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; 28 May 2015 18:45:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2oF-00037f-8J for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:45:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2oF-000395-6Y for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:45:39 +0000 Date: Thu, 28 May 2015 18:45:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/EFI: keep EFI runtime services top level page tables up-to-date X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit db83975f0fcd30370392ed288a7bd2420624ed4e Author: Jan Beulich AuthorDate: Tue May 19 11:35:30 2015 +0200 Commit: Jan Beulich CommitDate: Tue May 19 11:39:09 2015 +0200 x86/EFI: keep EFI runtime services top level page tables up-to-date Updates to idle_pg_table[] need to be mirrored into the page tables used for invoking EFI runtime services. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/efi/runtime.h | 7 +++++++ xen/arch/x86/efi/stub.c | 3 +++ xen/arch/x86/mm.c | 5 ++++- xen/include/asm-x86/page.h | 1 + 4 files changed, 15 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/efi/runtime.h b/xen/arch/x86/efi/runtime.h index 0eb2fb9..d9eb8f5 100644 --- a/xen/arch/x86/efi/runtime.h +++ b/xen/arch/x86/efi/runtime.h @@ -1,5 +1,12 @@ +#include #include #ifndef COMPAT l4_pgentry_t *__read_mostly efi_l4_pgtable; + +void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t l4e) +{ + if ( efi_l4_pgtable ) + l4e_write(efi_l4_pgtable + l4idx, l4e); +} #endif diff --git a/xen/arch/x86/efi/stub.c b/xen/arch/x86/efi/stub.c index b8f49f8..627009f 100644 --- a/xen/arch/x86/efi/stub.c +++ b/xen/arch/x86/efi/stub.c @@ -2,6 +2,7 @@ #include #include #include +#include #ifndef efi_enabled const bool_t efi_enabled = 0; @@ -9,6 +10,8 @@ const bool_t efi_enabled = 0; void __init efi_init_memory(void) { } +void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t l4e) { } + paddr_t efi_rs_page_table(void) { BUG(); diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 034de22..5fe08df 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -5311,7 +5311,10 @@ static l3_pgentry_t *virt_to_xen_l3e(unsigned long v) spin_lock(&map_pgdir_lock); if ( !(l4e_get_flags(*pl4e) & _PAGE_PRESENT) ) { - l4e_write(pl4e, l4e_from_paddr(__pa(pl3e), __PAGE_HYPERVISOR)); + l4_pgentry_t l4e = l4e_from_paddr(__pa(pl3e), __PAGE_HYPERVISOR); + + l4e_write(pl4e, l4e); + efi_update_l4_pgtable(l4_table_offset(v), l4e); pl3e = NULL; } if ( locking ) diff --git a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h index 8977a76..27c2ae7 100644 --- a/xen/include/asm-x86/page.h +++ b/xen/include/asm-x86/page.h @@ -288,6 +288,7 @@ extern l2_pgentry_t l2_identmap[4*L2_PAGETABLE_ENTRIES]; extern l1_pgentry_t l1_identmap[L1_PAGETABLE_ENTRIES], l1_fixmap[L1_PAGETABLE_ENTRIES]; void paging_init(void); +void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t); #endif /* !defined(__ASSEMBLY__) */ #define _PAGE_NONE _AC(0x000,U) -- 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 May 28 18:45:53 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:45:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2oT-0004CR-7W; Thu, 28 May 2015 18:45:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2oR-0004CD-Ne for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:45:51 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 19/C8-03895-F5267655; Thu, 28 May 2015 18:45:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1432838749!10995260!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29006 invoked from network); 28 May 2015 18:45:50 -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; 28 May 2015 18:45:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2oP-00037l-FS for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:45:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2oP-00039e-Ct for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:45:49 +0000 Date: Thu, 28 May 2015 18:45:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] spinlock: fix build with older GCC X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1037e33c88bb0e1fe530c164f242df17030102e1 Author: David Vrabel AuthorDate: Tue May 19 15:49:22 2015 +0200 Commit: Jan Beulich CommitDate: Tue May 19 15:49:22 2015 +0200 spinlock: fix build with older GCC Older GCC versions such as 4.3 cannot have initializers for the members of anonymous structures, so initialize .head_tail instead. Use a SPINLOCK_TICKET_INC define so this initializer is near the spinlock_tickets_t definition (in case the structure changes requiring changes to the initializer). Signed-off-by: David Vrabel Reported-and-tested-by: Jan Beulich --- xen/common/spinlock.c | 2 +- xen/include/xen/spinlock.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c index c8dc8ba..29149d1 100644 --- a/xen/common/spinlock.c +++ b/xen/common/spinlock.c @@ -132,7 +132,7 @@ static always_inline u16 observe_head(spinlock_tickets_t *t) void _spin_lock(spinlock_t *lock) { - spinlock_tickets_t tickets = { .tail = 1, }; + spinlock_tickets_t tickets = SPINLOCK_TICKET_INC; LOCK_PROFILE_VAR; check_lock(&lock->debug); diff --git a/xen/include/xen/spinlock.h b/xen/include/xen/spinlock.h index 311685a..9286543 100644 --- a/xen/include/xen/spinlock.h +++ b/xen/include/xen/spinlock.h @@ -132,6 +132,8 @@ typedef union { }; } spinlock_tickets_t; +#define SPINLOCK_TICKET_INC { .head_tail = 0x10000, } + typedef struct spinlock { spinlock_tickets_t tickets; u16 recurse_cpu:12; -- 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 May 28 18:45:53 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:45:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2oT-0004CR-7W; Thu, 28 May 2015 18:45:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2oR-0004CD-Ne for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:45:51 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 19/C8-03895-F5267655; Thu, 28 May 2015 18:45:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1432838749!10995260!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29006 invoked from network); 28 May 2015 18:45:50 -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; 28 May 2015 18:45:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2oP-00037l-FS for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:45:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2oP-00039e-Ct for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:45:49 +0000 Date: Thu, 28 May 2015 18:45:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] spinlock: fix build with older GCC X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1037e33c88bb0e1fe530c164f242df17030102e1 Author: David Vrabel AuthorDate: Tue May 19 15:49:22 2015 +0200 Commit: Jan Beulich CommitDate: Tue May 19 15:49:22 2015 +0200 spinlock: fix build with older GCC Older GCC versions such as 4.3 cannot have initializers for the members of anonymous structures, so initialize .head_tail instead. Use a SPINLOCK_TICKET_INC define so this initializer is near the spinlock_tickets_t definition (in case the structure changes requiring changes to the initializer). Signed-off-by: David Vrabel Reported-and-tested-by: Jan Beulich --- xen/common/spinlock.c | 2 +- xen/include/xen/spinlock.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c index c8dc8ba..29149d1 100644 --- a/xen/common/spinlock.c +++ b/xen/common/spinlock.c @@ -132,7 +132,7 @@ static always_inline u16 observe_head(spinlock_tickets_t *t) void _spin_lock(spinlock_t *lock) { - spinlock_tickets_t tickets = { .tail = 1, }; + spinlock_tickets_t tickets = SPINLOCK_TICKET_INC; LOCK_PROFILE_VAR; check_lock(&lock->debug); diff --git a/xen/include/xen/spinlock.h b/xen/include/xen/spinlock.h index 311685a..9286543 100644 --- a/xen/include/xen/spinlock.h +++ b/xen/include/xen/spinlock.h @@ -132,6 +132,8 @@ typedef union { }; } spinlock_tickets_t; +#define SPINLOCK_TICKET_INC { .head_tail = 0x10000, } + typedef struct spinlock { spinlock_tickets_t tickets; u16 recurse_cpu:12; -- 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 May 28 18:46:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:46: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 1Yy2od-0004Dm-BM; Thu, 28 May 2015 18:46:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2ob-0004DZ-QO for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:46:01 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id 8E/38-03747-96267655; Thu, 28 May 2015 18:46:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1432838759!8126983!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21561 invoked from network); 28 May 2015 18:46:00 -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; 28 May 2015 18:46:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2oZ-00037u-Kf for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:45:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2oZ-0003AJ-JY for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:45:59 +0000 Date: Thu, 28 May 2015 18:45:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mwait-idle: support additional Broadwell model X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e8577050577f703074e8d057096b6f0dffb918c4 Author: Len Brown AuthorDate: Wed May 20 13:23:17 2015 +0200 Commit: Jan Beulich CommitDate: Wed May 20 13:23:17 2015 +0200 mwait-idle: support additional Broadwell model Signed-off-by: Len Brown [Linux commit bea57077e44ec9c1e6d3a3c142c8a3c0289e290d] Signed-off-by: Jan Beulich --- xen/arch/x86/cpu/mwait-idle.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index 6dd5822..fbe0582 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -683,6 +683,7 @@ static struct intel_idle_id { ICPU(0x46, hsw), ICPU(0x4d, avn), ICPU(0x3d, bdw), + ICPU(0x47, bdw), ICPU(0x4f, bdw), ICPU(0x56, bdw), {} -- 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 May 28 18:46:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:46: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 1Yy2od-0004Dm-BM; Thu, 28 May 2015 18:46:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2ob-0004DZ-QO for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:46:01 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id 8E/38-03747-96267655; Thu, 28 May 2015 18:46:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1432838759!8126983!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21561 invoked from network); 28 May 2015 18:46:00 -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; 28 May 2015 18:46:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2oZ-00037u-Kf for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:45:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2oZ-0003AJ-JY for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:45:59 +0000 Date: Thu, 28 May 2015 18:45:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mwait-idle: support additional Broadwell model X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e8577050577f703074e8d057096b6f0dffb918c4 Author: Len Brown AuthorDate: Wed May 20 13:23:17 2015 +0200 Commit: Jan Beulich CommitDate: Wed May 20 13:23:17 2015 +0200 mwait-idle: support additional Broadwell model Signed-off-by: Len Brown [Linux commit bea57077e44ec9c1e6d3a3c142c8a3c0289e290d] Signed-off-by: Jan Beulich --- xen/arch/x86/cpu/mwait-idle.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index 6dd5822..fbe0582 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -683,6 +683,7 @@ static struct intel_idle_id { ICPU(0x46, hsw), ICPU(0x4d, avn), ICPU(0x3d, bdw), + ICPU(0x47, bdw), ICPU(0x4f, bdw), ICPU(0x56, bdw), {} -- 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 May 28 18:46:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:46: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 1Yy2oo-0004FW-GR; Thu, 28 May 2015 18:46:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2om-0004FE-FN for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:46:12 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 3B/FF-01469-37267655; Thu, 28 May 2015 18:46:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1432838769!13700606!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29433 invoked from network); 28 May 2015 18:46:10 -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; 28 May 2015 18:46:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2oj-00038T-Pv for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:46:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2oj-0003BV-OO for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:46:09 +0000 Date: Thu, 28 May 2015 18:46:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mwait-idle: update support for Silvermont Core in Baytrail SOC X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ad8a366760aacb54b2e303b9b082eb95aab5cd42 Author: Len Brown AuthorDate: Wed May 20 13:23:49 2015 +0200 Commit: Jan Beulich CommitDate: Wed May 20 13:23:49 2015 +0200 mwait-idle: update support for Silvermont Core in Baytrail SOC On some Silvermont-Core/Baytrail-SOC systems, C1E latency is higher than original specifications. Although C1E is still enumerated in CPUID.MWAIT.EDX, we delete the state from intel_idle to avoid latency impact. Under some conditions, the latency of the C6N-BYT and C6S-BYT states may exceed the specified values of 40 and 140 usec, respectively. Increase those values to 300 and 500 usec; to assure that the hardware does not violate constraints that may be set by the Linux PM_QOS sub-system. Also increase the C7-BYT target residency to 4.0 ms from 1.5 ms. Signed-off-by: Len Brown [Linux commit d7ef76717322c8e2df7d4360b33faa9466cb1a0d] Signed-off-by: Jan Beulich --- xen/arch/x86/cpu/mwait-idle.c | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index fbe0582..bea31b1 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -196,28 +196,22 @@ static const struct cpuidle_state byt_cstates[] = { .target_residency = 1, }, { - .name = "C1E-BYT", - .flags = MWAIT2flg(0x01), - .exit_latency = 15, - .target_residency = 30, - }, - { .name = "C6N-BYT", .flags = MWAIT2flg(0x58) | CPUIDLE_FLAG_TLB_FLUSHED, - .exit_latency = 40, + .exit_latency = 300, .target_residency = 275, }, { .name = "C6S-BYT", .flags = MWAIT2flg(0x52) | CPUIDLE_FLAG_TLB_FLUSHED, - .exit_latency = 140, + .exit_latency = 500, .target_residency = 560, }, { .name = "C7-BYT", .flags = MWAIT2flg(0x60) | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 1200, - .target_residency = 1500, + .target_residency = 4000, }, { .name = "C7S-BYT", -- 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 May 28 18:46:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:46: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 1Yy2oo-0004FW-GR; Thu, 28 May 2015 18:46:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2om-0004FE-FN for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:46:12 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 3B/FF-01469-37267655; Thu, 28 May 2015 18:46:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1432838769!13700606!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29433 invoked from network); 28 May 2015 18:46:10 -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; 28 May 2015 18:46:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2oj-00038T-Pv for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:46:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2oj-0003BV-OO for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:46:09 +0000 Date: Thu, 28 May 2015 18:46:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mwait-idle: update support for Silvermont Core in Baytrail SOC X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ad8a366760aacb54b2e303b9b082eb95aab5cd42 Author: Len Brown AuthorDate: Wed May 20 13:23:49 2015 +0200 Commit: Jan Beulich CommitDate: Wed May 20 13:23:49 2015 +0200 mwait-idle: update support for Silvermont Core in Baytrail SOC On some Silvermont-Core/Baytrail-SOC systems, C1E latency is higher than original specifications. Although C1E is still enumerated in CPUID.MWAIT.EDX, we delete the state from intel_idle to avoid latency impact. Under some conditions, the latency of the C6N-BYT and C6S-BYT states may exceed the specified values of 40 and 140 usec, respectively. Increase those values to 300 and 500 usec; to assure that the hardware does not violate constraints that may be set by the Linux PM_QOS sub-system. Also increase the C7-BYT target residency to 4.0 ms from 1.5 ms. Signed-off-by: Len Brown [Linux commit d7ef76717322c8e2df7d4360b33faa9466cb1a0d] Signed-off-by: Jan Beulich --- xen/arch/x86/cpu/mwait-idle.c | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index fbe0582..bea31b1 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -196,28 +196,22 @@ static const struct cpuidle_state byt_cstates[] = { .target_residency = 1, }, { - .name = "C1E-BYT", - .flags = MWAIT2flg(0x01), - .exit_latency = 15, - .target_residency = 30, - }, - { .name = "C6N-BYT", .flags = MWAIT2flg(0x58) | CPUIDLE_FLAG_TLB_FLUSHED, - .exit_latency = 40, + .exit_latency = 300, .target_residency = 275, }, { .name = "C6S-BYT", .flags = MWAIT2flg(0x52) | CPUIDLE_FLAG_TLB_FLUSHED, - .exit_latency = 140, + .exit_latency = 500, .target_residency = 560, }, { .name = "C7-BYT", .flags = MWAIT2flg(0x60) | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 1200, - .target_residency = 1500, + .target_residency = 4000, }, { .name = "C7S-BYT", -- 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 May 28 18:46:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:46: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 1Yy2oy-0004Os-Kh; Thu, 28 May 2015 18:46:24 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2ow-0004Ja-Rj for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:46:22 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 47/0C-23832-E7267655; Thu, 28 May 2015 18:46:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1432838780!10995351!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31267 invoked from network); 28 May 2015 18:46:21 -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; 28 May 2015 18:46:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2ot-00038Z-Vw for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:46:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2ot-0003Br-UC for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:46:19 +0000 Date: Thu, 28 May 2015 18:46:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mwait-idle: add support for the Airmont Core in the Cherrytrail and Braswell SOCs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0c3580814afe7458c4072f0e45714d38d59fa595 Author: Len Brown AuthorDate: Wed May 20 13:24:34 2015 +0200 Commit: Jan Beulich CommitDate: Wed May 20 13:24:34 2015 +0200 mwait-idle: add support for the Airmont Core in the Cherrytrail and Braswell SOCs Support C-states for the Airmont core in the Cherrytrail and Braswell SOCs. The states are similar to those of Silvermont in Baytrail, except both flavors of C6 states are faster. Signed-off-by: Len Brown [Linux commit cab07a5652d1d124b505c2b7ed21c6823295c5d7] Signed-off-by: Jan Beulich --- xen/arch/x86/cpu/mwait-idle.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index bea31b1..162e19b 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -222,6 +222,40 @@ static const struct cpuidle_state byt_cstates[] = { {} }; +static const struct cpuidle_state cht_cstates[] = { + { + .name = "C1-CHT", + .flags = MWAIT2flg(0x00), + .exit_latency = 1, + .target_residency = 1, + }, + { + .name = "C6N-CHT", + .flags = MWAIT2flg(0x58) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 80, + .target_residency = 275, + }, + { + .name = "C6S-CHT", + .flags = MWAIT2flg(0x52) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 200, + .target_residency = 560, + }, + { + .name = "C7-CHT", + .flags = MWAIT2flg(0x60) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 1200, + .target_residency = 4000, + }, + { + .name = "C7S-CHT", + .flags = MWAIT2flg(0x64) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 10000, + .target_residency = 20000, + }, + {} +}; + static const struct cpuidle_state ivb_cstates[] = { { .name = "C1-IVB", @@ -625,6 +659,12 @@ static const struct idle_cpu idle_cpu_byt = { .byt_auto_demotion_disable_flag = 1, }; +static const struct idle_cpu idle_cpu_cht = { + .state_table = cht_cstates, + .disable_promotion_to_c1e = 1, + .byt_auto_demotion_disable_flag = 1, +}; + static const struct idle_cpu idle_cpu_ivb = { .state_table = ivb_cstates, .disable_promotion_to_c1e = 1, @@ -669,6 +709,7 @@ static struct intel_idle_id { ICPU(0x2d, snb), ICPU(0x36, atom), ICPU(0x37, byt), + ICPU(0x4c, cht), ICPU(0x3a, ivb), ICPU(0x3e, ivt), ICPU(0x3c, hsw), -- 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 May 28 18:46:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:46: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 1Yy2oy-0004Os-Kh; Thu, 28 May 2015 18:46:24 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2ow-0004Ja-Rj for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:46:22 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 47/0C-23832-E7267655; Thu, 28 May 2015 18:46:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1432838780!10995351!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31267 invoked from network); 28 May 2015 18:46:21 -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; 28 May 2015 18:46:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2ot-00038Z-Vw for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:46:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2ot-0003Br-UC for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:46:19 +0000 Date: Thu, 28 May 2015 18:46:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mwait-idle: add support for the Airmont Core in the Cherrytrail and Braswell SOCs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0c3580814afe7458c4072f0e45714d38d59fa595 Author: Len Brown AuthorDate: Wed May 20 13:24:34 2015 +0200 Commit: Jan Beulich CommitDate: Wed May 20 13:24:34 2015 +0200 mwait-idle: add support for the Airmont Core in the Cherrytrail and Braswell SOCs Support C-states for the Airmont core in the Cherrytrail and Braswell SOCs. The states are similar to those of Silvermont in Baytrail, except both flavors of C6 states are faster. Signed-off-by: Len Brown [Linux commit cab07a5652d1d124b505c2b7ed21c6823295c5d7] Signed-off-by: Jan Beulich --- xen/arch/x86/cpu/mwait-idle.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index bea31b1..162e19b 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -222,6 +222,40 @@ static const struct cpuidle_state byt_cstates[] = { {} }; +static const struct cpuidle_state cht_cstates[] = { + { + .name = "C1-CHT", + .flags = MWAIT2flg(0x00), + .exit_latency = 1, + .target_residency = 1, + }, + { + .name = "C6N-CHT", + .flags = MWAIT2flg(0x58) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 80, + .target_residency = 275, + }, + { + .name = "C6S-CHT", + .flags = MWAIT2flg(0x52) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 200, + .target_residency = 560, + }, + { + .name = "C7-CHT", + .flags = MWAIT2flg(0x60) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 1200, + .target_residency = 4000, + }, + { + .name = "C7S-CHT", + .flags = MWAIT2flg(0x64) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 10000, + .target_residency = 20000, + }, + {} +}; + static const struct cpuidle_state ivb_cstates[] = { { .name = "C1-IVB", @@ -625,6 +659,12 @@ static const struct idle_cpu idle_cpu_byt = { .byt_auto_demotion_disable_flag = 1, }; +static const struct idle_cpu idle_cpu_cht = { + .state_table = cht_cstates, + .disable_promotion_to_c1e = 1, + .byt_auto_demotion_disable_flag = 1, +}; + static const struct idle_cpu idle_cpu_ivb = { .state_table = ivb_cstates, .disable_promotion_to_c1e = 1, @@ -669,6 +709,7 @@ static struct intel_idle_id { ICPU(0x2d, snb), ICPU(0x36, atom), ICPU(0x37, byt), + ICPU(0x4c, cht), ICPU(0x3a, ivb), ICPU(0x3e, ivt), ICPU(0x3c, hsw), -- 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 May 28 18:46:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:46:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2p7-0004l4-Qi; Thu, 28 May 2015 18:46:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2p6-0004hS-PK for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:46:32 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 86/C7-06457-88267655; Thu, 28 May 2015 18:46:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1432838790!11049585!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2181 invoked from network); 28 May 2015 18:46:31 -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; 28 May 2015 18:46:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2p4-00038h-7D for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:46:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2p4-0003CE-4R for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:46:30 +0000 Date: Thu, 28 May 2015 18:46:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: don't unconditionally touch the hvm_domain union during domain construction X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 74d0932448245cc4776d50811ceb80365623893c Author: Andrew Cooper AuthorDate: Wed May 20 13:25:12 2015 +0200 Commit: Jan Beulich CommitDate: Wed May 20 13:25:12 2015 +0200 x86: don't unconditionally touch the hvm_domain union during domain construction It may not be the appropriate half to touch. Drop the superfluous mem_sharing_enabled assignment, and move the hap_enabled assignment to a suitable conditional before it is actually needed. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/domain.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 1f1550e..6e9464c 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -513,12 +513,6 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags, int i, paging_initialised = 0; int rc = -ENOMEM; - d->arch.hvm_domain.hap_enabled = - has_hvm_container_domain(d) && - hvm_funcs.hap_supported && - (domcr_flags & DOMCRF_hap); - d->arch.hvm_domain.mem_sharing_enabled = 0; - d->arch.s3_integrity = !!(domcr_flags & DOMCRF_s3_integrity); INIT_LIST_HEAD(&d->arch.pdev_list); @@ -541,7 +535,12 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags, } if ( has_hvm_container_domain(d) ) + { + d->arch.hvm_domain.hap_enabled = + hvm_funcs.hap_supported && (domcr_flags & DOMCRF_hap); + rc = create_perdomain_mapping(d, PERDOMAIN_VIRT_START, 0, NULL, NULL); + } else if ( is_idle_domain(d) ) rc = 0; else -- 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 May 28 18:46:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:46:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2p7-0004l4-Qi; Thu, 28 May 2015 18:46:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2p6-0004hS-PK for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:46:32 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 86/C7-06457-88267655; Thu, 28 May 2015 18:46:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1432838790!11049585!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2181 invoked from network); 28 May 2015 18:46:31 -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; 28 May 2015 18:46:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2p4-00038h-7D for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:46:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2p4-0003CE-4R for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:46:30 +0000 Date: Thu, 28 May 2015 18:46:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: don't unconditionally touch the hvm_domain union during domain construction X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 74d0932448245cc4776d50811ceb80365623893c Author: Andrew Cooper AuthorDate: Wed May 20 13:25:12 2015 +0200 Commit: Jan Beulich CommitDate: Wed May 20 13:25:12 2015 +0200 x86: don't unconditionally touch the hvm_domain union during domain construction It may not be the appropriate half to touch. Drop the superfluous mem_sharing_enabled assignment, and move the hap_enabled assignment to a suitable conditional before it is actually needed. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/domain.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 1f1550e..6e9464c 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -513,12 +513,6 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags, int i, paging_initialised = 0; int rc = -ENOMEM; - d->arch.hvm_domain.hap_enabled = - has_hvm_container_domain(d) && - hvm_funcs.hap_supported && - (domcr_flags & DOMCRF_hap); - d->arch.hvm_domain.mem_sharing_enabled = 0; - d->arch.s3_integrity = !!(domcr_flags & DOMCRF_s3_integrity); INIT_LIST_HEAD(&d->arch.pdev_list); @@ -541,7 +535,12 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags, } if ( has_hvm_container_domain(d) ) + { + d->arch.hvm_domain.hap_enabled = + hvm_funcs.hap_supported && (domcr_flags & DOMCRF_hap); + rc = create_perdomain_mapping(d, PERDOMAIN_VIRT_START, 0, NULL, NULL); + } else if ( is_idle_domain(d) ) rc = 0; else -- 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 May 28 18:46:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:46:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2pH-00055w-Ui; Thu, 28 May 2015 18:46:43 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2pH-00054i-8D for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:46:43 +0000 Content-Length: 7156 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id 5C/5E-27764-29267655; Thu, 28 May 2015 18:46:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1432838800!18335370!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5103 invoked from network); 28 May 2015 18:46:41 -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; 28 May 2015 18:46:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2pE-00038n-E8 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:46:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2pE-0003DM-Bu for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:46:40 +0000 Date: Thu, 28 May 2015 18:46:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/pvh: use a custom IO bitmap for PVH hardware domains X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============7323822418516296791==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============7323822418516296791== Content-Length: 6900 Content-Transfer-Encoding: quoted-printable commit 8ddb99287cd18da99a95a9f70904a97b52893599 Author: Roger Pau Monn=C3=A9 AuthorDate: Wed May 20 13:26:43 2015 +0200 Commit: Jan Beulich CommitDate: Wed May 20 13:26:43 2015 +0200 x86/pvh: use a custom IO bitmap for PVH hardware domains Since a PVH hardware domain has access to the physical hardware create a custom more permissive IO bitmap. The permissions set on the bitmap are populated based on the contents of the ioports rangeset. Signed-off-by: Roger Pau Monn=C3=A9 Signed-off-by: Jan Beulich --- xen/arch/x86/hvm/hvm.c | 24 ++++++++++++++++++++++-- xen/arch/x86/hvm/svm/vmcb.c | 2 +- xen/arch/x86/hvm/vmx/vmcs.c | 4 ++-- xen/arch/x86/setup.c | 28 ++++++++++++++++++++++++++++ xen/common/domain.c | 3 +++ xen/include/asm-x86/hvm/domain.h | 2 ++ xen/include/asm-x86/setup.h | 1 + 7 files changed, 59 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 689e402..89423fa 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -77,9 +77,13 @@ integer_param("hvm_debug", opt_hvm_debug_level); struct hvm_function_table hvm_funcs __read_mostly; -/* I/O permission bitmap is globally shared by all HVM guests. */ +/* + * The I/O permission bitmap is globally shared by all HVM guests except + * the hardware domain which needs a more permissive one. + */ +#define HVM_IOBITMAP_SIZE (3 * PAGE_SIZE) unsigned long __attribute__ ((__section__ (".bss.page_aligned"))) - hvm_io_bitmap[3*PAGE_SIZE/BYTES_PER_LONG]; + hvm_io_bitmap[HVM_IOBITMAP_SIZE / BYTES_PER_LONG]; /* Xen command-line option to enable HAP */ static bool_t __initdata opt_hap_enabled =3D 1; @@ -1461,6 +1465,20 @@ int hvm_domain_initialise(struct domain *d) goto fail1; d->arch.hvm_domain.io_handler->num_slot =3D 0; + /* Set the default IO Bitmap. */ + if ( is_hardware_domain(d) ) + { + d->arch.hvm_domain.io_bitmap =3D _xmalloc(HVM_IOBITMAP_SIZE, PAGE_SIZE); + if ( d->arch.hvm_domain.io_bitmap =3D=3D NULL ) + { + rc =3D -ENOMEM; + goto fail1; + } + memset(d->arch.hvm_domain.io_bitmap, ~0, HVM_IOBITMAP_SIZE); + } + else + d->arch.hvm_domain.io_bitmap =3D hvm_io_bitmap; + if ( is_pvh_domain(d) ) { register_portio_handler(d, 0, 0x10003, handle_pvh_io); @@ -1496,6 +1514,8 @@ int hvm_domain_initialise(struct domain *d) stdvga_deinit(d); vioapic_deinit(d); fail1: + if ( is_hardware_domain(d) ) + xfree(d->arch.hvm_domain.io_bitmap); xfree(d->arch.hvm_domain.io_handler); xfree(d->arch.hvm_domain.params); fail0: diff --git a/xen/arch/x86/hvm/svm/vmcb.c b/xen/arch/x86/hvm/svm/vmcb.c index 21292bb..6339d2a 100644 --- a/xen/arch/x86/hvm/svm/vmcb.c +++ b/xen/arch/x86/hvm/svm/vmcb.c @@ -118,7 +118,7 @@ static int construct_vmcb(struct vcpu *v) svm_disable_intercept_for_msr(v, MSR_AMD64_LWP_CBADDR); vmcb->_msrpm_base_pa =3D (u64)virt_to_maddr(arch_svm->msrpm); - vmcb->_iopm_base_pa =3D (u64)virt_to_maddr(hvm_io_bitmap); + vmcb->_iopm_base_pa =3D __pa(v->domain->arch.hvm_domain.io_bitmap); /* Virtualise EFLAGS.IF and LAPIC TPR (CR8). */ vmcb->_vintr.fields.intr_masking =3D 1; diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 3123706..355d1b5 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -1032,8 +1032,8 @@ static int construct_vmcs(struct vcpu *v) } /* I/O access bitmap. */ - __vmwrite(IO_BITMAP_A, virt_to_maddr((char *)hvm_io_bitmap + 0)); - __vmwrite(IO_BITMAP_B, virt_to_maddr((char *)hvm_io_bitmap + PAGE_SIZE)); + __vmwrite(IO_BITMAP_A, __pa(d->arch.hvm_domain.io_bitmap)); + __vmwrite(IO_BITMAP_B, __pa(d->arch.hvm_domain.io_bitmap) + PAGE_SIZE); if ( cpu_has_vmx_virtual_intr_delivery ) { diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 2b9787a..cd333f9 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1446,6 +1446,8 @@ void __init noreturn __start_xen(unsigned long mbi_p) dmi_end_boot(); + setup_io_bitmap(dom0); + system_state =3D SYS_STATE_active; domain_unpause_by_systemcontroller(dom0); @@ -1509,6 +1511,32 @@ int __hwdom_init xen_in_range(unsigned long mfn) return 0; } +static int __hwdom_init io_bitmap_cb(unsigned long s, unsigned long e, + void *ctx) +{ + struct domain *d =3D ctx; + unsigned int i; + + ASSERT(e <=3D INT_MAX); + for ( i =3D s; i <=3D e; i++ ) + __clear_bit(i, d->arch.hvm_domain.io_bitmap); + + return 0; +} + +void __hwdom_init setup_io_bitmap(struct domain *d) +{ + int rc; + + if ( has_hvm_container_domain(d) ) + { + bitmap_fill(d->arch.hvm_domain.io_bitmap, 0x10000); + rc =3D rangeset_report_ranges(d->arch.ioport_caps, 0, 0x10000, + io_bitmap_cb, d); + BUG_ON(rc); + } +} + /* * Local variables: * mode: C diff --git a/xen/common/domain.c b/xen/common/domain.c index 6803c4d..b0e83f5 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -42,6 +42,7 @@ #include #include #include +#include /* Linux config option: propageted to domain0 */ /* xen_processor_pmbits: xen control Cx, Px, ... */ @@ -219,6 +220,8 @@ static int late_hwdom_init(struct domain *d) rangeset_swap(d->iomem_caps, dom0->iomem_caps); #ifdef CONFIG_X86 rangeset_swap(d->arch.ioport_caps, dom0->arch.ioport_caps); + setup_io_bitmap(d); + setup_io_bitmap(dom0); #endif rcu_unlock_domain(dom0); diff --git a/xen/include/asm-x86/hvm/domain.h b/xen/include/asm-x86/hvm/domain.h index 0f8b19a..bdab45d 100644 --- a/xen/include/asm-x86/hvm/domain.h +++ b/xen/include/asm-x86/hvm/domain.h @@ -141,6 +141,8 @@ struct hvm_domain { */ uint64_t sync_tsc; + unsigned long *io_bitmap; + union { struct vmx_domain vmx; struct svm_domain svm; diff --git a/xen/include/asm-x86/setup.h b/xen/include/asm-x86/setup.h index 08bc23a..381d9f8 100644 --- a/xen/include/asm-x86/setup.h +++ b/xen/include/asm-x86/setup.h @@ -32,6 +32,7 @@ int construct_dom0( module_t *initrd, void *(*bootstrap_map)(const module_t *), char *cmdline); +void setup_io_bitmap(struct domain *d); unsigned long initial_images_nrpages(nodeid_t node); void discard_initial_images(void); -- generated by git-patchbot for /home/xen/git/xen.git#master --===============7323822418516296791== 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 --===============7323822418516296791==-- From xen-changelog-bounces@lists.xen.org Thu May 28 18:46:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:46:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2pH-00055w-Ui; Thu, 28 May 2015 18:46:43 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2pH-00054i-8D for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:46:43 +0000 Content-Length: 7156 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id 5C/5E-27764-29267655; Thu, 28 May 2015 18:46:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1432838800!18335370!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5103 invoked from network); 28 May 2015 18:46:41 -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; 28 May 2015 18:46:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2pE-00038n-E8 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:46:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2pE-0003DM-Bu for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:46:40 +0000 Date: Thu, 28 May 2015 18:46:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/pvh: use a custom IO bitmap for PVH hardware domains X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============7323822418516296791==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============7323822418516296791== Content-Length: 6900 Content-Transfer-Encoding: quoted-printable commit 8ddb99287cd18da99a95a9f70904a97b52893599 Author: Roger Pau Monn=C3=A9 AuthorDate: Wed May 20 13:26:43 2015 +0200 Commit: Jan Beulich CommitDate: Wed May 20 13:26:43 2015 +0200 x86/pvh: use a custom IO bitmap for PVH hardware domains Since a PVH hardware domain has access to the physical hardware create a custom more permissive IO bitmap. The permissions set on the bitmap are populated based on the contents of the ioports rangeset. Signed-off-by: Roger Pau Monn=C3=A9 Signed-off-by: Jan Beulich --- xen/arch/x86/hvm/hvm.c | 24 ++++++++++++++++++++++-- xen/arch/x86/hvm/svm/vmcb.c | 2 +- xen/arch/x86/hvm/vmx/vmcs.c | 4 ++-- xen/arch/x86/setup.c | 28 ++++++++++++++++++++++++++++ xen/common/domain.c | 3 +++ xen/include/asm-x86/hvm/domain.h | 2 ++ xen/include/asm-x86/setup.h | 1 + 7 files changed, 59 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 689e402..89423fa 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -77,9 +77,13 @@ integer_param("hvm_debug", opt_hvm_debug_level); struct hvm_function_table hvm_funcs __read_mostly; -/* I/O permission bitmap is globally shared by all HVM guests. */ +/* + * The I/O permission bitmap is globally shared by all HVM guests except + * the hardware domain which needs a more permissive one. + */ +#define HVM_IOBITMAP_SIZE (3 * PAGE_SIZE) unsigned long __attribute__ ((__section__ (".bss.page_aligned"))) - hvm_io_bitmap[3*PAGE_SIZE/BYTES_PER_LONG]; + hvm_io_bitmap[HVM_IOBITMAP_SIZE / BYTES_PER_LONG]; /* Xen command-line option to enable HAP */ static bool_t __initdata opt_hap_enabled =3D 1; @@ -1461,6 +1465,20 @@ int hvm_domain_initialise(struct domain *d) goto fail1; d->arch.hvm_domain.io_handler->num_slot =3D 0; + /* Set the default IO Bitmap. */ + if ( is_hardware_domain(d) ) + { + d->arch.hvm_domain.io_bitmap =3D _xmalloc(HVM_IOBITMAP_SIZE, PAGE_SIZE); + if ( d->arch.hvm_domain.io_bitmap =3D=3D NULL ) + { + rc =3D -ENOMEM; + goto fail1; + } + memset(d->arch.hvm_domain.io_bitmap, ~0, HVM_IOBITMAP_SIZE); + } + else + d->arch.hvm_domain.io_bitmap =3D hvm_io_bitmap; + if ( is_pvh_domain(d) ) { register_portio_handler(d, 0, 0x10003, handle_pvh_io); @@ -1496,6 +1514,8 @@ int hvm_domain_initialise(struct domain *d) stdvga_deinit(d); vioapic_deinit(d); fail1: + if ( is_hardware_domain(d) ) + xfree(d->arch.hvm_domain.io_bitmap); xfree(d->arch.hvm_domain.io_handler); xfree(d->arch.hvm_domain.params); fail0: diff --git a/xen/arch/x86/hvm/svm/vmcb.c b/xen/arch/x86/hvm/svm/vmcb.c index 21292bb..6339d2a 100644 --- a/xen/arch/x86/hvm/svm/vmcb.c +++ b/xen/arch/x86/hvm/svm/vmcb.c @@ -118,7 +118,7 @@ static int construct_vmcb(struct vcpu *v) svm_disable_intercept_for_msr(v, MSR_AMD64_LWP_CBADDR); vmcb->_msrpm_base_pa =3D (u64)virt_to_maddr(arch_svm->msrpm); - vmcb->_iopm_base_pa =3D (u64)virt_to_maddr(hvm_io_bitmap); + vmcb->_iopm_base_pa =3D __pa(v->domain->arch.hvm_domain.io_bitmap); /* Virtualise EFLAGS.IF and LAPIC TPR (CR8). */ vmcb->_vintr.fields.intr_masking =3D 1; diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 3123706..355d1b5 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -1032,8 +1032,8 @@ static int construct_vmcs(struct vcpu *v) } /* I/O access bitmap. */ - __vmwrite(IO_BITMAP_A, virt_to_maddr((char *)hvm_io_bitmap + 0)); - __vmwrite(IO_BITMAP_B, virt_to_maddr((char *)hvm_io_bitmap + PAGE_SIZE)); + __vmwrite(IO_BITMAP_A, __pa(d->arch.hvm_domain.io_bitmap)); + __vmwrite(IO_BITMAP_B, __pa(d->arch.hvm_domain.io_bitmap) + PAGE_SIZE); if ( cpu_has_vmx_virtual_intr_delivery ) { diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 2b9787a..cd333f9 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1446,6 +1446,8 @@ void __init noreturn __start_xen(unsigned long mbi_p) dmi_end_boot(); + setup_io_bitmap(dom0); + system_state =3D SYS_STATE_active; domain_unpause_by_systemcontroller(dom0); @@ -1509,6 +1511,32 @@ int __hwdom_init xen_in_range(unsigned long mfn) return 0; } +static int __hwdom_init io_bitmap_cb(unsigned long s, unsigned long e, + void *ctx) +{ + struct domain *d =3D ctx; + unsigned int i; + + ASSERT(e <=3D INT_MAX); + for ( i =3D s; i <=3D e; i++ ) + __clear_bit(i, d->arch.hvm_domain.io_bitmap); + + return 0; +} + +void __hwdom_init setup_io_bitmap(struct domain *d) +{ + int rc; + + if ( has_hvm_container_domain(d) ) + { + bitmap_fill(d->arch.hvm_domain.io_bitmap, 0x10000); + rc =3D rangeset_report_ranges(d->arch.ioport_caps, 0, 0x10000, + io_bitmap_cb, d); + BUG_ON(rc); + } +} + /* * Local variables: * mode: C diff --git a/xen/common/domain.c b/xen/common/domain.c index 6803c4d..b0e83f5 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -42,6 +42,7 @@ #include #include #include +#include /* Linux config option: propageted to domain0 */ /* xen_processor_pmbits: xen control Cx, Px, ... */ @@ -219,6 +220,8 @@ static int late_hwdom_init(struct domain *d) rangeset_swap(d->iomem_caps, dom0->iomem_caps); #ifdef CONFIG_X86 rangeset_swap(d->arch.ioport_caps, dom0->arch.ioport_caps); + setup_io_bitmap(d); + setup_io_bitmap(dom0); #endif rcu_unlock_domain(dom0); diff --git a/xen/include/asm-x86/hvm/domain.h b/xen/include/asm-x86/hvm/domain.h index 0f8b19a..bdab45d 100644 --- a/xen/include/asm-x86/hvm/domain.h +++ b/xen/include/asm-x86/hvm/domain.h @@ -141,6 +141,8 @@ struct hvm_domain { */ uint64_t sync_tsc; + unsigned long *io_bitmap; + union { struct vmx_domain vmx; struct svm_domain svm; diff --git a/xen/include/asm-x86/setup.h b/xen/include/asm-x86/setup.h index 08bc23a..381d9f8 100644 --- a/xen/include/asm-x86/setup.h +++ b/xen/include/asm-x86/setup.h @@ -32,6 +32,7 @@ int construct_dom0( module_t *initrd, void *(*bootstrap_map)(const module_t *), char *cmdline); +void setup_io_bitmap(struct domain *d); unsigned long initial_images_nrpages(nodeid_t node); void discard_initial_images(void); -- generated by git-patchbot for /home/xen/git/xen.git#master --===============7323822418516296791== 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 --===============7323822418516296791==-- From xen-changelog-bounces@lists.xen.org Thu May 28 18:46:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:46:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2pS-00057V-1z; Thu, 28 May 2015 18:46:54 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2pR-00057I-EP for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:46:53 +0000 Content-Length: 2357 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 38/AE-31258-C9267655; Thu, 28 May 2015 18:46:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1432838810!10735236!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1261 invoked from network); 28 May 2015 18:46:51 -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; 28 May 2015 18:46:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2pO-00038t-KB for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:46:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2pO-0003Dj-IF for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:46:50 +0000 Date: Thu, 28 May 2015 18:46:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/pvh: trap access to sensitive IO ports X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============6325398384271246753==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============6325398384271246753== Content-Length: 1956 Content-Transfer-Encoding: quoted-printable commit 72d5acdc1d5b83107066e25054f9119e7771cf70 Author: Roger Pau Monn=C3=A9 AuthorDate: Wed May 20 13:27:23 2015 +0200 Commit: Jan Beulich CommitDate: Wed May 20 13:27:23 2015 +0200 x86/pvh: trap access to sensitive IO ports This is needed so Xen can properly trap 4 byte accesses to 0xcf8 in order to keep consistency with accesses to 0xcfc. The access to RTC ports also needs to be trapped in order to keep consistency, this includes RTC_PORT(0) and RTC_PORT(1) (0x70 and 0x71 respectively). Signed-off-by: Roger Pau Monn=C3=A9 --- xen/arch/x86/setup.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index cd333f9..2cc9185 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -49,6 +49,7 @@ #include #include #include +#include /* opt_nosmp: If true, secondary processors are ignored. */ static bool_t __initdata opt_nosmp; @@ -1534,6 +1535,16 @@ void __hwdom_init setup_io_bitmap(struct domain *d) rc =3D rangeset_report_ranges(d->arch.ioport_caps, 0, 0x10000, io_bitmap_cb, d); BUG_ON(rc); + /* + * NB: we need to trap accesses to 0xcf8 in order to intercept + * 4 byte accesses, that need to be handled by Xen in order to + * keep consistency. + * Access to 1 byte RTC ports also needs to be trapped in order + * to keep consistency with PV. + */ + __set_bit(0xcf8, d->arch.hvm_domain.io_bitmap); + __set_bit(RTC_PORT(0), d->arch.hvm_domain.io_bitmap); + __set_bit(RTC_PORT(1), d->arch.hvm_domain.io_bitmap); } } -- generated by git-patchbot for /home/xen/git/xen.git#master --===============6325398384271246753== 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 --===============6325398384271246753==-- From xen-changelog-bounces@lists.xen.org Thu May 28 18:46:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:46:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2pS-00057V-1z; Thu, 28 May 2015 18:46:54 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2pR-00057I-EP for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:46:53 +0000 Content-Length: 2357 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 38/AE-31258-C9267655; Thu, 28 May 2015 18:46:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1432838810!10735236!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1261 invoked from network); 28 May 2015 18:46:51 -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; 28 May 2015 18:46:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2pO-00038t-KB for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:46:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2pO-0003Dj-IF for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:46:50 +0000 Date: Thu, 28 May 2015 18:46:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/pvh: trap access to sensitive IO ports X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============6325398384271246753==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============6325398384271246753== Content-Length: 1956 Content-Transfer-Encoding: quoted-printable commit 72d5acdc1d5b83107066e25054f9119e7771cf70 Author: Roger Pau Monn=C3=A9 AuthorDate: Wed May 20 13:27:23 2015 +0200 Commit: Jan Beulich CommitDate: Wed May 20 13:27:23 2015 +0200 x86/pvh: trap access to sensitive IO ports This is needed so Xen can properly trap 4 byte accesses to 0xcf8 in order to keep consistency with accesses to 0xcfc. The access to RTC ports also needs to be trapped in order to keep consistency, this includes RTC_PORT(0) and RTC_PORT(1) (0x70 and 0x71 respectively). Signed-off-by: Roger Pau Monn=C3=A9 --- xen/arch/x86/setup.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index cd333f9..2cc9185 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -49,6 +49,7 @@ #include #include #include +#include /* opt_nosmp: If true, secondary processors are ignored. */ static bool_t __initdata opt_nosmp; @@ -1534,6 +1535,16 @@ void __hwdom_init setup_io_bitmap(struct domain *d) rc =3D rangeset_report_ranges(d->arch.ioport_caps, 0, 0x10000, io_bitmap_cb, d); BUG_ON(rc); + /* + * NB: we need to trap accesses to 0xcf8 in order to intercept + * 4 byte accesses, that need to be handled by Xen in order to + * keep consistency. + * Access to 1 byte RTC ports also needs to be trapped in order + * to keep consistency with PV. + */ + __set_bit(0xcf8, d->arch.hvm_domain.io_bitmap); + __set_bit(RTC_PORT(0), d->arch.hvm_domain.io_bitmap); + __set_bit(RTC_PORT(1), d->arch.hvm_domain.io_bitmap); } } -- generated by git-patchbot for /home/xen/git/xen.git#master --===============6325398384271246753== 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 --===============6325398384271246753==-- From xen-changelog-bounces@lists.xen.org Thu May 28 18:47:04 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:47:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2pc-00058t-5O; Thu, 28 May 2015 18:47:04 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2pb-00058j-Am for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:47:03 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 64/89-16813-6A267655; Thu, 28 May 2015 18:47:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1432838821!18335421!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6768 invoked from network); 28 May 2015 18:47:01 -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; 28 May 2015 18:47:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2pY-000392-Pi for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:47:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2pY-0003E6-OR for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:47:00 +0000 Date: Thu, 28 May 2015 18:47:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pci: make pci_device_detect() return bool_t X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 119ce8154c32202fe30c4474819e64605333f297 Author: Tiejun Chen AuthorDate: Wed May 20 13:31:08 2015 +0200 Commit: Jan Beulich CommitDate: Wed May 20 13:31:08 2015 +0200 pci: make pci_device_detect() return bool_t This function should better return as bool_t and remove that pointless comment. Suggested-by: Jan Beulich Signed-off-by: Tiejun Chen --- xen/drivers/passthrough/pci.c | 7 ++----- xen/drivers/passthrough/vtd/dmar.c | 4 ++-- xen/include/xen/pci.h | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index 862e20f..e30be43 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -904,10 +904,7 @@ out: return ret; } -/* - * detect pci device, return 0 if it exists, or return 0 - */ -int __init pci_device_detect(u16 seg, u8 bus, u8 dev, u8 func) +bool_t __init pci_device_detect(u16 seg, u8 bus, u8 dev, u8 func) { u32 vendor; @@ -965,7 +962,7 @@ static int __init _scan_pci_devices(struct pci_seg *pseg, void *arg) { for ( func = 0; func < 8; func++ ) { - if ( pci_device_detect(pseg->nr, bus, dev, func) == 0 ) + if ( !pci_device_detect(pseg->nr, bus, dev, func) ) { if ( !func ) break; diff --git a/xen/drivers/passthrough/vtd/dmar.c b/xen/drivers/passthrough/vtd/dmar.c index 18d7903..2b07be9 100644 --- a/xen/drivers/passthrough/vtd/dmar.c +++ b/xen/drivers/passthrough/vtd/dmar.c @@ -524,7 +524,7 @@ acpi_parse_one_drhd(struct acpi_dmar_header *header) d = PCI_SLOT(dmaru->scope.devices[i]); f = PCI_FUNC(dmaru->scope.devices[i]); - if ( pci_device_detect(drhd->segment, b, d, f) == 0 ) + if ( !pci_device_detect(drhd->segment, b, d, f) ) { dprintk(XENLOG_WARNING VTDPREFIX, " Non-existent device (%04x:%02x:%02x.%u) is reported" @@ -636,7 +636,7 @@ acpi_parse_one_rmrr(struct acpi_dmar_header *header) d = PCI_SLOT(rmrru->scope.devices[i]); f = PCI_FUNC(rmrru->scope.devices[i]); - if ( pci_device_detect(rmrr->segment, b, d, f) == 0 ) + if ( !pci_device_detect(rmrr->segment, b, d, f) ) { dprintk(XENLOG_WARNING VTDPREFIX, " Non-existent device (%04x:%02x:%02x.%u) is reported" diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h index 4377f3e..3908146 100644 --- a/xen/include/xen/pci.h +++ b/xen/include/xen/pci.h @@ -93,7 +93,7 @@ struct pci_dev { extern spinlock_t pcidevs_lock; bool_t pci_known_segment(u16 seg); -int pci_device_detect(u16 seg, u8 bus, u8 dev, u8 func); +bool_t pci_device_detect(u16 seg, u8 bus, u8 dev, u8 func); int scan_pci_devices(void); enum pdev_type pdev_type(u16 seg, u8 bus, u8 devfn); int find_upstream_bridge(u16 seg, u8 *bus, u8 *devfn, u8 *secbus); -- 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 May 28 18:47:04 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:47:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2pc-00058t-5O; Thu, 28 May 2015 18:47:04 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2pb-00058j-Am for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:47:03 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 64/89-16813-6A267655; Thu, 28 May 2015 18:47:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1432838821!18335421!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6768 invoked from network); 28 May 2015 18:47:01 -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; 28 May 2015 18:47:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2pY-000392-Pi for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:47:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2pY-0003E6-OR for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:47:00 +0000 Date: Thu, 28 May 2015 18:47:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pci: make pci_device_detect() return bool_t X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 119ce8154c32202fe30c4474819e64605333f297 Author: Tiejun Chen AuthorDate: Wed May 20 13:31:08 2015 +0200 Commit: Jan Beulich CommitDate: Wed May 20 13:31:08 2015 +0200 pci: make pci_device_detect() return bool_t This function should better return as bool_t and remove that pointless comment. Suggested-by: Jan Beulich Signed-off-by: Tiejun Chen --- xen/drivers/passthrough/pci.c | 7 ++----- xen/drivers/passthrough/vtd/dmar.c | 4 ++-- xen/include/xen/pci.h | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index 862e20f..e30be43 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -904,10 +904,7 @@ out: return ret; } -/* - * detect pci device, return 0 if it exists, or return 0 - */ -int __init pci_device_detect(u16 seg, u8 bus, u8 dev, u8 func) +bool_t __init pci_device_detect(u16 seg, u8 bus, u8 dev, u8 func) { u32 vendor; @@ -965,7 +962,7 @@ static int __init _scan_pci_devices(struct pci_seg *pseg, void *arg) { for ( func = 0; func < 8; func++ ) { - if ( pci_device_detect(pseg->nr, bus, dev, func) == 0 ) + if ( !pci_device_detect(pseg->nr, bus, dev, func) ) { if ( !func ) break; diff --git a/xen/drivers/passthrough/vtd/dmar.c b/xen/drivers/passthrough/vtd/dmar.c index 18d7903..2b07be9 100644 --- a/xen/drivers/passthrough/vtd/dmar.c +++ b/xen/drivers/passthrough/vtd/dmar.c @@ -524,7 +524,7 @@ acpi_parse_one_drhd(struct acpi_dmar_header *header) d = PCI_SLOT(dmaru->scope.devices[i]); f = PCI_FUNC(dmaru->scope.devices[i]); - if ( pci_device_detect(drhd->segment, b, d, f) == 0 ) + if ( !pci_device_detect(drhd->segment, b, d, f) ) { dprintk(XENLOG_WARNING VTDPREFIX, " Non-existent device (%04x:%02x:%02x.%u) is reported" @@ -636,7 +636,7 @@ acpi_parse_one_rmrr(struct acpi_dmar_header *header) d = PCI_SLOT(rmrru->scope.devices[i]); f = PCI_FUNC(rmrru->scope.devices[i]); - if ( pci_device_detect(rmrr->segment, b, d, f) == 0 ) + if ( !pci_device_detect(rmrr->segment, b, d, f) ) { dprintk(XENLOG_WARNING VTDPREFIX, " Non-existent device (%04x:%02x:%02x.%u) is reported" diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h index 4377f3e..3908146 100644 --- a/xen/include/xen/pci.h +++ b/xen/include/xen/pci.h @@ -93,7 +93,7 @@ struct pci_dev { extern spinlock_t pcidevs_lock; bool_t pci_known_segment(u16 seg); -int pci_device_detect(u16 seg, u8 bus, u8 dev, u8 func); +bool_t pci_device_detect(u16 seg, u8 bus, u8 dev, u8 func); int scan_pci_devices(void); enum pdev_type pdev_type(u16 seg, u8 bus, u8 devfn); int find_upstream_bridge(u16 seg, u8 *bus, u8 *devfn, u8 *secbus); -- 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 May 28 18:47:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:47: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 1Yy2pn-0005AR-8i; Thu, 28 May 2015 18:47:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2pm-0005AG-Bc for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:47:14 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id C4/53-10593-1B267655; Thu, 28 May 2015 18:47:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1432838831!10986095!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21478 invoked from network); 28 May 2015 18:47:12 -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; 28 May 2015 18:47:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2pj-00039b-3x for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:47:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2pi-0003Ef-Tg for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:47:11 +0000 Date: Thu, 28 May 2015 18:47:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/domctl: fix getpageframeinfo* handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ea329b0dccbd66133b136971a78ea88baaeca817 Author: Andrew Cooper AuthorDate: Wed May 20 13:31:50 2015 +0200 Commit: Jan Beulich CommitDate: Wed May 20 13:31:50 2015 +0200 x86/domctl: fix getpageframeinfo* handling In tree, there is one single caller of XEN_DOMCTL_getpageframeinfo3 (xc_get_pfn_type_batch()), and no callers of the older variants. getpageframeinfo3 and getpageframeinfo2 are compatible if the parameter contents are considered to be unsigned long, and indeed, a compat guest calling getpageframeinfo3 falls through into the getpageframeinfo2 handler. However, getpageframeinfo3 and getpageframeinfo2 have different algorithms for calculating the eventual frame type, which means that a toolstack will get different answers depending on whether it is compat or not. Rewrite getpageframeinfo3 such that the code block can handle both regular and compat guests, and use the original getpageframeinfo3 algorithm for frame time, which is more complete. Remove getpageframeinfo2 and getpageframeinfo1, as they are unused and obsolete. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/domctl.c | 306 +++++++++-------------------------- xen/include/public/domctl.h | 27 +--- xen/xsm/flask/hooks.c | 2 - xen/xsm/flask/policy/access_vectors | 2 +- 4 files changed, 78 insertions(+), 259 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 20cdccb..684259b 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -91,237 +91,6 @@ long arch_do_domctl( break; } - case XEN_DOMCTL_getpageframeinfo: - { - struct page_info *page; - unsigned long mfn = domctl->u.getpageframeinfo.gmfn; - - ret = -EINVAL; - if ( unlikely(!mfn_valid(mfn)) ) - break; - - page = mfn_to_page(mfn); - - if ( likely(get_page(page, d)) ) - { - ret = 0; - - domctl->u.getpageframeinfo.type = XEN_DOMCTL_PFINFO_NOTAB; - - if ( (page->u.inuse.type_info & PGT_count_mask) != 0 ) - { - switch ( page->u.inuse.type_info & PGT_type_mask ) - { - case PGT_l1_page_table: - domctl->u.getpageframeinfo.type = XEN_DOMCTL_PFINFO_L1TAB; - break; - case PGT_l2_page_table: - domctl->u.getpageframeinfo.type = XEN_DOMCTL_PFINFO_L2TAB; - break; - case PGT_l3_page_table: - domctl->u.getpageframeinfo.type = XEN_DOMCTL_PFINFO_L3TAB; - break; - case PGT_l4_page_table: - domctl->u.getpageframeinfo.type = XEN_DOMCTL_PFINFO_L4TAB; - break; - } - } - - put_page(page); - } - - copyback = 1; - break; - } - - case XEN_DOMCTL_getpageframeinfo3: - if ( !has_32bit_shinfo(currd) ) - { - unsigned int n, j; - unsigned int num = domctl->u.getpageframeinfo3.num; - struct page_info *page; - xen_pfn_t *arr; - - if ( unlikely(num > 1024) || - unlikely(num != domctl->u.getpageframeinfo3.num) ) - { - ret = -E2BIG; - break; - } - - page = alloc_domheap_page(currd, MEMF_no_owner); - if ( !page ) - { - ret = -ENOMEM; - break; - } - arr = __map_domain_page(page); - - for ( n = ret = 0; n < num; ) - { - unsigned int k = min_t(unsigned int, num - n, - PAGE_SIZE / sizeof(*arr)); - - if ( copy_from_guest_offset(arr, - domctl->u.getpageframeinfo3.array, - n, k) ) - { - ret = -EFAULT; - break; - } - - for ( j = 0; j < k; j++ ) - { - unsigned long type = 0; - p2m_type_t t; - - page = get_page_from_gfn(d, arr[j], &t, P2M_ALLOC); - - if ( unlikely(!page) || - unlikely(is_xen_heap_page(page)) ) - { - if ( p2m_is_broken(t) ) - type = XEN_DOMCTL_PFINFO_BROKEN; - else - type = XEN_DOMCTL_PFINFO_XTAB; - } - else - { - switch( page->u.inuse.type_info & PGT_type_mask ) - { - case PGT_l1_page_table: - type = XEN_DOMCTL_PFINFO_L1TAB; - break; - case PGT_l2_page_table: - type = XEN_DOMCTL_PFINFO_L2TAB; - break; - case PGT_l3_page_table: - type = XEN_DOMCTL_PFINFO_L3TAB; - break; - case PGT_l4_page_table: - type = XEN_DOMCTL_PFINFO_L4TAB; - break; - } - - if ( page->u.inuse.type_info & PGT_pinned ) - type |= XEN_DOMCTL_PFINFO_LPINTAB; - - if ( page->count_info & PGC_broken ) - type = XEN_DOMCTL_PFINFO_BROKEN; - } - - if ( page ) - put_page(page); - arr[j] = type; - } - - if ( copy_to_guest_offset(domctl->u.getpageframeinfo3.array, - n, arr, k) ) - { - ret = -EFAULT; - break; - } - - n += k; - } - - page = mfn_to_page(domain_page_map_to_mfn(arr)); - unmap_domain_page(arr); - free_domheap_page(page); - - break; - } - /* fall thru */ - case XEN_DOMCTL_getpageframeinfo2: - { - int n,j; - int num = domctl->u.getpageframeinfo2.num; - uint32_t *arr32; - - if ( unlikely(num > 1024) ) - { - ret = -E2BIG; - break; - } - - arr32 = alloc_xenheap_page(); - if ( !arr32 ) - { - ret = -ENOMEM; - break; - } - - ret = 0; - for ( n = 0; n < num; ) - { - int k = PAGE_SIZE / 4; - if ( (num - n) < k ) - k = num - n; - - if ( copy_from_guest_offset(arr32, - domctl->u.getpageframeinfo2.array, - n, k) ) - { - ret = -EFAULT; - break; - } - - for ( j = 0; j < k; j++ ) - { - struct page_info *page; - unsigned long gfn = arr32[j]; - - page = get_page_from_gfn(d, gfn, NULL, P2M_ALLOC); - - if ( domctl->cmd == XEN_DOMCTL_getpageframeinfo3) - arr32[j] = 0; - - if ( unlikely(!page) || - unlikely(is_xen_heap_page(page)) ) - arr32[j] |= XEN_DOMCTL_PFINFO_XTAB; - else - { - unsigned long type = 0; - - switch( page->u.inuse.type_info & PGT_type_mask ) - { - case PGT_l1_page_table: - type = XEN_DOMCTL_PFINFO_L1TAB; - break; - case PGT_l2_page_table: - type = XEN_DOMCTL_PFINFO_L2TAB; - break; - case PGT_l3_page_table: - type = XEN_DOMCTL_PFINFO_L3TAB; - break; - case PGT_l4_page_table: - type = XEN_DOMCTL_PFINFO_L4TAB; - break; - } - - if ( page->u.inuse.type_info & PGT_pinned ) - type |= XEN_DOMCTL_PFINFO_LPINTAB; - arr32[j] |= type; - } - - if ( page ) - put_page(page); - } - - if ( copy_to_guest_offset(domctl->u.getpageframeinfo2.array, - n, arr32, k) ) - { - ret = -EFAULT; - break; - } - - n += k; - } - - free_xenheap_page(arr32); - break; - } - case XEN_DOMCTL_getmemlist: { unsigned long max_pfns = domctl->u.getmemlist.max_pfns; @@ -378,6 +147,81 @@ long arch_do_domctl( break; } + case XEN_DOMCTL_getpageframeinfo3: + { + unsigned int num = domctl->u.getpageframeinfo3.num; + unsigned int width = has_32bit_shinfo(currd) ? 4 : 8; + + /* Games to allow this code block to handle a compat guest. */ + void __user *guest_handle = domctl->u.getpageframeinfo3.array.p; + + if ( unlikely(num > 1024) || + unlikely(num != domctl->u.getpageframeinfo3.num) ) + { + ret = -E2BIG; + break; + } + + for ( i = 0; i < num; ++i ) + { + unsigned long gfn = 0, type = 0; + struct page_info *page; + p2m_type_t t; + + if ( raw_copy_from_guest(&gfn, guest_handle + (i * width), width) ) + { + ret = -EFAULT; + break; + } + + page = get_page_from_gfn(d, gfn, &t, P2M_ALLOC); + + if ( unlikely(!page) || + unlikely(is_xen_heap_page(page)) ) + { + if ( unlikely(p2m_is_broken(t)) ) + type = XEN_DOMCTL_PFINFO_BROKEN; + else + type = XEN_DOMCTL_PFINFO_XTAB; + } + else + { + switch( page->u.inuse.type_info & PGT_type_mask ) + { + case PGT_l1_page_table: + type = XEN_DOMCTL_PFINFO_L1TAB; + break; + case PGT_l2_page_table: + type = XEN_DOMCTL_PFINFO_L2TAB; + break; + case PGT_l3_page_table: + type = XEN_DOMCTL_PFINFO_L3TAB; + break; + case PGT_l4_page_table: + type = XEN_DOMCTL_PFINFO_L4TAB; + break; + } + + if ( page->u.inuse.type_info & PGT_pinned ) + type |= XEN_DOMCTL_PFINFO_LPINTAB; + + if ( page->count_info & PGC_broken ) + type = XEN_DOMCTL_PFINFO_BROKEN; + } + + if ( page ) + put_page(page); + + if ( __raw_copy_to_guest(guest_handle + (i * width), &type, width) ) + { + ret = -EFAULT; + break; + } + } + + break; + } + case XEN_DOMCTL_hypercall_init: { unsigned long gmfn = domctl->u.hypercall_init.gmfn; diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 0c0ea4a..5d15f2a 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -149,27 +149,6 @@ DEFINE_XEN_GUEST_HANDLE(xen_domctl_getmemlist_t); #define XEN_DOMCTL_PFINFO_BROKEN (0xdU<<28) /* broken page */ #define XEN_DOMCTL_PFINFO_LTAB_MASK (0xfU<<28) -struct xen_domctl_getpageframeinfo { - /* IN variables. */ - uint64_aligned_t gmfn; /* GMFN to query */ - /* OUT variables. */ - /* Is the page PINNED to a type? */ - uint32_t type; /* see above type defs */ -}; -typedef struct xen_domctl_getpageframeinfo xen_domctl_getpageframeinfo_t; -DEFINE_XEN_GUEST_HANDLE(xen_domctl_getpageframeinfo_t); - - -/* XEN_DOMCTL_getpageframeinfo2 */ -struct xen_domctl_getpageframeinfo2 { - /* IN variables. */ - uint64_aligned_t num; - /* IN/OUT variables. */ - XEN_GUEST_HANDLE_64(uint32) array; -}; -typedef struct xen_domctl_getpageframeinfo2 xen_domctl_getpageframeinfo2_t; -DEFINE_XEN_GUEST_HANDLE(xen_domctl_getpageframeinfo2_t); - /* XEN_DOMCTL_getpageframeinfo3 */ struct xen_domctl_getpageframeinfo3 { /* IN variables. */ @@ -1073,8 +1052,8 @@ struct xen_domctl { #define XEN_DOMCTL_unpausedomain 4 #define XEN_DOMCTL_getdomaininfo 5 #define XEN_DOMCTL_getmemlist 6 -#define XEN_DOMCTL_getpageframeinfo 7 -#define XEN_DOMCTL_getpageframeinfo2 8 +/* #define XEN_DOMCTL_getpageframeinfo 7 Obsolete - use getpageframeinfo3 */ +/* #define XEN_DOMCTL_getpageframeinfo2 8 Obsolete - use getpageframeinfo3 */ #define XEN_DOMCTL_setvcpuaffinity 9 #define XEN_DOMCTL_shadow_op 10 #define XEN_DOMCTL_max_mem 11 @@ -1150,8 +1129,6 @@ struct xen_domctl { struct xen_domctl_createdomain createdomain; struct xen_domctl_getdomaininfo getdomaininfo; struct xen_domctl_getmemlist getmemlist; - struct xen_domctl_getpageframeinfo getpageframeinfo; - struct xen_domctl_getpageframeinfo2 getpageframeinfo2; struct xen_domctl_getpageframeinfo3 getpageframeinfo3; struct xen_domctl_nodeaffinity nodeaffinity; struct xen_domctl_vcpuaffinity vcpuaffinity; diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 11b7453..6e37d29 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -644,8 +644,6 @@ static int flask_domctl(struct domain *d, int cmd) case XEN_DOMCTL_setdebugging: return current_has_perm(d, SECCLASS_DOMAIN, DOMAIN__SETDEBUGGING); - case XEN_DOMCTL_getpageframeinfo: - case XEN_DOMCTL_getpageframeinfo2: case XEN_DOMCTL_getpageframeinfo3: return current_has_perm(d, SECCLASS_MMU, MMU__PAGEINFO); diff --git a/xen/xsm/flask/policy/access_vectors b/xen/xsm/flask/policy/access_vectors index ea556df..68284d5 100644 --- a/xen/xsm/flask/policy/access_vectors +++ b/xen/xsm/flask/policy/access_vectors @@ -339,7 +339,7 @@ class mmu # source = domain making the hypercall # target = domain whose pages are being mapped map_write -# XEN_DOMCTL_getpageframeinfo* +# XEN_DOMCTL_getpageframeinfo3 pageinfo # XEN_DOMCTL_getmemlist pagelist -- 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 May 28 18:47:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:47: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 1Yy2pn-0005AR-8i; Thu, 28 May 2015 18:47:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2pm-0005AG-Bc for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:47:14 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id C4/53-10593-1B267655; Thu, 28 May 2015 18:47:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1432838831!10986095!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21478 invoked from network); 28 May 2015 18:47:12 -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; 28 May 2015 18:47:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2pj-00039b-3x for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:47:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2pi-0003Ef-Tg for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:47:11 +0000 Date: Thu, 28 May 2015 18:47:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/domctl: fix getpageframeinfo* handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ea329b0dccbd66133b136971a78ea88baaeca817 Author: Andrew Cooper AuthorDate: Wed May 20 13:31:50 2015 +0200 Commit: Jan Beulich CommitDate: Wed May 20 13:31:50 2015 +0200 x86/domctl: fix getpageframeinfo* handling In tree, there is one single caller of XEN_DOMCTL_getpageframeinfo3 (xc_get_pfn_type_batch()), and no callers of the older variants. getpageframeinfo3 and getpageframeinfo2 are compatible if the parameter contents are considered to be unsigned long, and indeed, a compat guest calling getpageframeinfo3 falls through into the getpageframeinfo2 handler. However, getpageframeinfo3 and getpageframeinfo2 have different algorithms for calculating the eventual frame type, which means that a toolstack will get different answers depending on whether it is compat or not. Rewrite getpageframeinfo3 such that the code block can handle both regular and compat guests, and use the original getpageframeinfo3 algorithm for frame time, which is more complete. Remove getpageframeinfo2 and getpageframeinfo1, as they are unused and obsolete. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/domctl.c | 306 +++++++++-------------------------- xen/include/public/domctl.h | 27 +--- xen/xsm/flask/hooks.c | 2 - xen/xsm/flask/policy/access_vectors | 2 +- 4 files changed, 78 insertions(+), 259 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 20cdccb..684259b 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -91,237 +91,6 @@ long arch_do_domctl( break; } - case XEN_DOMCTL_getpageframeinfo: - { - struct page_info *page; - unsigned long mfn = domctl->u.getpageframeinfo.gmfn; - - ret = -EINVAL; - if ( unlikely(!mfn_valid(mfn)) ) - break; - - page = mfn_to_page(mfn); - - if ( likely(get_page(page, d)) ) - { - ret = 0; - - domctl->u.getpageframeinfo.type = XEN_DOMCTL_PFINFO_NOTAB; - - if ( (page->u.inuse.type_info & PGT_count_mask) != 0 ) - { - switch ( page->u.inuse.type_info & PGT_type_mask ) - { - case PGT_l1_page_table: - domctl->u.getpageframeinfo.type = XEN_DOMCTL_PFINFO_L1TAB; - break; - case PGT_l2_page_table: - domctl->u.getpageframeinfo.type = XEN_DOMCTL_PFINFO_L2TAB; - break; - case PGT_l3_page_table: - domctl->u.getpageframeinfo.type = XEN_DOMCTL_PFINFO_L3TAB; - break; - case PGT_l4_page_table: - domctl->u.getpageframeinfo.type = XEN_DOMCTL_PFINFO_L4TAB; - break; - } - } - - put_page(page); - } - - copyback = 1; - break; - } - - case XEN_DOMCTL_getpageframeinfo3: - if ( !has_32bit_shinfo(currd) ) - { - unsigned int n, j; - unsigned int num = domctl->u.getpageframeinfo3.num; - struct page_info *page; - xen_pfn_t *arr; - - if ( unlikely(num > 1024) || - unlikely(num != domctl->u.getpageframeinfo3.num) ) - { - ret = -E2BIG; - break; - } - - page = alloc_domheap_page(currd, MEMF_no_owner); - if ( !page ) - { - ret = -ENOMEM; - break; - } - arr = __map_domain_page(page); - - for ( n = ret = 0; n < num; ) - { - unsigned int k = min_t(unsigned int, num - n, - PAGE_SIZE / sizeof(*arr)); - - if ( copy_from_guest_offset(arr, - domctl->u.getpageframeinfo3.array, - n, k) ) - { - ret = -EFAULT; - break; - } - - for ( j = 0; j < k; j++ ) - { - unsigned long type = 0; - p2m_type_t t; - - page = get_page_from_gfn(d, arr[j], &t, P2M_ALLOC); - - if ( unlikely(!page) || - unlikely(is_xen_heap_page(page)) ) - { - if ( p2m_is_broken(t) ) - type = XEN_DOMCTL_PFINFO_BROKEN; - else - type = XEN_DOMCTL_PFINFO_XTAB; - } - else - { - switch( page->u.inuse.type_info & PGT_type_mask ) - { - case PGT_l1_page_table: - type = XEN_DOMCTL_PFINFO_L1TAB; - break; - case PGT_l2_page_table: - type = XEN_DOMCTL_PFINFO_L2TAB; - break; - case PGT_l3_page_table: - type = XEN_DOMCTL_PFINFO_L3TAB; - break; - case PGT_l4_page_table: - type = XEN_DOMCTL_PFINFO_L4TAB; - break; - } - - if ( page->u.inuse.type_info & PGT_pinned ) - type |= XEN_DOMCTL_PFINFO_LPINTAB; - - if ( page->count_info & PGC_broken ) - type = XEN_DOMCTL_PFINFO_BROKEN; - } - - if ( page ) - put_page(page); - arr[j] = type; - } - - if ( copy_to_guest_offset(domctl->u.getpageframeinfo3.array, - n, arr, k) ) - { - ret = -EFAULT; - break; - } - - n += k; - } - - page = mfn_to_page(domain_page_map_to_mfn(arr)); - unmap_domain_page(arr); - free_domheap_page(page); - - break; - } - /* fall thru */ - case XEN_DOMCTL_getpageframeinfo2: - { - int n,j; - int num = domctl->u.getpageframeinfo2.num; - uint32_t *arr32; - - if ( unlikely(num > 1024) ) - { - ret = -E2BIG; - break; - } - - arr32 = alloc_xenheap_page(); - if ( !arr32 ) - { - ret = -ENOMEM; - break; - } - - ret = 0; - for ( n = 0; n < num; ) - { - int k = PAGE_SIZE / 4; - if ( (num - n) < k ) - k = num - n; - - if ( copy_from_guest_offset(arr32, - domctl->u.getpageframeinfo2.array, - n, k) ) - { - ret = -EFAULT; - break; - } - - for ( j = 0; j < k; j++ ) - { - struct page_info *page; - unsigned long gfn = arr32[j]; - - page = get_page_from_gfn(d, gfn, NULL, P2M_ALLOC); - - if ( domctl->cmd == XEN_DOMCTL_getpageframeinfo3) - arr32[j] = 0; - - if ( unlikely(!page) || - unlikely(is_xen_heap_page(page)) ) - arr32[j] |= XEN_DOMCTL_PFINFO_XTAB; - else - { - unsigned long type = 0; - - switch( page->u.inuse.type_info & PGT_type_mask ) - { - case PGT_l1_page_table: - type = XEN_DOMCTL_PFINFO_L1TAB; - break; - case PGT_l2_page_table: - type = XEN_DOMCTL_PFINFO_L2TAB; - break; - case PGT_l3_page_table: - type = XEN_DOMCTL_PFINFO_L3TAB; - break; - case PGT_l4_page_table: - type = XEN_DOMCTL_PFINFO_L4TAB; - break; - } - - if ( page->u.inuse.type_info & PGT_pinned ) - type |= XEN_DOMCTL_PFINFO_LPINTAB; - arr32[j] |= type; - } - - if ( page ) - put_page(page); - } - - if ( copy_to_guest_offset(domctl->u.getpageframeinfo2.array, - n, arr32, k) ) - { - ret = -EFAULT; - break; - } - - n += k; - } - - free_xenheap_page(arr32); - break; - } - case XEN_DOMCTL_getmemlist: { unsigned long max_pfns = domctl->u.getmemlist.max_pfns; @@ -378,6 +147,81 @@ long arch_do_domctl( break; } + case XEN_DOMCTL_getpageframeinfo3: + { + unsigned int num = domctl->u.getpageframeinfo3.num; + unsigned int width = has_32bit_shinfo(currd) ? 4 : 8; + + /* Games to allow this code block to handle a compat guest. */ + void __user *guest_handle = domctl->u.getpageframeinfo3.array.p; + + if ( unlikely(num > 1024) || + unlikely(num != domctl->u.getpageframeinfo3.num) ) + { + ret = -E2BIG; + break; + } + + for ( i = 0; i < num; ++i ) + { + unsigned long gfn = 0, type = 0; + struct page_info *page; + p2m_type_t t; + + if ( raw_copy_from_guest(&gfn, guest_handle + (i * width), width) ) + { + ret = -EFAULT; + break; + } + + page = get_page_from_gfn(d, gfn, &t, P2M_ALLOC); + + if ( unlikely(!page) || + unlikely(is_xen_heap_page(page)) ) + { + if ( unlikely(p2m_is_broken(t)) ) + type = XEN_DOMCTL_PFINFO_BROKEN; + else + type = XEN_DOMCTL_PFINFO_XTAB; + } + else + { + switch( page->u.inuse.type_info & PGT_type_mask ) + { + case PGT_l1_page_table: + type = XEN_DOMCTL_PFINFO_L1TAB; + break; + case PGT_l2_page_table: + type = XEN_DOMCTL_PFINFO_L2TAB; + break; + case PGT_l3_page_table: + type = XEN_DOMCTL_PFINFO_L3TAB; + break; + case PGT_l4_page_table: + type = XEN_DOMCTL_PFINFO_L4TAB; + break; + } + + if ( page->u.inuse.type_info & PGT_pinned ) + type |= XEN_DOMCTL_PFINFO_LPINTAB; + + if ( page->count_info & PGC_broken ) + type = XEN_DOMCTL_PFINFO_BROKEN; + } + + if ( page ) + put_page(page); + + if ( __raw_copy_to_guest(guest_handle + (i * width), &type, width) ) + { + ret = -EFAULT; + break; + } + } + + break; + } + case XEN_DOMCTL_hypercall_init: { unsigned long gmfn = domctl->u.hypercall_init.gmfn; diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 0c0ea4a..5d15f2a 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -149,27 +149,6 @@ DEFINE_XEN_GUEST_HANDLE(xen_domctl_getmemlist_t); #define XEN_DOMCTL_PFINFO_BROKEN (0xdU<<28) /* broken page */ #define XEN_DOMCTL_PFINFO_LTAB_MASK (0xfU<<28) -struct xen_domctl_getpageframeinfo { - /* IN variables. */ - uint64_aligned_t gmfn; /* GMFN to query */ - /* OUT variables. */ - /* Is the page PINNED to a type? */ - uint32_t type; /* see above type defs */ -}; -typedef struct xen_domctl_getpageframeinfo xen_domctl_getpageframeinfo_t; -DEFINE_XEN_GUEST_HANDLE(xen_domctl_getpageframeinfo_t); - - -/* XEN_DOMCTL_getpageframeinfo2 */ -struct xen_domctl_getpageframeinfo2 { - /* IN variables. */ - uint64_aligned_t num; - /* IN/OUT variables. */ - XEN_GUEST_HANDLE_64(uint32) array; -}; -typedef struct xen_domctl_getpageframeinfo2 xen_domctl_getpageframeinfo2_t; -DEFINE_XEN_GUEST_HANDLE(xen_domctl_getpageframeinfo2_t); - /* XEN_DOMCTL_getpageframeinfo3 */ struct xen_domctl_getpageframeinfo3 { /* IN variables. */ @@ -1073,8 +1052,8 @@ struct xen_domctl { #define XEN_DOMCTL_unpausedomain 4 #define XEN_DOMCTL_getdomaininfo 5 #define XEN_DOMCTL_getmemlist 6 -#define XEN_DOMCTL_getpageframeinfo 7 -#define XEN_DOMCTL_getpageframeinfo2 8 +/* #define XEN_DOMCTL_getpageframeinfo 7 Obsolete - use getpageframeinfo3 */ +/* #define XEN_DOMCTL_getpageframeinfo2 8 Obsolete - use getpageframeinfo3 */ #define XEN_DOMCTL_setvcpuaffinity 9 #define XEN_DOMCTL_shadow_op 10 #define XEN_DOMCTL_max_mem 11 @@ -1150,8 +1129,6 @@ struct xen_domctl { struct xen_domctl_createdomain createdomain; struct xen_domctl_getdomaininfo getdomaininfo; struct xen_domctl_getmemlist getmemlist; - struct xen_domctl_getpageframeinfo getpageframeinfo; - struct xen_domctl_getpageframeinfo2 getpageframeinfo2; struct xen_domctl_getpageframeinfo3 getpageframeinfo3; struct xen_domctl_nodeaffinity nodeaffinity; struct xen_domctl_vcpuaffinity vcpuaffinity; diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 11b7453..6e37d29 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -644,8 +644,6 @@ static int flask_domctl(struct domain *d, int cmd) case XEN_DOMCTL_setdebugging: return current_has_perm(d, SECCLASS_DOMAIN, DOMAIN__SETDEBUGGING); - case XEN_DOMCTL_getpageframeinfo: - case XEN_DOMCTL_getpageframeinfo2: case XEN_DOMCTL_getpageframeinfo3: return current_has_perm(d, SECCLASS_MMU, MMU__PAGEINFO); diff --git a/xen/xsm/flask/policy/access_vectors b/xen/xsm/flask/policy/access_vectors index ea556df..68284d5 100644 --- a/xen/xsm/flask/policy/access_vectors +++ b/xen/xsm/flask/policy/access_vectors @@ -339,7 +339,7 @@ class mmu # source = domain making the hypercall # target = domain whose pages are being mapped map_write -# XEN_DOMCTL_getpageframeinfo* +# XEN_DOMCTL_getpageframeinfo3 pageinfo # XEN_DOMCTL_getmemlist pagelist -- 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 May 28 18:47:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:47: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 1Yy2px-0005C0-EZ; Thu, 28 May 2015 18:47:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2pv-0005Bp-RG for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:47:23 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id AF/E6-10437-BB267655; Thu, 28 May 2015 18:47:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1432838841!11092502!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4499 invoked from network); 28 May 2015 18:47:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 28 May 2015 18:47:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2pt-00039h-9J for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:47:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2pt-0003F2-7Z for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:47:21 +0000 Date: Thu, 28 May 2015 18:47:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] arm: drop redundant declaration of arch_get_xen_caps() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit eab064758751a5fd8af240cc5e6591f83e2217ec Author: Jan Beulich AuthorDate: Wed May 20 13:39:39 2015 +0200 Commit: Jan Beulich CommitDate: Wed May 20 13:39:39 2015 +0200 arm: drop redundant declaration of arch_get_xen_caps() It's being declared in xen/hypercall.h, and the duplication causes a build failure with commit 8ddb99287c. Signed-off-by: Jan Beulich --- xen/include/asm-arm/setup.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/include/asm-arm/setup.h b/xen/include/asm-arm/setup.h index ba5a67d..0dee41b 100644 --- a/xen/include/asm-arm/setup.h +++ b/xen/include/asm-arm/setup.h @@ -51,7 +51,7 @@ void arch_init_memory(void); void copy_from_paddr(void *dst, paddr_t paddr, unsigned long len); -void arch_get_xen_caps(xen_capabilities_info_t *info); +//void arch_get_xen_caps(xen_capabilities_info_t *info); int construct_dom0(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 Thu May 28 18:47:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:47: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 1Yy2px-0005C0-EZ; Thu, 28 May 2015 18:47:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2pv-0005Bp-RG for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:47:23 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id AF/E6-10437-BB267655; Thu, 28 May 2015 18:47:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1432838841!11092502!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4499 invoked from network); 28 May 2015 18:47:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 28 May 2015 18:47:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2pt-00039h-9J for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:47:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2pt-0003F2-7Z for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:47:21 +0000 Date: Thu, 28 May 2015 18:47:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] arm: drop redundant declaration of arch_get_xen_caps() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit eab064758751a5fd8af240cc5e6591f83e2217ec Author: Jan Beulich AuthorDate: Wed May 20 13:39:39 2015 +0200 Commit: Jan Beulich CommitDate: Wed May 20 13:39:39 2015 +0200 arm: drop redundant declaration of arch_get_xen_caps() It's being declared in xen/hypercall.h, and the duplication causes a build failure with commit 8ddb99287c. Signed-off-by: Jan Beulich --- xen/include/asm-arm/setup.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/include/asm-arm/setup.h b/xen/include/asm-arm/setup.h index ba5a67d..0dee41b 100644 --- a/xen/include/asm-arm/setup.h +++ b/xen/include/asm-arm/setup.h @@ -51,7 +51,7 @@ void arch_init_memory(void); void copy_from_paddr(void *dst, paddr_t paddr, unsigned long len); -void arch_get_xen_caps(xen_capabilities_info_t *info); +//void arch_get_xen_caps(xen_capabilities_info_t *info); int construct_dom0(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 Thu May 28 18:47:36 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:47: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 1Yy2q8-0005Db-HT; Thu, 28 May 2015 18:47:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2q6-0005DO-Pe for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:47:34 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 16/17-10437-6C267655; Thu, 28 May 2015 18:47:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1432838851!7326959!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27106 invoked from network); 28 May 2015 18:47:32 -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; 28 May 2015 18:47:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2q3-00039p-Dm for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:47:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2q3-0003FS-CG for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:47:31 +0000 Date: Thu, 28 May 2015 18:47:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: remove redundant declation of arch_get_xen_caps X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 28c0ec1d952ec37209e96310a6ea18ffbe218d98 Author: Ian Campbell AuthorDate: Wed May 20 13:05:28 2015 +0100 Commit: Ian Campbell CommitDate: Wed May 20 13:05:28 2015 +0100 xen: arm: remove redundant declation of arch_get_xen_caps It was recently commented out, but just remove it instead. Signed-off-by: Ian Campbell --- xen/include/asm-arm/setup.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/xen/include/asm-arm/setup.h b/xen/include/asm-arm/setup.h index 0dee41b..81bb3da 100644 --- a/xen/include/asm-arm/setup.h +++ b/xen/include/asm-arm/setup.h @@ -51,8 +51,6 @@ void arch_init_memory(void); void copy_from_paddr(void *dst, paddr_t paddr, unsigned long len); -//void arch_get_xen_caps(xen_capabilities_info_t *info); - int construct_dom0(struct domain *d); void discard_initial_modules(void); -- 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 May 28 18:47:36 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:47: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 1Yy2q8-0005Db-HT; Thu, 28 May 2015 18:47:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2q6-0005DO-Pe for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:47:34 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 16/17-10437-6C267655; Thu, 28 May 2015 18:47:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1432838851!7326959!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27106 invoked from network); 28 May 2015 18:47:32 -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; 28 May 2015 18:47:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2q3-00039p-Dm for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:47:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2q3-0003FS-CG for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:47:31 +0000 Date: Thu, 28 May 2015 18:47:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: remove redundant declation of arch_get_xen_caps X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 28c0ec1d952ec37209e96310a6ea18ffbe218d98 Author: Ian Campbell AuthorDate: Wed May 20 13:05:28 2015 +0100 Commit: Ian Campbell CommitDate: Wed May 20 13:05:28 2015 +0100 xen: arm: remove redundant declation of arch_get_xen_caps It was recently commented out, but just remove it instead. Signed-off-by: Ian Campbell --- xen/include/asm-arm/setup.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/xen/include/asm-arm/setup.h b/xen/include/asm-arm/setup.h index 0dee41b..81bb3da 100644 --- a/xen/include/asm-arm/setup.h +++ b/xen/include/asm-arm/setup.h @@ -51,8 +51,6 @@ void arch_init_memory(void); void copy_from_paddr(void *dst, paddr_t paddr, unsigned long len); -//void arch_get_xen_caps(xen_capabilities_info_t *info); - int construct_dom0(struct domain *d); void discard_initial_modules(void); -- 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 May 28 18:47:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:47: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 1Yy2qH-0005F5-KM; Thu, 28 May 2015 18:47:45 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2qG-0005En-1A for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:47:44 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id B2/3A-03026-FC267655; Thu, 28 May 2015 18:47:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1432838861!10658143!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15855 invoked from network); 28 May 2015 18:47:42 -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; 28 May 2015 18:47:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2qD-00039v-Jv for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:47:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2qD-0003GO-Hm for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:47:41 +0000 Date: Thu, 28 May 2015 18:47:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] public: clarify xen_arch_domainconfig ABI statement X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 931f5777c710823c44c1d35e94991b65f4b6d078 Author: Andrew Cooper AuthorDate: Thu May 21 08:56:01 2015 +0200 Commit: Jan Beulich CommitDate: Thu May 21 08:56:01 2015 +0200 public: clarify xen_arch_domainconfig ABI statement This structure is used by XEN_DOMCTL_createdomain, and is liable to be modified going forwards. Explicitly state that it falls under the XEN_DOMCTL_INTERFACE_VERSION. Signed-off-by: Andrew Cooper Reviewed-by: Julien Grall Reviewed-by: Don Slutz --- xen/include/public/arch-arm.h | 4 ++++ xen/include/public/arch-x86/xen.h | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h index c029e0f..2cbd323 100644 --- a/xen/include/public/arch-arm.h +++ b/xen/include/public/arch-arm.h @@ -309,6 +309,10 @@ struct arch_shared_info { typedef struct arch_shared_info arch_shared_info_t; typedef uint64_t xen_callback_t; +/* + * struct xen_arch_domainconfig's ABI is covered by + * XEN_DOMCTL_INTERFACE_VERSION. + */ #define XEN_DOMCTL_CONFIG_GIC_DEFAULT 0 #define XEN_DOMCTL_CONFIG_GIC_V2 1 #define XEN_DOMCTL_CONFIG_GIC_V3 2 diff --git a/xen/include/public/arch-x86/xen.h b/xen/include/public/arch-x86/xen.h index cea3fe7..8a52c04 100644 --- a/xen/include/public/arch-x86/xen.h +++ b/xen/include/public/arch-x86/xen.h @@ -262,6 +262,10 @@ struct arch_shared_info { }; typedef struct arch_shared_info arch_shared_info_t; +/* + * struct xen_arch_domainconfig's ABI is covered by + * XEN_DOMCTL_INTERFACE_VERSION. + */ struct xen_arch_domainconfig { char dummy; }; -- 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 May 28 18:47:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:47: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 1Yy2qH-0005F5-KM; Thu, 28 May 2015 18:47:45 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2qG-0005En-1A for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:47:44 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id B2/3A-03026-FC267655; Thu, 28 May 2015 18:47:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1432838861!10658143!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15855 invoked from network); 28 May 2015 18:47:42 -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; 28 May 2015 18:47:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2qD-00039v-Jv for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:47:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2qD-0003GO-Hm for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:47:41 +0000 Date: Thu, 28 May 2015 18:47:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] public: clarify xen_arch_domainconfig ABI statement X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 931f5777c710823c44c1d35e94991b65f4b6d078 Author: Andrew Cooper AuthorDate: Thu May 21 08:56:01 2015 +0200 Commit: Jan Beulich CommitDate: Thu May 21 08:56:01 2015 +0200 public: clarify xen_arch_domainconfig ABI statement This structure is used by XEN_DOMCTL_createdomain, and is liable to be modified going forwards. Explicitly state that it falls under the XEN_DOMCTL_INTERFACE_VERSION. Signed-off-by: Andrew Cooper Reviewed-by: Julien Grall Reviewed-by: Don Slutz --- xen/include/public/arch-arm.h | 4 ++++ xen/include/public/arch-x86/xen.h | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h index c029e0f..2cbd323 100644 --- a/xen/include/public/arch-arm.h +++ b/xen/include/public/arch-arm.h @@ -309,6 +309,10 @@ struct arch_shared_info { typedef struct arch_shared_info arch_shared_info_t; typedef uint64_t xen_callback_t; +/* + * struct xen_arch_domainconfig's ABI is covered by + * XEN_DOMCTL_INTERFACE_VERSION. + */ #define XEN_DOMCTL_CONFIG_GIC_DEFAULT 0 #define XEN_DOMCTL_CONFIG_GIC_V2 1 #define XEN_DOMCTL_CONFIG_GIC_V3 2 diff --git a/xen/include/public/arch-x86/xen.h b/xen/include/public/arch-x86/xen.h index cea3fe7..8a52c04 100644 --- a/xen/include/public/arch-x86/xen.h +++ b/xen/include/public/arch-x86/xen.h @@ -262,6 +262,10 @@ struct arch_shared_info { }; typedef struct arch_shared_info arch_shared_info_t; +/* + * struct xen_arch_domainconfig's ABI is covered by + * XEN_DOMCTL_INTERFACE_VERSION. + */ struct xen_arch_domainconfig { char dummy; }; -- 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 May 28 18:47:56 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:47:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2qS-0005Gj-3Q; Thu, 28 May 2015 18:47:56 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2qQ-0005GQ-90 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:47:54 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id DF/43-03739-9D267655; Thu, 28 May 2015 18:47:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1432838872!13529024!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30013 invoked from network); 28 May 2015 18:47:52 -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; 28 May 2015 18:47:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2qN-0003A8-Ou for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:47:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2qN-0003Gp-Ny for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:47:51 +0000 Date: Thu, 28 May 2015 18:47:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mm: PV GDT handling cleanup X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cb1daee1b505aafe9f6fd79a5e5b789be4674c1d Author: Andrew Cooper AuthorDate: Thu May 21 08:56:24 2015 +0200 Commit: Jan Beulich CommitDate: Thu May 21 08:56:24 2015 +0200 x86/mm: PV GDT handling cleanup These are a few bits of cleanup noticed when double checking the PV GDT handling for migration v2. * Drop write-only 'mfn' variable in set_gdt() * Hoist page_get_owner() call in alloc_segdesc_page() and unify exit paths No functional change. Signed-off-by: Andrew Cooper --- xen/arch/x86/mm.c | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 5fe08df..74e146d 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -545,21 +545,17 @@ static void invalidate_shadow_ldt(struct vcpu *v, int flush) static int alloc_segdesc_page(struct page_info *page) { - struct desc_struct *descs; - int i; - - descs = __map_domain_page(page); + const struct domain *owner = page_get_owner(page); + struct desc_struct *descs = __map_domain_page(page); + unsigned i; for ( i = 0; i < 512; i++ ) - if ( unlikely(!check_descriptor(page_get_owner(page), &descs[i])) ) - goto fail; + if ( unlikely(!check_descriptor(owner, &descs[i])) ) + break; unmap_domain_page(descs); - return 0; - fail: - unmap_domain_page(descs); - return -EINVAL; + return i == 512 ? 0 : -EINVAL; } @@ -4382,7 +4378,7 @@ long set_gdt(struct vcpu *v, l1_pgentry_t *pl1e; /* NB. There are 512 8-byte entries per GDT page. */ int i, nr_pages = (entries + 511) / 512; - unsigned long mfn, *pfns; + unsigned long *pfns; if ( entries > FIRST_RESERVED_GDT_ENTRY ) return -EINVAL; @@ -4404,7 +4400,7 @@ long set_gdt(struct vcpu *v, put_page(page); goto fail; } - mfn = frames[i] = page_to_mfn(page); + frames[i] = page_to_mfn(page); } /* Tear down the old GDT. */ -- 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 May 28 18:47:56 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:47:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2qS-0005Gj-3Q; Thu, 28 May 2015 18:47:56 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2qQ-0005GQ-90 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:47:54 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id DF/43-03739-9D267655; Thu, 28 May 2015 18:47:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1432838872!13529024!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30013 invoked from network); 28 May 2015 18:47:52 -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; 28 May 2015 18:47:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2qN-0003A8-Ou for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:47:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2qN-0003Gp-Ny for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:47:51 +0000 Date: Thu, 28 May 2015 18:47:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mm: PV GDT handling cleanup X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cb1daee1b505aafe9f6fd79a5e5b789be4674c1d Author: Andrew Cooper AuthorDate: Thu May 21 08:56:24 2015 +0200 Commit: Jan Beulich CommitDate: Thu May 21 08:56:24 2015 +0200 x86/mm: PV GDT handling cleanup These are a few bits of cleanup noticed when double checking the PV GDT handling for migration v2. * Drop write-only 'mfn' variable in set_gdt() * Hoist page_get_owner() call in alloc_segdesc_page() and unify exit paths No functional change. Signed-off-by: Andrew Cooper --- xen/arch/x86/mm.c | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 5fe08df..74e146d 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -545,21 +545,17 @@ static void invalidate_shadow_ldt(struct vcpu *v, int flush) static int alloc_segdesc_page(struct page_info *page) { - struct desc_struct *descs; - int i; - - descs = __map_domain_page(page); + const struct domain *owner = page_get_owner(page); + struct desc_struct *descs = __map_domain_page(page); + unsigned i; for ( i = 0; i < 512; i++ ) - if ( unlikely(!check_descriptor(page_get_owner(page), &descs[i])) ) - goto fail; + if ( unlikely(!check_descriptor(owner, &descs[i])) ) + break; unmap_domain_page(descs); - return 0; - fail: - unmap_domain_page(descs); - return -EINVAL; + return i == 512 ? 0 : -EINVAL; } @@ -4382,7 +4378,7 @@ long set_gdt(struct vcpu *v, l1_pgentry_t *pl1e; /* NB. There are 512 8-byte entries per GDT page. */ int i, nr_pages = (entries + 511) / 512; - unsigned long mfn, *pfns; + unsigned long *pfns; if ( entries > FIRST_RESERVED_GDT_ENTRY ) return -EINVAL; @@ -4404,7 +4400,7 @@ long set_gdt(struct vcpu *v, put_page(page); goto fail; } - mfn = frames[i] = page_to_mfn(page); + frames[i] = page_to_mfn(page); } /* Tear down the old GDT. */ -- 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 May 28 18:48:08 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:48: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 1Yy2qe-0005Ik-6U; Thu, 28 May 2015 18:48:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2qa-0005IA-7L for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:48:06 +0000 Content-Length: 1705 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 6F/B6-13047-3E267655; Thu, 28 May 2015 18:48:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1432838882!12208181!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15254 invoked from network); 28 May 2015 18:48:03 -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; 28 May 2015 18:48:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2qX-0003Ak-VN for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:48:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2qX-0003HW-SY for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:48:01 +0000 Date: Thu, 28 May 2015 18:48:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] vmap: avoid hitting an ASSERT with vfree(NULL) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7202831484435489372==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============7202831484435489372== Content-Length: 1295 Content-Transfer-Encoding: quoted-printable commit 640f891eb258563bb155e577389e8c5e6541a59a Author: Andrew Cooper AuthorDate: Thu May 21 08:57:19 2015 +0200 Commit: Jan Beulich CommitDate: Thu May 21 08:57:19 2015 +0200 vmap: avoid hitting an ASSERT with vfree(NULL) and unconditionally defer the vm_size() call, as it doesn't have a NULL short circuit. Reported-by: Wei Liu Signed-off-by: Andrew Cooper Tested-by: Wei Liu Reviewed-by: Roger Pau Monn=C3=A9 Acked-by: Tim Deegan --- xen/common/vmap.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/xen/common/vmap.c b/xen/common/vmap.c index 8752595..ac66a8c 100644 --- a/xen/common/vmap.c +++ b/xen/common/vmap.c @@ -268,10 +268,14 @@ void *vzalloc(size_t size) void vfree(void *va) { - unsigned int i, pages =3D vm_size(va); + unsigned int i, pages; struct page_info *pg; PAGE_LIST_HEAD(pg_list); + if ( !va ) + return; + + pages =3D vm_size(va); ASSERT(pages); for ( i =3D 0; i < pages; i++ ) -- generated by git-patchbot for /home/xen/git/xen.git#master --===============7202831484435489372== 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 --===============7202831484435489372==-- From xen-changelog-bounces@lists.xen.org Thu May 28 18:48:08 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:48: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 1Yy2qe-0005Ik-6U; Thu, 28 May 2015 18:48:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2qa-0005IA-7L for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:48:06 +0000 Content-Length: 1705 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 6F/B6-13047-3E267655; Thu, 28 May 2015 18:48:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1432838882!12208181!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15254 invoked from network); 28 May 2015 18:48:03 -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; 28 May 2015 18:48:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2qX-0003Ak-VN for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:48:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2qX-0003HW-SY for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:48:01 +0000 Date: Thu, 28 May 2015 18:48:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] vmap: avoid hitting an ASSERT with vfree(NULL) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7202831484435489372==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============7202831484435489372== Content-Length: 1295 Content-Transfer-Encoding: quoted-printable commit 640f891eb258563bb155e577389e8c5e6541a59a Author: Andrew Cooper AuthorDate: Thu May 21 08:57:19 2015 +0200 Commit: Jan Beulich CommitDate: Thu May 21 08:57:19 2015 +0200 vmap: avoid hitting an ASSERT with vfree(NULL) and unconditionally defer the vm_size() call, as it doesn't have a NULL short circuit. Reported-by: Wei Liu Signed-off-by: Andrew Cooper Tested-by: Wei Liu Reviewed-by: Roger Pau Monn=C3=A9 Acked-by: Tim Deegan --- xen/common/vmap.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/xen/common/vmap.c b/xen/common/vmap.c index 8752595..ac66a8c 100644 --- a/xen/common/vmap.c +++ b/xen/common/vmap.c @@ -268,10 +268,14 @@ void *vzalloc(size_t size) void vfree(void *va) { - unsigned int i, pages =3D vm_size(va); + unsigned int i, pages; struct page_info *pg; PAGE_LIST_HEAD(pg_list); + if ( !va ) + return; + + pages =3D vm_size(va); ASSERT(pages); for ( i =3D 0; i < pages; i++ ) -- generated by git-patchbot for /home/xen/git/xen.git#master --===============7202831484435489372== 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 --===============7202831484435489372==-- From xen-changelog-bounces@lists.xen.org Thu May 28 18:48:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:48: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 1Yy2qo-0005KS-9r; Thu, 28 May 2015 18:48:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2qm-0005KC-76 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:48:16 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id BD/AB-03371-FE267655; Thu, 28 May 2015 18:48:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1432838892!18349517!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5638 invoked from network); 28 May 2015 18:48:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 28 May 2015 18:48:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2qi-0003Aq-DG for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:48:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2qi-0003Hz-3f for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:48:12 +0000 Date: Thu, 28 May 2015 18:48:12 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: Check if fdt_{first, next}_subnode are present in libfdt X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4b7fbef6fb309cc3058b5d7eb4c75996693f6401 Author: Julien Grall AuthorDate: Tue Mar 17 17:58:14 2015 +0000 Commit: Ian Campbell CommitDate: Thu May 21 14:59:17 2015 +0100 tools/libxl: Check if fdt_{first,next}_subnode are present in libfdt The functions fdt_{first,next}_subnode may not be available because: * It has been introduced in 2013 => Doesn't work on Wheezy * The prototype exists but the functions are not exposed. Don't ask why... The later has been fixed recently in the dtc repo [1] When the functions are not available, implement our own in order to use them in a following patch. Note that the _hidden attribute is placed in both the prototype and the declaration because some version of libfdt expose the prototype but not the declaration. [1] git://git.kernel.org/pub/scm/utils/dtc/dtc.git commit a4b093f7366fdb429ca1781144d3985fa50d0fbb Signed-off-by: Julien Grall Signed-off-by: Ian Jackson Cc: Wei Liu Acked-by: Ian Campbell [ ijc -- ran autogen.sh ] --- tools/config.h.in | 14 ++++ tools/configure | 152 +++++++++++++++++++++++++++++++++++++ tools/configure.ac | 6 ++ tools/libxl/Makefile | 2 +- tools/libxl/libxl_libfdt_compat.c | 94 +++++++++++++++++++++++ tools/libxl/libxl_libfdt_compat.h | 81 ++++++++++++++++++++ 6 files changed, 348 insertions(+), 1 deletions(-) diff --git a/tools/config.h.in b/tools/config.h.in index 2a0ae48..42cd293 100644 --- a/tools/config.h.in +++ b/tools/config.h.in @@ -3,6 +3,20 @@ /* Blktap2 enabled */ #undef HAVE_BLKTAP2 +/* Define to 1 if you have the declaration of `fdt_first_subnode', and to 0 if + you don't. */ +#undef HAVE_DECL_FDT_FIRST_SUBNODE + +/* Define to 1 if you have the declaration of `fdt_next_subnode', and to 0 if + you don't. */ +#undef HAVE_DECL_FDT_NEXT_SUBNODE + +/* Define to 1 if you have the `fdt_first_subnode' function. */ +#undef HAVE_FDT_FIRST_SUBNODE + +/* Define to 1 if you have the `fdt_next_subnode' function. */ +#undef HAVE_FDT_NEXT_SUBNODE + /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H diff --git a/tools/configure b/tools/configure index a752acd..c092e06 100755 --- a/tools/configure +++ b/tools/configure @@ -1929,6 +1929,119 @@ fi as_fn_set_status $ac_retval } # ac_fn_c_try_link + +# ac_fn_c_check_func LINENO FUNC VAR +# ---------------------------------- +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_c_check_func () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Define $2 to an innocuous variant, in case declares $2. + For example, HP-UX 11i declares gettimeofday. */ +#define $2 innocuous_$2 + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $2 + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $2 (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$2 || defined __stub___$2 +choke me +#endif + +int +main () +{ +return $2 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_func + +# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES +# --------------------------------------------- +# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR +# accordingly. +ac_fn_c_check_decl () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + as_decl_name=`echo $2|sed 's/ *(.*//'` + as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 +$as_echo_n "checking whether $as_decl_name is declared... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +#ifndef $as_decl_name +#ifdef __cplusplus + (void) $as_decl_use; +#else + (void) $as_decl_name; +#endif +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_decl cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. @@ -8621,6 +8734,45 @@ else as_fn_error $? "Could not find libfdt" "$LINENO" 5 fi + +# The functions fdt_{first,next}_subnode may not be available because: +# * It has been introduced in 2013 => Doesn't work on Wheezy +# * The prototype exists but the functions are not exposed. Don't ask why... +for ac_func in fdt_first_subnode fdt_next_subnode +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + +ac_fn_c_check_decl "$LINENO" "fdt_first_subnode" "ac_cv_have_decl_fdt_first_subnode" "#include +" +if test "x$ac_cv_have_decl_fdt_first_subnode" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_FDT_FIRST_SUBNODE $ac_have_decl +_ACEOF +ac_fn_c_check_decl "$LINENO" "fdt_next_subnode" "ac_cv_have_decl_fdt_next_subnode" "#include +" +if test "x$ac_cv_have_decl_fdt_next_subnode" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_FDT_NEXT_SUBNODE $ac_have_decl +_ACEOF + esac # Checks for header files. diff --git a/tools/configure.ac b/tools/configure.ac index d31c2f3..5b48ab2 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -355,6 +355,12 @@ AC_SUBST(libiconv) case "$host_cpu" in arm*|aarch64) AC_CHECK_LIB([fdt], [fdt_create], [], [AC_MSG_ERROR([Could not find libfdt])]) + +# The functions fdt_{first,next}_subnode may not be available because: +# * It has been introduced in 2013 => Doesn't work on Wheezy +# * The prototype exists but the functions are not exposed. Don't ask why... +AC_CHECK_FUNCS([fdt_first_subnode fdt_next_subnode]) +AC_CHECK_DECLS([fdt_first_subnode, fdt_next_subnode],,,[#include ]) esac # Checks for header files. diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 1b16598..2afb146 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -59,7 +59,7 @@ endif LIBXL_OBJS-y += libxl_remus_device.o libxl_remus_disk_drbd.o LIBXL_OBJS-$(CONFIG_X86) += libxl_cpuid.o libxl_x86.o libxl_psr.o -LIBXL_OBJS-$(CONFIG_ARM) += libxl_nocpuid.o libxl_arm.o +LIBXL_OBJS-$(CONFIG_ARM) += libxl_nocpuid.o libxl_arm.o libxl_libfdt_compat.o ifeq ($(CONFIG_NetBSD),y) LIBXL_OBJS-y += libxl_netbsd.o diff --git a/tools/libxl/libxl_libfdt_compat.c b/tools/libxl/libxl_libfdt_compat.c new file mode 100644 index 0000000..02b8f74 --- /dev/null +++ b/tools/libxl/libxl_libfdt_compat.c @@ -0,0 +1,94 @@ +/* + * Copyright (C) 2006 David Gibson, IBM Corporation. + * + * This file is part of libxl, and was originally taken from libfdt. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * Additionally, this particular file is dual licensed. That is, + * alternatively, at your option: + * + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * 1. Redistributions of source code must retain the above + * copyright notice, this list of conditions and the following + * disclaimer. + * 2. Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Note that this applies only to this file, and other files with a + * similar notice. Also, note that when the same code is distributed + * along with the rest of libxl, you must comply with the terms of the + * LGPLv2.1 for the whole of libxl including this file. + * + * The intent is to permit, in particular, upstream libfdt to + * incorporate improvements to this file within upstream libfdt. At + * the time of writing, upstream libfdt is dual licensed: 2-clause BSD + * (as above) and GPLv2-or-later. The 2-clause BSD licence is + * compatible with both GPLv2-or-later and LGPLv2.1-only; this permits + * copying in both directions, and the optional licence upgrade to a + * copyleft licence by libdft upstream or the Xen Project, + * respectively. + */ + +#include + +#include "libxl_libfdt_compat.h" + +#ifndef HAVE_FDT_FIRST_SUBNODE +_hidden int fdt_first_subnode(const void *fdt, int offset) +{ + int depth = 0; + + offset = fdt_next_node(fdt, offset, &depth); + if (offset < 0 || depth != 1) + return -FDT_ERR_NOTFOUND; + + return offset; +} +#endif + +#ifndef HAVE_FDT_NEXT_SUBNODE +_hidden int fdt_next_subnode(const void *fdt, int offset) +{ + int depth = 1; + + /* + * With respect to the parent, the depth of the next subnode will be + * the same as the last. + */ + do { + offset = fdt_next_node(fdt, offset, &depth); + if (offset < 0 || depth < 1) + return -FDT_ERR_NOTFOUND; + } while (depth > 1); + + return offset; +} +#endif diff --git a/tools/libxl/libxl_libfdt_compat.h b/tools/libxl/libxl_libfdt_compat.h new file mode 100644 index 0000000..53a5076 --- /dev/null +++ b/tools/libxl/libxl_libfdt_compat.h @@ -0,0 +1,81 @@ +/* + * Copyright (C) 2006 David Gibson, IBM Corporation. + * + * This file is part of libxl, and was originally taken from libfdt. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * Additionally, this particular file is dual licensed. That is, + * alternatively, at your option: + * + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * 1. Redistributions of source code must retain the above + * copyright notice, this list of conditions and the following + * disclaimer. + * 2. Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Note that this applies only to this file, and other files with a + * similar notice. Also, note that when the same code is distributed + * along with the rest of libxl, you must comply with the terms of the + * LGPLv2.1 for the whole of libxl including this file. + * + * The intent is to permit, in particular, upstream libfdt to + * incorporate improvements to this file within upstream libfdt. At + * the time of writing, upstream libfdt is dual licensed: 2-clause BSD + * (as above) and GPLv2-or-later. The 2-clause BSD licence is + * compatible with both GPLv2-or-later and LGPLv2.1-only; this permits + * copying in both directions, and the optional licence upgrade to a + * copyleft licence by libdft upstream or the Xen Project, + * respectively. + */ + +#ifndef LIBXL_LIBFDT_COMPAT_H +#define LIBXL_LIBFDT_COMPAT_H + +#include "libxl_internal.h" + +#if !HAVE_DECL_FDT_FIRST_SUBNODE +_hidden int fdt_first_subnode(const void *fdt, int offset); +#endif + +#if !HAVE_DECL_FDT_NEXT_SUBNODE +_hidden int fdt_next_subnode(const void *fdt, int offset); +#endif + +#endif + +/* + * Local variables: + * mode: C + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ -- 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 May 28 18:48:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:48: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 1Yy2qo-0005KS-9r; Thu, 28 May 2015 18:48:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2qm-0005KC-76 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:48:16 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id BD/AB-03371-FE267655; Thu, 28 May 2015 18:48:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1432838892!18349517!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5638 invoked from network); 28 May 2015 18:48:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 28 May 2015 18:48:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2qi-0003Aq-DG for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:48:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2qi-0003Hz-3f for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:48:12 +0000 Date: Thu, 28 May 2015 18:48:12 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: Check if fdt_{first, next}_subnode are present in libfdt X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4b7fbef6fb309cc3058b5d7eb4c75996693f6401 Author: Julien Grall AuthorDate: Tue Mar 17 17:58:14 2015 +0000 Commit: Ian Campbell CommitDate: Thu May 21 14:59:17 2015 +0100 tools/libxl: Check if fdt_{first,next}_subnode are present in libfdt The functions fdt_{first,next}_subnode may not be available because: * It has been introduced in 2013 => Doesn't work on Wheezy * The prototype exists but the functions are not exposed. Don't ask why... The later has been fixed recently in the dtc repo [1] When the functions are not available, implement our own in order to use them in a following patch. Note that the _hidden attribute is placed in both the prototype and the declaration because some version of libfdt expose the prototype but not the declaration. [1] git://git.kernel.org/pub/scm/utils/dtc/dtc.git commit a4b093f7366fdb429ca1781144d3985fa50d0fbb Signed-off-by: Julien Grall Signed-off-by: Ian Jackson Cc: Wei Liu Acked-by: Ian Campbell [ ijc -- ran autogen.sh ] --- tools/config.h.in | 14 ++++ tools/configure | 152 +++++++++++++++++++++++++++++++++++++ tools/configure.ac | 6 ++ tools/libxl/Makefile | 2 +- tools/libxl/libxl_libfdt_compat.c | 94 +++++++++++++++++++++++ tools/libxl/libxl_libfdt_compat.h | 81 ++++++++++++++++++++ 6 files changed, 348 insertions(+), 1 deletions(-) diff --git a/tools/config.h.in b/tools/config.h.in index 2a0ae48..42cd293 100644 --- a/tools/config.h.in +++ b/tools/config.h.in @@ -3,6 +3,20 @@ /* Blktap2 enabled */ #undef HAVE_BLKTAP2 +/* Define to 1 if you have the declaration of `fdt_first_subnode', and to 0 if + you don't. */ +#undef HAVE_DECL_FDT_FIRST_SUBNODE + +/* Define to 1 if you have the declaration of `fdt_next_subnode', and to 0 if + you don't. */ +#undef HAVE_DECL_FDT_NEXT_SUBNODE + +/* Define to 1 if you have the `fdt_first_subnode' function. */ +#undef HAVE_FDT_FIRST_SUBNODE + +/* Define to 1 if you have the `fdt_next_subnode' function. */ +#undef HAVE_FDT_NEXT_SUBNODE + /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H diff --git a/tools/configure b/tools/configure index a752acd..c092e06 100755 --- a/tools/configure +++ b/tools/configure @@ -1929,6 +1929,119 @@ fi as_fn_set_status $ac_retval } # ac_fn_c_try_link + +# ac_fn_c_check_func LINENO FUNC VAR +# ---------------------------------- +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_c_check_func () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Define $2 to an innocuous variant, in case declares $2. + For example, HP-UX 11i declares gettimeofday. */ +#define $2 innocuous_$2 + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $2 + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $2 (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$2 || defined __stub___$2 +choke me +#endif + +int +main () +{ +return $2 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_func + +# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES +# --------------------------------------------- +# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR +# accordingly. +ac_fn_c_check_decl () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + as_decl_name=`echo $2|sed 's/ *(.*//'` + as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 +$as_echo_n "checking whether $as_decl_name is declared... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +#ifndef $as_decl_name +#ifdef __cplusplus + (void) $as_decl_use; +#else + (void) $as_decl_name; +#endif +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_decl cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. @@ -8621,6 +8734,45 @@ else as_fn_error $? "Could not find libfdt" "$LINENO" 5 fi + +# The functions fdt_{first,next}_subnode may not be available because: +# * It has been introduced in 2013 => Doesn't work on Wheezy +# * The prototype exists but the functions are not exposed. Don't ask why... +for ac_func in fdt_first_subnode fdt_next_subnode +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + +ac_fn_c_check_decl "$LINENO" "fdt_first_subnode" "ac_cv_have_decl_fdt_first_subnode" "#include +" +if test "x$ac_cv_have_decl_fdt_first_subnode" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_FDT_FIRST_SUBNODE $ac_have_decl +_ACEOF +ac_fn_c_check_decl "$LINENO" "fdt_next_subnode" "ac_cv_have_decl_fdt_next_subnode" "#include +" +if test "x$ac_cv_have_decl_fdt_next_subnode" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_FDT_NEXT_SUBNODE $ac_have_decl +_ACEOF + esac # Checks for header files. diff --git a/tools/configure.ac b/tools/configure.ac index d31c2f3..5b48ab2 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -355,6 +355,12 @@ AC_SUBST(libiconv) case "$host_cpu" in arm*|aarch64) AC_CHECK_LIB([fdt], [fdt_create], [], [AC_MSG_ERROR([Could not find libfdt])]) + +# The functions fdt_{first,next}_subnode may not be available because: +# * It has been introduced in 2013 => Doesn't work on Wheezy +# * The prototype exists but the functions are not exposed. Don't ask why... +AC_CHECK_FUNCS([fdt_first_subnode fdt_next_subnode]) +AC_CHECK_DECLS([fdt_first_subnode, fdt_next_subnode],,,[#include ]) esac # Checks for header files. diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 1b16598..2afb146 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -59,7 +59,7 @@ endif LIBXL_OBJS-y += libxl_remus_device.o libxl_remus_disk_drbd.o LIBXL_OBJS-$(CONFIG_X86) += libxl_cpuid.o libxl_x86.o libxl_psr.o -LIBXL_OBJS-$(CONFIG_ARM) += libxl_nocpuid.o libxl_arm.o +LIBXL_OBJS-$(CONFIG_ARM) += libxl_nocpuid.o libxl_arm.o libxl_libfdt_compat.o ifeq ($(CONFIG_NetBSD),y) LIBXL_OBJS-y += libxl_netbsd.o diff --git a/tools/libxl/libxl_libfdt_compat.c b/tools/libxl/libxl_libfdt_compat.c new file mode 100644 index 0000000..02b8f74 --- /dev/null +++ b/tools/libxl/libxl_libfdt_compat.c @@ -0,0 +1,94 @@ +/* + * Copyright (C) 2006 David Gibson, IBM Corporation. + * + * This file is part of libxl, and was originally taken from libfdt. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * Additionally, this particular file is dual licensed. That is, + * alternatively, at your option: + * + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * 1. Redistributions of source code must retain the above + * copyright notice, this list of conditions and the following + * disclaimer. + * 2. Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Note that this applies only to this file, and other files with a + * similar notice. Also, note that when the same code is distributed + * along with the rest of libxl, you must comply with the terms of the + * LGPLv2.1 for the whole of libxl including this file. + * + * The intent is to permit, in particular, upstream libfdt to + * incorporate improvements to this file within upstream libfdt. At + * the time of writing, upstream libfdt is dual licensed: 2-clause BSD + * (as above) and GPLv2-or-later. The 2-clause BSD licence is + * compatible with both GPLv2-or-later and LGPLv2.1-only; this permits + * copying in both directions, and the optional licence upgrade to a + * copyleft licence by libdft upstream or the Xen Project, + * respectively. + */ + +#include + +#include "libxl_libfdt_compat.h" + +#ifndef HAVE_FDT_FIRST_SUBNODE +_hidden int fdt_first_subnode(const void *fdt, int offset) +{ + int depth = 0; + + offset = fdt_next_node(fdt, offset, &depth); + if (offset < 0 || depth != 1) + return -FDT_ERR_NOTFOUND; + + return offset; +} +#endif + +#ifndef HAVE_FDT_NEXT_SUBNODE +_hidden int fdt_next_subnode(const void *fdt, int offset) +{ + int depth = 1; + + /* + * With respect to the parent, the depth of the next subnode will be + * the same as the last. + */ + do { + offset = fdt_next_node(fdt, offset, &depth); + if (offset < 0 || depth < 1) + return -FDT_ERR_NOTFOUND; + } while (depth > 1); + + return offset; +} +#endif diff --git a/tools/libxl/libxl_libfdt_compat.h b/tools/libxl/libxl_libfdt_compat.h new file mode 100644 index 0000000..53a5076 --- /dev/null +++ b/tools/libxl/libxl_libfdt_compat.h @@ -0,0 +1,81 @@ +/* + * Copyright (C) 2006 David Gibson, IBM Corporation. + * + * This file is part of libxl, and was originally taken from libfdt. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * Additionally, this particular file is dual licensed. That is, + * alternatively, at your option: + * + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * 1. Redistributions of source code must retain the above + * copyright notice, this list of conditions and the following + * disclaimer. + * 2. Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Note that this applies only to this file, and other files with a + * similar notice. Also, note that when the same code is distributed + * along with the rest of libxl, you must comply with the terms of the + * LGPLv2.1 for the whole of libxl including this file. + * + * The intent is to permit, in particular, upstream libfdt to + * incorporate improvements to this file within upstream libfdt. At + * the time of writing, upstream libfdt is dual licensed: 2-clause BSD + * (as above) and GPLv2-or-later. The 2-clause BSD licence is + * compatible with both GPLv2-or-later and LGPLv2.1-only; this permits + * copying in both directions, and the optional licence upgrade to a + * copyleft licence by libdft upstream or the Xen Project, + * respectively. + */ + +#ifndef LIBXL_LIBFDT_COMPAT_H +#define LIBXL_LIBFDT_COMPAT_H + +#include "libxl_internal.h" + +#if !HAVE_DECL_FDT_FIRST_SUBNODE +_hidden int fdt_first_subnode(const void *fdt, int offset); +#endif + +#if !HAVE_DECL_FDT_NEXT_SUBNODE +_hidden int fdt_next_subnode(const void *fdt, int offset); +#endif + +#endif + +/* + * Local variables: + * mode: C + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ -- 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 May 28 18:48:26 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:48:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2qw-0005Mb-IA; Thu, 28 May 2015 18:48:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2qv-0005MI-Ll for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:48:25 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id CE/34-13517-8F267655; Thu, 28 May 2015 18:48:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1432838902!8605418!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13710 invoked from network); 28 May 2015 18:48:23 -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; 28 May 2015 18:48:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2qs-0003Aw-L0 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:48:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2qs-0003IL-J6 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:48:22 +0000 Date: Thu, 28 May 2015 18:48:22 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/(lib)xl: Add partial device tree support for 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 51c2d7bd4d5c88bddc409964ae1739afbc64a1bb Author: Julien Grall AuthorDate: Wed May 13 19:33:38 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:11:59 2015 +0100 tools/(lib)xl: Add partial device tree support for ARM Allow the user to pass additional nodes to the guest device tree. For this purpose, everything in the node /passthrough from the partial device tree will be copied into the guest device tree. The node /aliases will be also copied to allow the user to define aliases which can be used by the guest kernel. A simple partial device tree will look like: /dts-v1/; / { #address-cells = <2>; #size-cells = <2>; passthrough { compatible = "simple-bus"; ranges; #address-cells = <2>; #size-cells = <2>; /* List of your nodes */ } }; Note that: * The interrupt-parent property will be added by the toolstack in the root node * The properties compatible, ranges, #address-cells and #size-cells in /passthrough are mandatory. The helpers provided by the libfdt don't perform all the necessary security check on a given device tree. Therefore, only trusted device tree should be used. Note: The partial device tree code requires the presence of libfdt functions which have been only correctly exported in libfdt 1.4.0 and higher. All the major distributions but Debian Wheezy are using v1.4.0 or higher. It has been decided to disable partial device tree support on OSes where libfdt doesn't meet the requirement. Signed-off-by: Julien Grall Cc: Ian Jackson Cc: Wei Liu Acked-by: Ian Campbell [ ijc -- ran autogen.sh ] --- docs/man/xl.cfg.pod.5 | 10 +++ tools/config.h.in | 3 + tools/configure | 23 ++++++ tools/configure.ac | 12 +++ tools/libxl/libxl_arm.c | 173 +++++++++++++++++++++++++++++++++++++++++++ tools/libxl/libxl_types.idl | 4 + tools/libxl/xl_cmdimpl.c | 1 + 7 files changed, 226 insertions(+), 0 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 8e4154f..ead8a5c 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -460,6 +460,16 @@ not emulated. Specify that this domain is a driver domain. This enables certain features needed in order to run a driver domain. +=item B + +Specify a partial device tree (compiled via the Device Tree Compiler). +Everything under the node "/passthrough" will be copied into the guest +device tree. For convenience, the node "/aliases" is also copied to allow +the user to defined aliases which can be used by the guest kernel. + +Given the complexity of verifying the validity of a device tree, this +option should only be used with trusted device tree. + =back =head2 Devices diff --git a/tools/config.h.in b/tools/config.h.in index 42cd293..d55173b 100644 --- a/tools/config.h.in +++ b/tools/config.h.in @@ -1,5 +1,8 @@ /* config.h.in. Generated from configure.ac by autoheader. */ +/* Enabling support partial device tree in libxl */ +#undef ENABLE_PARTIAL_DEVICE_TREE + /* Blktap2 enabled */ #undef HAVE_BLKTAP2 diff --git a/tools/configure b/tools/configure index c092e06..e7c246d 100755 --- a/tools/configure +++ b/tools/configure @@ -8735,6 +8735,29 @@ else fi +# Check for libfdt >= 1.4.0. If present enable passthrough +# Note that libfdt doesn't provide versionning. So we need to rely on +# function present in new version. +# Use fdt_first_property_offset which has been correctly exported since v1.4.0 +ac_fn_c_check_func "$LINENO" "fdt_first_property_offset" "ac_cv_func_fdt_first_property_offset" +if test "x$ac_cv_func_fdt_first_property_offset" = xyes; then : + partial_dt="y" +else + partial_dt="n" +fi + + +if test "x$partial_dt" = "xy" ; then : + +$as_echo "#define ENABLE_PARTIAL_DEVICE_TREE 1" >>confdefs.h + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling support for partial device tree in libxl. + Please install libfdt library - version 1.4.0 or higher" >&5 +$as_echo "$as_me: WARNING: Disabling support for partial device tree in libxl. + Please install libfdt library - version 1.4.0 or higher" >&2;} +fi + # The functions fdt_{first,next}_subnode may not be available because: # * It has been introduced in 2013 => Doesn't work on Wheezy # * The prototype exists but the functions are not exposed. Don't ask why... diff --git a/tools/configure.ac b/tools/configure.ac index 5b48ab2..58b6caa 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -356,6 +356,18 @@ case "$host_cpu" in arm*|aarch64) AC_CHECK_LIB([fdt], [fdt_create], [], [AC_MSG_ERROR([Could not find libfdt])]) +# Check for libfdt >= 1.4.0. If present enable passthrough +# Note that libfdt doesn't provide versionning. So we need to rely on +# function present in new version. +# Use fdt_first_property_offset which has been correctly exported since v1.4.0 +AC_CHECK_FUNC(fdt_first_property_offset, [partial_dt="y"], [partial_dt="n"]) + +AS_IF([test "x$partial_dt" = "xy" ], + [AC_DEFINE([ENABLE_PARTIAL_DEVICE_TREE], [1], + [Enabling support partial device tree in libxl])], + [AC_MSG_WARN([Disabling support for partial device tree in libxl. + Please install libfdt library - version 1.4.0 or higher])]) + # The functions fdt_{first,next}_subnode may not be available because: # * It has been introduced in 2013 => Doesn't work on Wheezy # * The prototype exists but the functions are not exposed. Don't ask why... diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c index feded58..71dbb9e 100644 --- a/tools/libxl/libxl_arm.c +++ b/tools/libxl/libxl_arm.c @@ -1,5 +1,6 @@ #include "libxl_internal.h" #include "libxl_arch.h" +#include "libxl_libfdt_compat.h" #include #include @@ -542,6 +543,157 @@ out: } } +#ifdef ENABLE_PARTIAL_DEVICE_TREE + +static int check_partial_fdt(libxl__gc *gc, void *fdt, size_t size) +{ + int r; + + if (fdt_magic(fdt) != FDT_MAGIC) { + LOG(ERROR, "Partial FDT is not a valid Flat Device Tree"); + return ERROR_FAIL; + } + + r = fdt_check_header(fdt); + if (r) { + LOG(ERROR, "Failed to check the partial FDT (%d)", r); + return ERROR_FAIL; + } + + if (fdt_totalsize(fdt) > size) { + LOG(ERROR, "Partial FDT totalsize is too big"); + return ERROR_FAIL; + } + + return 0; +} + +static int copy_properties(libxl__gc *gc, void *fdt, void *pfdt, + int nodeoff) +{ + int propoff, nameoff, r; + const struct fdt_property *prop; + + for (propoff = fdt_first_property_offset(pfdt, nodeoff); + propoff >= 0; + propoff = fdt_next_property_offset(pfdt, propoff)) { + + if (!(prop = fdt_get_property_by_offset(pfdt, propoff, NULL))) { + return -FDT_ERR_INTERNAL; + } + + nameoff = fdt32_to_cpu(prop->nameoff); + r = fdt_property(fdt, fdt_string(pfdt, nameoff), + prop->data, fdt32_to_cpu(prop->len)); + if (r) return r; + } + + /* FDT_ERR_NOTFOUND => There is no more properties for this node */ + return (propoff != -FDT_ERR_NOTFOUND)? propoff : 0; +} + +/* Copy a node from the partial device tree to the guest device tree */ +static int copy_node(libxl__gc *gc, void *fdt, void *pfdt, + int nodeoff, int depth) +{ + int r; + + r = fdt_begin_node(fdt, fdt_get_name(pfdt, nodeoff, NULL)); + if (r) return r; + + r = copy_properties(gc, fdt, pfdt, nodeoff); + if (r) return r; + + for (nodeoff = fdt_first_subnode(pfdt, nodeoff); + nodeoff >= 0; + nodeoff = fdt_next_subnode(pfdt, nodeoff)) { + r = copy_node(gc, fdt, pfdt, nodeoff, depth + 1); + if (r) return r; + } + + if (nodeoff != -FDT_ERR_NOTFOUND) + return nodeoff; + + r = fdt_end_node(fdt); + if (r) return r; + + return 0; +} + +static int copy_node_by_path(libxl__gc *gc, const char *path, + void *fdt, void *pfdt) +{ + int nodeoff, r; + const char *name = strrchr(path, '/'); + + if (!name) + return -FDT_ERR_INTERNAL; + + name++; + + /* + * The FDT function to look at a node doesn't take into account the + * unit (i.e anything after @) when search by name. Check if the + * name exactly matches. + */ + nodeoff = fdt_path_offset(pfdt, path); + if (nodeoff < 0) + return nodeoff; + + if (strcmp(fdt_get_name(pfdt, nodeoff, NULL), name)) + return -FDT_ERR_NOTFOUND; + + r = copy_node(gc, fdt, pfdt, nodeoff, 0); + if (r) return r; + + return 0; +} + +/* + * The partial device tree is not copied entirely. Only the relevant bits are + * copied to the guest device tree: + * - /passthrough node + * - /aliases node + */ +static int copy_partial_fdt(libxl__gc *gc, void *fdt, void *pfdt) +{ + int r; + + r = copy_node_by_path(gc, "/passthrough", fdt, pfdt); + if (r < 0) { + LOG(ERROR, "Can't copy the node \"/passthrough\" from the partial FDT"); + return r; + } + + r = copy_node_by_path(gc, "/aliases", fdt, pfdt); + if (r < 0 && r != -FDT_ERR_NOTFOUND) { + LOG(ERROR, "Can't copy the node \"/aliases\" from the partial FDT"); + return r; + } + + return 0; +} + +#else + +static int check_partial_fdt(libxl__gc *gc, void *fdt, size_t size) +{ + LOG(ERROR, "partial device tree not supported"); + + return ERROR_FAIL; +} + +static int copy_partial_fdt(libxl__gc *gc, void *fdt, void *pfdt) +{ + /* + * We should never be here when the partial device tree is not + * supported. + * */ + return -FDT_ERR_INTERNAL; +} + +#endif /* ENABLE_PARTIAL_DEVICE_TREE */ + #define FDT_MAX_SIZE (1<<20) int libxl__arch_domain_init_hw_description(libxl__gc *gc, @@ -550,8 +702,10 @@ int libxl__arch_domain_init_hw_description(libxl__gc *gc, struct xc_dom_image *dom) { void *fdt = NULL; + void *pfdt = NULL; int rc, res; size_t fdt_size = 0; + int pfdt_size = 0; const libxl_version_info *vers; const struct arch_info *ainfo; @@ -571,6 +725,22 @@ int libxl__arch_domain_init_hw_description(libxl__gc *gc, vers->xen_version_major, vers->xen_version_minor); LOG(DEBUG, " - vGIC version: %s", gicv_to_string(xc_config->gic_version)); + if (info->device_tree) { + LOG(DEBUG, " - Partial device tree provided: %s", info->device_tree); + + rc = libxl_read_file_contents(CTX, info->device_tree, + &pfdt, &pfdt_size); + if (rc) { + LOGEV(ERROR, rc, "failed to read the partial device file %s", + info->device_tree); + return ERROR_FAIL; + } + libxl__ptr_add(gc, pfdt); + + if (check_partial_fdt(gc, pfdt, pfdt_size)) + return ERROR_FAIL; + } + /* * Call "call" handling FDT_ERR_*. Will either: * - loop back to retry_resize @@ -637,6 +807,9 @@ next_resize: FDT( make_timer_node(gc, fdt, ainfo) ); FDT( make_hypervisor_node(gc, fdt, vers) ); + if (pfdt) + FDT( copy_partial_fdt(gc, fdt, pfdt) ); + FDT( fdt_end_node(fdt) ); FDT( fdt_finish(fdt) ); diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 65d479f..4ea1290 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -413,6 +413,10 @@ libxl_domain_build_info = Struct("domain_build_info",[ ("kernel", string), ("cmdline", string), ("ramdisk", string), + # Given the complexity of verifying the validity of a device tree, + # libxl doesn't do any security check on it. It's the responsibility + # of the caller to provide only trusted device tree. + ("device_tree", string), ("u", KeyedUnion(None, libxl_domain_type, "type", [("hvm", Struct(None, [("firmware", string), ("bios", libxl_bios_type), diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 373aa37..2125a09 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1379,6 +1379,7 @@ static void parse_config_data(const char *config_source, xlu_cfg_replace_string (config, "kernel", &b_info->kernel, 0); xlu_cfg_replace_string (config, "ramdisk", &b_info->ramdisk, 0); + xlu_cfg_replace_string (config, "device_tree", &b_info->device_tree, 0); b_info->cmdline = parse_cmdline(config); xlu_cfg_get_defbool(config, "driver_domain", &c_info->driver_domain, 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 May 28 18:48:26 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:48:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2qw-0005Mb-IA; Thu, 28 May 2015 18:48:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2qv-0005MI-Ll for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:48:25 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id CE/34-13517-8F267655; Thu, 28 May 2015 18:48:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1432838902!8605418!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13710 invoked from network); 28 May 2015 18:48:23 -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; 28 May 2015 18:48:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2qs-0003Aw-L0 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:48:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2qs-0003IL-J6 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:48:22 +0000 Date: Thu, 28 May 2015 18:48:22 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/(lib)xl: Add partial device tree support for 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 51c2d7bd4d5c88bddc409964ae1739afbc64a1bb Author: Julien Grall AuthorDate: Wed May 13 19:33:38 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:11:59 2015 +0100 tools/(lib)xl: Add partial device tree support for ARM Allow the user to pass additional nodes to the guest device tree. For this purpose, everything in the node /passthrough from the partial device tree will be copied into the guest device tree. The node /aliases will be also copied to allow the user to define aliases which can be used by the guest kernel. A simple partial device tree will look like: /dts-v1/; / { #address-cells = <2>; #size-cells = <2>; passthrough { compatible = "simple-bus"; ranges; #address-cells = <2>; #size-cells = <2>; /* List of your nodes */ } }; Note that: * The interrupt-parent property will be added by the toolstack in the root node * The properties compatible, ranges, #address-cells and #size-cells in /passthrough are mandatory. The helpers provided by the libfdt don't perform all the necessary security check on a given device tree. Therefore, only trusted device tree should be used. Note: The partial device tree code requires the presence of libfdt functions which have been only correctly exported in libfdt 1.4.0 and higher. All the major distributions but Debian Wheezy are using v1.4.0 or higher. It has been decided to disable partial device tree support on OSes where libfdt doesn't meet the requirement. Signed-off-by: Julien Grall Cc: Ian Jackson Cc: Wei Liu Acked-by: Ian Campbell [ ijc -- ran autogen.sh ] --- docs/man/xl.cfg.pod.5 | 10 +++ tools/config.h.in | 3 + tools/configure | 23 ++++++ tools/configure.ac | 12 +++ tools/libxl/libxl_arm.c | 173 +++++++++++++++++++++++++++++++++++++++++++ tools/libxl/libxl_types.idl | 4 + tools/libxl/xl_cmdimpl.c | 1 + 7 files changed, 226 insertions(+), 0 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 8e4154f..ead8a5c 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -460,6 +460,16 @@ not emulated. Specify that this domain is a driver domain. This enables certain features needed in order to run a driver domain. +=item B + +Specify a partial device tree (compiled via the Device Tree Compiler). +Everything under the node "/passthrough" will be copied into the guest +device tree. For convenience, the node "/aliases" is also copied to allow +the user to defined aliases which can be used by the guest kernel. + +Given the complexity of verifying the validity of a device tree, this +option should only be used with trusted device tree. + =back =head2 Devices diff --git a/tools/config.h.in b/tools/config.h.in index 42cd293..d55173b 100644 --- a/tools/config.h.in +++ b/tools/config.h.in @@ -1,5 +1,8 @@ /* config.h.in. Generated from configure.ac by autoheader. */ +/* Enabling support partial device tree in libxl */ +#undef ENABLE_PARTIAL_DEVICE_TREE + /* Blktap2 enabled */ #undef HAVE_BLKTAP2 diff --git a/tools/configure b/tools/configure index c092e06..e7c246d 100755 --- a/tools/configure +++ b/tools/configure @@ -8735,6 +8735,29 @@ else fi +# Check for libfdt >= 1.4.0. If present enable passthrough +# Note that libfdt doesn't provide versionning. So we need to rely on +# function present in new version. +# Use fdt_first_property_offset which has been correctly exported since v1.4.0 +ac_fn_c_check_func "$LINENO" "fdt_first_property_offset" "ac_cv_func_fdt_first_property_offset" +if test "x$ac_cv_func_fdt_first_property_offset" = xyes; then : + partial_dt="y" +else + partial_dt="n" +fi + + +if test "x$partial_dt" = "xy" ; then : + +$as_echo "#define ENABLE_PARTIAL_DEVICE_TREE 1" >>confdefs.h + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling support for partial device tree in libxl. + Please install libfdt library - version 1.4.0 or higher" >&5 +$as_echo "$as_me: WARNING: Disabling support for partial device tree in libxl. + Please install libfdt library - version 1.4.0 or higher" >&2;} +fi + # The functions fdt_{first,next}_subnode may not be available because: # * It has been introduced in 2013 => Doesn't work on Wheezy # * The prototype exists but the functions are not exposed. Don't ask why... diff --git a/tools/configure.ac b/tools/configure.ac index 5b48ab2..58b6caa 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -356,6 +356,18 @@ case "$host_cpu" in arm*|aarch64) AC_CHECK_LIB([fdt], [fdt_create], [], [AC_MSG_ERROR([Could not find libfdt])]) +# Check for libfdt >= 1.4.0. If present enable passthrough +# Note that libfdt doesn't provide versionning. So we need to rely on +# function present in new version. +# Use fdt_first_property_offset which has been correctly exported since v1.4.0 +AC_CHECK_FUNC(fdt_first_property_offset, [partial_dt="y"], [partial_dt="n"]) + +AS_IF([test "x$partial_dt" = "xy" ], + [AC_DEFINE([ENABLE_PARTIAL_DEVICE_TREE], [1], + [Enabling support partial device tree in libxl])], + [AC_MSG_WARN([Disabling support for partial device tree in libxl. + Please install libfdt library - version 1.4.0 or higher])]) + # The functions fdt_{first,next}_subnode may not be available because: # * It has been introduced in 2013 => Doesn't work on Wheezy # * The prototype exists but the functions are not exposed. Don't ask why... diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c index feded58..71dbb9e 100644 --- a/tools/libxl/libxl_arm.c +++ b/tools/libxl/libxl_arm.c @@ -1,5 +1,6 @@ #include "libxl_internal.h" #include "libxl_arch.h" +#include "libxl_libfdt_compat.h" #include #include @@ -542,6 +543,157 @@ out: } } +#ifdef ENABLE_PARTIAL_DEVICE_TREE + +static int check_partial_fdt(libxl__gc *gc, void *fdt, size_t size) +{ + int r; + + if (fdt_magic(fdt) != FDT_MAGIC) { + LOG(ERROR, "Partial FDT is not a valid Flat Device Tree"); + return ERROR_FAIL; + } + + r = fdt_check_header(fdt); + if (r) { + LOG(ERROR, "Failed to check the partial FDT (%d)", r); + return ERROR_FAIL; + } + + if (fdt_totalsize(fdt) > size) { + LOG(ERROR, "Partial FDT totalsize is too big"); + return ERROR_FAIL; + } + + return 0; +} + +static int copy_properties(libxl__gc *gc, void *fdt, void *pfdt, + int nodeoff) +{ + int propoff, nameoff, r; + const struct fdt_property *prop; + + for (propoff = fdt_first_property_offset(pfdt, nodeoff); + propoff >= 0; + propoff = fdt_next_property_offset(pfdt, propoff)) { + + if (!(prop = fdt_get_property_by_offset(pfdt, propoff, NULL))) { + return -FDT_ERR_INTERNAL; + } + + nameoff = fdt32_to_cpu(prop->nameoff); + r = fdt_property(fdt, fdt_string(pfdt, nameoff), + prop->data, fdt32_to_cpu(prop->len)); + if (r) return r; + } + + /* FDT_ERR_NOTFOUND => There is no more properties for this node */ + return (propoff != -FDT_ERR_NOTFOUND)? propoff : 0; +} + +/* Copy a node from the partial device tree to the guest device tree */ +static int copy_node(libxl__gc *gc, void *fdt, void *pfdt, + int nodeoff, int depth) +{ + int r; + + r = fdt_begin_node(fdt, fdt_get_name(pfdt, nodeoff, NULL)); + if (r) return r; + + r = copy_properties(gc, fdt, pfdt, nodeoff); + if (r) return r; + + for (nodeoff = fdt_first_subnode(pfdt, nodeoff); + nodeoff >= 0; + nodeoff = fdt_next_subnode(pfdt, nodeoff)) { + r = copy_node(gc, fdt, pfdt, nodeoff, depth + 1); + if (r) return r; + } + + if (nodeoff != -FDT_ERR_NOTFOUND) + return nodeoff; + + r = fdt_end_node(fdt); + if (r) return r; + + return 0; +} + +static int copy_node_by_path(libxl__gc *gc, const char *path, + void *fdt, void *pfdt) +{ + int nodeoff, r; + const char *name = strrchr(path, '/'); + + if (!name) + return -FDT_ERR_INTERNAL; + + name++; + + /* + * The FDT function to look at a node doesn't take into account the + * unit (i.e anything after @) when search by name. Check if the + * name exactly matches. + */ + nodeoff = fdt_path_offset(pfdt, path); + if (nodeoff < 0) + return nodeoff; + + if (strcmp(fdt_get_name(pfdt, nodeoff, NULL), name)) + return -FDT_ERR_NOTFOUND; + + r = copy_node(gc, fdt, pfdt, nodeoff, 0); + if (r) return r; + + return 0; +} + +/* + * The partial device tree is not copied entirely. Only the relevant bits are + * copied to the guest device tree: + * - /passthrough node + * - /aliases node + */ +static int copy_partial_fdt(libxl__gc *gc, void *fdt, void *pfdt) +{ + int r; + + r = copy_node_by_path(gc, "/passthrough", fdt, pfdt); + if (r < 0) { + LOG(ERROR, "Can't copy the node \"/passthrough\" from the partial FDT"); + return r; + } + + r = copy_node_by_path(gc, "/aliases", fdt, pfdt); + if (r < 0 && r != -FDT_ERR_NOTFOUND) { + LOG(ERROR, "Can't copy the node \"/aliases\" from the partial FDT"); + return r; + } + + return 0; +} + +#else + +static int check_partial_fdt(libxl__gc *gc, void *fdt, size_t size) +{ + LOG(ERROR, "partial device tree not supported"); + + return ERROR_FAIL; +} + +static int copy_partial_fdt(libxl__gc *gc, void *fdt, void *pfdt) +{ + /* + * We should never be here when the partial device tree is not + * supported. + * */ + return -FDT_ERR_INTERNAL; +} + +#endif /* ENABLE_PARTIAL_DEVICE_TREE */ + #define FDT_MAX_SIZE (1<<20) int libxl__arch_domain_init_hw_description(libxl__gc *gc, @@ -550,8 +702,10 @@ int libxl__arch_domain_init_hw_description(libxl__gc *gc, struct xc_dom_image *dom) { void *fdt = NULL; + void *pfdt = NULL; int rc, res; size_t fdt_size = 0; + int pfdt_size = 0; const libxl_version_info *vers; const struct arch_info *ainfo; @@ -571,6 +725,22 @@ int libxl__arch_domain_init_hw_description(libxl__gc *gc, vers->xen_version_major, vers->xen_version_minor); LOG(DEBUG, " - vGIC version: %s", gicv_to_string(xc_config->gic_version)); + if (info->device_tree) { + LOG(DEBUG, " - Partial device tree provided: %s", info->device_tree); + + rc = libxl_read_file_contents(CTX, info->device_tree, + &pfdt, &pfdt_size); + if (rc) { + LOGEV(ERROR, rc, "failed to read the partial device file %s", + info->device_tree); + return ERROR_FAIL; + } + libxl__ptr_add(gc, pfdt); + + if (check_partial_fdt(gc, pfdt, pfdt_size)) + return ERROR_FAIL; + } + /* * Call "call" handling FDT_ERR_*. Will either: * - loop back to retry_resize @@ -637,6 +807,9 @@ next_resize: FDT( make_timer_node(gc, fdt, ainfo) ); FDT( make_hypervisor_node(gc, fdt, vers) ); + if (pfdt) + FDT( copy_partial_fdt(gc, fdt, pfdt) ); + FDT( fdt_end_node(fdt) ); FDT( fdt_finish(fdt) ); diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 65d479f..4ea1290 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -413,6 +413,10 @@ libxl_domain_build_info = Struct("domain_build_info",[ ("kernel", string), ("cmdline", string), ("ramdisk", string), + # Given the complexity of verifying the validity of a device tree, + # libxl doesn't do any security check on it. It's the responsibility + # of the caller to provide only trusted device tree. + ("device_tree", string), ("u", KeyedUnion(None, libxl_domain_type, "type", [("hvm", Struct(None, [("firmware", string), ("bios", libxl_bios_type), diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 373aa37..2125a09 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1379,6 +1379,7 @@ static void parse_config_data(const char *config_source, xlu_cfg_replace_string (config, "kernel", &b_info->kernel, 0); xlu_cfg_replace_string (config, "ramdisk", &b_info->ramdisk, 0); + xlu_cfg_replace_string (config, "device_tree", &b_info->device_tree, 0); b_info->cmdline = parse_cmdline(config); xlu_cfg_get_defbool(config, "driver_domain", &c_info->driver_domain, 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 May 28 18:48:36 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:48: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 1Yy2r6-0005OI-L2; Thu, 28 May 2015 18:48:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2r5-0005O9-K6 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:48:35 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 22/F7-10437-20367655; Thu, 28 May 2015 18:48:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1432838913!11017268!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19517 invoked from network); 28 May 2015 18:48:34 -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; 28 May 2015 18:48:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2r2-0003B1-Ql for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:48:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2r2-0003Il-P7 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:48:32 +0000 Date: Thu, 28 May 2015 18:48:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: arm: Use an higher value for the GIC phandle X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c3ba52a84dd84ff27105a95943091e96b25a1178 Author: Julien Grall AuthorDate: Wed May 13 19:33:39 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:12:08 2015 +0100 tools/libxl: arm: Use an higher value for the GIC phandle The partial device tree may contains phandle. The Device Tree Compiler tends to allocate the phandle from 1. Reserve the ID 65000 for the GIC phandle. I think we can safely assume that the partial device tree will never contain a such ID. Signed-off-by: Julien Grall Acked-by: Ian Campbell Cc: Ian Jackson Cc: Wei Liu --- docs/man/xl.cfg.pod.5 | 3 +++ tools/libxl/libxl_arm.c | 9 +++++---- tools/libxl/libxl_types.idl | 2 ++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index ead8a5c..fb8721f 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -470,6 +470,9 @@ the user to defined aliases which can be used by the guest kernel. Given the complexity of verifying the validity of a device tree, this option should only be used with trusted device tree. +Note that the partial device tree should avoid to use the phandle 65000 +which is reserved by the toolstack. + =back =head2 Devices diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c index 71dbb9e..4fb5e26 100644 --- a/tools/libxl/libxl_arm.c +++ b/tools/libxl/libxl_arm.c @@ -81,10 +81,11 @@ static struct arch_info { {"xen-3.0-aarch64", "arm,armv8-timer", "arm,armv8" }, }; -enum { - PHANDLE_NONE = 0, - PHANDLE_GIC, -}; +/* + * The device tree compiler (DTC) is allocating the phandle from 1 to + * onwards. Reserve a high value for the GIC phandle. + */ +#define PHANDLE_GIC (65000) typedef uint32_t be32; typedef be32 gic_interrupt[3]; diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 4ea1290..f1c62ed 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -416,6 +416,8 @@ libxl_domain_build_info = Struct("domain_build_info",[ # Given the complexity of verifying the validity of a device tree, # libxl doesn't do any security check on it. It's the responsibility # of the caller to provide only trusted device tree. + # Note that the partial device tree should avoid to use the phandle + # 65000 which is reserved by the toolstack. ("device_tree", string), ("u", KeyedUnion(None, libxl_domain_type, "type", [("hvm", Struct(None, [("firmware", string), -- 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 May 28 18:48:36 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:48: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 1Yy2r6-0005OI-L2; Thu, 28 May 2015 18:48:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2r5-0005O9-K6 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:48:35 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 22/F7-10437-20367655; Thu, 28 May 2015 18:48:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1432838913!11017268!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19517 invoked from network); 28 May 2015 18:48:34 -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; 28 May 2015 18:48:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2r2-0003B1-Ql for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:48:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2r2-0003Il-P7 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:48:32 +0000 Date: Thu, 28 May 2015 18:48:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: arm: Use an higher value for the GIC phandle X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c3ba52a84dd84ff27105a95943091e96b25a1178 Author: Julien Grall AuthorDate: Wed May 13 19:33:39 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:12:08 2015 +0100 tools/libxl: arm: Use an higher value for the GIC phandle The partial device tree may contains phandle. The Device Tree Compiler tends to allocate the phandle from 1. Reserve the ID 65000 for the GIC phandle. I think we can safely assume that the partial device tree will never contain a such ID. Signed-off-by: Julien Grall Acked-by: Ian Campbell Cc: Ian Jackson Cc: Wei Liu --- docs/man/xl.cfg.pod.5 | 3 +++ tools/libxl/libxl_arm.c | 9 +++++---- tools/libxl/libxl_types.idl | 2 ++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index ead8a5c..fb8721f 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -470,6 +470,9 @@ the user to defined aliases which can be used by the guest kernel. Given the complexity of verifying the validity of a device tree, this option should only be used with trusted device tree. +Note that the partial device tree should avoid to use the phandle 65000 +which is reserved by the toolstack. + =back =head2 Devices diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c index 71dbb9e..4fb5e26 100644 --- a/tools/libxl/libxl_arm.c +++ b/tools/libxl/libxl_arm.c @@ -81,10 +81,11 @@ static struct arch_info { {"xen-3.0-aarch64", "arm,armv8-timer", "arm,armv8" }, }; -enum { - PHANDLE_NONE = 0, - PHANDLE_GIC, -}; +/* + * The device tree compiler (DTC) is allocating the phandle from 1 to + * onwards. Reserve a high value for the GIC phandle. + */ +#define PHANDLE_GIC (65000) typedef uint32_t be32; typedef be32 gic_interrupt[3]; diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 4ea1290..f1c62ed 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -416,6 +416,8 @@ libxl_domain_build_info = Struct("domain_build_info",[ # Given the complexity of verifying the validity of a device tree, # libxl doesn't do any security check on it. It's the responsibility # of the caller to provide only trusted device tree. + # Note that the partial device tree should avoid to use the phandle + # 65000 which is reserved by the toolstack. ("device_tree", string), ("u", KeyedUnion(None, libxl_domain_type, "type", [("hvm", Struct(None, [("firmware", string), -- 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 May 28 18:48:47 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:48: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 1Yy2rH-0005Q8-O0; Thu, 28 May 2015 18:48:47 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2rG-0005Px-KC for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:48:46 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 38/9F-05057-D0367655; Thu, 28 May 2015 18:48:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1432838923!12181814!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29310 invoked from network); 28 May 2015 18:48:44 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 May 2015 18:48:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2rD-0003B7-00 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:48:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2rC-0003K0-Uf for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:48:42 +0000 Date: Thu, 28 May 2015 18:48:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Add support for Device Tree passthrough X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2017224d3d2ce9bed2dd5731487dd9caf422fde6 Author: Julien Grall AuthorDate: Wed May 13 19:33:40 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:12:09 2015 +0100 libxl: Add support for Device Tree passthrough On ARM, every non-PCI device are described in the device tree. Each of them can be found via a path. This patch introduces a very basic support, only the IOMMU will be set up correctly. The user will have to: - Describe the device in the partial device tree - Map manually MMIO/IRQ This is a first approach, that will allow to have a basic Device Tree passthrough support in Xen. This could be improved later. Furthermore add LIBXL_HAVE_DEVICETREE_PASSTHROUGH to indicate we support Device Tree passthrough and partial device tree (introduced by a previous patch). Signed-off-by: Julien Grall Acked-by: Ian Jackson Acked-by: Ian Campbell Cc: Wei Liu --- tools/libxl/libxl.h | 7 +++++++ tools/libxl/libxl_create.c | 32 ++++++++++++++++++++++++++++++++ tools/libxl/libxl_internal.h | 5 +++++ tools/libxl/libxl_types.idl | 5 +++++ 4 files changed, 49 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 2ed7194..0a7913b 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -192,6 +192,13 @@ * is not present, instead of ERROR_INVAL. */ #define LIBXL_HAVE_ERROR_DOMAIN_NOTFOUND 1 + +/* + * libxl_domain_build_info has device_tree and libxl_device_dtdev + * exists. This mean Device Tree passthrough is supported for ARM + */ +#define LIBXL_HAVE_DEVICETREE_PASSTHROUGH 1 + /* * libxl ABI compatibility * diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index f0da7dc..0a2359e 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -764,6 +764,8 @@ static void domcreate_attach_vtpms(libxl__egc *egc, libxl__multidev *multidev, int ret); static void domcreate_attach_pci(libxl__egc *egc, libxl__multidev *aodevs, int ret); +static void domcreate_attach_dtdev(libxl__egc *egc, + libxl__domain_create_state *dcs); static void domcreate_console_available(libxl__egc *egc, libxl__domain_create_state *dcs); @@ -1457,6 +1459,36 @@ static void domcreate_attach_pci(libxl__egc *egc, libxl__multidev *multidev, } } + domcreate_attach_dtdev(egc, dcs); + return; + +error_out: + assert(ret); + domcreate_complete(egc, dcs, ret); +} + +static void domcreate_attach_dtdev(libxl__egc *egc, + libxl__domain_create_state *dcs) +{ + STATE_AO_GC(dcs->ao); + int i; + int ret; + int domid = dcs->guest_domid; + + /* convenience aliases */ + libxl_domain_config *const d_config = dcs->guest_config; + + for (i = 0; i < d_config->num_dtdevs; i++) { + const libxl_device_dtdev *dtdev = &d_config->dtdevs[i]; + + LOG(DEBUG, "Assign device \"%s\" to dom%u", dtdev->path, domid); + ret = xc_assign_dt_device(CTX->xch, domid, dtdev->path); + if (ret < 0) { + LOG(ERROR, "xc_assign_dtdevice failed: %d\n", ret); + goto error_out; + } + } + domcreate_console_available(egc, dcs); domcreate_complete(egc, dcs, 0); diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 8aaa1ad..bb3a5c7 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1208,6 +1208,11 @@ _hidden int libxl__create_pci_backend(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, int num); _hidden int libxl__device_pci_destroy_all(libxl__gc *gc, uint32_t domid); +/* from libxl_dtdev */ + +_hidden int libxl__device_dt_add(libxl__gc *gc, uint32_t domid, + const libxl_device_dtdev *dtdev); + /*----- xswait: wait for a xenstore node to be suitable -----*/ typedef struct libxl__xswait_state libxl__xswait_state; diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index f1c62ed..23f27d4 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -541,6 +541,10 @@ libxl_device_pci = Struct("device_pci", [ ("seize", bool), ]) +libxl_device_dtdev = Struct("device_dtdev", [ + ("path", string), + ]) + libxl_device_vtpm = Struct("device_vtpm", [ ("backend_domid", libxl_domid), ("backend_domname", string), @@ -567,6 +571,7 @@ libxl_domain_config = Struct("domain_config", [ ("disks", Array(libxl_device_disk, "num_disks")), ("nics", Array(libxl_device_nic, "num_nics")), ("pcidevs", Array(libxl_device_pci, "num_pcidevs")), + ("dtdevs", Array(libxl_device_dtdev, "num_dtdevs")), ("vfbs", Array(libxl_device_vfb, "num_vfbs")), ("vkbs", Array(libxl_device_vkb, "num_vkbs")), ("vtpms", Array(libxl_device_vtpm, "num_vtpms")), -- 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 May 28 18:48:47 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:48: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 1Yy2rH-0005Q8-O0; Thu, 28 May 2015 18:48:47 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2rG-0005Px-KC for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:48:46 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 38/9F-05057-D0367655; Thu, 28 May 2015 18:48:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1432838923!12181814!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29310 invoked from network); 28 May 2015 18:48:44 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 May 2015 18:48:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2rD-0003B7-00 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:48:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2rC-0003K0-Uf for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:48:42 +0000 Date: Thu, 28 May 2015 18:48:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Add support for Device Tree passthrough X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2017224d3d2ce9bed2dd5731487dd9caf422fde6 Author: Julien Grall AuthorDate: Wed May 13 19:33:40 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:12:09 2015 +0100 libxl: Add support for Device Tree passthrough On ARM, every non-PCI device are described in the device tree. Each of them can be found via a path. This patch introduces a very basic support, only the IOMMU will be set up correctly. The user will have to: - Describe the device in the partial device tree - Map manually MMIO/IRQ This is a first approach, that will allow to have a basic Device Tree passthrough support in Xen. This could be improved later. Furthermore add LIBXL_HAVE_DEVICETREE_PASSTHROUGH to indicate we support Device Tree passthrough and partial device tree (introduced by a previous patch). Signed-off-by: Julien Grall Acked-by: Ian Jackson Acked-by: Ian Campbell Cc: Wei Liu --- tools/libxl/libxl.h | 7 +++++++ tools/libxl/libxl_create.c | 32 ++++++++++++++++++++++++++++++++ tools/libxl/libxl_internal.h | 5 +++++ tools/libxl/libxl_types.idl | 5 +++++ 4 files changed, 49 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 2ed7194..0a7913b 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -192,6 +192,13 @@ * is not present, instead of ERROR_INVAL. */ #define LIBXL_HAVE_ERROR_DOMAIN_NOTFOUND 1 + +/* + * libxl_domain_build_info has device_tree and libxl_device_dtdev + * exists. This mean Device Tree passthrough is supported for ARM + */ +#define LIBXL_HAVE_DEVICETREE_PASSTHROUGH 1 + /* * libxl ABI compatibility * diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index f0da7dc..0a2359e 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -764,6 +764,8 @@ static void domcreate_attach_vtpms(libxl__egc *egc, libxl__multidev *multidev, int ret); static void domcreate_attach_pci(libxl__egc *egc, libxl__multidev *aodevs, int ret); +static void domcreate_attach_dtdev(libxl__egc *egc, + libxl__domain_create_state *dcs); static void domcreate_console_available(libxl__egc *egc, libxl__domain_create_state *dcs); @@ -1457,6 +1459,36 @@ static void domcreate_attach_pci(libxl__egc *egc, libxl__multidev *multidev, } } + domcreate_attach_dtdev(egc, dcs); + return; + +error_out: + assert(ret); + domcreate_complete(egc, dcs, ret); +} + +static void domcreate_attach_dtdev(libxl__egc *egc, + libxl__domain_create_state *dcs) +{ + STATE_AO_GC(dcs->ao); + int i; + int ret; + int domid = dcs->guest_domid; + + /* convenience aliases */ + libxl_domain_config *const d_config = dcs->guest_config; + + for (i = 0; i < d_config->num_dtdevs; i++) { + const libxl_device_dtdev *dtdev = &d_config->dtdevs[i]; + + LOG(DEBUG, "Assign device \"%s\" to dom%u", dtdev->path, domid); + ret = xc_assign_dt_device(CTX->xch, domid, dtdev->path); + if (ret < 0) { + LOG(ERROR, "xc_assign_dtdevice failed: %d\n", ret); + goto error_out; + } + } + domcreate_console_available(egc, dcs); domcreate_complete(egc, dcs, 0); diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 8aaa1ad..bb3a5c7 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1208,6 +1208,11 @@ _hidden int libxl__create_pci_backend(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, int num); _hidden int libxl__device_pci_destroy_all(libxl__gc *gc, uint32_t domid); +/* from libxl_dtdev */ + +_hidden int libxl__device_dt_add(libxl__gc *gc, uint32_t domid, + const libxl_device_dtdev *dtdev); + /*----- xswait: wait for a xenstore node to be suitable -----*/ typedef struct libxl__xswait_state libxl__xswait_state; diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index f1c62ed..23f27d4 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -541,6 +541,10 @@ libxl_device_pci = Struct("device_pci", [ ("seize", bool), ]) +libxl_device_dtdev = Struct("device_dtdev", [ + ("path", string), + ]) + libxl_device_vtpm = Struct("device_vtpm", [ ("backend_domid", libxl_domid), ("backend_domname", string), @@ -567,6 +571,7 @@ libxl_domain_config = Struct("domain_config", [ ("disks", Array(libxl_device_disk, "num_disks")), ("nics", Array(libxl_device_nic, "num_nics")), ("pcidevs", Array(libxl_device_pci, "num_pcidevs")), + ("dtdevs", Array(libxl_device_dtdev, "num_dtdevs")), ("vfbs", Array(libxl_device_vfb, "num_vfbs")), ("vkbs", Array(libxl_device_vkb, "num_vkbs")), ("vtpms", Array(libxl_device_vtpm, "num_vtpms")), -- 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 May 28 18:48:56 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:48:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2rQ-0005Rk-Qy; Thu, 28 May 2015 18:48:56 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2rP-0005Ra-OQ for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:48:55 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 4D/00-31258-71367655; Thu, 28 May 2015 18:48:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1432838933!18319192!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9857 invoked from network); 28 May 2015 18:48:54 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 28 May 2015 18:48:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2rN-0003BJ-6I for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:48:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2rN-0003KY-5N for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:48:53 +0000 Date: Thu, 28 May 2015 18:48:53 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: Add new option dtdev X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 16b19d329a84987d451f68ff93edc8573c4587e1 Author: Julien Grall AuthorDate: Wed May 13 19:33:41 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:12:09 2015 +0100 xl: Add new option dtdev The option "dtdev" will be used to passthrough a device described in the device tree to a guest. Signed-off-by: Julien Grall Acked-by: Ian Campbell Cc: Ian Jackson Cc: Wei Liu --- docs/man/xl.cfg.pod.5 | 5 +++++ tools/libxl/xl_cmdimpl.c | 22 +++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index fb8721f..a189091 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -789,6 +789,11 @@ More information about Xen gfx_passthru feature is available on the XenVGAPassthrough L wiki page. +=item B + +Specifies the host device tree nodes to passthrough to this guest. Each +DTDEV_PATH is the absolute path in the device tree. + =item B Allow guest to access specific legacy I/O ports. Each B diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 2125a09..8eaf1c7 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1169,7 +1169,7 @@ static void parse_config_data(const char *config_source, long l, vcpus = 0; XLU_Config *config; XLU_ConfigList *cpus, *vbds, *nics, *pcis, *cvfbs, *cpuids, *vtpms; - XLU_ConfigList *channels, *ioports, *irqs, *iomem, *viridian; + XLU_ConfigList *channels, *ioports, *irqs, *iomem, *viridian, *dtdevs; int num_ioports, num_irqs, num_iomem, num_cpus, num_viridian; int pci_power_mgmt = 0; int pci_msitranslate = 0; @@ -1941,6 +1941,26 @@ skip_vfb: libxl_defbool_set(&b_info->u.pv.e820_host, true); } + if (!xlu_cfg_get_list (config, "dtdev", &dtdevs, 0, 0)) { + d_config->num_dtdevs = 0; + d_config->dtdevs = NULL; + for (i = 0; (buf = xlu_cfg_get_listitem(dtdevs, i)) != NULL; i++) { + libxl_device_dtdev *dtdev; + + d_config->dtdevs = xrealloc(d_config->dtdevs, + sizeof (libxl_device_dtdev) * (i + 1)); + dtdev = d_config->dtdevs + d_config->num_dtdevs; + libxl_device_dtdev_init(dtdev); + + dtdev->path = strdup(buf); + if (dtdev->path == NULL) { + fprintf(stderr, "unable to duplicate string for dtdevs\n"); + exit(-1); + } + d_config->num_dtdevs++; + } + } + switch (xlu_cfg_get_list(config, "cpuid", &cpuids, 0, 1)) { case 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 May 28 18:48:56 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:48:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2rQ-0005Rk-Qy; Thu, 28 May 2015 18:48:56 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2rP-0005Ra-OQ for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:48:55 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 4D/00-31258-71367655; Thu, 28 May 2015 18:48:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1432838933!18319192!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9857 invoked from network); 28 May 2015 18:48:54 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 28 May 2015 18:48:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2rN-0003BJ-6I for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:48:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2rN-0003KY-5N for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:48:53 +0000 Date: Thu, 28 May 2015 18:48:53 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: Add new option dtdev X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 16b19d329a84987d451f68ff93edc8573c4587e1 Author: Julien Grall AuthorDate: Wed May 13 19:33:41 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:12:09 2015 +0100 xl: Add new option dtdev The option "dtdev" will be used to passthrough a device described in the device tree to a guest. Signed-off-by: Julien Grall Acked-by: Ian Campbell Cc: Ian Jackson Cc: Wei Liu --- docs/man/xl.cfg.pod.5 | 5 +++++ tools/libxl/xl_cmdimpl.c | 22 +++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index fb8721f..a189091 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -789,6 +789,11 @@ More information about Xen gfx_passthru feature is available on the XenVGAPassthrough L wiki page. +=item B + +Specifies the host device tree nodes to passthrough to this guest. Each +DTDEV_PATH is the absolute path in the device tree. + =item B Allow guest to access specific legacy I/O ports. Each B diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 2125a09..8eaf1c7 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1169,7 +1169,7 @@ static void parse_config_data(const char *config_source, long l, vcpus = 0; XLU_Config *config; XLU_ConfigList *cpus, *vbds, *nics, *pcis, *cvfbs, *cpuids, *vtpms; - XLU_ConfigList *channels, *ioports, *irqs, *iomem, *viridian; + XLU_ConfigList *channels, *ioports, *irqs, *iomem, *viridian, *dtdevs; int num_ioports, num_irqs, num_iomem, num_cpus, num_viridian; int pci_power_mgmt = 0; int pci_msitranslate = 0; @@ -1941,6 +1941,26 @@ skip_vfb: libxl_defbool_set(&b_info->u.pv.e820_host, true); } + if (!xlu_cfg_get_list (config, "dtdev", &dtdevs, 0, 0)) { + d_config->num_dtdevs = 0; + d_config->dtdevs = NULL; + for (i = 0; (buf = xlu_cfg_get_listitem(dtdevs, i)) != NULL; i++) { + libxl_device_dtdev *dtdev; + + d_config->dtdevs = xrealloc(d_config->dtdevs, + sizeof (libxl_device_dtdev) * (i + 1)); + dtdev = d_config->dtdevs + d_config->num_dtdevs; + libxl_device_dtdev_init(dtdev); + + dtdev->path = strdup(buf); + if (dtdev->path == NULL) { + fprintf(stderr, "unable to duplicate string for dtdevs\n"); + exit(-1); + } + d_config->num_dtdevs++; + } + } + switch (xlu_cfg_get_list(config, "cpuid", &cpuids, 0, 1)) { case 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 May 28 18:49:08 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:49: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 1Yy2rc-0005U1-48; Thu, 28 May 2015 18:49:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2rb-0005To-6a for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:49:07 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id D4/83-29123-22367655; Thu, 28 May 2015 18:49:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1432838944!18322005!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13527 invoked from network); 28 May 2015 18:49:05 -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; 28 May 2015 18:49:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2rX-0003Bu-EK for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:49:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2rX-0003Lc-Bn for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:49:03 +0000 Date: Thu, 28 May 2015 18:49:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs/misc: arm: Add documentation about Device Tree passthrough X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0b241606568bb3826bfb817dddc8f1f3141ee5dc Author: Julien Grall AuthorDate: Wed May 13 19:33:42 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:12:09 2015 +0100 docs/misc: arm: Add documentation about Device Tree passthrough Note that the example is done on Midway whose SMMU driver is not supported on Xen upstream. Currently, I don't have other platform where I can test Device Tree passthrough. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- docs/misc/arm/passthrough.txt | 62 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 0 deletions(-) diff --git a/docs/misc/arm/passthrough.txt b/docs/misc/arm/passthrough.txt new file mode 100644 index 0000000..082e9ab --- /dev/null +++ b/docs/misc/arm/passthrough.txt @@ -0,0 +1,62 @@ +Passthrough a device described in the Device Tree to a guest +============================================================ + +The example will use the secondary network card for the midway server. + +1) Mark the device to let Xen know the device will be used for passthrough. +This is done in the device tree node describing the device by adding the +property "xen,passthrough". The command to do it in U-Boot is: + + fdt set /soc/ethernet@fff51000 xen,passthrough + +2) Create a partial device tree describing the device. The IRQ are mapped +1:1 to the guest (i.e VIRQ == IRQ). For MMIO, you will have to find a hole +in the guest memory layout (see xen/include/public/arch-arm.h, note that +the layout is not stable and can change between versions of Xen). + +/dts-v1/; + +/ { + /* #*cells are here to keep DTC happy */ + #address-cells = <2>; + #size-cells = <2>; + + aliases { + net = &mac0; + }; + + passthrough { + compatible = "simple-bus"; + ranges; + #address-cells = <2>; + #size-cells = <2>; + mac0: ethernet@10000000 { + compatible = "calxeda,hb-xgmac"; + reg = <0 0x10000000 0 0x1000>; + interrupts = <0 80 4 0 81 4 0 82 4>; + }; + }; +}; + +Note: + * The interrupt-parent property will be added by the toolstack in the + root node; + * The following properties are mandatory with the /passthrough node: + - compatible: It should always contain "simple-bus" + - ranges + - #address-cells + - #size-cells + * See http://www.devicetree.org/Device_Tree_Usage for more + information about device tree. + +3) Compile the partial guest device with dtc (Device Tree Compiler). +For our purpose, the compiled file will be called guest-midway.dtb and +placed in /root in DOM0. + +3) Add the following options in the guest configuration file: + +device_tree = "/root/guest-midway.dtb" +dtdev = [ "/soc/ethernet@fff51000" ] +irqs = [ 112, 113, 114 ] +iomem = [ "0xfff51,1@0x10000" ] + -- 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 May 28 18:49:08 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:49: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 1Yy2rc-0005U1-48; Thu, 28 May 2015 18:49:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2rb-0005To-6a for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:49:07 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id D4/83-29123-22367655; Thu, 28 May 2015 18:49:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1432838944!18322005!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13527 invoked from network); 28 May 2015 18:49:05 -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; 28 May 2015 18:49:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2rX-0003Bu-EK for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:49:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2rX-0003Lc-Bn for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:49:03 +0000 Date: Thu, 28 May 2015 18:49:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs/misc: arm: Add documentation about Device Tree passthrough X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0b241606568bb3826bfb817dddc8f1f3141ee5dc Author: Julien Grall AuthorDate: Wed May 13 19:33:42 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:12:09 2015 +0100 docs/misc: arm: Add documentation about Device Tree passthrough Note that the example is done on Midway whose SMMU driver is not supported on Xen upstream. Currently, I don't have other platform where I can test Device Tree passthrough. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- docs/misc/arm/passthrough.txt | 62 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 0 deletions(-) diff --git a/docs/misc/arm/passthrough.txt b/docs/misc/arm/passthrough.txt new file mode 100644 index 0000000..082e9ab --- /dev/null +++ b/docs/misc/arm/passthrough.txt @@ -0,0 +1,62 @@ +Passthrough a device described in the Device Tree to a guest +============================================================ + +The example will use the secondary network card for the midway server. + +1) Mark the device to let Xen know the device will be used for passthrough. +This is done in the device tree node describing the device by adding the +property "xen,passthrough". The command to do it in U-Boot is: + + fdt set /soc/ethernet@fff51000 xen,passthrough + +2) Create a partial device tree describing the device. The IRQ are mapped +1:1 to the guest (i.e VIRQ == IRQ). For MMIO, you will have to find a hole +in the guest memory layout (see xen/include/public/arch-arm.h, note that +the layout is not stable and can change between versions of Xen). + +/dts-v1/; + +/ { + /* #*cells are here to keep DTC happy */ + #address-cells = <2>; + #size-cells = <2>; + + aliases { + net = &mac0; + }; + + passthrough { + compatible = "simple-bus"; + ranges; + #address-cells = <2>; + #size-cells = <2>; + mac0: ethernet@10000000 { + compatible = "calxeda,hb-xgmac"; + reg = <0 0x10000000 0 0x1000>; + interrupts = <0 80 4 0 81 4 0 82 4>; + }; + }; +}; + +Note: + * The interrupt-parent property will be added by the toolstack in the + root node; + * The following properties are mandatory with the /passthrough node: + - compatible: It should always contain "simple-bus" + - ranges + - #address-cells + - #size-cells + * See http://www.devicetree.org/Device_Tree_Usage for more + information about device tree. + +3) Compile the partial guest device with dtc (Device Tree Compiler). +For our purpose, the compiled file will be called guest-midway.dtb and +placed in /root in DOM0. + +3) Add the following options in the guest configuration file: + +device_tree = "/root/guest-midway.dtb" +dtdev = [ "/soc/ethernet@fff51000" ] +irqs = [ 112, 113, 114 ] +iomem = [ "0xfff51,1@0x10000" ] + -- 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 May 28 18:49:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:49: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 1Yy2rm-0005W2-8Q; Thu, 28 May 2015 18:49:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2rl-0005Vk-BO for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:49:17 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 97/30-03219-C2367655; Thu, 28 May 2015 18:49:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1432838955!8242709!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25287 invoked from network); 28 May 2015 18:49:15 -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; 28 May 2015 18:49:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2rj-0003C0-0a for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:49:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2ri-0003M0-RG for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:49:14 +0000 Date: Thu, 28 May 2015 18:49:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libx: Don't export libxl__arch_* to the library X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a74720dc2bcd65327bd0a7b3baf90539d9fcbcdb Author: Julien Grall AuthorDate: Wed May 20 14:01:18 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:12:09 2015 +0100 tools/libx: Don't export libxl__arch_* to the library libxl__arch_* should only be used internally by libxl. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- tools/libxl/libxl_arch.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_arch.h b/tools/libxl/libxl_arch.h index 77b1f2a..d04871c 100644 --- a/tools/libxl/libxl_arch.h +++ b/tools/libxl/libxl_arch.h @@ -16,31 +16,37 @@ #define LIBXL_ARCH_H /* fill the arch specific configuration for the domain */ +_hidden int libxl__arch_domain_prepare_config(libxl__gc *gc, libxl_domain_config *d_config, xc_domain_configuration_t *xc_config); /* arch specific internal domain creation function */ +_hidden int libxl__arch_domain_create(libxl__gc *gc, libxl_domain_config *d_config, uint32_t domid); /* setup arch specific hardware description, i.e. DTB on ARM */ +_hidden int libxl__arch_domain_init_hw_description(libxl__gc *gc, libxl_domain_build_info *info, libxl__domain_build_state *state, struct xc_dom_image *dom); /* finalize arch specific hardware description. */ +_hidden int libxl__arch_domain_finalise_hw_description(libxl__gc *gc, libxl_domain_build_info *info, struct xc_dom_image *dom); /* build vNUMA vmemrange with arch specific information */ +_hidden int libxl__arch_vnuma_build_vmemrange(libxl__gc *gc, uint32_t domid, libxl_domain_build_info *b_info, libxl__domain_build_state *state); /* arch specific irq map function */ +_hidden int libxl__arch_domain_map_irq(libxl__gc *gc, uint32_t domid, int irq); #endif -- 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 May 28 18:49:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:49: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 1Yy2rm-0005W2-8Q; Thu, 28 May 2015 18:49:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2rl-0005Vk-BO for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:49:17 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 97/30-03219-C2367655; Thu, 28 May 2015 18:49:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1432838955!8242709!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25287 invoked from network); 28 May 2015 18:49:15 -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; 28 May 2015 18:49:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2rj-0003C0-0a for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:49:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2ri-0003M0-RG for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:49:14 +0000 Date: Thu, 28 May 2015 18:49:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libx: Don't export libxl__arch_* to the library X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a74720dc2bcd65327bd0a7b3baf90539d9fcbcdb Author: Julien Grall AuthorDate: Wed May 20 14:01:18 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:12:09 2015 +0100 tools/libx: Don't export libxl__arch_* to the library libxl__arch_* should only be used internally by libxl. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- tools/libxl/libxl_arch.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_arch.h b/tools/libxl/libxl_arch.h index 77b1f2a..d04871c 100644 --- a/tools/libxl/libxl_arch.h +++ b/tools/libxl/libxl_arch.h @@ -16,31 +16,37 @@ #define LIBXL_ARCH_H /* fill the arch specific configuration for the domain */ +_hidden int libxl__arch_domain_prepare_config(libxl__gc *gc, libxl_domain_config *d_config, xc_domain_configuration_t *xc_config); /* arch specific internal domain creation function */ +_hidden int libxl__arch_domain_create(libxl__gc *gc, libxl_domain_config *d_config, uint32_t domid); /* setup arch specific hardware description, i.e. DTB on ARM */ +_hidden int libxl__arch_domain_init_hw_description(libxl__gc *gc, libxl_domain_build_info *info, libxl__domain_build_state *state, struct xc_dom_image *dom); /* finalize arch specific hardware description. */ +_hidden int libxl__arch_domain_finalise_hw_description(libxl__gc *gc, libxl_domain_build_info *info, struct xc_dom_image *dom); /* build vNUMA vmemrange with arch specific information */ +_hidden int libxl__arch_vnuma_build_vmemrange(libxl__gc *gc, uint32_t domid, libxl_domain_build_info *b_info, libxl__domain_build_state *state); /* arch specific irq map function */ +_hidden int libxl__arch_domain_map_irq(libxl__gc *gc, uint32_t domid, int irq); #endif -- 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 May 28 18:49:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:49: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 1Yy2rx-0005Xa-Dd; Thu, 28 May 2015 18:49:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2rw-0005XN-8v for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:49:28 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 25/97-03561-73367655; Thu, 28 May 2015 18:49:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1432838965!10181644!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2598 invoked from network); 28 May 2015 18:49:26 -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; 28 May 2015 18:49:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2rt-0003C6-6e for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:49:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2rt-0003MM-4U for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:49:25 +0000 Date: Thu, 28 May 2015 18:49:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: pass environment to device model X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit de214e9f93de57fb5239e958372f314d29d3f7a9 Author: Olaf Hering AuthorDate: Mon Apr 20 13:40:31 2015 +0000 Commit: Ian Campbell CommitDate: Thu May 21 15:12:09 2015 +0100 libxl: pass environment to device model Prepare device-model setup functions to pass also environment variables to the spawned process. This is required for upcoming changes which will set DISPLAY and XAUTHORITY for SDL. Signed-off-by: Olaf Hering Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl_dm.c | 76 ++++++++++++++++++++++++++++++----------------- 1 files changed, 48 insertions(+), 28 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 0c6408d..95660b8 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -122,9 +122,10 @@ static const char *dm_keymap(const libxl_domain_config *guest_config) return NULL; } -static char ** libxl__build_device_model_args_old(libxl__gc *gc, +static int libxl__build_device_model_args_old(libxl__gc *gc, const char *dm, int domid, const libxl_domain_config *guest_config, + char ***args, char ***envs, const libxl__domain_build_state *state) { const libxl_domain_create_info *c_info = &guest_config->c_info; @@ -135,8 +136,9 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, const int num_nics = guest_config->num_nics; const char *keymap = dm_keymap(guest_config); int i; - flexarray_t *dm_args; + flexarray_t *dm_args, *dm_envs; dm_args = flexarray_make(gc, 16, 1); + dm_envs = flexarray_make(gc, 16, 1); flexarray_vappend(dm_args, dm, "-d", libxl__sprintf(gc, "%d", domid), NULL); @@ -161,7 +163,7 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, if (strchr(vnc->listen, ':') != NULL) { if (vnc->display) { LOG(ERROR, "vncdisplay set, vnclisten contains display"); - return NULL; + return ERROR_INVAL; } vncarg = vnc->listen; } else { @@ -207,14 +209,14 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, if (b_info->kernel) { LOG(ERROR, "HVM direct kernel boot is not supported by " "qemu-xen-traditional"); - return NULL; + return ERROR_INVAL; } if (b_info->u.hvm.serial || b_info->u.hvm.serial_list) { if ( b_info->u.hvm.serial && b_info->u.hvm.serial_list ) { LOG(ERROR, "Both serial and serial_list set"); - return NULL; + return ERROR_INVAL; } if (b_info->u.hvm.serial) { flexarray_vappend(dm_args, @@ -264,7 +266,7 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, if ( b_info->u.hvm.usbdevice && b_info->u.hvm.usbdevice_list ) { LOG(ERROR, "Both usbdevice and usbdevice_list set"); - return NULL; + return ERROR_INVAL; } flexarray_append(dm_args, "-usb"); if (b_info->u.hvm.usbdevice) { @@ -355,7 +357,11 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, abort(); } flexarray_append(dm_args, NULL); - return (char **) flexarray_contents(dm_args); + *args = (char **) flexarray_contents(dm_args); + flexarray_append(dm_envs, NULL); + if (envs) + *envs = (char **) flexarray_contents(dm_envs); + return 0; } static const char *qemu_disk_format_string(libxl_disk_format format) @@ -418,9 +424,10 @@ static char *dm_spice_options(libxl__gc *gc, return opt; } -static char ** libxl__build_device_model_args_new(libxl__gc *gc, +static int libxl__build_device_model_args_new(libxl__gc *gc, const char *dm, int guest_domid, const libxl_domain_config *guest_config, + char ***args, char ***envs, const libxl__domain_build_state *state, int *dm_state_fd) { @@ -435,12 +442,13 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, const libxl_sdl_info *sdl = dm_sdl(guest_config); const char *keymap = dm_keymap(guest_config); char *machinearg; - flexarray_t *dm_args; + flexarray_t *dm_args, *dm_envs; int i, connection, devid; uint64_t ram_size; const char *path, *chardev; dm_args = flexarray_make(gc, 16, 1); + dm_envs = flexarray_make(gc, 16, 1); flexarray_vappend(dm_args, dm, "-xen-domid", @@ -481,7 +489,7 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, /* We've forgotten to add the clause */ LOG(ERROR, "%s: unknown channel connection %d", __func__, connection); - return NULL; + return ERROR_INVAL; } flexarray_append(dm_args, "-chardev"); flexarray_append(dm_args, (void*)chardev); @@ -518,7 +526,7 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, if (strchr(vnc->listen, ':') != NULL) { if (vnc->display) { LOG(ERROR, "vncdisplay set, vnclisten contains display"); - return NULL; + return ERROR_INVAL; } vncarg = vnc->listen; } else { @@ -577,7 +585,7 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, if ( b_info->u.hvm.serial && b_info->u.hvm.serial_list ) { LOG(ERROR, "Both serial and serial_list set"); - return NULL; + return ERROR_INVAL; } if (b_info->u.hvm.serial) { flexarray_vappend(dm_args, @@ -602,7 +610,7 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, const libxl_spice_info *spice = &b_info->u.hvm.spice; char *spiceoptions = dm_spice_options(gc, spice); if (!spiceoptions) - return NULL; + return ERROR_INVAL; flexarray_append(dm_args, "-spice"); flexarray_append(dm_args, spiceoptions); @@ -645,7 +653,7 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, if ( b_info->u.hvm.usbdevice && b_info->u.hvm.usbdevice_list ) { LOG(ERROR, "Both usbdevice and usbdevice_list set"); - return NULL; + return ERROR_INVAL; } flexarray_append(dm_args, "-usb"); if (b_info->u.hvm.usbdevice) { @@ -683,7 +691,7 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, default: LOG(ERROR, "usbversion parameter is invalid, " "must be between 1 and 3"); - return NULL; + return ERROR_INVAL; } if (b_info->u.hvm.spice.usbredirection >= 0 && b_info->u.hvm.spice.usbredirection < 5) { @@ -695,7 +703,7 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, } else { LOG(ERROR, "usbredirection parameter is invalid, " "it must be between 1 and 4"); - return NULL; + return ERROR_INVAL; } } if (b_info->u.hvm.soundhw) { @@ -880,12 +888,17 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, } } flexarray_append(dm_args, NULL); - return (char **) flexarray_contents(dm_args); + *args = (char **) flexarray_contents(dm_args); + flexarray_append(dm_envs, NULL); + if (envs) + *envs = (char **) flexarray_contents(dm_envs); + return 0; } -static char ** libxl__build_device_model_args(libxl__gc *gc, +static int libxl__build_device_model_args(libxl__gc *gc, const char *dm, int guest_domid, const libxl_domain_config *guest_config, + char ***args, char ***envs, const libxl__domain_build_state *state, int *dm_state_fd) /* dm_state_fd may be NULL iff caller knows we are using old stubdom @@ -897,17 +910,19 @@ static char ** libxl__build_device_model_args(libxl__gc *gc, case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: return libxl__build_device_model_args_old(gc, dm, guest_domid, guest_config, + args, envs, state); case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: assert(dm_state_fd != NULL); assert(*dm_state_fd < 0); return libxl__build_device_model_args_new(gc, dm, guest_domid, guest_config, + args, envs, state, dm_state_fd); default: LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "unknown device model version %d", guest_config->b_info.device_model_version); - return NULL; + return ERROR_INVAL; } } @@ -1117,9 +1132,10 @@ void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state *sdss) if (ret) goto out; - args = libxl__build_device_model_args(gc, "stubdom-dm", guest_domid, - guest_config, d_state, NULL); - if (!args) { + ret = libxl__build_device_model_args(gc, "stubdom-dm", guest_domid, + guest_config, &args, NULL, + d_state, NULL); + if (ret) { ret = ERROR_FAIL; goto out; } @@ -1401,7 +1417,7 @@ void libxl__spawn_local_dm(libxl__egc *egc, libxl__dm_spawn_state *dmss) char *path; int logfile_w, null; int rc; - char **args, **arg; + char **args, **arg, **envs; xs_transaction_t t; char *vm_path; char **pass_stuff; @@ -1423,12 +1439,11 @@ void libxl__spawn_local_dm(libxl__egc *egc, libxl__dm_spawn_state *dmss) rc = ERROR_FAIL; goto out; } - args = libxl__build_device_model_args(gc, dm, domid, guest_config, state, + rc = libxl__build_device_model_args(gc, dm, domid, guest_config, + &args, &envs, state, &dm_state_fd); - if (!args) { - rc = ERROR_FAIL; + if (rc) goto out; - } if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { path = xs_get_domain_path(ctx->xsh, domid); @@ -1495,6 +1510,11 @@ retry_transaction: LIBXL__LOG(CTX, XTL_DEBUG, "Spawning device-model %s with arguments:", dm); for (arg = args; *arg; arg++) LIBXL__LOG(CTX, XTL_DEBUG, " %s", *arg); + if (*envs) { + LOG(DEBUG, "Spawning device-model %s with additional environment:", dm); + for (arg = envs; *arg; arg += 2) + LOG(DEBUG, " %s=%s", arg[0], arg[1]); + } spawn->what = GCSPRINTF("domain %d device model", domid); spawn->xspath = libxl__device_model_xs_path(gc, LIBXL_TOOLSTACK_DOMID, @@ -1511,7 +1531,7 @@ retry_transaction: goto out_close; if (!rc) { /* inner child */ setsid(); - libxl__exec(gc, null, logfile_w, logfile_w, dm, args, NULL); + libxl__exec(gc, null, logfile_w, logfile_w, dm, args, envs); } rc = 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 May 28 18:49:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:49: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 1Yy2rx-0005Xa-Dd; Thu, 28 May 2015 18:49:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2rw-0005XN-8v for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:49:28 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 25/97-03561-73367655; Thu, 28 May 2015 18:49:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1432838965!10181644!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2598 invoked from network); 28 May 2015 18:49:26 -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; 28 May 2015 18:49:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2rt-0003C6-6e for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:49:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2rt-0003MM-4U for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:49:25 +0000 Date: Thu, 28 May 2015 18:49:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: pass environment to device model X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit de214e9f93de57fb5239e958372f314d29d3f7a9 Author: Olaf Hering AuthorDate: Mon Apr 20 13:40:31 2015 +0000 Commit: Ian Campbell CommitDate: Thu May 21 15:12:09 2015 +0100 libxl: pass environment to device model Prepare device-model setup functions to pass also environment variables to the spawned process. This is required for upcoming changes which will set DISPLAY and XAUTHORITY for SDL. Signed-off-by: Olaf Hering Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl_dm.c | 76 ++++++++++++++++++++++++++++++----------------- 1 files changed, 48 insertions(+), 28 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 0c6408d..95660b8 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -122,9 +122,10 @@ static const char *dm_keymap(const libxl_domain_config *guest_config) return NULL; } -static char ** libxl__build_device_model_args_old(libxl__gc *gc, +static int libxl__build_device_model_args_old(libxl__gc *gc, const char *dm, int domid, const libxl_domain_config *guest_config, + char ***args, char ***envs, const libxl__domain_build_state *state) { const libxl_domain_create_info *c_info = &guest_config->c_info; @@ -135,8 +136,9 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, const int num_nics = guest_config->num_nics; const char *keymap = dm_keymap(guest_config); int i; - flexarray_t *dm_args; + flexarray_t *dm_args, *dm_envs; dm_args = flexarray_make(gc, 16, 1); + dm_envs = flexarray_make(gc, 16, 1); flexarray_vappend(dm_args, dm, "-d", libxl__sprintf(gc, "%d", domid), NULL); @@ -161,7 +163,7 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, if (strchr(vnc->listen, ':') != NULL) { if (vnc->display) { LOG(ERROR, "vncdisplay set, vnclisten contains display"); - return NULL; + return ERROR_INVAL; } vncarg = vnc->listen; } else { @@ -207,14 +209,14 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, if (b_info->kernel) { LOG(ERROR, "HVM direct kernel boot is not supported by " "qemu-xen-traditional"); - return NULL; + return ERROR_INVAL; } if (b_info->u.hvm.serial || b_info->u.hvm.serial_list) { if ( b_info->u.hvm.serial && b_info->u.hvm.serial_list ) { LOG(ERROR, "Both serial and serial_list set"); - return NULL; + return ERROR_INVAL; } if (b_info->u.hvm.serial) { flexarray_vappend(dm_args, @@ -264,7 +266,7 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, if ( b_info->u.hvm.usbdevice && b_info->u.hvm.usbdevice_list ) { LOG(ERROR, "Both usbdevice and usbdevice_list set"); - return NULL; + return ERROR_INVAL; } flexarray_append(dm_args, "-usb"); if (b_info->u.hvm.usbdevice) { @@ -355,7 +357,11 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, abort(); } flexarray_append(dm_args, NULL); - return (char **) flexarray_contents(dm_args); + *args = (char **) flexarray_contents(dm_args); + flexarray_append(dm_envs, NULL); + if (envs) + *envs = (char **) flexarray_contents(dm_envs); + return 0; } static const char *qemu_disk_format_string(libxl_disk_format format) @@ -418,9 +424,10 @@ static char *dm_spice_options(libxl__gc *gc, return opt; } -static char ** libxl__build_device_model_args_new(libxl__gc *gc, +static int libxl__build_device_model_args_new(libxl__gc *gc, const char *dm, int guest_domid, const libxl_domain_config *guest_config, + char ***args, char ***envs, const libxl__domain_build_state *state, int *dm_state_fd) { @@ -435,12 +442,13 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, const libxl_sdl_info *sdl = dm_sdl(guest_config); const char *keymap = dm_keymap(guest_config); char *machinearg; - flexarray_t *dm_args; + flexarray_t *dm_args, *dm_envs; int i, connection, devid; uint64_t ram_size; const char *path, *chardev; dm_args = flexarray_make(gc, 16, 1); + dm_envs = flexarray_make(gc, 16, 1); flexarray_vappend(dm_args, dm, "-xen-domid", @@ -481,7 +489,7 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, /* We've forgotten to add the clause */ LOG(ERROR, "%s: unknown channel connection %d", __func__, connection); - return NULL; + return ERROR_INVAL; } flexarray_append(dm_args, "-chardev"); flexarray_append(dm_args, (void*)chardev); @@ -518,7 +526,7 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, if (strchr(vnc->listen, ':') != NULL) { if (vnc->display) { LOG(ERROR, "vncdisplay set, vnclisten contains display"); - return NULL; + return ERROR_INVAL; } vncarg = vnc->listen; } else { @@ -577,7 +585,7 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, if ( b_info->u.hvm.serial && b_info->u.hvm.serial_list ) { LOG(ERROR, "Both serial and serial_list set"); - return NULL; + return ERROR_INVAL; } if (b_info->u.hvm.serial) { flexarray_vappend(dm_args, @@ -602,7 +610,7 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, const libxl_spice_info *spice = &b_info->u.hvm.spice; char *spiceoptions = dm_spice_options(gc, spice); if (!spiceoptions) - return NULL; + return ERROR_INVAL; flexarray_append(dm_args, "-spice"); flexarray_append(dm_args, spiceoptions); @@ -645,7 +653,7 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, if ( b_info->u.hvm.usbdevice && b_info->u.hvm.usbdevice_list ) { LOG(ERROR, "Both usbdevice and usbdevice_list set"); - return NULL; + return ERROR_INVAL; } flexarray_append(dm_args, "-usb"); if (b_info->u.hvm.usbdevice) { @@ -683,7 +691,7 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, default: LOG(ERROR, "usbversion parameter is invalid, " "must be between 1 and 3"); - return NULL; + return ERROR_INVAL; } if (b_info->u.hvm.spice.usbredirection >= 0 && b_info->u.hvm.spice.usbredirection < 5) { @@ -695,7 +703,7 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, } else { LOG(ERROR, "usbredirection parameter is invalid, " "it must be between 1 and 4"); - return NULL; + return ERROR_INVAL; } } if (b_info->u.hvm.soundhw) { @@ -880,12 +888,17 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, } } flexarray_append(dm_args, NULL); - return (char **) flexarray_contents(dm_args); + *args = (char **) flexarray_contents(dm_args); + flexarray_append(dm_envs, NULL); + if (envs) + *envs = (char **) flexarray_contents(dm_envs); + return 0; } -static char ** libxl__build_device_model_args(libxl__gc *gc, +static int libxl__build_device_model_args(libxl__gc *gc, const char *dm, int guest_domid, const libxl_domain_config *guest_config, + char ***args, char ***envs, const libxl__domain_build_state *state, int *dm_state_fd) /* dm_state_fd may be NULL iff caller knows we are using old stubdom @@ -897,17 +910,19 @@ static char ** libxl__build_device_model_args(libxl__gc *gc, case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: return libxl__build_device_model_args_old(gc, dm, guest_domid, guest_config, + args, envs, state); case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: assert(dm_state_fd != NULL); assert(*dm_state_fd < 0); return libxl__build_device_model_args_new(gc, dm, guest_domid, guest_config, + args, envs, state, dm_state_fd); default: LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "unknown device model version %d", guest_config->b_info.device_model_version); - return NULL; + return ERROR_INVAL; } } @@ -1117,9 +1132,10 @@ void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state *sdss) if (ret) goto out; - args = libxl__build_device_model_args(gc, "stubdom-dm", guest_domid, - guest_config, d_state, NULL); - if (!args) { + ret = libxl__build_device_model_args(gc, "stubdom-dm", guest_domid, + guest_config, &args, NULL, + d_state, NULL); + if (ret) { ret = ERROR_FAIL; goto out; } @@ -1401,7 +1417,7 @@ void libxl__spawn_local_dm(libxl__egc *egc, libxl__dm_spawn_state *dmss) char *path; int logfile_w, null; int rc; - char **args, **arg; + char **args, **arg, **envs; xs_transaction_t t; char *vm_path; char **pass_stuff; @@ -1423,12 +1439,11 @@ void libxl__spawn_local_dm(libxl__egc *egc, libxl__dm_spawn_state *dmss) rc = ERROR_FAIL; goto out; } - args = libxl__build_device_model_args(gc, dm, domid, guest_config, state, + rc = libxl__build_device_model_args(gc, dm, domid, guest_config, + &args, &envs, state, &dm_state_fd); - if (!args) { - rc = ERROR_FAIL; + if (rc) goto out; - } if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { path = xs_get_domain_path(ctx->xsh, domid); @@ -1495,6 +1510,11 @@ retry_transaction: LIBXL__LOG(CTX, XTL_DEBUG, "Spawning device-model %s with arguments:", dm); for (arg = args; *arg; arg++) LIBXL__LOG(CTX, XTL_DEBUG, " %s", *arg); + if (*envs) { + LOG(DEBUG, "Spawning device-model %s with additional environment:", dm); + for (arg = envs; *arg; arg += 2) + LOG(DEBUG, " %s=%s", arg[0], arg[1]); + } spawn->what = GCSPRINTF("domain %d device model", domid); spawn->xspath = libxl__device_model_xs_path(gc, LIBXL_TOOLSTACK_DOMID, @@ -1511,7 +1531,7 @@ retry_transaction: goto out_close; if (!rc) { /* inner child */ setsid(); - libxl__exec(gc, null, logfile_w, logfile_w, dm, args, NULL); + libxl__exec(gc, null, logfile_w, logfile_w, dm, args, envs); } rc = 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 May 28 18:49:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:49: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 1Yy2s8-0005Z9-Gm; Thu, 28 May 2015 18:49:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2s6-0005Yw-P2 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:49:38 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id F3/CB-03026-24367655; Thu, 28 May 2015 18:49:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1432838976!8127436!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6831 invoked from network); 28 May 2015 18:49:37 -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; 28 May 2015 18:49:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2s4-0003CE-9a for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:49:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2s3-0003Mk-B4 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:49:35 +0000 Date: Thu, 28 May 2015 18:49:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: set DISPLAY and XAUTHORITY if sdl is enabled X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 21fb45ddaf9efd066bad87073d2ae459c9bb04bf Author: Olaf Hering AuthorDate: Mon Apr 20 13:40:32 2015 +0000 Commit: Ian Campbell CommitDate: Thu May 21 15:12:10 2015 +0100 libxl: set DISPLAY and XAUTHORITY if sdl is enabled With this change the following domU.cfg will show the VM window on the local dom0 display, instead of the remote side (it via ssh -X login): vnc=0 sdl=1 display=":0" xauthority="/run/gdm/auth-for-olaf-nMXhOi/database" Signed-off-by: Olaf Hering Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Ian Campbell --- docs/man/xl.cfg.pod.5 | 7 ++----- tools/libxl/libxl_dm.c | 10 ++++++++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index a189091..0bbd3c3 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -577,15 +577,12 @@ Simple DirectMedia Layer). The default is to not enable this mode. =item C Specifies the X Window display that should be used when the sdl option -is used. Note: passing this value to the device-model is not currently -implemented, so providing this option will have no effect. +is used. =item C Specifies the path to the X authority file that should be used to -connect to the X server when the sdl option is used. Note: passing -this value to the device-model is not currently implemented, so -providing this option will have no effect. +connect to the X server when the sdl option is used. =item C diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 95660b8..3dd7c04 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -196,7 +196,10 @@ static int libxl__build_device_model_args_old(libxl__gc *gc, if (!libxl_defbool_val(sdl->opengl)) { flexarray_append(dm_args, "-disable-opengl"); } - /* XXX sdl->{display,xauthority} into $DISPLAY/$XAUTHORITY */ + if (sdl->display) + flexarray_append_pair(dm_envs, "DISPLAY", sdl->display); + if (sdl->xauthority) + flexarray_append_pair(dm_envs, "XAUTHORITY", sdl->xauthority); } if (keymap) { flexarray_vappend(dm_args, "-k", keymap, NULL); @@ -562,7 +565,10 @@ static int libxl__build_device_model_args_new(libxl__gc *gc, if (sdl) { flexarray_append(dm_args, "-sdl"); - /* XXX sdl->{display,xauthority} into $DISPLAY/$XAUTHORITY */ + if (sdl->display) + flexarray_append_pair(dm_envs, "DISPLAY", sdl->display); + if (sdl->xauthority) + flexarray_append_pair(dm_envs, "XAUTHORITY", sdl->xauthority); } if (keymap) { -- 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 May 28 18:49:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:49: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 1Yy2s8-0005Z9-Gm; Thu, 28 May 2015 18:49:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2s6-0005Yw-P2 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:49:38 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id F3/CB-03026-24367655; Thu, 28 May 2015 18:49:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1432838976!8127436!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6831 invoked from network); 28 May 2015 18:49:37 -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; 28 May 2015 18:49:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2s4-0003CE-9a for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:49:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2s3-0003Mk-B4 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:49:35 +0000 Date: Thu, 28 May 2015 18:49:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: set DISPLAY and XAUTHORITY if sdl is enabled X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 21fb45ddaf9efd066bad87073d2ae459c9bb04bf Author: Olaf Hering AuthorDate: Mon Apr 20 13:40:32 2015 +0000 Commit: Ian Campbell CommitDate: Thu May 21 15:12:10 2015 +0100 libxl: set DISPLAY and XAUTHORITY if sdl is enabled With this change the following domU.cfg will show the VM window on the local dom0 display, instead of the remote side (it via ssh -X login): vnc=0 sdl=1 display=":0" xauthority="/run/gdm/auth-for-olaf-nMXhOi/database" Signed-off-by: Olaf Hering Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Ian Campbell --- docs/man/xl.cfg.pod.5 | 7 ++----- tools/libxl/libxl_dm.c | 10 ++++++++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index a189091..0bbd3c3 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -577,15 +577,12 @@ Simple DirectMedia Layer). The default is to not enable this mode. =item C Specifies the X Window display that should be used when the sdl option -is used. Note: passing this value to the device-model is not currently -implemented, so providing this option will have no effect. +is used. =item C Specifies the path to the X authority file that should be used to -connect to the X server when the sdl option is used. Note: passing -this value to the device-model is not currently implemented, so -providing this option will have no effect. +connect to the X server when the sdl option is used. =item C diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 95660b8..3dd7c04 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -196,7 +196,10 @@ static int libxl__build_device_model_args_old(libxl__gc *gc, if (!libxl_defbool_val(sdl->opengl)) { flexarray_append(dm_args, "-disable-opengl"); } - /* XXX sdl->{display,xauthority} into $DISPLAY/$XAUTHORITY */ + if (sdl->display) + flexarray_append_pair(dm_envs, "DISPLAY", sdl->display); + if (sdl->xauthority) + flexarray_append_pair(dm_envs, "XAUTHORITY", sdl->xauthority); } if (keymap) { flexarray_vappend(dm_args, "-k", keymap, NULL); @@ -562,7 +565,10 @@ static int libxl__build_device_model_args_new(libxl__gc *gc, if (sdl) { flexarray_append(dm_args, "-sdl"); - /* XXX sdl->{display,xauthority} into $DISPLAY/$XAUTHORITY */ + if (sdl->display) + flexarray_append_pair(dm_envs, "DISPLAY", sdl->display); + if (sdl->xauthority) + flexarray_append_pair(dm_envs, "XAUTHORITY", sdl->xauthority); } if (keymap) { -- 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 May 28 18:49:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:49:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2sI-0005av-L8; Thu, 28 May 2015 18:49:50 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2sG-0005ac-QI for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:49:48 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 81/A7-30151-C4367655; Thu, 28 May 2015 18:49:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1432838986!18322120!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15763 invoked from network); 28 May 2015 18:49:47 -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; 28 May 2015 18:49:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2sE-0003CK-FR for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:49:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2sE-0003No-EE for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:49:46 +0000 Date: Thu, 28 May 2015 18:49:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: gic-v3: Implement correctly the callback send_SGI X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8c1ed6d0c08c8139c42ce0a12121b268ea144a52 Author: Julien Grall AuthorDate: Fri May 8 18:01:12 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:12:10 2015 +0100 xen/arm: gic-v3: Implement correctly the callback send_SGI Currently, the GICv3 driver is only able to send an SGI when the cpumask is provided. Although with the modes SGI_TARGET_OTHERS and SGI_TARGET_SELF, no cpumask is provided. Any usage of those modes will crash the hypersivor. Rename gicv3_send_sgi to gicv3_send_sgi_list and implement the different modes: - SGI_TARGET_OTHERS: Set the Interrupt Routing Mode (bit 40) to 1 (see Table 4 on Section 4.2.6 PRD03-GENC-010745 24.0) - SGI_TARGET_SELF: Unlike GICv2, the GICv3 SGI registers don't provide a specific field. So use gicv3_send_sgi_list and pass the cpumask of the current CPU - SGI_TARGET_LIST: Directly call gicv3_send_sgi_list with the given cpumask Also, use WRITE_SYSREG64 to write into ICC_SGI1R_EL1 the access is 64-bit on all the architectures. Reported-by: Chen Baozi Signed-off-by: Julien Grall Tested-by: Chen Baozi Acked-by: Ian Campbell --- xen/arch/arm/gic-v3.c | 27 ++++++++++++++++++++++++--- xen/include/asm-arm/gic_v3_defs.h | 2 +- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index db498ed..30682cf 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -808,8 +808,7 @@ out: return tlist; } -static void gicv3_send_sgi(enum gic_sgi sgi, enum gic_sgi_mode mode, - const cpumask_t *cpumask) +static void gicv3_send_sgi_list(enum gic_sgi sgi, const cpumask_t *cpumask) { int cpu = 0; uint64_t val; @@ -833,12 +832,34 @@ static void gicv3_send_sgi(enum gic_sgi sgi, enum gic_sgi_mode mode, MPIDR_AFFINITY_LEVEL(cluster_id, 1) << 16 | tlist); - WRITE_SYSREG(val, ICC_SGI1R_EL1); + WRITE_SYSREG64(val, ICC_SGI1R_EL1); } /* Force above writes to ICC_SGI1R_EL1 */ isb(); } +static void gicv3_send_sgi(enum gic_sgi sgi, enum gic_sgi_mode mode, + const cpumask_t *cpumask) +{ + switch ( mode ) + { + case SGI_TARGET_OTHERS: + WRITE_SYSREG64(ICH_SGI_TARGET_OTHERS << ICH_SGI_IRQMODE_SHIFT | + (uint64_t)sgi << ICH_SGI_IRQ_SHIFT, + ICC_SGI1R_EL1); + isb(); + break; + case SGI_TARGET_SELF: + gicv3_send_sgi_list(sgi, cpumask_of(smp_processor_id())); + break; + case SGI_TARGET_LIST: + gicv3_send_sgi_list(sgi, cpumask); + break; + default: + BUG(); + } +} + /* Shut down the per-CPU GIC interface */ static void gicv3_disable_interface(void) { diff --git a/xen/include/asm-arm/gic_v3_defs.h b/xen/include/asm-arm/gic_v3_defs.h index b8a1c2e..556f114 100644 --- a/xen/include/asm-arm/gic_v3_defs.h +++ b/xen/include/asm-arm/gic_v3_defs.h @@ -147,7 +147,7 @@ #define ICH_SGI_IRQMODE_SHIFT 40 #define ICH_SGI_IRQMODE_MASK 0x1 -#define ICH_SGI_TARGET_OTHERS 1 +#define ICH_SGI_TARGET_OTHERS 1UL #define ICH_SGI_TARGET_LIST 0 #define ICH_SGI_IRQ_SHIFT 24 #define ICH_SGI_IRQ_MASK 0xf -- 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 May 28 18:49:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:49:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2sI-0005av-L8; Thu, 28 May 2015 18:49:50 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2sG-0005ac-QI for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:49:48 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 81/A7-30151-C4367655; Thu, 28 May 2015 18:49:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1432838986!18322120!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15763 invoked from network); 28 May 2015 18:49:47 -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; 28 May 2015 18:49:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2sE-0003CK-FR for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:49:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2sE-0003No-EE for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:49:46 +0000 Date: Thu, 28 May 2015 18:49:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: gic-v3: Implement correctly the callback send_SGI X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8c1ed6d0c08c8139c42ce0a12121b268ea144a52 Author: Julien Grall AuthorDate: Fri May 8 18:01:12 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:12:10 2015 +0100 xen/arm: gic-v3: Implement correctly the callback send_SGI Currently, the GICv3 driver is only able to send an SGI when the cpumask is provided. Although with the modes SGI_TARGET_OTHERS and SGI_TARGET_SELF, no cpumask is provided. Any usage of those modes will crash the hypersivor. Rename gicv3_send_sgi to gicv3_send_sgi_list and implement the different modes: - SGI_TARGET_OTHERS: Set the Interrupt Routing Mode (bit 40) to 1 (see Table 4 on Section 4.2.6 PRD03-GENC-010745 24.0) - SGI_TARGET_SELF: Unlike GICv2, the GICv3 SGI registers don't provide a specific field. So use gicv3_send_sgi_list and pass the cpumask of the current CPU - SGI_TARGET_LIST: Directly call gicv3_send_sgi_list with the given cpumask Also, use WRITE_SYSREG64 to write into ICC_SGI1R_EL1 the access is 64-bit on all the architectures. Reported-by: Chen Baozi Signed-off-by: Julien Grall Tested-by: Chen Baozi Acked-by: Ian Campbell --- xen/arch/arm/gic-v3.c | 27 ++++++++++++++++++++++++--- xen/include/asm-arm/gic_v3_defs.h | 2 +- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index db498ed..30682cf 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -808,8 +808,7 @@ out: return tlist; } -static void gicv3_send_sgi(enum gic_sgi sgi, enum gic_sgi_mode mode, - const cpumask_t *cpumask) +static void gicv3_send_sgi_list(enum gic_sgi sgi, const cpumask_t *cpumask) { int cpu = 0; uint64_t val; @@ -833,12 +832,34 @@ static void gicv3_send_sgi(enum gic_sgi sgi, enum gic_sgi_mode mode, MPIDR_AFFINITY_LEVEL(cluster_id, 1) << 16 | tlist); - WRITE_SYSREG(val, ICC_SGI1R_EL1); + WRITE_SYSREG64(val, ICC_SGI1R_EL1); } /* Force above writes to ICC_SGI1R_EL1 */ isb(); } +static void gicv3_send_sgi(enum gic_sgi sgi, enum gic_sgi_mode mode, + const cpumask_t *cpumask) +{ + switch ( mode ) + { + case SGI_TARGET_OTHERS: + WRITE_SYSREG64(ICH_SGI_TARGET_OTHERS << ICH_SGI_IRQMODE_SHIFT | + (uint64_t)sgi << ICH_SGI_IRQ_SHIFT, + ICC_SGI1R_EL1); + isb(); + break; + case SGI_TARGET_SELF: + gicv3_send_sgi_list(sgi, cpumask_of(smp_processor_id())); + break; + case SGI_TARGET_LIST: + gicv3_send_sgi_list(sgi, cpumask); + break; + default: + BUG(); + } +} + /* Shut down the per-CPU GIC interface */ static void gicv3_disable_interface(void) { diff --git a/xen/include/asm-arm/gic_v3_defs.h b/xen/include/asm-arm/gic_v3_defs.h index b8a1c2e..556f114 100644 --- a/xen/include/asm-arm/gic_v3_defs.h +++ b/xen/include/asm-arm/gic_v3_defs.h @@ -147,7 +147,7 @@ #define ICH_SGI_IRQMODE_SHIFT 40 #define ICH_SGI_IRQMODE_MASK 0x1 -#define ICH_SGI_TARGET_OTHERS 1 +#define ICH_SGI_TARGET_OTHERS 1UL #define ICH_SGI_TARGET_LIST 0 #define ICH_SGI_IRQ_SHIFT 24 #define ICH_SGI_IRQ_MASK 0xf -- 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 May 28 18:50:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:50: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 1Yy2sS-0005cm-T0; Thu, 28 May 2015 18:50:00 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2sS-0005ce-6h for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:50:00 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id F7/FE-23832-75367655; Thu, 28 May 2015 18:49:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1432838996!11092923!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12042 invoked from network); 28 May 2015 18:49:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 28 May 2015 18:49:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2sO-0003CT-M9 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:49:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2sO-0003OE-Jt for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:49:56 +0000 Date: Thu, 28 May 2015 18:49:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: replace private SBINDIR with automake sbindir X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8e986e5a61efeca92b9b268e77957d45d8316ee4 Author: Olaf Hering AuthorDate: Mon May 11 15:24:49 2015 +0000 Commit: Ian Campbell CommitDate: Thu May 21 15:12:10 2015 +0100 tools: replace private SBINDIR with automake sbindir Reuse automake variable instead of inventing a private variable. The result of this command: git grep -wnl SBINDIR | xargs sed -i 's@SBINDIR@sbindir@g' Signed-off-by: Olaf Hering Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Cc: Mukesh Rathor Cc: Tim Deegan Cc: Daniel De Graaf Cc: David Scott Acked-by: Ian Campbell --- Config.mk | 2 +- config/Paths.mk.in | 1 - tools/Makefile | 6 +++--- tools/blktap2/control/Makefile | 4 ++-- tools/blktap2/drivers/Makefile | 2 +- tools/blktap2/vhd/Makefile | 2 +- tools/console/Makefile | 4 ++-- tools/debugger/gdbsx/Makefile | 4 ++-- tools/debugger/kdd/Makefile | 4 ++-- tools/flask/utils/Makefile | 4 ++-- tools/hotplug/FreeBSD/rc.d/xencommons.in | 12 ++++++------ tools/hotplug/FreeBSD/vif-bridge | 2 +- tools/hotplug/Linux/init.d/xen-watchdog.in | 2 +- tools/hotplug/Linux/init.d/xencommons.in | 2 +- tools/hotplug/Linux/xen-hotplug-common.sh.in | 2 +- tools/hotplug/Linux/xendomains.in | 2 +- tools/hotplug/NetBSD/block | 2 +- tools/hotplug/NetBSD/rc.d/xen-watchdog | 4 ++-- tools/hotplug/NetBSD/rc.d/xencommons.in | 12 ++++++------ tools/hotplug/NetBSD/rc.d/xendomains | 2 +- tools/hotplug/NetBSD/vif-bridge | 2 +- tools/hotplug/NetBSD/vif-ip | 2 +- tools/libxl/Makefile | 4 ++-- tools/misc/Makefile | 4 ++-- tools/ocaml/xenstored/Makefile | 4 ++-- tools/tests/mce-test/tools/Makefile | 2 +- tools/xenbackendd/Makefile | 4 ++-- tools/xenmon/Makefile | 8 ++++---- tools/xenpmd/Makefile | 4 ++-- tools/xenstat/xentop/Makefile | 4 ++-- tools/xenstore/Makefile | 4 ++-- 31 files changed, 58 insertions(+), 59 deletions(-) diff --git a/Config.mk b/Config.mk index 28b77d6..abb1e44 100644 --- a/Config.mk +++ b/Config.mk @@ -157,7 +157,7 @@ define move-if-changed if ! cmp -s $(1) $(2); then mv -f $(1) $(2); else rm -f $(1); fi endef -BUILD_MAKE_VARS := SBINDIR BINDIR LIBEXEC LIBEXEC_BIN LIBDIR SHAREDIR \ +BUILD_MAKE_VARS := sbindir BINDIR LIBEXEC LIBEXEC_BIN LIBDIR SHAREDIR \ XENFIRMWAREDIR XEN_CONFIG_DIR XEN_SCRIPT_DIR XEN_LOCK_DIR \ XEN_RUN_DIR XEN_PAGING_DIR diff --git a/config/Paths.mk.in b/config/Paths.mk.in index 150bae7..26674b1 100644 --- a/config/Paths.mk.in +++ b/config/Paths.mk.in @@ -31,7 +31,6 @@ sysconfdir := @sysconfdir@ PREFIX := $(prefix) -SBINDIR := $(sbindir) BINDIR := $(bindir) LIBEXEC := $(libexecdir)/$(PACKAGE_TARNAME) LIBEXEC_BIN := @LIBEXEC_BIN@ diff --git a/tools/Makefile b/tools/Makefile index 966354a..77625cb 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -71,7 +71,7 @@ uninstall: rm -f $(D)$(CONFIG_DIR)/udev/rules.d/xen-backend.rules rm -f $(D)$(CONFIG_DIR)/udev/rules.d/xend.rules rm -f $(D)$(SYSCONFIG_DIR)/xendomains - rm -f $(D)$(SBINDIR)/xendomains + rm -f $(D)$(sbindir)/xendomains rm -f $(D)$(SYSCONFIG_DIR)/xencommons rm -rf $(D)/var/lib/xen* rm -rf $(D)$(BINDIR)/cpuperf-perfcntr $(D)$(BINDIR)/cpuperf-xen @@ -93,8 +93,8 @@ uninstall: rm -rf $(D)$(LIBDIR)/libxenstore* $(D)$(LIBDIR)/libxlutil* rm -rf $(D)$(LIBDIR)/python/xen $(D)$(LIBDIR)/python/grub rm -rf $(D)$(LIBEXEC) - rm -rf $(D)$(SBINDIR)/setmask - rm -rf $(D)$(SBINDIR)/xen* $(D)$(SBINDIR)/netfix $(D)$(SBINDIR)/xm + rm -rf $(D)$(sbindir)/setmask + rm -rf $(D)$(sbindir)/xen* $(D)$(sbindir)/netfix $(D)$(sbindir)/xm rm -rf $(D)$(SHAREDIR)/doc/xen rm -rf $(D)$(SHAREDIR)/xen rm -rf $(D)$(SHAREDIR)/qemu-xen diff --git a/tools/blktap2/control/Makefile b/tools/blktap2/control/Makefile index 1ae6902..9ae2e51 100644 --- a/tools/blktap2/control/Makefile +++ b/tools/blktap2/control/Makefile @@ -61,8 +61,8 @@ $(LIB_SHARED): $(CTL_PICS) $(CC) $(LDFLAGS) -fPIC -Wl,$(SONAME_LDFLAG) -Wl,$(LIBSONAME) $(SHLIB_LDFLAGS) -rdynamic $^ -o $@ $(APPEND_LDFLAGS) install: $(IBIN) $(LIB_STATIC) $(LIB_SHARED) - $(INSTALL_DIR) -p $(DESTDIR)$(SBINDIR) - $(INSTALL_PROG) $(IBIN) $(DESTDIR)$(SBINDIR) + $(INSTALL_DIR) -p $(DESTDIR)$(sbindir) + $(INSTALL_PROG) $(IBIN) $(DESTDIR)$(sbindir) $(INSTALL_DATA) $(LIB_STATIC) $(DESTDIR)$(LIBDIR) $(INSTALL_PROG) $(LIB_SHARED) $(DESTDIR)$(LIBDIR) ln -sf $(LIBSONAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME).so diff --git a/tools/blktap2/drivers/Makefile b/tools/blktap2/drivers/Makefile index 2f96c91..5328c40 100644 --- a/tools/blktap2/drivers/Makefile +++ b/tools/blktap2/drivers/Makefile @@ -7,7 +7,7 @@ LIBVHDDIR = $(BLKTAP_ROOT)/vhd/lib IBIN = tapdisk2 td-util tapdisk-client tapdisk-stream tapdisk-diff QCOW_UTIL = img2qcow qcow-create qcow2raw LOCK_UTIL = lock-util -INST_DIR = $(SBINDIR) +INST_DIR = $(sbindir) CFLAGS += -Werror CFLAGS += -Wno-unused diff --git a/tools/blktap2/vhd/Makefile b/tools/blktap2/vhd/Makefile index 9e21cce..fabd665 100644 --- a/tools/blktap2/vhd/Makefile +++ b/tools/blktap2/vhd/Makefile @@ -6,7 +6,7 @@ SUBDIRS-y := SUBDIRS-y += lib IBIN = vhd-util vhd-update -INST_DIR = $(SBINDIR) +INST_DIR = $(sbindir) CFLAGS += -Werror CFLAGS += -Wno-unused diff --git a/tools/console/Makefile b/tools/console/Makefile index 239ec60..71f8088 100644 --- a/tools/console/Makefile +++ b/tools/console/Makefile @@ -33,8 +33,8 @@ xenconsole: $(patsubst %.c,%.o,$(wildcard client/*.c)) .PHONY: install install: $(BIN) - $(INSTALL_DIR) $(DESTDIR)/$(SBINDIR) - $(INSTALL_PROG) xenconsoled $(DESTDIR)/$(SBINDIR) + $(INSTALL_DIR) $(DESTDIR)/$(sbindir) + $(INSTALL_PROG) xenconsoled $(DESTDIR)/$(sbindir) $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_PROG) xenconsole $(DESTDIR)$(LIBEXEC_BIN) diff --git a/tools/debugger/gdbsx/Makefile b/tools/debugger/gdbsx/Makefile index 31eb900..4ed6d76 100644 --- a/tools/debugger/gdbsx/Makefile +++ b/tools/debugger/gdbsx/Makefile @@ -18,8 +18,8 @@ distclean: clean .PHONY: install install: all - [ -d $(DESTDIR)$(SBINDIR) ] || $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) - $(INSTALL_PROG) gdbsx $(DESTDIR)$(SBINDIR)/gdbsx + [ -d $(DESTDIR)$(sbindir) ] || $(INSTALL_DIR) $(DESTDIR)$(sbindir) + $(INSTALL_PROG) gdbsx $(DESTDIR)$(sbindir)/gdbsx gdbsx: gx/gx_all.a xg/xg_all.a $(CC) -o $@ $^ diff --git a/tools/debugger/kdd/Makefile b/tools/debugger/kdd/Makefile index 8eafc82..a79d7cf 100644 --- a/tools/debugger/kdd/Makefile +++ b/tools/debugger/kdd/Makefile @@ -21,5 +21,5 @@ distclean: clean .PHONY: install install: all - [ -d $(DESTDIR)$(SBINDIR) ] || $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) - $(INSTALL_PROG) kdd $(DESTDIR)$(SBINDIR)/kdd + [ -d $(DESTDIR)$(sbindir) ] || $(INSTALL_DIR) $(DESTDIR)$(sbindir) + $(INSTALL_PROG) kdd $(DESTDIR)$(sbindir)/kdd diff --git a/tools/flask/utils/Makefile b/tools/flask/utils/Makefile index 5dfd271..91a53b4 100644 --- a/tools/flask/utils/Makefile +++ b/tools/flask/utils/Makefile @@ -52,7 +52,7 @@ print-end: .PHONY: install install: all - $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) - $(INSTALL_PROG) $(CLIENTS) $(DESTDIR)$(SBINDIR) + $(INSTALL_DIR) $(DESTDIR)$(sbindir) + $(INSTALL_PROG) $(CLIENTS) $(DESTDIR)$(sbindir) -include $(DEPS) diff --git a/tools/hotplug/FreeBSD/rc.d/xencommons.in b/tools/hotplug/FreeBSD/rc.d/xencommons.in index 900990b..3e204d6 100644 --- a/tools/hotplug/FreeBSD/rc.d/xencommons.in +++ b/tools/hotplug/FreeBSD/rc.d/xencommons.in @@ -33,7 +33,7 @@ xen_startcmd() local time=0 local timeout=30 - xenstored_pid=$(check_pidfile ${XENSTORED_PIDFILE} ${SBINDIR}/xenstored) + xenstored_pid=$(check_pidfile ${XENSTORED_PIDFILE} ${sbindir}/xenstored) if test -z "$xenstored_pid"; then printf "Cleaning xenstore database.\n" if [ -z "${XENSTORED_ROOTDIR}" ]; then @@ -45,7 +45,7 @@ xen_startcmd() if [ -n "${XENSTORED_TRACE}" ]; then XENSTORED_ARGS="${XENSTORED_ARGS} -T /var/log/xen/xenstored-trace.log" fi - ${SBINDIR}/xenstored ${XENSTORED_ARGS} + ${sbindir}/xenstored ${XENSTORED_ARGS} while [ $time -lt $timeout ] && ! `${BINDIR}/xenstore-read -s / >/dev/null 2>&1` ; do printf "." time=$(($time+1)) @@ -60,7 +60,7 @@ xen_startcmd() XENCONSOLED_ARGS="${XENCONSOLED_ARGS} --log=${XENCONSOLED_TRACE}" fi - ${SBINDIR}/xenconsoled ${XENCONSOLED_ARGS} + ${sbindir}/xenconsoled ${XENCONSOLED_ARGS} printf "\n" @@ -74,7 +74,7 @@ xen_stop() printf "Stopping xencommons.\n" printf "WARNING: Not stopping xenstored, as it cannot be restarted.\n" - rc_pid=$(check_pidfile ${XENCONSOLED_PIDFILE} ${SBINDIR}/xenconsoled) + rc_pid=$(check_pidfile ${XENCONSOLED_PIDFILE} ${sbindir}/xenconsoled) pids="$pids $rc_pid" kill -${sig_stop:-TERM} $pids @@ -83,12 +83,12 @@ xen_stop() xen_status() { - xenstored_pid=$(check_pidfile ${XENSTORED_PIDFILE} ${SBINDIR}/xenstored) + xenstored_pid=$(check_pidfile ${XENSTORED_PIDFILE} ${sbindir}/xenstored) if test -n ${xenstored_pid}; then pids="$pids $xenstored_pid" fi - xenconsoled_pid=$(check_pidfile ${XENCONSOLED_PIDFILE} ${SBINDIR}/xenconsoled) + xenconsoled_pid=$(check_pidfile ${XENCONSOLED_PIDFILE} ${sbindir}/xenconsoled) if test -n ${xenconsoled_pid}; then pids="$pids $xenconsoled_pid" fi diff --git a/tools/hotplug/FreeBSD/vif-bridge b/tools/hotplug/FreeBSD/vif-bridge index 062b20a..3319710 100644 --- a/tools/hotplug/FreeBSD/vif-bridge +++ b/tools/hotplug/FreeBSD/vif-bridge @@ -13,7 +13,7 @@ DIR=$(dirname "$0") . "${DIR}/hotplugpath.sh" -PATH=${BINDIR}:${SBINDIR}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin +PATH=${BINDIR}:${sbindir}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin export PATH path=$1 diff --git a/tools/hotplug/Linux/init.d/xen-watchdog.in b/tools/hotplug/Linux/init.d/xen-watchdog.in index 32c7268..c05f1f6 100644 --- a/tools/hotplug/Linux/init.d/xen-watchdog.in +++ b/tools/hotplug/Linux/init.d/xen-watchdog.in @@ -19,7 +19,7 @@ . @XEN_SCRIPT_DIR@/hotplugpath.sh -DAEMON=${SBINDIR}/xenwatchdogd +DAEMON=${sbindir}/xenwatchdogd base=$(basename $DAEMON) # Source function library. diff --git a/tools/hotplug/Linux/init.d/xencommons.in b/tools/hotplug/Linux/init.d/xencommons.in index a1095c2..82b3fcb 100644 --- a/tools/hotplug/Linux/init.d/xencommons.in +++ b/tools/hotplug/Linux/init.d/xencommons.in @@ -96,7 +96,7 @@ do_start () { echo Starting xenconsoled... test -z "$XENCONSOLED_TRACE" || XENCONSOLED_ARGS=" --log=$XENCONSOLED_TRACE" - ${SBINDIR}/xenconsoled --pid-file=$XENCONSOLED_PIDFILE $XENCONSOLED_ARGS + ${sbindir}/xenconsoled --pid-file=$XENCONSOLED_PIDFILE $XENCONSOLED_ARGS echo Starting QEMU as disk backend for dom0 test -z "$QEMU_XEN" && QEMU_XEN="${LIBEXEC_BIN}/qemu-system-i386" $QEMU_XEN -xen-domid 0 -xen-attach -name dom0 -nographic -M xenpv -daemonize \ diff --git a/tools/hotplug/Linux/xen-hotplug-common.sh.in b/tools/hotplug/Linux/xen-hotplug-common.sh.in index 1deafe1..f698880 100644 --- a/tools/hotplug/Linux/xen-hotplug-common.sh.in +++ b/tools/hotplug/Linux/xen-hotplug-common.sh.in @@ -30,7 +30,7 @@ dir=$(dirname "$0") exec 2>>/var/log/xen/xen-hotplug.log -export PATH="${BINDIR}:${SBINDIR}:${LIBEXEC_BIN}:/sbin:/bin:/usr/bin:/usr/sbin:$PATH" +export PATH="${BINDIR}:${sbindir}:${LIBEXEC_BIN}:/sbin:/bin:/usr/bin:/usr/sbin:$PATH" export LD_LIBRARY_PATH="${LIBDIR}${LD_LIBRARY_PATH+:}$LD_LIBRARY_PATH" export LANG="POSIX" unset $(set | grep ^LC_ | cut -d= -f1) diff --git a/tools/hotplug/Linux/xendomains.in b/tools/hotplug/Linux/xendomains.in index 2e65ac6..0603842 100644 --- a/tools/hotplug/Linux/xendomains.in +++ b/tools/hotplug/Linux/xendomains.in @@ -29,7 +29,7 @@ . @XEN_SCRIPT_DIR@/hotplugpath.sh -CMD=${SBINDIR}/xl +CMD=${sbindir}/xl HEADCOMP="Xen saved domain" $CMD list &> /dev/null if test $? -ne 0 diff --git a/tools/hotplug/NetBSD/block b/tools/hotplug/NetBSD/block index b2e9af5..3a78ea2 100644 --- a/tools/hotplug/NetBSD/block +++ b/tools/hotplug/NetBSD/block @@ -7,7 +7,7 @@ DIR=$(dirname "$0") . "${DIR}/hotplugpath.sh" -PATH=${BINDIR}:${SBINDIR}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin +PATH=${BINDIR}:${sbindir}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin export PATH error() { diff --git a/tools/hotplug/NetBSD/rc.d/xen-watchdog b/tools/hotplug/NetBSD/rc.d/xen-watchdog index ff4a52c..0941fe7 100644 --- a/tools/hotplug/NetBSD/rc.d/xen-watchdog +++ b/tools/hotplug/NetBSD/rc.d/xen-watchdog @@ -16,8 +16,8 @@ export LD_LIBRARY_PATH name="xenwatchdog" rcvar=$name -command="${SBINDIR}/xenwatchdogd" -start_cmd="echo Starting ${name}. && PATH=${PATH}:${SBINDIR} ${command} 30 15" +command="${sbindir}/xenwatchdogd" +start_cmd="echo Starting ${name}. && PATH=${PATH}:${sbindir} ${command} 30 15" load_rc_config $name run_rc_command "$1" diff --git a/tools/hotplug/NetBSD/rc.d/xencommons.in b/tools/hotplug/NetBSD/rc.d/xencommons.in index db03f22..82c2171 100644 --- a/tools/hotplug/NetBSD/rc.d/xencommons.in +++ b/tools/hotplug/NetBSD/rc.d/xencommons.in @@ -37,7 +37,7 @@ xen_startcmd() local time=0 local timeout=30 - xenstored_pid=$(check_pidfile ${XENSTORED_PIDFILE} ${SBINDIR}/xenstored) + xenstored_pid=$(check_pidfile ${XENSTORED_PIDFILE} ${sbindir}/xenstored) if test -z "$xenstored_pid"; then printf "Cleaning xenstore database.\n" if [ -z "${XENSTORED_ROOTDIR}" ]; then @@ -49,7 +49,7 @@ xen_startcmd() if [ -n "${XENSTORED_TRACE}" ]; then XENSTORED_ARGS="${XENSTORED_ARGS} -T /var/log/xen/xenstored-trace.log" fi - ${SBINDIR}/xenstored ${XENSTORED_ARGS} + ${sbindir}/xenstored ${XENSTORED_ARGS} while [ $time -lt $timeout ] && ! `${BINDIR}/xenstore-read -s / >/dev/null 2>&1` ; do printf "." time=$(($time+1)) @@ -64,7 +64,7 @@ xen_startcmd() XENCONSOLED_ARGS="${XENCONSOLED_ARGS} --log=${XENCONSOLED_TRACE}" fi - ${SBINDIR}/xenconsoled ${XENCONSOLED_ARGS} + ${sbindir}/xenconsoled ${XENCONSOLED_ARGS} printf "\n" @@ -78,7 +78,7 @@ xen_stop() printf "Stopping xencommons.\n" printf "WARNING: Not stopping xenstored, as it cannot be restarted.\n" - rc_pid=$(check_pidfile ${XENCONSOLED_PIDFILE} ${SBINDIR}/xenconsoled) + rc_pid=$(check_pidfile ${XENCONSOLED_PIDFILE} ${sbindir}/xenconsoled) pids="$pids $rc_pid" kill -${sig_stop:-TERM} $pids @@ -87,12 +87,12 @@ xen_stop() xen_status() { - xenstored_pid=$(check_pidfile ${XENSTORED_PIDFILE} ${SBINDIR}/xenstored) + xenstored_pid=$(check_pidfile ${XENSTORED_PIDFILE} ${sbindir}/xenstored) if test -n ${xenstored_pid}; then pids="$pids $xenstored_pid" fi - xenconsoled_pid=$(check_pidfile ${XENCONSOLED_PIDFILE} ${SBINDIR}/xenconsoled) + xenconsoled_pid=$(check_pidfile ${XENCONSOLED_PIDFILE} ${sbindir}/xenconsoled) if test -n ${xenconsoled_pid}; then pids="$pids $xenconsoled_pid" fi diff --git a/tools/hotplug/NetBSD/rc.d/xendomains b/tools/hotplug/NetBSD/rc.d/xendomains index b0e7111..204a8f0 100644 --- a/tools/hotplug/NetBSD/rc.d/xendomains +++ b/tools/hotplug/NetBSD/rc.d/xendomains @@ -34,7 +34,7 @@ LD_LIBRARY_PATH="${LIBDIR}" export LD_LIBRARY_PATH name="xendomains" -ctl_command="${SBINDIR}/xl" +ctl_command="${sbindir}/xl" start_cmd="xendomains_start" stop_cmd="xendomains_stop" list_cmd="xendomains_list" diff --git a/tools/hotplug/NetBSD/vif-bridge b/tools/hotplug/NetBSD/vif-bridge index 960303e..d6a2b16 100644 --- a/tools/hotplug/NetBSD/vif-bridge +++ b/tools/hotplug/NetBSD/vif-bridge @@ -7,7 +7,7 @@ DIR=$(dirname "$0") . "${DIR}/hotplugpath.sh" -PATH=${BINDIR}:${SBINDIR}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin +PATH=${BINDIR}:${sbindir}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin export PATH xpath=$1 diff --git a/tools/hotplug/NetBSD/vif-ip b/tools/hotplug/NetBSD/vif-ip index 28c43de..fd60b7e 100644 --- a/tools/hotplug/NetBSD/vif-ip +++ b/tools/hotplug/NetBSD/vif-ip @@ -7,7 +7,7 @@ DIR=$(dirname "$0") . "${DIR}/hotplugpath.sh" -PATH=${BINDIR}:${SBINDIR}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin +PATH=${BINDIR}:${sbindir}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin export PATH xpath=$1 diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 2afb146..8e5181e 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -256,13 +256,13 @@ $(PKG_CONFIG): % : %.in Makefile .PHONY: install install: all - $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) + $(INSTALL_DIR) $(DESTDIR)$(sbindir) $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DIR) $(DESTDIR)$(BASH_COMPLETION_DIR) $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/pkgconfig - $(INSTALL_PROG) xl $(DESTDIR)$(SBINDIR) + $(INSTALL_PROG) xl $(DESTDIR)$(sbindir) $(INSTALL_PROG) xen-init-dom0 $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_PROG) libxl-save-helper $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_SHLIB) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) diff --git a/tools/misc/Makefile b/tools/misc/Makefile index ccd36af..a3007c2 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -52,10 +52,10 @@ all build: $(TARGETS_BUILD) .PHONY: install install: build $(INSTALL_DIR) $(DESTDIR)$(BINDIR) - $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) + $(INSTALL_DIR) $(DESTDIR)$(sbindir) $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_PYTHON_PROG) $(INSTALL_BIN) $(DESTDIR)$(BINDIR) - $(INSTALL_PYTHON_PROG) $(INSTALL_SBIN) $(DESTDIR)$(SBINDIR) + $(INSTALL_PYTHON_PROG) $(INSTALL_SBIN) $(DESTDIR)$(sbindir) $(INSTALL_PYTHON_PROG) $(INSTALL_PRIVBIN) $(DESTDIR)$(LIBEXEC_BIN) .PHONY: clean diff --git a/tools/ocaml/xenstored/Makefile b/tools/ocaml/xenstored/Makefile index 48f1079..bcf09d4 100644 --- a/tools/ocaml/xenstored/Makefile +++ b/tools/ocaml/xenstored/Makefile @@ -77,8 +77,8 @@ bins: $(PROGRAMS) libs: $(LIBS) install: all - $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) - $(INSTALL_PROG) oxenstored $(DESTDIR)$(SBINDIR) + $(INSTALL_DIR) $(DESTDIR)$(sbindir) + $(INSTALL_PROG) oxenstored $(DESTDIR)$(sbindir) $(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR) $(INSTALL_DATA) oxenstored.conf $(DESTDIR)$(XEN_CONFIG_DIR) diff --git a/tools/tests/mce-test/tools/Makefile b/tools/tests/mce-test/tools/Makefile index 4a0db49..924e4dd 100644 --- a/tools/tests/mce-test/tools/Makefile +++ b/tools/tests/mce-test/tools/Makefile @@ -13,7 +13,7 @@ CFLAGS += $(CFLAGS_xeninclude) all: xen-mceinj install: xen-mceinj - $(INSTALL_PROG) xen-mceinj $(DESTDIR)$(SBINDIR) + $(INSTALL_PROG) xen-mceinj $(DESTDIR)$(sbindir) .PHONY: clean clean: diff --git a/tools/xenbackendd/Makefile b/tools/xenbackendd/Makefile index b6bc160..f52be74 100644 --- a/tools/xenbackendd/Makefile +++ b/tools/xenbackendd/Makefile @@ -25,8 +25,8 @@ build: xenbackendd .PHONY: install install: build - $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) - $(INSTALL_PROG) xenbackendd $(DESTDIR)$(SBINDIR) + $(INSTALL_DIR) $(DESTDIR)$(sbindir) + $(INSTALL_PROG) xenbackendd $(DESTDIR)$(sbindir) .PHONY: clean clean: diff --git a/tools/xenmon/Makefile b/tools/xenmon/Makefile index c206d94..a676d32 100644 --- a/tools/xenmon/Makefile +++ b/tools/xenmon/Makefile @@ -27,10 +27,10 @@ build: xentrace_setmask xenbaked .PHONY: install install: build - $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) - $(INSTALL_PROG) xenbaked $(DESTDIR)$(SBINDIR)/xenbaked - $(INSTALL_PROG) xentrace_setmask $(DESTDIR)$(SBINDIR)/xentrace_setmask - $(INSTALL_PROG) xenmon.py $(DESTDIR)$(SBINDIR)/xenmon.py + $(INSTALL_DIR) $(DESTDIR)$(sbindir) + $(INSTALL_PROG) xenbaked $(DESTDIR)$(sbindir)/xenbaked + $(INSTALL_PROG) xentrace_setmask $(DESTDIR)$(sbindir)/xentrace_setmask + $(INSTALL_PROG) xenmon.py $(DESTDIR)$(sbindir)/xenmon.py $(INSTALL_DIR) $(DESTDIR)$(DOCDIR) $(INSTALL_DATA) README $(DESTDIR)$(DOCDIR)/README.xenmon diff --git a/tools/xenpmd/Makefile b/tools/xenpmd/Makefile index 4605261..55e8fc5 100644 --- a/tools/xenpmd/Makefile +++ b/tools/xenpmd/Makefile @@ -11,8 +11,8 @@ all: xenpmd .PHONY: install install: all - $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) - $(INSTALL_PROG) xenpmd $(DESTDIR)$(SBINDIR) + $(INSTALL_DIR) $(DESTDIR)$(sbindir) + $(INSTALL_PROG) xenpmd $(DESTDIR)$(sbindir) .PHONY: clean clean: diff --git a/tools/xenstat/xentop/Makefile b/tools/xenstat/xentop/Makefile index 5376fdc..2652c9d 100644 --- a/tools/xenstat/xentop/Makefile +++ b/tools/xenstat/xentop/Makefile @@ -31,8 +31,8 @@ all: xentop .PHONY: install install: xentop xentop.1 - $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) - $(INSTALL_PROG) xentop $(DESTDIR)$(SBINDIR)/xentop + $(INSTALL_DIR) $(DESTDIR)$(sbindir) + $(INSTALL_PROG) xentop $(DESTDIR)$(sbindir)/xentop $(INSTALL_DIR) $(DESTDIR)$(MAN1DIR) $(INSTALL_DATA) xentop.1 $(DESTDIR)$(MAN1DIR)/xentop.1 diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index 60c3a08..a4664ec 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -132,9 +132,9 @@ install: all $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xenstore-compat ifeq ($(XENSTORE_XENSTORED),y) - $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) + $(INSTALL_DIR) $(DESTDIR)$(sbindir) $(INSTALL_DIR) $(DESTDIR)$(XEN_LIB_STORED) - $(INSTALL_PROG) xenstored $(DESTDIR)$(SBINDIR) + $(INSTALL_PROG) xenstored $(DESTDIR)$(sbindir) endif $(INSTALL_PROG) xenstore-control $(DESTDIR)$(BINDIR) $(INSTALL_PROG) xenstore $(DESTDIR)$(BINDIR) -- 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 May 28 18:50:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:50: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 1Yy2sS-0005cm-T0; Thu, 28 May 2015 18:50:00 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2sS-0005ce-6h for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:50:00 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id F7/FE-23832-75367655; Thu, 28 May 2015 18:49:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1432838996!11092923!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12042 invoked from network); 28 May 2015 18:49:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 28 May 2015 18:49:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2sO-0003CT-M9 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:49:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2sO-0003OE-Jt for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:49:56 +0000 Date: Thu, 28 May 2015 18:49:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: replace private SBINDIR with automake sbindir X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8e986e5a61efeca92b9b268e77957d45d8316ee4 Author: Olaf Hering AuthorDate: Mon May 11 15:24:49 2015 +0000 Commit: Ian Campbell CommitDate: Thu May 21 15:12:10 2015 +0100 tools: replace private SBINDIR with automake sbindir Reuse automake variable instead of inventing a private variable. The result of this command: git grep -wnl SBINDIR | xargs sed -i 's@SBINDIR@sbindir@g' Signed-off-by: Olaf Hering Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Cc: Mukesh Rathor Cc: Tim Deegan Cc: Daniel De Graaf Cc: David Scott Acked-by: Ian Campbell --- Config.mk | 2 +- config/Paths.mk.in | 1 - tools/Makefile | 6 +++--- tools/blktap2/control/Makefile | 4 ++-- tools/blktap2/drivers/Makefile | 2 +- tools/blktap2/vhd/Makefile | 2 +- tools/console/Makefile | 4 ++-- tools/debugger/gdbsx/Makefile | 4 ++-- tools/debugger/kdd/Makefile | 4 ++-- tools/flask/utils/Makefile | 4 ++-- tools/hotplug/FreeBSD/rc.d/xencommons.in | 12 ++++++------ tools/hotplug/FreeBSD/vif-bridge | 2 +- tools/hotplug/Linux/init.d/xen-watchdog.in | 2 +- tools/hotplug/Linux/init.d/xencommons.in | 2 +- tools/hotplug/Linux/xen-hotplug-common.sh.in | 2 +- tools/hotplug/Linux/xendomains.in | 2 +- tools/hotplug/NetBSD/block | 2 +- tools/hotplug/NetBSD/rc.d/xen-watchdog | 4 ++-- tools/hotplug/NetBSD/rc.d/xencommons.in | 12 ++++++------ tools/hotplug/NetBSD/rc.d/xendomains | 2 +- tools/hotplug/NetBSD/vif-bridge | 2 +- tools/hotplug/NetBSD/vif-ip | 2 +- tools/libxl/Makefile | 4 ++-- tools/misc/Makefile | 4 ++-- tools/ocaml/xenstored/Makefile | 4 ++-- tools/tests/mce-test/tools/Makefile | 2 +- tools/xenbackendd/Makefile | 4 ++-- tools/xenmon/Makefile | 8 ++++---- tools/xenpmd/Makefile | 4 ++-- tools/xenstat/xentop/Makefile | 4 ++-- tools/xenstore/Makefile | 4 ++-- 31 files changed, 58 insertions(+), 59 deletions(-) diff --git a/Config.mk b/Config.mk index 28b77d6..abb1e44 100644 --- a/Config.mk +++ b/Config.mk @@ -157,7 +157,7 @@ define move-if-changed if ! cmp -s $(1) $(2); then mv -f $(1) $(2); else rm -f $(1); fi endef -BUILD_MAKE_VARS := SBINDIR BINDIR LIBEXEC LIBEXEC_BIN LIBDIR SHAREDIR \ +BUILD_MAKE_VARS := sbindir BINDIR LIBEXEC LIBEXEC_BIN LIBDIR SHAREDIR \ XENFIRMWAREDIR XEN_CONFIG_DIR XEN_SCRIPT_DIR XEN_LOCK_DIR \ XEN_RUN_DIR XEN_PAGING_DIR diff --git a/config/Paths.mk.in b/config/Paths.mk.in index 150bae7..26674b1 100644 --- a/config/Paths.mk.in +++ b/config/Paths.mk.in @@ -31,7 +31,6 @@ sysconfdir := @sysconfdir@ PREFIX := $(prefix) -SBINDIR := $(sbindir) BINDIR := $(bindir) LIBEXEC := $(libexecdir)/$(PACKAGE_TARNAME) LIBEXEC_BIN := @LIBEXEC_BIN@ diff --git a/tools/Makefile b/tools/Makefile index 966354a..77625cb 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -71,7 +71,7 @@ uninstall: rm -f $(D)$(CONFIG_DIR)/udev/rules.d/xen-backend.rules rm -f $(D)$(CONFIG_DIR)/udev/rules.d/xend.rules rm -f $(D)$(SYSCONFIG_DIR)/xendomains - rm -f $(D)$(SBINDIR)/xendomains + rm -f $(D)$(sbindir)/xendomains rm -f $(D)$(SYSCONFIG_DIR)/xencommons rm -rf $(D)/var/lib/xen* rm -rf $(D)$(BINDIR)/cpuperf-perfcntr $(D)$(BINDIR)/cpuperf-xen @@ -93,8 +93,8 @@ uninstall: rm -rf $(D)$(LIBDIR)/libxenstore* $(D)$(LIBDIR)/libxlutil* rm -rf $(D)$(LIBDIR)/python/xen $(D)$(LIBDIR)/python/grub rm -rf $(D)$(LIBEXEC) - rm -rf $(D)$(SBINDIR)/setmask - rm -rf $(D)$(SBINDIR)/xen* $(D)$(SBINDIR)/netfix $(D)$(SBINDIR)/xm + rm -rf $(D)$(sbindir)/setmask + rm -rf $(D)$(sbindir)/xen* $(D)$(sbindir)/netfix $(D)$(sbindir)/xm rm -rf $(D)$(SHAREDIR)/doc/xen rm -rf $(D)$(SHAREDIR)/xen rm -rf $(D)$(SHAREDIR)/qemu-xen diff --git a/tools/blktap2/control/Makefile b/tools/blktap2/control/Makefile index 1ae6902..9ae2e51 100644 --- a/tools/blktap2/control/Makefile +++ b/tools/blktap2/control/Makefile @@ -61,8 +61,8 @@ $(LIB_SHARED): $(CTL_PICS) $(CC) $(LDFLAGS) -fPIC -Wl,$(SONAME_LDFLAG) -Wl,$(LIBSONAME) $(SHLIB_LDFLAGS) -rdynamic $^ -o $@ $(APPEND_LDFLAGS) install: $(IBIN) $(LIB_STATIC) $(LIB_SHARED) - $(INSTALL_DIR) -p $(DESTDIR)$(SBINDIR) - $(INSTALL_PROG) $(IBIN) $(DESTDIR)$(SBINDIR) + $(INSTALL_DIR) -p $(DESTDIR)$(sbindir) + $(INSTALL_PROG) $(IBIN) $(DESTDIR)$(sbindir) $(INSTALL_DATA) $(LIB_STATIC) $(DESTDIR)$(LIBDIR) $(INSTALL_PROG) $(LIB_SHARED) $(DESTDIR)$(LIBDIR) ln -sf $(LIBSONAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME).so diff --git a/tools/blktap2/drivers/Makefile b/tools/blktap2/drivers/Makefile index 2f96c91..5328c40 100644 --- a/tools/blktap2/drivers/Makefile +++ b/tools/blktap2/drivers/Makefile @@ -7,7 +7,7 @@ LIBVHDDIR = $(BLKTAP_ROOT)/vhd/lib IBIN = tapdisk2 td-util tapdisk-client tapdisk-stream tapdisk-diff QCOW_UTIL = img2qcow qcow-create qcow2raw LOCK_UTIL = lock-util -INST_DIR = $(SBINDIR) +INST_DIR = $(sbindir) CFLAGS += -Werror CFLAGS += -Wno-unused diff --git a/tools/blktap2/vhd/Makefile b/tools/blktap2/vhd/Makefile index 9e21cce..fabd665 100644 --- a/tools/blktap2/vhd/Makefile +++ b/tools/blktap2/vhd/Makefile @@ -6,7 +6,7 @@ SUBDIRS-y := SUBDIRS-y += lib IBIN = vhd-util vhd-update -INST_DIR = $(SBINDIR) +INST_DIR = $(sbindir) CFLAGS += -Werror CFLAGS += -Wno-unused diff --git a/tools/console/Makefile b/tools/console/Makefile index 239ec60..71f8088 100644 --- a/tools/console/Makefile +++ b/tools/console/Makefile @@ -33,8 +33,8 @@ xenconsole: $(patsubst %.c,%.o,$(wildcard client/*.c)) .PHONY: install install: $(BIN) - $(INSTALL_DIR) $(DESTDIR)/$(SBINDIR) - $(INSTALL_PROG) xenconsoled $(DESTDIR)/$(SBINDIR) + $(INSTALL_DIR) $(DESTDIR)/$(sbindir) + $(INSTALL_PROG) xenconsoled $(DESTDIR)/$(sbindir) $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_PROG) xenconsole $(DESTDIR)$(LIBEXEC_BIN) diff --git a/tools/debugger/gdbsx/Makefile b/tools/debugger/gdbsx/Makefile index 31eb900..4ed6d76 100644 --- a/tools/debugger/gdbsx/Makefile +++ b/tools/debugger/gdbsx/Makefile @@ -18,8 +18,8 @@ distclean: clean .PHONY: install install: all - [ -d $(DESTDIR)$(SBINDIR) ] || $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) - $(INSTALL_PROG) gdbsx $(DESTDIR)$(SBINDIR)/gdbsx + [ -d $(DESTDIR)$(sbindir) ] || $(INSTALL_DIR) $(DESTDIR)$(sbindir) + $(INSTALL_PROG) gdbsx $(DESTDIR)$(sbindir)/gdbsx gdbsx: gx/gx_all.a xg/xg_all.a $(CC) -o $@ $^ diff --git a/tools/debugger/kdd/Makefile b/tools/debugger/kdd/Makefile index 8eafc82..a79d7cf 100644 --- a/tools/debugger/kdd/Makefile +++ b/tools/debugger/kdd/Makefile @@ -21,5 +21,5 @@ distclean: clean .PHONY: install install: all - [ -d $(DESTDIR)$(SBINDIR) ] || $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) - $(INSTALL_PROG) kdd $(DESTDIR)$(SBINDIR)/kdd + [ -d $(DESTDIR)$(sbindir) ] || $(INSTALL_DIR) $(DESTDIR)$(sbindir) + $(INSTALL_PROG) kdd $(DESTDIR)$(sbindir)/kdd diff --git a/tools/flask/utils/Makefile b/tools/flask/utils/Makefile index 5dfd271..91a53b4 100644 --- a/tools/flask/utils/Makefile +++ b/tools/flask/utils/Makefile @@ -52,7 +52,7 @@ print-end: .PHONY: install install: all - $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) - $(INSTALL_PROG) $(CLIENTS) $(DESTDIR)$(SBINDIR) + $(INSTALL_DIR) $(DESTDIR)$(sbindir) + $(INSTALL_PROG) $(CLIENTS) $(DESTDIR)$(sbindir) -include $(DEPS) diff --git a/tools/hotplug/FreeBSD/rc.d/xencommons.in b/tools/hotplug/FreeBSD/rc.d/xencommons.in index 900990b..3e204d6 100644 --- a/tools/hotplug/FreeBSD/rc.d/xencommons.in +++ b/tools/hotplug/FreeBSD/rc.d/xencommons.in @@ -33,7 +33,7 @@ xen_startcmd() local time=0 local timeout=30 - xenstored_pid=$(check_pidfile ${XENSTORED_PIDFILE} ${SBINDIR}/xenstored) + xenstored_pid=$(check_pidfile ${XENSTORED_PIDFILE} ${sbindir}/xenstored) if test -z "$xenstored_pid"; then printf "Cleaning xenstore database.\n" if [ -z "${XENSTORED_ROOTDIR}" ]; then @@ -45,7 +45,7 @@ xen_startcmd() if [ -n "${XENSTORED_TRACE}" ]; then XENSTORED_ARGS="${XENSTORED_ARGS} -T /var/log/xen/xenstored-trace.log" fi - ${SBINDIR}/xenstored ${XENSTORED_ARGS} + ${sbindir}/xenstored ${XENSTORED_ARGS} while [ $time -lt $timeout ] && ! `${BINDIR}/xenstore-read -s / >/dev/null 2>&1` ; do printf "." time=$(($time+1)) @@ -60,7 +60,7 @@ xen_startcmd() XENCONSOLED_ARGS="${XENCONSOLED_ARGS} --log=${XENCONSOLED_TRACE}" fi - ${SBINDIR}/xenconsoled ${XENCONSOLED_ARGS} + ${sbindir}/xenconsoled ${XENCONSOLED_ARGS} printf "\n" @@ -74,7 +74,7 @@ xen_stop() printf "Stopping xencommons.\n" printf "WARNING: Not stopping xenstored, as it cannot be restarted.\n" - rc_pid=$(check_pidfile ${XENCONSOLED_PIDFILE} ${SBINDIR}/xenconsoled) + rc_pid=$(check_pidfile ${XENCONSOLED_PIDFILE} ${sbindir}/xenconsoled) pids="$pids $rc_pid" kill -${sig_stop:-TERM} $pids @@ -83,12 +83,12 @@ xen_stop() xen_status() { - xenstored_pid=$(check_pidfile ${XENSTORED_PIDFILE} ${SBINDIR}/xenstored) + xenstored_pid=$(check_pidfile ${XENSTORED_PIDFILE} ${sbindir}/xenstored) if test -n ${xenstored_pid}; then pids="$pids $xenstored_pid" fi - xenconsoled_pid=$(check_pidfile ${XENCONSOLED_PIDFILE} ${SBINDIR}/xenconsoled) + xenconsoled_pid=$(check_pidfile ${XENCONSOLED_PIDFILE} ${sbindir}/xenconsoled) if test -n ${xenconsoled_pid}; then pids="$pids $xenconsoled_pid" fi diff --git a/tools/hotplug/FreeBSD/vif-bridge b/tools/hotplug/FreeBSD/vif-bridge index 062b20a..3319710 100644 --- a/tools/hotplug/FreeBSD/vif-bridge +++ b/tools/hotplug/FreeBSD/vif-bridge @@ -13,7 +13,7 @@ DIR=$(dirname "$0") . "${DIR}/hotplugpath.sh" -PATH=${BINDIR}:${SBINDIR}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin +PATH=${BINDIR}:${sbindir}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin export PATH path=$1 diff --git a/tools/hotplug/Linux/init.d/xen-watchdog.in b/tools/hotplug/Linux/init.d/xen-watchdog.in index 32c7268..c05f1f6 100644 --- a/tools/hotplug/Linux/init.d/xen-watchdog.in +++ b/tools/hotplug/Linux/init.d/xen-watchdog.in @@ -19,7 +19,7 @@ . @XEN_SCRIPT_DIR@/hotplugpath.sh -DAEMON=${SBINDIR}/xenwatchdogd +DAEMON=${sbindir}/xenwatchdogd base=$(basename $DAEMON) # Source function library. diff --git a/tools/hotplug/Linux/init.d/xencommons.in b/tools/hotplug/Linux/init.d/xencommons.in index a1095c2..82b3fcb 100644 --- a/tools/hotplug/Linux/init.d/xencommons.in +++ b/tools/hotplug/Linux/init.d/xencommons.in @@ -96,7 +96,7 @@ do_start () { echo Starting xenconsoled... test -z "$XENCONSOLED_TRACE" || XENCONSOLED_ARGS=" --log=$XENCONSOLED_TRACE" - ${SBINDIR}/xenconsoled --pid-file=$XENCONSOLED_PIDFILE $XENCONSOLED_ARGS + ${sbindir}/xenconsoled --pid-file=$XENCONSOLED_PIDFILE $XENCONSOLED_ARGS echo Starting QEMU as disk backend for dom0 test -z "$QEMU_XEN" && QEMU_XEN="${LIBEXEC_BIN}/qemu-system-i386" $QEMU_XEN -xen-domid 0 -xen-attach -name dom0 -nographic -M xenpv -daemonize \ diff --git a/tools/hotplug/Linux/xen-hotplug-common.sh.in b/tools/hotplug/Linux/xen-hotplug-common.sh.in index 1deafe1..f698880 100644 --- a/tools/hotplug/Linux/xen-hotplug-common.sh.in +++ b/tools/hotplug/Linux/xen-hotplug-common.sh.in @@ -30,7 +30,7 @@ dir=$(dirname "$0") exec 2>>/var/log/xen/xen-hotplug.log -export PATH="${BINDIR}:${SBINDIR}:${LIBEXEC_BIN}:/sbin:/bin:/usr/bin:/usr/sbin:$PATH" +export PATH="${BINDIR}:${sbindir}:${LIBEXEC_BIN}:/sbin:/bin:/usr/bin:/usr/sbin:$PATH" export LD_LIBRARY_PATH="${LIBDIR}${LD_LIBRARY_PATH+:}$LD_LIBRARY_PATH" export LANG="POSIX" unset $(set | grep ^LC_ | cut -d= -f1) diff --git a/tools/hotplug/Linux/xendomains.in b/tools/hotplug/Linux/xendomains.in index 2e65ac6..0603842 100644 --- a/tools/hotplug/Linux/xendomains.in +++ b/tools/hotplug/Linux/xendomains.in @@ -29,7 +29,7 @@ . @XEN_SCRIPT_DIR@/hotplugpath.sh -CMD=${SBINDIR}/xl +CMD=${sbindir}/xl HEADCOMP="Xen saved domain" $CMD list &> /dev/null if test $? -ne 0 diff --git a/tools/hotplug/NetBSD/block b/tools/hotplug/NetBSD/block index b2e9af5..3a78ea2 100644 --- a/tools/hotplug/NetBSD/block +++ b/tools/hotplug/NetBSD/block @@ -7,7 +7,7 @@ DIR=$(dirname "$0") . "${DIR}/hotplugpath.sh" -PATH=${BINDIR}:${SBINDIR}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin +PATH=${BINDIR}:${sbindir}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin export PATH error() { diff --git a/tools/hotplug/NetBSD/rc.d/xen-watchdog b/tools/hotplug/NetBSD/rc.d/xen-watchdog index ff4a52c..0941fe7 100644 --- a/tools/hotplug/NetBSD/rc.d/xen-watchdog +++ b/tools/hotplug/NetBSD/rc.d/xen-watchdog @@ -16,8 +16,8 @@ export LD_LIBRARY_PATH name="xenwatchdog" rcvar=$name -command="${SBINDIR}/xenwatchdogd" -start_cmd="echo Starting ${name}. && PATH=${PATH}:${SBINDIR} ${command} 30 15" +command="${sbindir}/xenwatchdogd" +start_cmd="echo Starting ${name}. && PATH=${PATH}:${sbindir} ${command} 30 15" load_rc_config $name run_rc_command "$1" diff --git a/tools/hotplug/NetBSD/rc.d/xencommons.in b/tools/hotplug/NetBSD/rc.d/xencommons.in index db03f22..82c2171 100644 --- a/tools/hotplug/NetBSD/rc.d/xencommons.in +++ b/tools/hotplug/NetBSD/rc.d/xencommons.in @@ -37,7 +37,7 @@ xen_startcmd() local time=0 local timeout=30 - xenstored_pid=$(check_pidfile ${XENSTORED_PIDFILE} ${SBINDIR}/xenstored) + xenstored_pid=$(check_pidfile ${XENSTORED_PIDFILE} ${sbindir}/xenstored) if test -z "$xenstored_pid"; then printf "Cleaning xenstore database.\n" if [ -z "${XENSTORED_ROOTDIR}" ]; then @@ -49,7 +49,7 @@ xen_startcmd() if [ -n "${XENSTORED_TRACE}" ]; then XENSTORED_ARGS="${XENSTORED_ARGS} -T /var/log/xen/xenstored-trace.log" fi - ${SBINDIR}/xenstored ${XENSTORED_ARGS} + ${sbindir}/xenstored ${XENSTORED_ARGS} while [ $time -lt $timeout ] && ! `${BINDIR}/xenstore-read -s / >/dev/null 2>&1` ; do printf "." time=$(($time+1)) @@ -64,7 +64,7 @@ xen_startcmd() XENCONSOLED_ARGS="${XENCONSOLED_ARGS} --log=${XENCONSOLED_TRACE}" fi - ${SBINDIR}/xenconsoled ${XENCONSOLED_ARGS} + ${sbindir}/xenconsoled ${XENCONSOLED_ARGS} printf "\n" @@ -78,7 +78,7 @@ xen_stop() printf "Stopping xencommons.\n" printf "WARNING: Not stopping xenstored, as it cannot be restarted.\n" - rc_pid=$(check_pidfile ${XENCONSOLED_PIDFILE} ${SBINDIR}/xenconsoled) + rc_pid=$(check_pidfile ${XENCONSOLED_PIDFILE} ${sbindir}/xenconsoled) pids="$pids $rc_pid" kill -${sig_stop:-TERM} $pids @@ -87,12 +87,12 @@ xen_stop() xen_status() { - xenstored_pid=$(check_pidfile ${XENSTORED_PIDFILE} ${SBINDIR}/xenstored) + xenstored_pid=$(check_pidfile ${XENSTORED_PIDFILE} ${sbindir}/xenstored) if test -n ${xenstored_pid}; then pids="$pids $xenstored_pid" fi - xenconsoled_pid=$(check_pidfile ${XENCONSOLED_PIDFILE} ${SBINDIR}/xenconsoled) + xenconsoled_pid=$(check_pidfile ${XENCONSOLED_PIDFILE} ${sbindir}/xenconsoled) if test -n ${xenconsoled_pid}; then pids="$pids $xenconsoled_pid" fi diff --git a/tools/hotplug/NetBSD/rc.d/xendomains b/tools/hotplug/NetBSD/rc.d/xendomains index b0e7111..204a8f0 100644 --- a/tools/hotplug/NetBSD/rc.d/xendomains +++ b/tools/hotplug/NetBSD/rc.d/xendomains @@ -34,7 +34,7 @@ LD_LIBRARY_PATH="${LIBDIR}" export LD_LIBRARY_PATH name="xendomains" -ctl_command="${SBINDIR}/xl" +ctl_command="${sbindir}/xl" start_cmd="xendomains_start" stop_cmd="xendomains_stop" list_cmd="xendomains_list" diff --git a/tools/hotplug/NetBSD/vif-bridge b/tools/hotplug/NetBSD/vif-bridge index 960303e..d6a2b16 100644 --- a/tools/hotplug/NetBSD/vif-bridge +++ b/tools/hotplug/NetBSD/vif-bridge @@ -7,7 +7,7 @@ DIR=$(dirname "$0") . "${DIR}/hotplugpath.sh" -PATH=${BINDIR}:${SBINDIR}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin +PATH=${BINDIR}:${sbindir}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin export PATH xpath=$1 diff --git a/tools/hotplug/NetBSD/vif-ip b/tools/hotplug/NetBSD/vif-ip index 28c43de..fd60b7e 100644 --- a/tools/hotplug/NetBSD/vif-ip +++ b/tools/hotplug/NetBSD/vif-ip @@ -7,7 +7,7 @@ DIR=$(dirname "$0") . "${DIR}/hotplugpath.sh" -PATH=${BINDIR}:${SBINDIR}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin +PATH=${BINDIR}:${sbindir}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin export PATH xpath=$1 diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 2afb146..8e5181e 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -256,13 +256,13 @@ $(PKG_CONFIG): % : %.in Makefile .PHONY: install install: all - $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) + $(INSTALL_DIR) $(DESTDIR)$(sbindir) $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DIR) $(DESTDIR)$(BASH_COMPLETION_DIR) $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/pkgconfig - $(INSTALL_PROG) xl $(DESTDIR)$(SBINDIR) + $(INSTALL_PROG) xl $(DESTDIR)$(sbindir) $(INSTALL_PROG) xen-init-dom0 $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_PROG) libxl-save-helper $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_SHLIB) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) diff --git a/tools/misc/Makefile b/tools/misc/Makefile index ccd36af..a3007c2 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -52,10 +52,10 @@ all build: $(TARGETS_BUILD) .PHONY: install install: build $(INSTALL_DIR) $(DESTDIR)$(BINDIR) - $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) + $(INSTALL_DIR) $(DESTDIR)$(sbindir) $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_PYTHON_PROG) $(INSTALL_BIN) $(DESTDIR)$(BINDIR) - $(INSTALL_PYTHON_PROG) $(INSTALL_SBIN) $(DESTDIR)$(SBINDIR) + $(INSTALL_PYTHON_PROG) $(INSTALL_SBIN) $(DESTDIR)$(sbindir) $(INSTALL_PYTHON_PROG) $(INSTALL_PRIVBIN) $(DESTDIR)$(LIBEXEC_BIN) .PHONY: clean diff --git a/tools/ocaml/xenstored/Makefile b/tools/ocaml/xenstored/Makefile index 48f1079..bcf09d4 100644 --- a/tools/ocaml/xenstored/Makefile +++ b/tools/ocaml/xenstored/Makefile @@ -77,8 +77,8 @@ bins: $(PROGRAMS) libs: $(LIBS) install: all - $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) - $(INSTALL_PROG) oxenstored $(DESTDIR)$(SBINDIR) + $(INSTALL_DIR) $(DESTDIR)$(sbindir) + $(INSTALL_PROG) oxenstored $(DESTDIR)$(sbindir) $(INSTALL_DIR) $(DESTDIR)$(XEN_CONFIG_DIR) $(INSTALL_DATA) oxenstored.conf $(DESTDIR)$(XEN_CONFIG_DIR) diff --git a/tools/tests/mce-test/tools/Makefile b/tools/tests/mce-test/tools/Makefile index 4a0db49..924e4dd 100644 --- a/tools/tests/mce-test/tools/Makefile +++ b/tools/tests/mce-test/tools/Makefile @@ -13,7 +13,7 @@ CFLAGS += $(CFLAGS_xeninclude) all: xen-mceinj install: xen-mceinj - $(INSTALL_PROG) xen-mceinj $(DESTDIR)$(SBINDIR) + $(INSTALL_PROG) xen-mceinj $(DESTDIR)$(sbindir) .PHONY: clean clean: diff --git a/tools/xenbackendd/Makefile b/tools/xenbackendd/Makefile index b6bc160..f52be74 100644 --- a/tools/xenbackendd/Makefile +++ b/tools/xenbackendd/Makefile @@ -25,8 +25,8 @@ build: xenbackendd .PHONY: install install: build - $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) - $(INSTALL_PROG) xenbackendd $(DESTDIR)$(SBINDIR) + $(INSTALL_DIR) $(DESTDIR)$(sbindir) + $(INSTALL_PROG) xenbackendd $(DESTDIR)$(sbindir) .PHONY: clean clean: diff --git a/tools/xenmon/Makefile b/tools/xenmon/Makefile index c206d94..a676d32 100644 --- a/tools/xenmon/Makefile +++ b/tools/xenmon/Makefile @@ -27,10 +27,10 @@ build: xentrace_setmask xenbaked .PHONY: install install: build - $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) - $(INSTALL_PROG) xenbaked $(DESTDIR)$(SBINDIR)/xenbaked - $(INSTALL_PROG) xentrace_setmask $(DESTDIR)$(SBINDIR)/xentrace_setmask - $(INSTALL_PROG) xenmon.py $(DESTDIR)$(SBINDIR)/xenmon.py + $(INSTALL_DIR) $(DESTDIR)$(sbindir) + $(INSTALL_PROG) xenbaked $(DESTDIR)$(sbindir)/xenbaked + $(INSTALL_PROG) xentrace_setmask $(DESTDIR)$(sbindir)/xentrace_setmask + $(INSTALL_PROG) xenmon.py $(DESTDIR)$(sbindir)/xenmon.py $(INSTALL_DIR) $(DESTDIR)$(DOCDIR) $(INSTALL_DATA) README $(DESTDIR)$(DOCDIR)/README.xenmon diff --git a/tools/xenpmd/Makefile b/tools/xenpmd/Makefile index 4605261..55e8fc5 100644 --- a/tools/xenpmd/Makefile +++ b/tools/xenpmd/Makefile @@ -11,8 +11,8 @@ all: xenpmd .PHONY: install install: all - $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) - $(INSTALL_PROG) xenpmd $(DESTDIR)$(SBINDIR) + $(INSTALL_DIR) $(DESTDIR)$(sbindir) + $(INSTALL_PROG) xenpmd $(DESTDIR)$(sbindir) .PHONY: clean clean: diff --git a/tools/xenstat/xentop/Makefile b/tools/xenstat/xentop/Makefile index 5376fdc..2652c9d 100644 --- a/tools/xenstat/xentop/Makefile +++ b/tools/xenstat/xentop/Makefile @@ -31,8 +31,8 @@ all: xentop .PHONY: install install: xentop xentop.1 - $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) - $(INSTALL_PROG) xentop $(DESTDIR)$(SBINDIR)/xentop + $(INSTALL_DIR) $(DESTDIR)$(sbindir) + $(INSTALL_PROG) xentop $(DESTDIR)$(sbindir)/xentop $(INSTALL_DIR) $(DESTDIR)$(MAN1DIR) $(INSTALL_DATA) xentop.1 $(DESTDIR)$(MAN1DIR)/xentop.1 diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index 60c3a08..a4664ec 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -132,9 +132,9 @@ install: all $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xenstore-compat ifeq ($(XENSTORE_XENSTORED),y) - $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) + $(INSTALL_DIR) $(DESTDIR)$(sbindir) $(INSTALL_DIR) $(DESTDIR)$(XEN_LIB_STORED) - $(INSTALL_PROG) xenstored $(DESTDIR)$(SBINDIR) + $(INSTALL_PROG) xenstored $(DESTDIR)$(sbindir) endif $(INSTALL_PROG) xenstore-control $(DESTDIR)$(BINDIR) $(INSTALL_PROG) xenstore $(DESTDIR)$(BINDIR) -- 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 May 28 18:50:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:50: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 1Yy2sc-0005eK-Vn; Thu, 28 May 2015 18:50:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2sb-0005eA-Mm for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:50:09 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id AF/24-29123-16367655; Thu, 28 May 2015 18:50:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1432839007!18319395!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24468 invoked from network); 28 May 2015 18:50:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 28 May 2015 18:50:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2sY-0003D0-Se for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:50:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2sY-0003PK-QM for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:50:06 +0000 Date: Thu, 28 May 2015 18:50:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: replace private BINDIR with automake bindir X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8db2e4bab2bba48cee76c758251b78043d1c58e4 Author: Olaf Hering AuthorDate: Mon May 11 15:24:50 2015 +0000 Commit: Ian Campbell CommitDate: Thu May 21 15:12:10 2015 +0100 tools: replace private BINDIR with automake bindir Reuse automake variable instead of inventing a private variable. The result of this command: git grep -wnl BINDIR | xargs sed -i 's@BINDIR@bindir@g' Signed-off-by: Olaf Hering Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Cc: George Dunlap Acked-by: Ian Campbell --- Config.mk | 2 +- config/Paths.mk.in | 1 - tools/Makefile | 16 ++++++++-------- tools/hotplug/FreeBSD/rc.d/xencommons.in | 2 +- tools/hotplug/FreeBSD/vif-bridge | 2 +- tools/hotplug/Linux/init.d/xencommons.in | 6 +++--- tools/hotplug/Linux/xen-hotplug-common.sh.in | 2 +- tools/hotplug/NetBSD/block | 2 +- tools/hotplug/NetBSD/rc.d/xencommons.in | 2 +- tools/hotplug/NetBSD/vif-bridge | 2 +- tools/hotplug/NetBSD/vif-ip | 2 +- tools/misc/Makefile | 4 ++-- tools/pygrub/Makefile | 6 +++--- tools/xenstore/Makefile | 14 +++++++------- tools/xentrace/Makefile | 6 +++--- 15 files changed, 34 insertions(+), 35 deletions(-) diff --git a/Config.mk b/Config.mk index abb1e44..1312a80 100644 --- a/Config.mk +++ b/Config.mk @@ -157,7 +157,7 @@ define move-if-changed if ! cmp -s $(1) $(2); then mv -f $(1) $(2); else rm -f $(1); fi endef -BUILD_MAKE_VARS := sbindir BINDIR LIBEXEC LIBEXEC_BIN LIBDIR SHAREDIR \ +BUILD_MAKE_VARS := sbindir bindir LIBEXEC LIBEXEC_BIN LIBDIR SHAREDIR \ XENFIRMWAREDIR XEN_CONFIG_DIR XEN_SCRIPT_DIR XEN_LOCK_DIR \ XEN_RUN_DIR XEN_PAGING_DIR diff --git a/config/Paths.mk.in b/config/Paths.mk.in index 26674b1..1653f26 100644 --- a/config/Paths.mk.in +++ b/config/Paths.mk.in @@ -31,7 +31,6 @@ sysconfdir := @sysconfdir@ PREFIX := $(prefix) -BINDIR := $(bindir) LIBEXEC := $(libexecdir)/$(PACKAGE_TARNAME) LIBEXEC_BIN := @LIBEXEC_BIN@ LIBEXEC_LIB := $(LIBEXEC)/lib diff --git a/tools/Makefile b/tools/Makefile index 77625cb..b05d12a 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -74,14 +74,14 @@ uninstall: rm -f $(D)$(sbindir)/xendomains rm -f $(D)$(SYSCONFIG_DIR)/xencommons rm -rf $(D)/var/lib/xen* - rm -rf $(D)$(BINDIR)/cpuperf-perfcntr $(D)$(BINDIR)/cpuperf-xen - rm -rf $(D)$(BINDIR)/xc_shadow - rm -rf $(D)$(BINDIR)/pygrub - rm -rf $(D)$(BINDIR)/setsize $(D)$(BINDIR)/tbctl - rm -rf $(D)$(BINDIR)/xsls - rm -rf $(D)$(BINDIR)/xenstore* $(D)$(BINDIR)/xentrace* - rm -rf $(D)$(BINDIR)/xen-detect $(D)$(BINDIR)/xencons - rm -rf $(D)$(BINDIR)/xenpvnetboot $(D)$(BINDIR)/qemu-*-xen + rm -rf $(D)$(bindir)/cpuperf-perfcntr $(D)$(bindir)/cpuperf-xen + rm -rf $(D)$(bindir)/xc_shadow + rm -rf $(D)$(bindir)/pygrub + rm -rf $(D)$(bindir)/setsize $(D)$(bindir)/tbctl + rm -rf $(D)$(bindir)/xsls + rm -rf $(D)$(bindir)/xenstore* $(D)$(bindir)/xentrace* + rm -rf $(D)$(bindir)/xen-detect $(D)$(bindir)/xencons + rm -rf $(D)$(bindir)/xenpvnetboot $(D)$(bindir)/qemu-*-xen rm -rf $(D)$(INCLUDEDIR)/xenctrl* $(D)$(INCLUDEDIR)/xenguest.h rm -rf $(D)$(INCLUDEDIR)/xs_lib.h $(D)$(INCLUDEDIR)/xs.h rm -rf $(D)$(INCLUDEDIR)/xenstore-compat/xs_lib.h $(D)$(INCLUDEDIR)/xenstore-compat/xs.h diff --git a/tools/hotplug/FreeBSD/rc.d/xencommons.in b/tools/hotplug/FreeBSD/rc.d/xencommons.in index 3e204d6..0ef9af9 100644 --- a/tools/hotplug/FreeBSD/rc.d/xencommons.in +++ b/tools/hotplug/FreeBSD/rc.d/xencommons.in @@ -46,7 +46,7 @@ xen_startcmd() XENSTORED_ARGS="${XENSTORED_ARGS} -T /var/log/xen/xenstored-trace.log" fi ${sbindir}/xenstored ${XENSTORED_ARGS} - while [ $time -lt $timeout ] && ! `${BINDIR}/xenstore-read -s / >/dev/null 2>&1` ; do + while [ $time -lt $timeout ] && ! `${bindir}/xenstore-read -s / >/dev/null 2>&1` ; do printf "." time=$(($time+1)) sleep 1 diff --git a/tools/hotplug/FreeBSD/vif-bridge b/tools/hotplug/FreeBSD/vif-bridge index 3319710..428c653 100644 --- a/tools/hotplug/FreeBSD/vif-bridge +++ b/tools/hotplug/FreeBSD/vif-bridge @@ -13,7 +13,7 @@ DIR=$(dirname "$0") . "${DIR}/hotplugpath.sh" -PATH=${BINDIR}:${sbindir}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin +PATH=${bindir}:${sbindir}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin export PATH path=$1 diff --git a/tools/hotplug/Linux/init.d/xencommons.in b/tools/hotplug/Linux/init.d/xencommons.in index 82b3fcb..00d0f55 100644 --- a/tools/hotplug/Linux/init.d/xencommons.in +++ b/tools/hotplug/Linux/init.d/xencommons.in @@ -62,7 +62,7 @@ do_start () { mkdir -p ${XEN_RUN_DIR} mkdir -p ${XEN_LOCK_DIR} - if ! `${BINDIR}/xenstore-read -s / >/dev/null 2>&1` + if ! `${bindir}/xenstore-read -s / >/dev/null 2>&1` then test -z "$XENSTORED_ROOTDIR" && XENSTORED_ROOTDIR="@XEN_LIB_STORED@" rm -f "$XENSTORED_ROOTDIR"/tdb* &>/dev/null @@ -77,7 +77,7 @@ do_start () { fi # Wait for xenstored to actually come up, timing out after 30 seconds - while [ $time -lt $timeout ] && ! `${BINDIR}/xenstore-read -s / >/dev/null 2>&1` ; do + while [ $time -lt $timeout ] && ! `${bindir}/xenstore-read -s / >/dev/null 2>&1` ; do echo -n . time=$(($time+1)) sleep 1 @@ -126,7 +126,7 @@ case "$1" in do_start ;; status) - ${BINDIR}/xenstore-read -s / + ${bindir}/xenstore-read -s / ;; stop) do_stop diff --git a/tools/hotplug/Linux/xen-hotplug-common.sh.in b/tools/hotplug/Linux/xen-hotplug-common.sh.in index f698880..eee8845 100644 --- a/tools/hotplug/Linux/xen-hotplug-common.sh.in +++ b/tools/hotplug/Linux/xen-hotplug-common.sh.in @@ -30,7 +30,7 @@ dir=$(dirname "$0") exec 2>>/var/log/xen/xen-hotplug.log -export PATH="${BINDIR}:${sbindir}:${LIBEXEC_BIN}:/sbin:/bin:/usr/bin:/usr/sbin:$PATH" +export PATH="${bindir}:${sbindir}:${LIBEXEC_BIN}:/sbin:/bin:/usr/bin:/usr/sbin:$PATH" export LD_LIBRARY_PATH="${LIBDIR}${LD_LIBRARY_PATH+:}$LD_LIBRARY_PATH" export LANG="POSIX" unset $(set | grep ^LC_ | cut -d= -f1) diff --git a/tools/hotplug/NetBSD/block b/tools/hotplug/NetBSD/block index 3a78ea2..32c20b6 100644 --- a/tools/hotplug/NetBSD/block +++ b/tools/hotplug/NetBSD/block @@ -7,7 +7,7 @@ DIR=$(dirname "$0") . "${DIR}/hotplugpath.sh" -PATH=${BINDIR}:${sbindir}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin +PATH=${bindir}:${sbindir}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin export PATH error() { diff --git a/tools/hotplug/NetBSD/rc.d/xencommons.in b/tools/hotplug/NetBSD/rc.d/xencommons.in index 82c2171..8217ae8 100644 --- a/tools/hotplug/NetBSD/rc.d/xencommons.in +++ b/tools/hotplug/NetBSD/rc.d/xencommons.in @@ -50,7 +50,7 @@ xen_startcmd() XENSTORED_ARGS="${XENSTORED_ARGS} -T /var/log/xen/xenstored-trace.log" fi ${sbindir}/xenstored ${XENSTORED_ARGS} - while [ $time -lt $timeout ] && ! `${BINDIR}/xenstore-read -s / >/dev/null 2>&1` ; do + while [ $time -lt $timeout ] && ! `${bindir}/xenstore-read -s / >/dev/null 2>&1` ; do printf "." time=$(($time+1)) sleep 1 diff --git a/tools/hotplug/NetBSD/vif-bridge b/tools/hotplug/NetBSD/vif-bridge index d6a2b16..b58e922 100644 --- a/tools/hotplug/NetBSD/vif-bridge +++ b/tools/hotplug/NetBSD/vif-bridge @@ -7,7 +7,7 @@ DIR=$(dirname "$0") . "${DIR}/hotplugpath.sh" -PATH=${BINDIR}:${sbindir}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin +PATH=${bindir}:${sbindir}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin export PATH xpath=$1 diff --git a/tools/hotplug/NetBSD/vif-ip b/tools/hotplug/NetBSD/vif-ip index fd60b7e..83cbfe2 100644 --- a/tools/hotplug/NetBSD/vif-ip +++ b/tools/hotplug/NetBSD/vif-ip @@ -7,7 +7,7 @@ DIR=$(dirname "$0") . "${DIR}/hotplugpath.sh" -PATH=${BINDIR}:${sbindir}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin +PATH=${bindir}:${sbindir}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin export PATH xpath=$1 diff --git a/tools/misc/Makefile b/tools/misc/Makefile index a3007c2..3817317 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -51,10 +51,10 @@ all build: $(TARGETS_BUILD) .PHONY: install install: build - $(INSTALL_DIR) $(DESTDIR)$(BINDIR) + $(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_DIR) $(DESTDIR)$(sbindir) $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) - $(INSTALL_PYTHON_PROG) $(INSTALL_BIN) $(DESTDIR)$(BINDIR) + $(INSTALL_PYTHON_PROG) $(INSTALL_BIN) $(DESTDIR)$(bindir) $(INSTALL_PYTHON_PROG) $(INSTALL_SBIN) $(DESTDIR)$(sbindir) $(INSTALL_PYTHON_PROG) $(INSTALL_PRIVBIN) $(DESTDIR)$(LIBEXEC_BIN) diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile index 00e654a..fe8e03b 100644 --- a/tools/pygrub/Makefile +++ b/tools/pygrub/Makefile @@ -15,10 +15,10 @@ install: all CC="$(CC)" CFLAGS="$(PY_CFLAGS)" $(PYTHON) setup.py install \ $(PYTHON_PREFIX_ARG) --root="$(DESTDIR)" \ --install-scripts=$(LIBEXEC_BIN) --force - set -e; if [ $(BINDIR) != $(LIBEXEC_BIN) -a \ - "`readlink -f $(DESTDIR)/$(BINDIR)`" != \ + set -e; if [ $(bindir) != $(LIBEXEC_BIN) -a \ + "`readlink -f $(DESTDIR)/$(bindir)`" != \ "`readlink -f $(LIBEXEC_BIN)`" ]; then \ - ln -sf $(LIBEXEC_BIN)/pygrub $(DESTDIR)/$(BINDIR); \ + ln -sf $(LIBEXEC_BIN)/pygrub $(DESTDIR)/$(bindir); \ fi .PHONY: clean diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index a4664ec..a809d74 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -128,7 +128,7 @@ tarball: clean .PHONY: install install: all - $(INSTALL_DIR) $(DESTDIR)$(BINDIR) + $(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xenstore-compat ifeq ($(XENSTORE_XENSTORED),y) @@ -136,10 +136,10 @@ ifeq ($(XENSTORE_XENSTORED),y) $(INSTALL_DIR) $(DESTDIR)$(XEN_LIB_STORED) $(INSTALL_PROG) xenstored $(DESTDIR)$(sbindir) endif - $(INSTALL_PROG) xenstore-control $(DESTDIR)$(BINDIR) - $(INSTALL_PROG) xenstore $(DESTDIR)$(BINDIR) + $(INSTALL_PROG) xenstore-control $(DESTDIR)$(bindir) + $(INSTALL_PROG) xenstore $(DESTDIR)$(bindir) set -e ; for c in $(CLIENTS) ; do \ - ln -f $(DESTDIR)$(BINDIR)/xenstore $(DESTDIR)$(BINDIR)/$${c} ; \ + ln -f $(DESTDIR)$(bindir)/xenstore $(DESTDIR)$(bindir)/$${c} ; \ done $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) $(INSTALL_SHLIB) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) @@ -155,10 +155,10 @@ endif .PHONY: clients-install clients-install: clients - $(INSTALL_DIR) $(DESTDIR)$(BINDIR) - $(INSTALL_PROG) xenstore $(DESTDIR)$(BINDIR) + $(INSTALL_DIR) $(DESTDIR)$(bindir) + $(INSTALL_PROG) xenstore $(DESTDIR)$(bindir) set -e ; for c in $(CLIENTS) ; do \ - ln -f $(DESTDIR)$(BINDIR)/xenstore $(DESTDIR)$(BINDIR)/$${c} ; \ + ln -f $(DESTDIR)$(bindir)/xenstore $(DESTDIR)$(bindir)/$${c} ; \ done -include $(DEPS) diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile index a64db86..8b80541 100644 --- a/tools/xentrace/Makefile +++ b/tools/xentrace/Makefile @@ -20,12 +20,12 @@ build: $(BIN) $(LIBBIN) .PHONY: install install: build - $(INSTALL_DIR) $(DESTDIR)$(BINDIR) + $(INSTALL_DIR) $(DESTDIR)$(bindir) [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_DIR) $(DESTDIR)$(MAN1DIR) $(INSTALL_DIR) $(DESTDIR)$(MAN8DIR) - $(INSTALL_PROG) $(BIN) $(DESTDIR)$(BINDIR) - $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(BINDIR) + $(INSTALL_PROG) $(BIN) $(DESTDIR)$(bindir) + $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(bindir) [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_DATA) $(MAN1) $(DESTDIR)$(MAN1DIR) $(INSTALL_DATA) $(MAN8) $(DESTDIR)$(MAN8DIR) -- 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 May 28 18:50:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:50: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 1Yy2sc-0005eK-Vn; Thu, 28 May 2015 18:50:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2sb-0005eA-Mm for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:50:09 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id AF/24-29123-16367655; Thu, 28 May 2015 18:50:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1432839007!18319395!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24468 invoked from network); 28 May 2015 18:50:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 28 May 2015 18:50:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2sY-0003D0-Se for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:50:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2sY-0003PK-QM for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:50:06 +0000 Date: Thu, 28 May 2015 18:50:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: replace private BINDIR with automake bindir X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8db2e4bab2bba48cee76c758251b78043d1c58e4 Author: Olaf Hering AuthorDate: Mon May 11 15:24:50 2015 +0000 Commit: Ian Campbell CommitDate: Thu May 21 15:12:10 2015 +0100 tools: replace private BINDIR with automake bindir Reuse automake variable instead of inventing a private variable. The result of this command: git grep -wnl BINDIR | xargs sed -i 's@BINDIR@bindir@g' Signed-off-by: Olaf Hering Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Cc: George Dunlap Acked-by: Ian Campbell --- Config.mk | 2 +- config/Paths.mk.in | 1 - tools/Makefile | 16 ++++++++-------- tools/hotplug/FreeBSD/rc.d/xencommons.in | 2 +- tools/hotplug/FreeBSD/vif-bridge | 2 +- tools/hotplug/Linux/init.d/xencommons.in | 6 +++--- tools/hotplug/Linux/xen-hotplug-common.sh.in | 2 +- tools/hotplug/NetBSD/block | 2 +- tools/hotplug/NetBSD/rc.d/xencommons.in | 2 +- tools/hotplug/NetBSD/vif-bridge | 2 +- tools/hotplug/NetBSD/vif-ip | 2 +- tools/misc/Makefile | 4 ++-- tools/pygrub/Makefile | 6 +++--- tools/xenstore/Makefile | 14 +++++++------- tools/xentrace/Makefile | 6 +++--- 15 files changed, 34 insertions(+), 35 deletions(-) diff --git a/Config.mk b/Config.mk index abb1e44..1312a80 100644 --- a/Config.mk +++ b/Config.mk @@ -157,7 +157,7 @@ define move-if-changed if ! cmp -s $(1) $(2); then mv -f $(1) $(2); else rm -f $(1); fi endef -BUILD_MAKE_VARS := sbindir BINDIR LIBEXEC LIBEXEC_BIN LIBDIR SHAREDIR \ +BUILD_MAKE_VARS := sbindir bindir LIBEXEC LIBEXEC_BIN LIBDIR SHAREDIR \ XENFIRMWAREDIR XEN_CONFIG_DIR XEN_SCRIPT_DIR XEN_LOCK_DIR \ XEN_RUN_DIR XEN_PAGING_DIR diff --git a/config/Paths.mk.in b/config/Paths.mk.in index 26674b1..1653f26 100644 --- a/config/Paths.mk.in +++ b/config/Paths.mk.in @@ -31,7 +31,6 @@ sysconfdir := @sysconfdir@ PREFIX := $(prefix) -BINDIR := $(bindir) LIBEXEC := $(libexecdir)/$(PACKAGE_TARNAME) LIBEXEC_BIN := @LIBEXEC_BIN@ LIBEXEC_LIB := $(LIBEXEC)/lib diff --git a/tools/Makefile b/tools/Makefile index 77625cb..b05d12a 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -74,14 +74,14 @@ uninstall: rm -f $(D)$(sbindir)/xendomains rm -f $(D)$(SYSCONFIG_DIR)/xencommons rm -rf $(D)/var/lib/xen* - rm -rf $(D)$(BINDIR)/cpuperf-perfcntr $(D)$(BINDIR)/cpuperf-xen - rm -rf $(D)$(BINDIR)/xc_shadow - rm -rf $(D)$(BINDIR)/pygrub - rm -rf $(D)$(BINDIR)/setsize $(D)$(BINDIR)/tbctl - rm -rf $(D)$(BINDIR)/xsls - rm -rf $(D)$(BINDIR)/xenstore* $(D)$(BINDIR)/xentrace* - rm -rf $(D)$(BINDIR)/xen-detect $(D)$(BINDIR)/xencons - rm -rf $(D)$(BINDIR)/xenpvnetboot $(D)$(BINDIR)/qemu-*-xen + rm -rf $(D)$(bindir)/cpuperf-perfcntr $(D)$(bindir)/cpuperf-xen + rm -rf $(D)$(bindir)/xc_shadow + rm -rf $(D)$(bindir)/pygrub + rm -rf $(D)$(bindir)/setsize $(D)$(bindir)/tbctl + rm -rf $(D)$(bindir)/xsls + rm -rf $(D)$(bindir)/xenstore* $(D)$(bindir)/xentrace* + rm -rf $(D)$(bindir)/xen-detect $(D)$(bindir)/xencons + rm -rf $(D)$(bindir)/xenpvnetboot $(D)$(bindir)/qemu-*-xen rm -rf $(D)$(INCLUDEDIR)/xenctrl* $(D)$(INCLUDEDIR)/xenguest.h rm -rf $(D)$(INCLUDEDIR)/xs_lib.h $(D)$(INCLUDEDIR)/xs.h rm -rf $(D)$(INCLUDEDIR)/xenstore-compat/xs_lib.h $(D)$(INCLUDEDIR)/xenstore-compat/xs.h diff --git a/tools/hotplug/FreeBSD/rc.d/xencommons.in b/tools/hotplug/FreeBSD/rc.d/xencommons.in index 3e204d6..0ef9af9 100644 --- a/tools/hotplug/FreeBSD/rc.d/xencommons.in +++ b/tools/hotplug/FreeBSD/rc.d/xencommons.in @@ -46,7 +46,7 @@ xen_startcmd() XENSTORED_ARGS="${XENSTORED_ARGS} -T /var/log/xen/xenstored-trace.log" fi ${sbindir}/xenstored ${XENSTORED_ARGS} - while [ $time -lt $timeout ] && ! `${BINDIR}/xenstore-read -s / >/dev/null 2>&1` ; do + while [ $time -lt $timeout ] && ! `${bindir}/xenstore-read -s / >/dev/null 2>&1` ; do printf "." time=$(($time+1)) sleep 1 diff --git a/tools/hotplug/FreeBSD/vif-bridge b/tools/hotplug/FreeBSD/vif-bridge index 3319710..428c653 100644 --- a/tools/hotplug/FreeBSD/vif-bridge +++ b/tools/hotplug/FreeBSD/vif-bridge @@ -13,7 +13,7 @@ DIR=$(dirname "$0") . "${DIR}/hotplugpath.sh" -PATH=${BINDIR}:${sbindir}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin +PATH=${bindir}:${sbindir}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin export PATH path=$1 diff --git a/tools/hotplug/Linux/init.d/xencommons.in b/tools/hotplug/Linux/init.d/xencommons.in index 82b3fcb..00d0f55 100644 --- a/tools/hotplug/Linux/init.d/xencommons.in +++ b/tools/hotplug/Linux/init.d/xencommons.in @@ -62,7 +62,7 @@ do_start () { mkdir -p ${XEN_RUN_DIR} mkdir -p ${XEN_LOCK_DIR} - if ! `${BINDIR}/xenstore-read -s / >/dev/null 2>&1` + if ! `${bindir}/xenstore-read -s / >/dev/null 2>&1` then test -z "$XENSTORED_ROOTDIR" && XENSTORED_ROOTDIR="@XEN_LIB_STORED@" rm -f "$XENSTORED_ROOTDIR"/tdb* &>/dev/null @@ -77,7 +77,7 @@ do_start () { fi # Wait for xenstored to actually come up, timing out after 30 seconds - while [ $time -lt $timeout ] && ! `${BINDIR}/xenstore-read -s / >/dev/null 2>&1` ; do + while [ $time -lt $timeout ] && ! `${bindir}/xenstore-read -s / >/dev/null 2>&1` ; do echo -n . time=$(($time+1)) sleep 1 @@ -126,7 +126,7 @@ case "$1" in do_start ;; status) - ${BINDIR}/xenstore-read -s / + ${bindir}/xenstore-read -s / ;; stop) do_stop diff --git a/tools/hotplug/Linux/xen-hotplug-common.sh.in b/tools/hotplug/Linux/xen-hotplug-common.sh.in index f698880..eee8845 100644 --- a/tools/hotplug/Linux/xen-hotplug-common.sh.in +++ b/tools/hotplug/Linux/xen-hotplug-common.sh.in @@ -30,7 +30,7 @@ dir=$(dirname "$0") exec 2>>/var/log/xen/xen-hotplug.log -export PATH="${BINDIR}:${sbindir}:${LIBEXEC_BIN}:/sbin:/bin:/usr/bin:/usr/sbin:$PATH" +export PATH="${bindir}:${sbindir}:${LIBEXEC_BIN}:/sbin:/bin:/usr/bin:/usr/sbin:$PATH" export LD_LIBRARY_PATH="${LIBDIR}${LD_LIBRARY_PATH+:}$LD_LIBRARY_PATH" export LANG="POSIX" unset $(set | grep ^LC_ | cut -d= -f1) diff --git a/tools/hotplug/NetBSD/block b/tools/hotplug/NetBSD/block index 3a78ea2..32c20b6 100644 --- a/tools/hotplug/NetBSD/block +++ b/tools/hotplug/NetBSD/block @@ -7,7 +7,7 @@ DIR=$(dirname "$0") . "${DIR}/hotplugpath.sh" -PATH=${BINDIR}:${sbindir}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin +PATH=${bindir}:${sbindir}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin export PATH error() { diff --git a/tools/hotplug/NetBSD/rc.d/xencommons.in b/tools/hotplug/NetBSD/rc.d/xencommons.in index 82c2171..8217ae8 100644 --- a/tools/hotplug/NetBSD/rc.d/xencommons.in +++ b/tools/hotplug/NetBSD/rc.d/xencommons.in @@ -50,7 +50,7 @@ xen_startcmd() XENSTORED_ARGS="${XENSTORED_ARGS} -T /var/log/xen/xenstored-trace.log" fi ${sbindir}/xenstored ${XENSTORED_ARGS} - while [ $time -lt $timeout ] && ! `${BINDIR}/xenstore-read -s / >/dev/null 2>&1` ; do + while [ $time -lt $timeout ] && ! `${bindir}/xenstore-read -s / >/dev/null 2>&1` ; do printf "." time=$(($time+1)) sleep 1 diff --git a/tools/hotplug/NetBSD/vif-bridge b/tools/hotplug/NetBSD/vif-bridge index d6a2b16..b58e922 100644 --- a/tools/hotplug/NetBSD/vif-bridge +++ b/tools/hotplug/NetBSD/vif-bridge @@ -7,7 +7,7 @@ DIR=$(dirname "$0") . "${DIR}/hotplugpath.sh" -PATH=${BINDIR}:${sbindir}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin +PATH=${bindir}:${sbindir}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin export PATH xpath=$1 diff --git a/tools/hotplug/NetBSD/vif-ip b/tools/hotplug/NetBSD/vif-ip index fd60b7e..83cbfe2 100644 --- a/tools/hotplug/NetBSD/vif-ip +++ b/tools/hotplug/NetBSD/vif-ip @@ -7,7 +7,7 @@ DIR=$(dirname "$0") . "${DIR}/hotplugpath.sh" -PATH=${BINDIR}:${sbindir}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin +PATH=${bindir}:${sbindir}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin export PATH xpath=$1 diff --git a/tools/misc/Makefile b/tools/misc/Makefile index a3007c2..3817317 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -51,10 +51,10 @@ all build: $(TARGETS_BUILD) .PHONY: install install: build - $(INSTALL_DIR) $(DESTDIR)$(BINDIR) + $(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_DIR) $(DESTDIR)$(sbindir) $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) - $(INSTALL_PYTHON_PROG) $(INSTALL_BIN) $(DESTDIR)$(BINDIR) + $(INSTALL_PYTHON_PROG) $(INSTALL_BIN) $(DESTDIR)$(bindir) $(INSTALL_PYTHON_PROG) $(INSTALL_SBIN) $(DESTDIR)$(sbindir) $(INSTALL_PYTHON_PROG) $(INSTALL_PRIVBIN) $(DESTDIR)$(LIBEXEC_BIN) diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile index 00e654a..fe8e03b 100644 --- a/tools/pygrub/Makefile +++ b/tools/pygrub/Makefile @@ -15,10 +15,10 @@ install: all CC="$(CC)" CFLAGS="$(PY_CFLAGS)" $(PYTHON) setup.py install \ $(PYTHON_PREFIX_ARG) --root="$(DESTDIR)" \ --install-scripts=$(LIBEXEC_BIN) --force - set -e; if [ $(BINDIR) != $(LIBEXEC_BIN) -a \ - "`readlink -f $(DESTDIR)/$(BINDIR)`" != \ + set -e; if [ $(bindir) != $(LIBEXEC_BIN) -a \ + "`readlink -f $(DESTDIR)/$(bindir)`" != \ "`readlink -f $(LIBEXEC_BIN)`" ]; then \ - ln -sf $(LIBEXEC_BIN)/pygrub $(DESTDIR)/$(BINDIR); \ + ln -sf $(LIBEXEC_BIN)/pygrub $(DESTDIR)/$(bindir); \ fi .PHONY: clean diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index a4664ec..a809d74 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -128,7 +128,7 @@ tarball: clean .PHONY: install install: all - $(INSTALL_DIR) $(DESTDIR)$(BINDIR) + $(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xenstore-compat ifeq ($(XENSTORE_XENSTORED),y) @@ -136,10 +136,10 @@ ifeq ($(XENSTORE_XENSTORED),y) $(INSTALL_DIR) $(DESTDIR)$(XEN_LIB_STORED) $(INSTALL_PROG) xenstored $(DESTDIR)$(sbindir) endif - $(INSTALL_PROG) xenstore-control $(DESTDIR)$(BINDIR) - $(INSTALL_PROG) xenstore $(DESTDIR)$(BINDIR) + $(INSTALL_PROG) xenstore-control $(DESTDIR)$(bindir) + $(INSTALL_PROG) xenstore $(DESTDIR)$(bindir) set -e ; for c in $(CLIENTS) ; do \ - ln -f $(DESTDIR)$(BINDIR)/xenstore $(DESTDIR)$(BINDIR)/$${c} ; \ + ln -f $(DESTDIR)$(bindir)/xenstore $(DESTDIR)$(bindir)/$${c} ; \ done $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) $(INSTALL_SHLIB) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) @@ -155,10 +155,10 @@ endif .PHONY: clients-install clients-install: clients - $(INSTALL_DIR) $(DESTDIR)$(BINDIR) - $(INSTALL_PROG) xenstore $(DESTDIR)$(BINDIR) + $(INSTALL_DIR) $(DESTDIR)$(bindir) + $(INSTALL_PROG) xenstore $(DESTDIR)$(bindir) set -e ; for c in $(CLIENTS) ; do \ - ln -f $(DESTDIR)$(BINDIR)/xenstore $(DESTDIR)$(BINDIR)/$${c} ; \ + ln -f $(DESTDIR)$(bindir)/xenstore $(DESTDIR)$(bindir)/$${c} ; \ done -include $(DEPS) diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile index a64db86..8b80541 100644 --- a/tools/xentrace/Makefile +++ b/tools/xentrace/Makefile @@ -20,12 +20,12 @@ build: $(BIN) $(LIBBIN) .PHONY: install install: build - $(INSTALL_DIR) $(DESTDIR)$(BINDIR) + $(INSTALL_DIR) $(DESTDIR)$(bindir) [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_DIR) $(DESTDIR)$(MAN1DIR) $(INSTALL_DIR) $(DESTDIR)$(MAN8DIR) - $(INSTALL_PROG) $(BIN) $(DESTDIR)$(BINDIR) - $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(BINDIR) + $(INSTALL_PROG) $(BIN) $(DESTDIR)$(bindir) + $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(bindir) [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_DATA) $(MAN1) $(DESTDIR)$(MAN1DIR) $(INSTALL_DATA) $(MAN8) $(DESTDIR)$(MAN8DIR) -- 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 May 28 18:50:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:50: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 1Yy2sm-0005hJ-6c; Thu, 28 May 2015 18:50:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2sl-0005gx-Bc for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:50:19 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 26/D0-05057-A6367655; Thu, 28 May 2015 18:50:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1432839017!13557374!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30537 invoked from network); 28 May 2015 18:50:18 -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; 28 May 2015 18:50:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2sj-0003DC-29 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:50:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2sj-0003Pv-0O for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:50:17 +0000 Date: Thu, 28 May 2015 18:50:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: replace private PREFIX with automake prefix X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7f5f57b466b026d19cacfe7fc5771895d05a053b Author: Olaf Hering AuthorDate: Mon May 11 15:24:51 2015 +0000 Commit: Ian Campbell CommitDate: Thu May 21 15:12:10 2015 +0100 tools: replace private PREFIX with automake prefix Reuse automake variable instead of inventing a private variable. Only qemu-traditional expects PREFIX in environment, which is provided by buildmakevars2shellvars. Signed-off-by: Olaf Hering Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Ian Campbell --- Config.mk | 6 +++--- config/Paths.mk.in | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Config.mk b/Config.mk index 1312a80..ec16961 100644 --- a/Config.mk +++ b/Config.mk @@ -75,8 +75,8 @@ EXTRA_LIB += $(EXTRA_PREFIX)/lib endif PYTHON ?= python -PYTHON_PREFIX_ARG ?= --prefix="$(PREFIX)" -# The above requires that PREFIX contains *no spaces*. This variable is here +PYTHON_PREFIX_ARG ?= --prefix="$(prefix)" +# The above requires that prefix contains *no spaces*. This variable is here # to permit the user to set PYTHON_PREFIX_ARG to '' to workaround this bug: # https://bugs.launchpad.net/ubuntu/+bug/362570 @@ -142,7 +142,7 @@ define as-insn-check-closure endef define buildmakevars2shellvars - export PREFIX="$(PREFIX)"; \ + export PREFIX="$(prefix)"; \ export XEN_SCRIPT_DIR="$(XEN_SCRIPT_DIR)"; \ export XEN_ROOT="$(XEN_ROOT)" endef diff --git a/config/Paths.mk.in b/config/Paths.mk.in index 1653f26..bf9bd51 100644 --- a/config/Paths.mk.in +++ b/config/Paths.mk.in @@ -29,8 +29,6 @@ includedir := @includedir@ localstatedir := @localstatedir@ sysconfdir := @sysconfdir@ -PREFIX := $(prefix) - LIBEXEC := $(libexecdir)/$(PACKAGE_TARNAME) LIBEXEC_BIN := @LIBEXEC_BIN@ LIBEXEC_LIB := $(LIBEXEC)/lib -- 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 May 28 18:50:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:50: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 1Yy2sm-0005hJ-6c; Thu, 28 May 2015 18:50:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2sl-0005gx-Bc for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:50:19 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 26/D0-05057-A6367655; Thu, 28 May 2015 18:50:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1432839017!13557374!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30537 invoked from network); 28 May 2015 18:50:18 -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; 28 May 2015 18:50:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2sj-0003DC-29 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:50:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2sj-0003Pv-0O for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:50:17 +0000 Date: Thu, 28 May 2015 18:50:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: replace private PREFIX with automake prefix X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7f5f57b466b026d19cacfe7fc5771895d05a053b Author: Olaf Hering AuthorDate: Mon May 11 15:24:51 2015 +0000 Commit: Ian Campbell CommitDate: Thu May 21 15:12:10 2015 +0100 tools: replace private PREFIX with automake prefix Reuse automake variable instead of inventing a private variable. Only qemu-traditional expects PREFIX in environment, which is provided by buildmakevars2shellvars. Signed-off-by: Olaf Hering Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Ian Campbell --- Config.mk | 6 +++--- config/Paths.mk.in | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Config.mk b/Config.mk index 1312a80..ec16961 100644 --- a/Config.mk +++ b/Config.mk @@ -75,8 +75,8 @@ EXTRA_LIB += $(EXTRA_PREFIX)/lib endif PYTHON ?= python -PYTHON_PREFIX_ARG ?= --prefix="$(PREFIX)" -# The above requires that PREFIX contains *no spaces*. This variable is here +PYTHON_PREFIX_ARG ?= --prefix="$(prefix)" +# The above requires that prefix contains *no spaces*. This variable is here # to permit the user to set PYTHON_PREFIX_ARG to '' to workaround this bug: # https://bugs.launchpad.net/ubuntu/+bug/362570 @@ -142,7 +142,7 @@ define as-insn-check-closure endef define buildmakevars2shellvars - export PREFIX="$(PREFIX)"; \ + export PREFIX="$(prefix)"; \ export XEN_SCRIPT_DIR="$(XEN_SCRIPT_DIR)"; \ export XEN_ROOT="$(XEN_ROOT)" endef diff --git a/config/Paths.mk.in b/config/Paths.mk.in index 1653f26..bf9bd51 100644 --- a/config/Paths.mk.in +++ b/config/Paths.mk.in @@ -29,8 +29,6 @@ includedir := @includedir@ localstatedir := @localstatedir@ sysconfdir := @sysconfdir@ -PREFIX := $(prefix) - LIBEXEC := $(libexecdir)/$(PACKAGE_TARNAME) LIBEXEC_BIN := @LIBEXEC_BIN@ LIBEXEC_LIB := $(LIBEXEC)/lib -- 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 May 28 18:50:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:50: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 1Yy2sx-0005jI-9X; Thu, 28 May 2015 18:50:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2sw-0005j6-DH for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:50:30 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id AF/D2-01469-57367655; Thu, 28 May 2015 18:50:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1432839027!18249376!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8042 invoked from network); 28 May 2015 18:50: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; 28 May 2015 18:50:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2st-0003DI-7t for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:50:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2st-0003QP-6E for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:50:27 +0000 Date: Thu, 28 May 2015 18:50:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: replace private INCLUDEDIR with automake includedir X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e3dcb16398e19ba965a2a4e7051ea1812be302fe Author: Olaf Hering AuthorDate: Mon May 11 15:24:52 2015 +0000 Commit: Ian Campbell CommitDate: Thu May 21 15:12:10 2015 +0100 tools: replace private INCLUDEDIR with automake includedir Reuse automake variable instead of inventing a private variable. The result of this command: git grep -wnl INCLUDEDIR | xargs sed -i 's@INCLUDEDIR@includedir@g' Signed-off-by: Olaf Hering Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Ian Campbell --- config/Paths.mk.in | 1 - tools/Makefile | 14 ++++++------ tools/blktap2/include/Makefile | 2 +- tools/include/Makefile | 40 ++++++++++++++++++------------------ tools/libfsimage/common/Makefile | 8 +++--- tools/libvchan/Makefile | 4 +- tools/libxc/Makefile | 6 ++-- tools/libxl/Makefile | 4 +- tools/xenstat/libxenstat/Makefile | 2 +- tools/xenstore/Makefile | 16 +++++++------- 10 files changed, 48 insertions(+), 49 deletions(-) diff --git a/config/Paths.mk.in b/config/Paths.mk.in index bf9bd51..32f7c78 100644 --- a/config/Paths.mk.in +++ b/config/Paths.mk.in @@ -34,7 +34,6 @@ LIBEXEC_BIN := @LIBEXEC_BIN@ LIBEXEC_LIB := $(LIBEXEC)/lib LIBEXEC_INC := $(LIBEXEC)/include -INCLUDEDIR := $(includedir) SHAREDIR := @SHAREDIR@ MANDIR := $(mandir) MAN1DIR := $(MANDIR)/man1 diff --git a/tools/Makefile b/tools/Makefile index b05d12a..1e0c0a7 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -82,13 +82,13 @@ uninstall: rm -rf $(D)$(bindir)/xenstore* $(D)$(bindir)/xentrace* rm -rf $(D)$(bindir)/xen-detect $(D)$(bindir)/xencons rm -rf $(D)$(bindir)/xenpvnetboot $(D)$(bindir)/qemu-*-xen - rm -rf $(D)$(INCLUDEDIR)/xenctrl* $(D)$(INCLUDEDIR)/xenguest.h - rm -rf $(D)$(INCLUDEDIR)/xs_lib.h $(D)$(INCLUDEDIR)/xs.h - rm -rf $(D)$(INCLUDEDIR)/xenstore-compat/xs_lib.h $(D)$(INCLUDEDIR)/xenstore-compat/xs.h - rm -rf $(D)$(INCLUDEDIR)/xenstore_lib.h $(D)$(INCLUDEDIR)/xenstore.h - rm -rf $(D)$(INCLUDEDIR)/xen - rm -rf $(D)$(INCLUDEDIR)/_libxl* $(D)$(INCLUDEDIR)/libxl* - rm -rf $(D)$(INCLUDEDIR)/xenstat.h $(D)$(INCLUDEDIR)/xentoollog.h + rm -rf $(D)$(includedir)/xenctrl* $(D)$(includedir)/xenguest.h + rm -rf $(D)$(includedir)/xs_lib.h $(D)$(includedir)/xs.h + rm -rf $(D)$(includedir)/xenstore-compat/xs_lib.h $(D)$(includedir)/xenstore-compat/xs.h + rm -rf $(D)$(includedir)/xenstore_lib.h $(D)$(includedir)/xenstore.h + rm -rf $(D)$(includedir)/xen + rm -rf $(D)$(includedir)/_libxl* $(D)$(includedir)/libxl* + rm -rf $(D)$(includedir)/xenstat.h $(D)$(includedir)/xentoollog.h rm -rf $(D)$(LIBDIR)/libxenctrl* $(D)$(LIBDIR)/libxenguest* rm -rf $(D)$(LIBDIR)/libxenstore* $(D)$(LIBDIR)/libxlutil* rm -rf $(D)$(LIBDIR)/python/xen $(D)$(LIBDIR)/python/grub diff --git a/tools/blktap2/include/Makefile b/tools/blktap2/include/Makefile index c238486..66e8a1e 100644 --- a/tools/blktap2/include/Makefile +++ b/tools/blktap2/include/Makefile @@ -6,7 +6,7 @@ all: .PHONY: install install: - $(INSTALL_DIR) -p $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_DIR) -p $(DESTDIR)$(includedir) .PHONY: clean diff --git a/tools/include/Makefile b/tools/include/Makefile index 601f79c..3cd157a 100644 --- a/tools/include/Makefile +++ b/tools/include/Makefile @@ -21,29 +21,29 @@ xen/.dir: .PHONY: install install: all - $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/arch-x86 - $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/arch-x86/hvm - $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/arch-arm - $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/arch-arm/hvm - $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/foreign - $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/hvm - $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/io - $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/sys - $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/xsm - $(INSTALL_DATA) xen/COPYING $(DESTDIR)$(INCLUDEDIR)/xen - $(INSTALL_DATA) xen/*.h $(DESTDIR)$(INCLUDEDIR)/xen - $(INSTALL_DATA) xen/arch-x86/*.h $(DESTDIR)$(INCLUDEDIR)/xen/arch-x86 - $(INSTALL_DATA) xen/arch-x86/hvm/*.h $(DESTDIR)$(INCLUDEDIR)/xen/arch-x86/hvm + $(INSTALL_DIR) $(DESTDIR)$(includedir)/xen/arch-x86 + $(INSTALL_DIR) $(DESTDIR)$(includedir)/xen/arch-x86/hvm + $(INSTALL_DIR) $(DESTDIR)$(includedir)/xen/arch-arm + $(INSTALL_DIR) $(DESTDIR)$(includedir)/xen/arch-arm/hvm + $(INSTALL_DIR) $(DESTDIR)$(includedir)/xen/foreign + $(INSTALL_DIR) $(DESTDIR)$(includedir)/xen/hvm + $(INSTALL_DIR) $(DESTDIR)$(includedir)/xen/io + $(INSTALL_DIR) $(DESTDIR)$(includedir)/xen/sys + $(INSTALL_DIR) $(DESTDIR)$(includedir)/xen/xsm + $(INSTALL_DATA) xen/COPYING $(DESTDIR)$(includedir)/xen + $(INSTALL_DATA) xen/*.h $(DESTDIR)$(includedir)/xen + $(INSTALL_DATA) xen/arch-x86/*.h $(DESTDIR)$(includedir)/xen/arch-x86 + $(INSTALL_DATA) xen/arch-x86/hvm/*.h $(DESTDIR)$(includedir)/xen/arch-x86/hvm # xen/arch-arm doesn't contains headers for now. Uncommented the line # as soon as a new header is added -# $(INSTALL_DATA) xen/arch-arm/*.h $(DESTDIR)$(INCLUDEDIR)/xen/arch-arm - $(INSTALL_DATA) xen/arch-arm/hvm/*.h $(DESTDIR)$(INCLUDEDIR)/xen/arch-arm/hvm - $(INSTALL_DATA) xen/foreign/*.h $(DESTDIR)$(INCLUDEDIR)/xen/foreign - $(INSTALL_DATA) xen/hvm/*.h $(DESTDIR)$(INCLUDEDIR)/xen/hvm - $(INSTALL_DATA) xen/io/*.h $(DESTDIR)$(INCLUDEDIR)/xen/io - $(INSTALL_DATA) xen/sys/*.h $(DESTDIR)$(INCLUDEDIR)/xen/sys - $(INSTALL_DATA) xen/xsm/*.h $(DESTDIR)$(INCLUDEDIR)/xen/xsm +# $(INSTALL_DATA) xen/arch-arm/*.h $(DESTDIR)$(includedir)/xen/arch-arm + $(INSTALL_DATA) xen/arch-arm/hvm/*.h $(DESTDIR)$(includedir)/xen/arch-arm/hvm + $(INSTALL_DATA) xen/foreign/*.h $(DESTDIR)$(includedir)/xen/foreign + $(INSTALL_DATA) xen/hvm/*.h $(DESTDIR)$(includedir)/xen/hvm + $(INSTALL_DATA) xen/io/*.h $(DESTDIR)$(includedir)/xen/io + $(INSTALL_DATA) xen/sys/*.h $(DESTDIR)$(includedir)/xen/sys + $(INSTALL_DATA) xen/xsm/*.h $(DESTDIR)$(includedir)/xen/xsm .PHONY: clean clean: diff --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Makefile index fb306f4..a70219f 100644 --- a/tools/libfsimage/common/Makefile +++ b/tools/libfsimage/common/Makefile @@ -23,13 +23,13 @@ all: $(LIB) .PHONY: install install: all $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) - $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_DIR) $(DESTDIR)$(includedir) $(INSTALL_PROG) libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) ln -sf libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libfsimage.so.$(MAJOR) ln -sf libfsimage.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libfsimage.so - $(INSTALL_DATA) fsimage.h $(DESTDIR)$(INCLUDEDIR) - $(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)$(INCLUDEDIR) - $(INSTALL_DATA) fsimage_grub.h $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_DATA) fsimage.h $(DESTDIR)$(includedir) + $(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)$(includedir) + $(INSTALL_DATA) fsimage_grub.h $(DESTDIR)$(includedir) clean distclean:: rm -f $(LIB) diff --git a/tools/libvchan/Makefile b/tools/libvchan/Makefile index d768df4..3ce7c10 100644 --- a/tools/libvchan/Makefile +++ b/tools/libvchan/Makefile @@ -43,11 +43,11 @@ vchan-node2: $(NODE2_OBJS) libxenvchan.so .PHONY: install install: all $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) - $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_DIR) $(DESTDIR)$(includedir) $(INSTALL_PROG) libxenvchan.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) ln -sf libxenvchan.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenvchan.so.$(MAJOR) ln -sf libxenvchan.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenvchan.so - $(INSTALL_DATA) libxenvchan.h $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_DATA) libxenvchan.h $(DESTDIR)$(includedir) $(INSTALL_DATA) libxenvchan.a $(DESTDIR)$(LIBDIR) .PHONY: clean diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 63878ec..f686f41 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -163,17 +163,17 @@ libs: $(LIB) .PHONY: install install: build $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) - $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_DIR) $(DESTDIR)$(includedir) $(INSTALL_SHLIB) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) $(INSTALL_DATA) libxenctrl.a $(DESTDIR)$(LIBDIR) $(SYMLINK_SHLIB) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so.$(MAJOR) $(SYMLINK_SHLIB) libxenctrl.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so - $(INSTALL_DATA) include/xenctrl.h include/xenctrlosdep.h include/xentoollog.h $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_DATA) include/xenctrl.h include/xenctrlosdep.h include/xentoollog.h $(DESTDIR)$(includedir) $(INSTALL_SHLIB) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) $(INSTALL_DATA) libxenguest.a $(DESTDIR)$(LIBDIR) $(SYMLINK_SHLIB) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenguest.so.$(MAJOR) $(SYMLINK_SHLIB) libxenguest.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenguest.so - $(INSTALL_DATA) include/xenguest.h $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_DATA) include/xenguest.h $(DESTDIR)$(includedir) .PHONY: TAGS TAGS: diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 8e5181e..c8b47bc 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -258,7 +258,7 @@ $(PKG_CONFIG): % : %.in Makefile install: all $(INSTALL_DIR) $(DESTDIR)$(sbindir) $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) - $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_DIR) $(DESTDIR)$(includedir) $(INSTALL_DIR) $(DESTDIR)$(BASH_COMPLETION_DIR) $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/pkgconfig @@ -273,7 +273,7 @@ install: all $(SYMLINK_SHLIB) libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(DESTDIR)$(LIBDIR)/libxlutil.so.$(XLUMAJOR) $(SYMLINK_SHLIB) libxlutil.so.$(XLUMAJOR) $(DESTDIR)$(LIBDIR)/libxlutil.so $(INSTALL_DATA) libxlutil.a $(DESTDIR)$(LIBDIR) - $(INSTALL_DATA) libxl.h libxl_event.h libxl_json.h _libxl_types.h _libxl_types_json.h _libxl_list.h libxl_utils.h libxl_uuid.h libxlutil.h $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_DATA) libxl.h libxl_event.h libxl_json.h _libxl_types.h _libxl_types_json.h _libxl_list.h libxl_utils.h libxl_uuid.h libxlutil.h $(DESTDIR)$(includedir) $(INSTALL_DATA) bash-completion $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh $(INSTALL_DATA) xenlight.pc $(DESTDIR)$(SHAREDIR)/pkgconfig/ $(INSTALL_DATA) xlutil.pc $(DESTDIR)$(SHAREDIR)/pkgconfig/ diff --git a/tools/xenstat/libxenstat/Makefile b/tools/xenstat/libxenstat/Makefile index 7c973f8..3b58147 100644 --- a/tools/xenstat/libxenstat/Makefile +++ b/tools/xenstat/libxenstat/Makefile @@ -56,7 +56,7 @@ src/libxenstat.so: src/libxenstat.so.$(MAJOR) .PHONY: install install: all - $(INSTALL_DATA) src/xenstat.h $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_DATA) src/xenstat.h $(DESTDIR)$(includedir) $(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIBDIR)/libxenstat.a $(INSTALL_PROG) src/libxenstat.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) ln -sf libxenstat.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenstat.so.$(MAJOR) diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index a809d74..4aec1f8 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -129,8 +129,8 @@ tarball: clean .PHONY: install install: all $(INSTALL_DIR) $(DESTDIR)$(bindir) - $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) - $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xenstore-compat + $(INSTALL_DIR) $(DESTDIR)$(includedir) + $(INSTALL_DIR) $(DESTDIR)$(includedir)/xenstore-compat ifeq ($(XENSTORE_XENSTORED),y) $(INSTALL_DIR) $(DESTDIR)$(sbindir) $(INSTALL_DIR) $(DESTDIR)$(XEN_LIB_STORED) @@ -146,12 +146,12 @@ endif ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenstore.so.$(MAJOR) ln -sf libxenstore.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenstore.so $(INSTALL_DATA) libxenstore.a $(DESTDIR)$(LIBDIR) - $(INSTALL_DATA) include/xenstore.h $(DESTDIR)$(INCLUDEDIR) - $(INSTALL_DATA) include/xenstore_lib.h $(DESTDIR)$(INCLUDEDIR) - $(INSTALL_DATA) include/compat/xs.h $(DESTDIR)$(INCLUDEDIR)/xenstore-compat/xs.h - $(INSTALL_DATA) include/compat/xs_lib.h $(DESTDIR)$(INCLUDEDIR)/xenstore-compat/xs_lib.h - ln -sf xenstore-compat/xs.h $(DESTDIR)$(INCLUDEDIR)/xs.h - ln -sf xenstore-compat/xs_lib.h $(DESTDIR)$(INCLUDEDIR)/xs_lib.h + $(INSTALL_DATA) include/xenstore.h $(DESTDIR)$(includedir) + $(INSTALL_DATA) include/xenstore_lib.h $(DESTDIR)$(includedir) + $(INSTALL_DATA) include/compat/xs.h $(DESTDIR)$(includedir)/xenstore-compat/xs.h + $(INSTALL_DATA) include/compat/xs_lib.h $(DESTDIR)$(includedir)/xenstore-compat/xs_lib.h + ln -sf xenstore-compat/xs.h $(DESTDIR)$(includedir)/xs.h + ln -sf xenstore-compat/xs_lib.h $(DESTDIR)$(includedir)/xs_lib.h .PHONY: clients-install clients-install: clients -- 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 May 28 18:50:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:50: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 1Yy2sx-0005jI-9X; Thu, 28 May 2015 18:50:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2sw-0005j6-DH for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:50:30 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id AF/D2-01469-57367655; Thu, 28 May 2015 18:50:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1432839027!18249376!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8042 invoked from network); 28 May 2015 18:50: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; 28 May 2015 18:50:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2st-0003DI-7t for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:50:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2st-0003QP-6E for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:50:27 +0000 Date: Thu, 28 May 2015 18:50:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: replace private INCLUDEDIR with automake includedir X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e3dcb16398e19ba965a2a4e7051ea1812be302fe Author: Olaf Hering AuthorDate: Mon May 11 15:24:52 2015 +0000 Commit: Ian Campbell CommitDate: Thu May 21 15:12:10 2015 +0100 tools: replace private INCLUDEDIR with automake includedir Reuse automake variable instead of inventing a private variable. The result of this command: git grep -wnl INCLUDEDIR | xargs sed -i 's@INCLUDEDIR@includedir@g' Signed-off-by: Olaf Hering Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Ian Campbell --- config/Paths.mk.in | 1 - tools/Makefile | 14 ++++++------ tools/blktap2/include/Makefile | 2 +- tools/include/Makefile | 40 ++++++++++++++++++------------------ tools/libfsimage/common/Makefile | 8 +++--- tools/libvchan/Makefile | 4 +- tools/libxc/Makefile | 6 ++-- tools/libxl/Makefile | 4 +- tools/xenstat/libxenstat/Makefile | 2 +- tools/xenstore/Makefile | 16 +++++++------- 10 files changed, 48 insertions(+), 49 deletions(-) diff --git a/config/Paths.mk.in b/config/Paths.mk.in index bf9bd51..32f7c78 100644 --- a/config/Paths.mk.in +++ b/config/Paths.mk.in @@ -34,7 +34,6 @@ LIBEXEC_BIN := @LIBEXEC_BIN@ LIBEXEC_LIB := $(LIBEXEC)/lib LIBEXEC_INC := $(LIBEXEC)/include -INCLUDEDIR := $(includedir) SHAREDIR := @SHAREDIR@ MANDIR := $(mandir) MAN1DIR := $(MANDIR)/man1 diff --git a/tools/Makefile b/tools/Makefile index b05d12a..1e0c0a7 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -82,13 +82,13 @@ uninstall: rm -rf $(D)$(bindir)/xenstore* $(D)$(bindir)/xentrace* rm -rf $(D)$(bindir)/xen-detect $(D)$(bindir)/xencons rm -rf $(D)$(bindir)/xenpvnetboot $(D)$(bindir)/qemu-*-xen - rm -rf $(D)$(INCLUDEDIR)/xenctrl* $(D)$(INCLUDEDIR)/xenguest.h - rm -rf $(D)$(INCLUDEDIR)/xs_lib.h $(D)$(INCLUDEDIR)/xs.h - rm -rf $(D)$(INCLUDEDIR)/xenstore-compat/xs_lib.h $(D)$(INCLUDEDIR)/xenstore-compat/xs.h - rm -rf $(D)$(INCLUDEDIR)/xenstore_lib.h $(D)$(INCLUDEDIR)/xenstore.h - rm -rf $(D)$(INCLUDEDIR)/xen - rm -rf $(D)$(INCLUDEDIR)/_libxl* $(D)$(INCLUDEDIR)/libxl* - rm -rf $(D)$(INCLUDEDIR)/xenstat.h $(D)$(INCLUDEDIR)/xentoollog.h + rm -rf $(D)$(includedir)/xenctrl* $(D)$(includedir)/xenguest.h + rm -rf $(D)$(includedir)/xs_lib.h $(D)$(includedir)/xs.h + rm -rf $(D)$(includedir)/xenstore-compat/xs_lib.h $(D)$(includedir)/xenstore-compat/xs.h + rm -rf $(D)$(includedir)/xenstore_lib.h $(D)$(includedir)/xenstore.h + rm -rf $(D)$(includedir)/xen + rm -rf $(D)$(includedir)/_libxl* $(D)$(includedir)/libxl* + rm -rf $(D)$(includedir)/xenstat.h $(D)$(includedir)/xentoollog.h rm -rf $(D)$(LIBDIR)/libxenctrl* $(D)$(LIBDIR)/libxenguest* rm -rf $(D)$(LIBDIR)/libxenstore* $(D)$(LIBDIR)/libxlutil* rm -rf $(D)$(LIBDIR)/python/xen $(D)$(LIBDIR)/python/grub diff --git a/tools/blktap2/include/Makefile b/tools/blktap2/include/Makefile index c238486..66e8a1e 100644 --- a/tools/blktap2/include/Makefile +++ b/tools/blktap2/include/Makefile @@ -6,7 +6,7 @@ all: .PHONY: install install: - $(INSTALL_DIR) -p $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_DIR) -p $(DESTDIR)$(includedir) .PHONY: clean diff --git a/tools/include/Makefile b/tools/include/Makefile index 601f79c..3cd157a 100644 --- a/tools/include/Makefile +++ b/tools/include/Makefile @@ -21,29 +21,29 @@ xen/.dir: .PHONY: install install: all - $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/arch-x86 - $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/arch-x86/hvm - $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/arch-arm - $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/arch-arm/hvm - $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/foreign - $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/hvm - $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/io - $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/sys - $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xen/xsm - $(INSTALL_DATA) xen/COPYING $(DESTDIR)$(INCLUDEDIR)/xen - $(INSTALL_DATA) xen/*.h $(DESTDIR)$(INCLUDEDIR)/xen - $(INSTALL_DATA) xen/arch-x86/*.h $(DESTDIR)$(INCLUDEDIR)/xen/arch-x86 - $(INSTALL_DATA) xen/arch-x86/hvm/*.h $(DESTDIR)$(INCLUDEDIR)/xen/arch-x86/hvm + $(INSTALL_DIR) $(DESTDIR)$(includedir)/xen/arch-x86 + $(INSTALL_DIR) $(DESTDIR)$(includedir)/xen/arch-x86/hvm + $(INSTALL_DIR) $(DESTDIR)$(includedir)/xen/arch-arm + $(INSTALL_DIR) $(DESTDIR)$(includedir)/xen/arch-arm/hvm + $(INSTALL_DIR) $(DESTDIR)$(includedir)/xen/foreign + $(INSTALL_DIR) $(DESTDIR)$(includedir)/xen/hvm + $(INSTALL_DIR) $(DESTDIR)$(includedir)/xen/io + $(INSTALL_DIR) $(DESTDIR)$(includedir)/xen/sys + $(INSTALL_DIR) $(DESTDIR)$(includedir)/xen/xsm + $(INSTALL_DATA) xen/COPYING $(DESTDIR)$(includedir)/xen + $(INSTALL_DATA) xen/*.h $(DESTDIR)$(includedir)/xen + $(INSTALL_DATA) xen/arch-x86/*.h $(DESTDIR)$(includedir)/xen/arch-x86 + $(INSTALL_DATA) xen/arch-x86/hvm/*.h $(DESTDIR)$(includedir)/xen/arch-x86/hvm # xen/arch-arm doesn't contains headers for now. Uncommented the line # as soon as a new header is added -# $(INSTALL_DATA) xen/arch-arm/*.h $(DESTDIR)$(INCLUDEDIR)/xen/arch-arm - $(INSTALL_DATA) xen/arch-arm/hvm/*.h $(DESTDIR)$(INCLUDEDIR)/xen/arch-arm/hvm - $(INSTALL_DATA) xen/foreign/*.h $(DESTDIR)$(INCLUDEDIR)/xen/foreign - $(INSTALL_DATA) xen/hvm/*.h $(DESTDIR)$(INCLUDEDIR)/xen/hvm - $(INSTALL_DATA) xen/io/*.h $(DESTDIR)$(INCLUDEDIR)/xen/io - $(INSTALL_DATA) xen/sys/*.h $(DESTDIR)$(INCLUDEDIR)/xen/sys - $(INSTALL_DATA) xen/xsm/*.h $(DESTDIR)$(INCLUDEDIR)/xen/xsm +# $(INSTALL_DATA) xen/arch-arm/*.h $(DESTDIR)$(includedir)/xen/arch-arm + $(INSTALL_DATA) xen/arch-arm/hvm/*.h $(DESTDIR)$(includedir)/xen/arch-arm/hvm + $(INSTALL_DATA) xen/foreign/*.h $(DESTDIR)$(includedir)/xen/foreign + $(INSTALL_DATA) xen/hvm/*.h $(DESTDIR)$(includedir)/xen/hvm + $(INSTALL_DATA) xen/io/*.h $(DESTDIR)$(includedir)/xen/io + $(INSTALL_DATA) xen/sys/*.h $(DESTDIR)$(includedir)/xen/sys + $(INSTALL_DATA) xen/xsm/*.h $(DESTDIR)$(includedir)/xen/xsm .PHONY: clean clean: diff --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Makefile index fb306f4..a70219f 100644 --- a/tools/libfsimage/common/Makefile +++ b/tools/libfsimage/common/Makefile @@ -23,13 +23,13 @@ all: $(LIB) .PHONY: install install: all $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) - $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_DIR) $(DESTDIR)$(includedir) $(INSTALL_PROG) libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) ln -sf libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libfsimage.so.$(MAJOR) ln -sf libfsimage.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libfsimage.so - $(INSTALL_DATA) fsimage.h $(DESTDIR)$(INCLUDEDIR) - $(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)$(INCLUDEDIR) - $(INSTALL_DATA) fsimage_grub.h $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_DATA) fsimage.h $(DESTDIR)$(includedir) + $(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)$(includedir) + $(INSTALL_DATA) fsimage_grub.h $(DESTDIR)$(includedir) clean distclean:: rm -f $(LIB) diff --git a/tools/libvchan/Makefile b/tools/libvchan/Makefile index d768df4..3ce7c10 100644 --- a/tools/libvchan/Makefile +++ b/tools/libvchan/Makefile @@ -43,11 +43,11 @@ vchan-node2: $(NODE2_OBJS) libxenvchan.so .PHONY: install install: all $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) - $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_DIR) $(DESTDIR)$(includedir) $(INSTALL_PROG) libxenvchan.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) ln -sf libxenvchan.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenvchan.so.$(MAJOR) ln -sf libxenvchan.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenvchan.so - $(INSTALL_DATA) libxenvchan.h $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_DATA) libxenvchan.h $(DESTDIR)$(includedir) $(INSTALL_DATA) libxenvchan.a $(DESTDIR)$(LIBDIR) .PHONY: clean diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 63878ec..f686f41 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -163,17 +163,17 @@ libs: $(LIB) .PHONY: install install: build $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) - $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_DIR) $(DESTDIR)$(includedir) $(INSTALL_SHLIB) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) $(INSTALL_DATA) libxenctrl.a $(DESTDIR)$(LIBDIR) $(SYMLINK_SHLIB) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so.$(MAJOR) $(SYMLINK_SHLIB) libxenctrl.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so - $(INSTALL_DATA) include/xenctrl.h include/xenctrlosdep.h include/xentoollog.h $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_DATA) include/xenctrl.h include/xenctrlosdep.h include/xentoollog.h $(DESTDIR)$(includedir) $(INSTALL_SHLIB) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) $(INSTALL_DATA) libxenguest.a $(DESTDIR)$(LIBDIR) $(SYMLINK_SHLIB) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenguest.so.$(MAJOR) $(SYMLINK_SHLIB) libxenguest.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenguest.so - $(INSTALL_DATA) include/xenguest.h $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_DATA) include/xenguest.h $(DESTDIR)$(includedir) .PHONY: TAGS TAGS: diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 8e5181e..c8b47bc 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -258,7 +258,7 @@ $(PKG_CONFIG): % : %.in Makefile install: all $(INSTALL_DIR) $(DESTDIR)$(sbindir) $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) - $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_DIR) $(DESTDIR)$(includedir) $(INSTALL_DIR) $(DESTDIR)$(BASH_COMPLETION_DIR) $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/pkgconfig @@ -273,7 +273,7 @@ install: all $(SYMLINK_SHLIB) libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(DESTDIR)$(LIBDIR)/libxlutil.so.$(XLUMAJOR) $(SYMLINK_SHLIB) libxlutil.so.$(XLUMAJOR) $(DESTDIR)$(LIBDIR)/libxlutil.so $(INSTALL_DATA) libxlutil.a $(DESTDIR)$(LIBDIR) - $(INSTALL_DATA) libxl.h libxl_event.h libxl_json.h _libxl_types.h _libxl_types_json.h _libxl_list.h libxl_utils.h libxl_uuid.h libxlutil.h $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_DATA) libxl.h libxl_event.h libxl_json.h _libxl_types.h _libxl_types_json.h _libxl_list.h libxl_utils.h libxl_uuid.h libxlutil.h $(DESTDIR)$(includedir) $(INSTALL_DATA) bash-completion $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh $(INSTALL_DATA) xenlight.pc $(DESTDIR)$(SHAREDIR)/pkgconfig/ $(INSTALL_DATA) xlutil.pc $(DESTDIR)$(SHAREDIR)/pkgconfig/ diff --git a/tools/xenstat/libxenstat/Makefile b/tools/xenstat/libxenstat/Makefile index 7c973f8..3b58147 100644 --- a/tools/xenstat/libxenstat/Makefile +++ b/tools/xenstat/libxenstat/Makefile @@ -56,7 +56,7 @@ src/libxenstat.so: src/libxenstat.so.$(MAJOR) .PHONY: install install: all - $(INSTALL_DATA) src/xenstat.h $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_DATA) src/xenstat.h $(DESTDIR)$(includedir) $(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIBDIR)/libxenstat.a $(INSTALL_PROG) src/libxenstat.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) ln -sf libxenstat.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenstat.so.$(MAJOR) diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index a809d74..4aec1f8 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -129,8 +129,8 @@ tarball: clean .PHONY: install install: all $(INSTALL_DIR) $(DESTDIR)$(bindir) - $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) - $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)/xenstore-compat + $(INSTALL_DIR) $(DESTDIR)$(includedir) + $(INSTALL_DIR) $(DESTDIR)$(includedir)/xenstore-compat ifeq ($(XENSTORE_XENSTORED),y) $(INSTALL_DIR) $(DESTDIR)$(sbindir) $(INSTALL_DIR) $(DESTDIR)$(XEN_LIB_STORED) @@ -146,12 +146,12 @@ endif ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenstore.so.$(MAJOR) ln -sf libxenstore.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenstore.so $(INSTALL_DATA) libxenstore.a $(DESTDIR)$(LIBDIR) - $(INSTALL_DATA) include/xenstore.h $(DESTDIR)$(INCLUDEDIR) - $(INSTALL_DATA) include/xenstore_lib.h $(DESTDIR)$(INCLUDEDIR) - $(INSTALL_DATA) include/compat/xs.h $(DESTDIR)$(INCLUDEDIR)/xenstore-compat/xs.h - $(INSTALL_DATA) include/compat/xs_lib.h $(DESTDIR)$(INCLUDEDIR)/xenstore-compat/xs_lib.h - ln -sf xenstore-compat/xs.h $(DESTDIR)$(INCLUDEDIR)/xs.h - ln -sf xenstore-compat/xs_lib.h $(DESTDIR)$(INCLUDEDIR)/xs_lib.h + $(INSTALL_DATA) include/xenstore.h $(DESTDIR)$(includedir) + $(INSTALL_DATA) include/xenstore_lib.h $(DESTDIR)$(includedir) + $(INSTALL_DATA) include/compat/xs.h $(DESTDIR)$(includedir)/xenstore-compat/xs.h + $(INSTALL_DATA) include/compat/xs_lib.h $(DESTDIR)$(includedir)/xenstore-compat/xs_lib.h + ln -sf xenstore-compat/xs.h $(DESTDIR)$(includedir)/xs.h + ln -sf xenstore-compat/xs_lib.h $(DESTDIR)$(includedir)/xs_lib.h .PHONY: clients-install clients-install: clients -- 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 May 28 18:50:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:50: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 1Yy2t6-0005kx-CH; Thu, 28 May 2015 18:50:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2t5-0005ki-PD for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:50:39 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id C3/CC-30658-F7367655; Thu, 28 May 2015 18:50:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1432839037!18304325!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26694 invoked from network); 28 May 2015 18:50:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 28 May 2015 18:50:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2t3-0003DQ-Dd for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:50:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2t3-0003Qw-Bk for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:50:37 +0000 Date: Thu, 28 May 2015 18:50:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: replace private MANDIR with automake mandir X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d0f9d93a20431287b487508cec8bb88f3614fe3b Author: Olaf Hering AuthorDate: Mon May 11 15:24:53 2015 +0000 Commit: Ian Campbell CommitDate: Thu May 21 15:12:11 2015 +0100 tools: replace private MANDIR with automake mandir Reuse automake variable instead of inventing a private variable. The result of this command: git grep -wnl MANDIR | xargs sed -i 's@MANDIR@mandir@g' Signed-off-by: Olaf Hering Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Ian Campbell --- config/Paths.mk.in | 5 ++--- docs/Makefile | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/config/Paths.mk.in b/config/Paths.mk.in index 32f7c78..8ca02bb 100644 --- a/config/Paths.mk.in +++ b/config/Paths.mk.in @@ -35,9 +35,8 @@ LIBEXEC_LIB := $(LIBEXEC)/lib LIBEXEC_INC := $(LIBEXEC)/include SHAREDIR := @SHAREDIR@ -MANDIR := $(mandir) -MAN1DIR := $(MANDIR)/man1 -MAN8DIR := $(MANDIR)/man8 +MAN1DIR := $(mandir)/man1 +MAN8DIR := $(mandir)/man8 LIBDIR := $(libdir) DOCDIR := $(docdir) diff --git a/docs/Makefile b/docs/Makefile index 9183252..94965c7 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -79,9 +79,9 @@ distclean: clean # Top level install targets .PHONY: install-man-pages install-man-pages: man-pages - $(INSTALL_DIR) $(DESTDIR)$(MANDIR) - cp -R man1 $(DESTDIR)$(MANDIR) - cp -R man5 $(DESTDIR)$(MANDIR) + $(INSTALL_DIR) $(DESTDIR)$(mandir) + cp -R man1 $(DESTDIR)$(mandir) + cp -R man5 $(DESTDIR)$(mandir) .PHONY: install-html install-html: html txt figs -- 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 May 28 18:50:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:50: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 1Yy2t6-0005kx-CH; Thu, 28 May 2015 18:50:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2t5-0005ki-PD for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:50:39 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id C3/CC-30658-F7367655; Thu, 28 May 2015 18:50:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1432839037!18304325!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26694 invoked from network); 28 May 2015 18:50:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 28 May 2015 18:50:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2t3-0003DQ-Dd for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:50:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2t3-0003Qw-Bk for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:50:37 +0000 Date: Thu, 28 May 2015 18:50:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: replace private MANDIR with automake mandir X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d0f9d93a20431287b487508cec8bb88f3614fe3b Author: Olaf Hering AuthorDate: Mon May 11 15:24:53 2015 +0000 Commit: Ian Campbell CommitDate: Thu May 21 15:12:11 2015 +0100 tools: replace private MANDIR with automake mandir Reuse automake variable instead of inventing a private variable. The result of this command: git grep -wnl MANDIR | xargs sed -i 's@MANDIR@mandir@g' Signed-off-by: Olaf Hering Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Ian Campbell --- config/Paths.mk.in | 5 ++--- docs/Makefile | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/config/Paths.mk.in b/config/Paths.mk.in index 32f7c78..8ca02bb 100644 --- a/config/Paths.mk.in +++ b/config/Paths.mk.in @@ -35,9 +35,8 @@ LIBEXEC_LIB := $(LIBEXEC)/lib LIBEXEC_INC := $(LIBEXEC)/include SHAREDIR := @SHAREDIR@ -MANDIR := $(mandir) -MAN1DIR := $(MANDIR)/man1 -MAN8DIR := $(MANDIR)/man8 +MAN1DIR := $(mandir)/man1 +MAN8DIR := $(mandir)/man8 LIBDIR := $(libdir) DOCDIR := $(docdir) diff --git a/docs/Makefile b/docs/Makefile index 9183252..94965c7 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -79,9 +79,9 @@ distclean: clean # Top level install targets .PHONY: install-man-pages install-man-pages: man-pages - $(INSTALL_DIR) $(DESTDIR)$(MANDIR) - cp -R man1 $(DESTDIR)$(MANDIR) - cp -R man5 $(DESTDIR)$(MANDIR) + $(INSTALL_DIR) $(DESTDIR)$(mandir) + cp -R man1 $(DESTDIR)$(mandir) + cp -R man5 $(DESTDIR)$(mandir) .PHONY: install-html install-html: html txt figs -- 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 May 28 18:50:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:50: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 1Yy2tI-0005mj-FE; Thu, 28 May 2015 18:50:52 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2tG-0005mZ-Mz for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:50:50 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 85/81-03219-A8367655; Thu, 28 May 2015 18:50:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1432839047!8242914!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1596 invoked from network); 28 May 2015 18:50:48 -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; 28 May 2015 18:50:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2tD-0003Da-KC for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:50:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2tD-0003SB-Hd for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:50:47 +0000 Date: Thu, 28 May 2015 18:50:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: replace private LIBDIR with automake libdir X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 93790b1c38f36661563fd2e4c0df1c84d1036fa5 Author: Olaf Hering AuthorDate: Mon May 11 15:24:54 2015 +0000 Commit: Ian Campbell CommitDate: Thu May 21 15:12:11 2015 +0100 tools: replace private LIBDIR with automake libdir Reuse automake variable instead of inventing a private variable. The result of this command: git grep -wnl LIBDIR | xargs sed -i 's@LIBDIR@libdir@g' Signed-off-by: Olaf Hering Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Ian Campbell --- Config.mk | 4 ++-- config/Paths.mk.in | 1 - tools/Makefile | 10 +++++----- tools/blktap2/control/Makefile | 8 ++++---- tools/blktap2/vhd/lib/Makefile | 2 +- tools/hotplug/FreeBSD/rc.d/xencommons.in | 2 +- tools/hotplug/Linux/xen-hotplug-common.sh.in | 2 +- tools/hotplug/NetBSD/rc.d/xen-watchdog | 2 +- tools/hotplug/NetBSD/rc.d/xencommons.in | 2 +- tools/hotplug/NetBSD/rc.d/xendomains | 2 +- tools/libfsimage/Rules.mk | 2 +- tools/libfsimage/common/Makefile | 8 ++++---- tools/libvchan/Makefile | 10 +++++----- tools/libxc/Makefile | 18 +++++++++--------- tools/libxl/Makefile | 18 +++++++++--------- tools/xenstat/libxenstat/Makefile | 8 ++++---- tools/xenstore/Makefile | 10 +++++----- 17 files changed, 54 insertions(+), 55 deletions(-) diff --git a/Config.mk b/Config.mk index ec16961..46928ca 100644 --- a/Config.mk +++ b/Config.mk @@ -157,7 +157,7 @@ define move-if-changed if ! cmp -s $(1) $(2); then mv -f $(1) $(2); else rm -f $(1); fi endef -BUILD_MAKE_VARS := sbindir bindir LIBEXEC LIBEXEC_BIN LIBDIR SHAREDIR \ +BUILD_MAKE_VARS := sbindir bindir LIBEXEC LIBEXEC_BIN libdir SHAREDIR \ XENFIRMWAREDIR XEN_CONFIG_DIR XEN_SCRIPT_DIR XEN_LOCK_DIR \ XEN_RUN_DIR XEN_PAGING_DIR @@ -204,7 +204,7 @@ CFLAGS += $(foreach i, $(EXTRA_INCLUDES), -I$(i)) LDFLAGS += $(foreach i, $(PREPEND_LIB), -L$(i)) CFLAGS += $(foreach i, $(PREPEND_INCLUDES), -I$(i)) ifeq ($(XEN_TOOLS_RPATH),y) -LDFLAGS += -Wl,-rpath,$(LIBDIR) +LDFLAGS += -Wl,-rpath,$(libdir) endif APPEND_LDFLAGS += $(foreach i, $(APPEND_LIB), -L$(i)) APPEND_CFLAGS += $(foreach i, $(APPEND_INCLUDES), -I$(i)) diff --git a/config/Paths.mk.in b/config/Paths.mk.in index 8ca02bb..6db108a 100644 --- a/config/Paths.mk.in +++ b/config/Paths.mk.in @@ -37,7 +37,6 @@ LIBEXEC_INC := $(LIBEXEC)/include SHAREDIR := @SHAREDIR@ MAN1DIR := $(mandir)/man1 MAN8DIR := $(mandir)/man8 -LIBDIR := $(libdir) DOCDIR := $(docdir) XEN_RUN_DIR := @XEN_RUN_DIR@ diff --git a/tools/Makefile b/tools/Makefile index 1e0c0a7..383d4ca 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -89,9 +89,9 @@ uninstall: rm -rf $(D)$(includedir)/xen rm -rf $(D)$(includedir)/_libxl* $(D)$(includedir)/libxl* rm -rf $(D)$(includedir)/xenstat.h $(D)$(includedir)/xentoollog.h - rm -rf $(D)$(LIBDIR)/libxenctrl* $(D)$(LIBDIR)/libxenguest* - rm -rf $(D)$(LIBDIR)/libxenstore* $(D)$(LIBDIR)/libxlutil* - rm -rf $(D)$(LIBDIR)/python/xen $(D)$(LIBDIR)/python/grub + rm -rf $(D)$(libdir)/libxenctrl* $(D)$(libdir)/libxenguest* + rm -rf $(D)$(libdir)/libxenstore* $(D)$(libdir)/libxlutil* + rm -rf $(D)$(libdir)/python/xen $(D)$(libdir)/python/grub rm -rf $(D)$(LIBEXEC) rm -rf $(D)$(sbindir)/setmask rm -rf $(D)$(sbindir)/xen* $(D)$(sbindir)/netfix $(D)$(sbindir)/xm @@ -117,8 +117,8 @@ IOEMU_CONFIGURE_CROSS ?= --cross-prefix=$(CROSS_COMPILE) \ endif ifeq ($(XEN_TOOLS_RPATH),y) -QEMU_UPSTREAM_RPATH := -Wl,-rpath,$(LIBEXEC_LIB):$(LIBDIR) -IOEMU_EXTRA_LDFLAGS := --extra-ldflags="-Wl,-rpath,$(LIBDIR)" +QEMU_UPSTREAM_RPATH := -Wl,-rpath,$(LIBEXEC_LIB):$(libdir) +IOEMU_EXTRA_LDFLAGS := --extra-ldflags="-Wl,-rpath,$(libdir)" else QEMU_UPSTREAM_RPATH := -Wl,-rpath,$(LIBEXEC_LIB) IOEMU_EXTRA_LDFLAGS := diff --git a/tools/blktap2/control/Makefile b/tools/blktap2/control/Makefile index 9ae2e51..767f52a 100644 --- a/tools/blktap2/control/Makefile +++ b/tools/blktap2/control/Makefile @@ -63,10 +63,10 @@ $(LIB_SHARED): $(CTL_PICS) install: $(IBIN) $(LIB_STATIC) $(LIB_SHARED) $(INSTALL_DIR) -p $(DESTDIR)$(sbindir) $(INSTALL_PROG) $(IBIN) $(DESTDIR)$(sbindir) - $(INSTALL_DATA) $(LIB_STATIC) $(DESTDIR)$(LIBDIR) - $(INSTALL_PROG) $(LIB_SHARED) $(DESTDIR)$(LIBDIR) - ln -sf $(LIBSONAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME).so - ln -sf $(LIB_SHARED) $(DESTDIR)$(LIBDIR)/$(LIBSONAME) + $(INSTALL_DATA) $(LIB_STATIC) $(DESTDIR)$(libdir) + $(INSTALL_PROG) $(LIB_SHARED) $(DESTDIR)$(libdir) + ln -sf $(LIBSONAME) $(DESTDIR)$(libdir)/$(LIBNAME).so + ln -sf $(LIB_SHARED) $(DESTDIR)$(libdir)/$(LIBSONAME) clean: rm -f $(OBJS) $(PICS) $(DEPS) $(IBIN) $(LIB_STATIC) $(LIB_SHARED) diff --git a/tools/blktap2/vhd/lib/Makefile b/tools/blktap2/vhd/lib/Makefile index 3904e97..ab2d648 100644 --- a/tools/blktap2/vhd/lib/Makefile +++ b/tools/blktap2/vhd/lib/Makefile @@ -10,7 +10,7 @@ LVM-UTIL-OBJ := $(BLKTAP_ROOT)/lvm/lvm-util.o LIBVHD-BUILD := libvhd.a -INST-DIR = $(LIBDIR) +INST-DIR = $(libdir) CFLAGS += -Werror CFLAGS += -Wno-unused diff --git a/tools/hotplug/FreeBSD/rc.d/xencommons.in b/tools/hotplug/FreeBSD/rc.d/xencommons.in index 0ef9af9..d453c6b 100644 --- a/tools/hotplug/FreeBSD/rc.d/xencommons.in +++ b/tools/hotplug/FreeBSD/rc.d/xencommons.in @@ -7,7 +7,7 @@ . @XEN_SCRIPT_DIR@/hotplugpath.sh -LD_LIBRARY_PATH="${LIBDIR}" +LD_LIBRARY_PATH="${libdir}" export LD_LIBRARY_PATH name="xencommons" diff --git a/tools/hotplug/Linux/xen-hotplug-common.sh.in b/tools/hotplug/Linux/xen-hotplug-common.sh.in index eee8845..40b933e 100644 --- a/tools/hotplug/Linux/xen-hotplug-common.sh.in +++ b/tools/hotplug/Linux/xen-hotplug-common.sh.in @@ -31,7 +31,7 @@ dir=$(dirname "$0") exec 2>>/var/log/xen/xen-hotplug.log export PATH="${bindir}:${sbindir}:${LIBEXEC_BIN}:/sbin:/bin:/usr/bin:/usr/sbin:$PATH" -export LD_LIBRARY_PATH="${LIBDIR}${LD_LIBRARY_PATH+:}$LD_LIBRARY_PATH" +export LD_LIBRARY_PATH="${libdir}${LD_LIBRARY_PATH+:}$LD_LIBRARY_PATH" export LANG="POSIX" unset $(set | grep ^LC_ | cut -d= -f1) diff --git a/tools/hotplug/NetBSD/rc.d/xen-watchdog b/tools/hotplug/NetBSD/rc.d/xen-watchdog index 0941fe7..d2e2ab8 100644 --- a/tools/hotplug/NetBSD/rc.d/xen-watchdog +++ b/tools/hotplug/NetBSD/rc.d/xen-watchdog @@ -11,7 +11,7 @@ DIR=$(dirname "$0") . "${DIR}/xen-hotplugpath.sh" -LD_LIBRARY_PATH="${LIBDIR}" +LD_LIBRARY_PATH="${libdir}" export LD_LIBRARY_PATH name="xenwatchdog" diff --git a/tools/hotplug/NetBSD/rc.d/xencommons.in b/tools/hotplug/NetBSD/rc.d/xencommons.in index 8217ae8..d7552cd 100644 --- a/tools/hotplug/NetBSD/rc.d/xencommons.in +++ b/tools/hotplug/NetBSD/rc.d/xencommons.in @@ -8,7 +8,7 @@ DIR=$(dirname "$0") . "${DIR}/xen-hotplugpath.sh" -LD_LIBRARY_PATH="${LIBDIR}" +LD_LIBRARY_PATH="${libdir}" export LD_LIBRARY_PATH name="xencommons" diff --git a/tools/hotplug/NetBSD/rc.d/xendomains b/tools/hotplug/NetBSD/rc.d/xendomains index 204a8f0..edc4495 100644 --- a/tools/hotplug/NetBSD/rc.d/xendomains +++ b/tools/hotplug/NetBSD/rc.d/xendomains @@ -30,7 +30,7 @@ DIR=$(dirname "$0") . "${DIR}/xen-hotplugpath.sh" -LD_LIBRARY_PATH="${LIBDIR}" +LD_LIBRARY_PATH="${libdir}" export LD_LIBRARY_PATH name="xendomains" diff --git a/tools/libfsimage/Rules.mk b/tools/libfsimage/Rules.mk index 8a23655..a0c6504 100644 --- a/tools/libfsimage/Rules.mk +++ b/tools/libfsimage/Rules.mk @@ -6,7 +6,7 @@ LDFLAGS += -L../common/ PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y)) -FSDIR = $(LIBDIR)/fs +FSDIR = $(libdir)/fs FSLIB = fsimage.so diff --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Makefile index a70219f..4840bc2 100644 --- a/tools/libfsimage/common/Makefile +++ b/tools/libfsimage/common/Makefile @@ -22,11 +22,11 @@ all: $(LIB) .PHONY: install install: all - $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) + $(INSTALL_DIR) $(DESTDIR)$(libdir) $(INSTALL_DIR) $(DESTDIR)$(includedir) - $(INSTALL_PROG) libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) - ln -sf libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libfsimage.so.$(MAJOR) - ln -sf libfsimage.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libfsimage.so + $(INSTALL_PROG) libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) + ln -sf libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libfsimage.so.$(MAJOR) + ln -sf libfsimage.so.$(MAJOR) $(DESTDIR)$(libdir)/libfsimage.so $(INSTALL_DATA) fsimage.h $(DESTDIR)$(includedir) $(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)$(includedir) $(INSTALL_DATA) fsimage_grub.h $(DESTDIR)$(includedir) diff --git a/tools/libvchan/Makefile b/tools/libvchan/Makefile index 3ce7c10..3c50fe6 100644 --- a/tools/libvchan/Makefile +++ b/tools/libvchan/Makefile @@ -42,13 +42,13 @@ vchan-node2: $(NODE2_OBJS) libxenvchan.so .PHONY: install install: all - $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) + $(INSTALL_DIR) $(DESTDIR)$(libdir) $(INSTALL_DIR) $(DESTDIR)$(includedir) - $(INSTALL_PROG) libxenvchan.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) - ln -sf libxenvchan.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenvchan.so.$(MAJOR) - ln -sf libxenvchan.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenvchan.so + $(INSTALL_PROG) libxenvchan.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) + ln -sf libxenvchan.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxenvchan.so.$(MAJOR) + ln -sf libxenvchan.so.$(MAJOR) $(DESTDIR)$(libdir)/libxenvchan.so $(INSTALL_DATA) libxenvchan.h $(DESTDIR)$(includedir) - $(INSTALL_DATA) libxenvchan.a $(DESTDIR)$(LIBDIR) + $(INSTALL_DATA) libxenvchan.a $(DESTDIR)$(libdir) .PHONY: clean clean: diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index f686f41..55782c8 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -162,17 +162,17 @@ libs: $(LIB) .PHONY: install install: build - $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) + $(INSTALL_DIR) $(DESTDIR)$(libdir) $(INSTALL_DIR) $(DESTDIR)$(includedir) - $(INSTALL_SHLIB) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) - $(INSTALL_DATA) libxenctrl.a $(DESTDIR)$(LIBDIR) - $(SYMLINK_SHLIB) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so.$(MAJOR) - $(SYMLINK_SHLIB) libxenctrl.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so + $(INSTALL_SHLIB) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) + $(INSTALL_DATA) libxenctrl.a $(DESTDIR)$(libdir) + $(SYMLINK_SHLIB) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxenctrl.so.$(MAJOR) + $(SYMLINK_SHLIB) libxenctrl.so.$(MAJOR) $(DESTDIR)$(libdir)/libxenctrl.so $(INSTALL_DATA) include/xenctrl.h include/xenctrlosdep.h include/xentoollog.h $(DESTDIR)$(includedir) - $(INSTALL_SHLIB) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) - $(INSTALL_DATA) libxenguest.a $(DESTDIR)$(LIBDIR) - $(SYMLINK_SHLIB) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenguest.so.$(MAJOR) - $(SYMLINK_SHLIB) libxenguest.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenguest.so + $(INSTALL_SHLIB) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) + $(INSTALL_DATA) libxenguest.a $(DESTDIR)$(libdir) + $(SYMLINK_SHLIB) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxenguest.so.$(MAJOR) + $(SYMLINK_SHLIB) libxenguest.so.$(MAJOR) $(DESTDIR)$(libdir)/libxenguest.so $(INSTALL_DATA) include/xenguest.h $(DESTDIR)$(includedir) .PHONY: TAGS diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index c8b47bc..cc9c152 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -257,7 +257,7 @@ $(PKG_CONFIG): % : %.in Makefile .PHONY: install install: all $(INSTALL_DIR) $(DESTDIR)$(sbindir) - $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) + $(INSTALL_DIR) $(DESTDIR)$(libdir) $(INSTALL_DIR) $(DESTDIR)$(includedir) $(INSTALL_DIR) $(DESTDIR)$(BASH_COMPLETION_DIR) $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) @@ -265,14 +265,14 @@ install: all $(INSTALL_PROG) xl $(DESTDIR)$(sbindir) $(INSTALL_PROG) xen-init-dom0 $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_PROG) libxl-save-helper $(DESTDIR)$(LIBEXEC_BIN) - $(INSTALL_SHLIB) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) - $(SYMLINK_SHLIB) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenlight.so.$(MAJOR) - $(SYMLINK_SHLIB) libxenlight.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenlight.so - $(INSTALL_DATA) libxenlight.a $(DESTDIR)$(LIBDIR) - $(INSTALL_SHLIB) libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(DESTDIR)$(LIBDIR) - $(SYMLINK_SHLIB) libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(DESTDIR)$(LIBDIR)/libxlutil.so.$(XLUMAJOR) - $(SYMLINK_SHLIB) libxlutil.so.$(XLUMAJOR) $(DESTDIR)$(LIBDIR)/libxlutil.so - $(INSTALL_DATA) libxlutil.a $(DESTDIR)$(LIBDIR) + $(INSTALL_SHLIB) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) + $(SYMLINK_SHLIB) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxenlight.so.$(MAJOR) + $(SYMLINK_SHLIB) libxenlight.so.$(MAJOR) $(DESTDIR)$(libdir)/libxenlight.so + $(INSTALL_DATA) libxenlight.a $(DESTDIR)$(libdir) + $(INSTALL_SHLIB) libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(DESTDIR)$(libdir) + $(SYMLINK_SHLIB) libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(DESTDIR)$(libdir)/libxlutil.so.$(XLUMAJOR) + $(SYMLINK_SHLIB) libxlutil.so.$(XLUMAJOR) $(DESTDIR)$(libdir)/libxlutil.so + $(INSTALL_DATA) libxlutil.a $(DESTDIR)$(libdir) $(INSTALL_DATA) libxl.h libxl_event.h libxl_json.h _libxl_types.h _libxl_types_json.h _libxl_list.h libxl_utils.h libxl_uuid.h libxlutil.h $(DESTDIR)$(includedir) $(INSTALL_DATA) bash-completion $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh $(INSTALL_DATA) xenlight.pc $(DESTDIR)$(SHAREDIR)/pkgconfig/ diff --git a/tools/xenstat/libxenstat/Makefile b/tools/xenstat/libxenstat/Makefile index 3b58147..850d24a 100644 --- a/tools/xenstat/libxenstat/Makefile +++ b/tools/xenstat/libxenstat/Makefile @@ -57,10 +57,10 @@ src/libxenstat.so: src/libxenstat.so.$(MAJOR) .PHONY: install install: all $(INSTALL_DATA) src/xenstat.h $(DESTDIR)$(includedir) - $(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIBDIR)/libxenstat.a - $(INSTALL_PROG) src/libxenstat.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) - ln -sf libxenstat.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenstat.so.$(MAJOR) - ln -sf libxenstat.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenstat.so + $(INSTALL_DATA) $(LIB) $(DESTDIR)$(libdir)/libxenstat.a + $(INSTALL_PROG) src/libxenstat.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) + ln -sf libxenstat.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxenstat.so.$(MAJOR) + ln -sf libxenstat.so.$(MAJOR) $(DESTDIR)$(libdir)/libxenstat.so PYLIB=bindings/swig/python/_xenstat.so PYMOD=bindings/swig/python/xenstat.py diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index 4aec1f8..30f3b46 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -141,11 +141,11 @@ endif set -e ; for c in $(CLIENTS) ; do \ ln -f $(DESTDIR)$(bindir)/xenstore $(DESTDIR)$(bindir)/$${c} ; \ done - $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) - $(INSTALL_SHLIB) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) - ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenstore.so.$(MAJOR) - ln -sf libxenstore.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenstore.so - $(INSTALL_DATA) libxenstore.a $(DESTDIR)$(LIBDIR) + $(INSTALL_DIR) $(DESTDIR)$(libdir) + $(INSTALL_SHLIB) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) + ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxenstore.so.$(MAJOR) + ln -sf libxenstore.so.$(MAJOR) $(DESTDIR)$(libdir)/libxenstore.so + $(INSTALL_DATA) libxenstore.a $(DESTDIR)$(libdir) $(INSTALL_DATA) include/xenstore.h $(DESTDIR)$(includedir) $(INSTALL_DATA) include/xenstore_lib.h $(DESTDIR)$(includedir) $(INSTALL_DATA) include/compat/xs.h $(DESTDIR)$(includedir)/xenstore-compat/xs.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 Thu May 28 18:50:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:50: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 1Yy2tI-0005mj-FE; Thu, 28 May 2015 18:50:52 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2tG-0005mZ-Mz for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:50:50 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 85/81-03219-A8367655; Thu, 28 May 2015 18:50:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1432839047!8242914!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1596 invoked from network); 28 May 2015 18:50:48 -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; 28 May 2015 18:50:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2tD-0003Da-KC for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:50:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2tD-0003SB-Hd for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:50:47 +0000 Date: Thu, 28 May 2015 18:50:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: replace private LIBDIR with automake libdir X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 93790b1c38f36661563fd2e4c0df1c84d1036fa5 Author: Olaf Hering AuthorDate: Mon May 11 15:24:54 2015 +0000 Commit: Ian Campbell CommitDate: Thu May 21 15:12:11 2015 +0100 tools: replace private LIBDIR with automake libdir Reuse automake variable instead of inventing a private variable. The result of this command: git grep -wnl LIBDIR | xargs sed -i 's@LIBDIR@libdir@g' Signed-off-by: Olaf Hering Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Ian Campbell --- Config.mk | 4 ++-- config/Paths.mk.in | 1 - tools/Makefile | 10 +++++----- tools/blktap2/control/Makefile | 8 ++++---- tools/blktap2/vhd/lib/Makefile | 2 +- tools/hotplug/FreeBSD/rc.d/xencommons.in | 2 +- tools/hotplug/Linux/xen-hotplug-common.sh.in | 2 +- tools/hotplug/NetBSD/rc.d/xen-watchdog | 2 +- tools/hotplug/NetBSD/rc.d/xencommons.in | 2 +- tools/hotplug/NetBSD/rc.d/xendomains | 2 +- tools/libfsimage/Rules.mk | 2 +- tools/libfsimage/common/Makefile | 8 ++++---- tools/libvchan/Makefile | 10 +++++----- tools/libxc/Makefile | 18 +++++++++--------- tools/libxl/Makefile | 18 +++++++++--------- tools/xenstat/libxenstat/Makefile | 8 ++++---- tools/xenstore/Makefile | 10 +++++----- 17 files changed, 54 insertions(+), 55 deletions(-) diff --git a/Config.mk b/Config.mk index ec16961..46928ca 100644 --- a/Config.mk +++ b/Config.mk @@ -157,7 +157,7 @@ define move-if-changed if ! cmp -s $(1) $(2); then mv -f $(1) $(2); else rm -f $(1); fi endef -BUILD_MAKE_VARS := sbindir bindir LIBEXEC LIBEXEC_BIN LIBDIR SHAREDIR \ +BUILD_MAKE_VARS := sbindir bindir LIBEXEC LIBEXEC_BIN libdir SHAREDIR \ XENFIRMWAREDIR XEN_CONFIG_DIR XEN_SCRIPT_DIR XEN_LOCK_DIR \ XEN_RUN_DIR XEN_PAGING_DIR @@ -204,7 +204,7 @@ CFLAGS += $(foreach i, $(EXTRA_INCLUDES), -I$(i)) LDFLAGS += $(foreach i, $(PREPEND_LIB), -L$(i)) CFLAGS += $(foreach i, $(PREPEND_INCLUDES), -I$(i)) ifeq ($(XEN_TOOLS_RPATH),y) -LDFLAGS += -Wl,-rpath,$(LIBDIR) +LDFLAGS += -Wl,-rpath,$(libdir) endif APPEND_LDFLAGS += $(foreach i, $(APPEND_LIB), -L$(i)) APPEND_CFLAGS += $(foreach i, $(APPEND_INCLUDES), -I$(i)) diff --git a/config/Paths.mk.in b/config/Paths.mk.in index 8ca02bb..6db108a 100644 --- a/config/Paths.mk.in +++ b/config/Paths.mk.in @@ -37,7 +37,6 @@ LIBEXEC_INC := $(LIBEXEC)/include SHAREDIR := @SHAREDIR@ MAN1DIR := $(mandir)/man1 MAN8DIR := $(mandir)/man8 -LIBDIR := $(libdir) DOCDIR := $(docdir) XEN_RUN_DIR := @XEN_RUN_DIR@ diff --git a/tools/Makefile b/tools/Makefile index 1e0c0a7..383d4ca 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -89,9 +89,9 @@ uninstall: rm -rf $(D)$(includedir)/xen rm -rf $(D)$(includedir)/_libxl* $(D)$(includedir)/libxl* rm -rf $(D)$(includedir)/xenstat.h $(D)$(includedir)/xentoollog.h - rm -rf $(D)$(LIBDIR)/libxenctrl* $(D)$(LIBDIR)/libxenguest* - rm -rf $(D)$(LIBDIR)/libxenstore* $(D)$(LIBDIR)/libxlutil* - rm -rf $(D)$(LIBDIR)/python/xen $(D)$(LIBDIR)/python/grub + rm -rf $(D)$(libdir)/libxenctrl* $(D)$(libdir)/libxenguest* + rm -rf $(D)$(libdir)/libxenstore* $(D)$(libdir)/libxlutil* + rm -rf $(D)$(libdir)/python/xen $(D)$(libdir)/python/grub rm -rf $(D)$(LIBEXEC) rm -rf $(D)$(sbindir)/setmask rm -rf $(D)$(sbindir)/xen* $(D)$(sbindir)/netfix $(D)$(sbindir)/xm @@ -117,8 +117,8 @@ IOEMU_CONFIGURE_CROSS ?= --cross-prefix=$(CROSS_COMPILE) \ endif ifeq ($(XEN_TOOLS_RPATH),y) -QEMU_UPSTREAM_RPATH := -Wl,-rpath,$(LIBEXEC_LIB):$(LIBDIR) -IOEMU_EXTRA_LDFLAGS := --extra-ldflags="-Wl,-rpath,$(LIBDIR)" +QEMU_UPSTREAM_RPATH := -Wl,-rpath,$(LIBEXEC_LIB):$(libdir) +IOEMU_EXTRA_LDFLAGS := --extra-ldflags="-Wl,-rpath,$(libdir)" else QEMU_UPSTREAM_RPATH := -Wl,-rpath,$(LIBEXEC_LIB) IOEMU_EXTRA_LDFLAGS := diff --git a/tools/blktap2/control/Makefile b/tools/blktap2/control/Makefile index 9ae2e51..767f52a 100644 --- a/tools/blktap2/control/Makefile +++ b/tools/blktap2/control/Makefile @@ -63,10 +63,10 @@ $(LIB_SHARED): $(CTL_PICS) install: $(IBIN) $(LIB_STATIC) $(LIB_SHARED) $(INSTALL_DIR) -p $(DESTDIR)$(sbindir) $(INSTALL_PROG) $(IBIN) $(DESTDIR)$(sbindir) - $(INSTALL_DATA) $(LIB_STATIC) $(DESTDIR)$(LIBDIR) - $(INSTALL_PROG) $(LIB_SHARED) $(DESTDIR)$(LIBDIR) - ln -sf $(LIBSONAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME).so - ln -sf $(LIB_SHARED) $(DESTDIR)$(LIBDIR)/$(LIBSONAME) + $(INSTALL_DATA) $(LIB_STATIC) $(DESTDIR)$(libdir) + $(INSTALL_PROG) $(LIB_SHARED) $(DESTDIR)$(libdir) + ln -sf $(LIBSONAME) $(DESTDIR)$(libdir)/$(LIBNAME).so + ln -sf $(LIB_SHARED) $(DESTDIR)$(libdir)/$(LIBSONAME) clean: rm -f $(OBJS) $(PICS) $(DEPS) $(IBIN) $(LIB_STATIC) $(LIB_SHARED) diff --git a/tools/blktap2/vhd/lib/Makefile b/tools/blktap2/vhd/lib/Makefile index 3904e97..ab2d648 100644 --- a/tools/blktap2/vhd/lib/Makefile +++ b/tools/blktap2/vhd/lib/Makefile @@ -10,7 +10,7 @@ LVM-UTIL-OBJ := $(BLKTAP_ROOT)/lvm/lvm-util.o LIBVHD-BUILD := libvhd.a -INST-DIR = $(LIBDIR) +INST-DIR = $(libdir) CFLAGS += -Werror CFLAGS += -Wno-unused diff --git a/tools/hotplug/FreeBSD/rc.d/xencommons.in b/tools/hotplug/FreeBSD/rc.d/xencommons.in index 0ef9af9..d453c6b 100644 --- a/tools/hotplug/FreeBSD/rc.d/xencommons.in +++ b/tools/hotplug/FreeBSD/rc.d/xencommons.in @@ -7,7 +7,7 @@ . @XEN_SCRIPT_DIR@/hotplugpath.sh -LD_LIBRARY_PATH="${LIBDIR}" +LD_LIBRARY_PATH="${libdir}" export LD_LIBRARY_PATH name="xencommons" diff --git a/tools/hotplug/Linux/xen-hotplug-common.sh.in b/tools/hotplug/Linux/xen-hotplug-common.sh.in index eee8845..40b933e 100644 --- a/tools/hotplug/Linux/xen-hotplug-common.sh.in +++ b/tools/hotplug/Linux/xen-hotplug-common.sh.in @@ -31,7 +31,7 @@ dir=$(dirname "$0") exec 2>>/var/log/xen/xen-hotplug.log export PATH="${bindir}:${sbindir}:${LIBEXEC_BIN}:/sbin:/bin:/usr/bin:/usr/sbin:$PATH" -export LD_LIBRARY_PATH="${LIBDIR}${LD_LIBRARY_PATH+:}$LD_LIBRARY_PATH" +export LD_LIBRARY_PATH="${libdir}${LD_LIBRARY_PATH+:}$LD_LIBRARY_PATH" export LANG="POSIX" unset $(set | grep ^LC_ | cut -d= -f1) diff --git a/tools/hotplug/NetBSD/rc.d/xen-watchdog b/tools/hotplug/NetBSD/rc.d/xen-watchdog index 0941fe7..d2e2ab8 100644 --- a/tools/hotplug/NetBSD/rc.d/xen-watchdog +++ b/tools/hotplug/NetBSD/rc.d/xen-watchdog @@ -11,7 +11,7 @@ DIR=$(dirname "$0") . "${DIR}/xen-hotplugpath.sh" -LD_LIBRARY_PATH="${LIBDIR}" +LD_LIBRARY_PATH="${libdir}" export LD_LIBRARY_PATH name="xenwatchdog" diff --git a/tools/hotplug/NetBSD/rc.d/xencommons.in b/tools/hotplug/NetBSD/rc.d/xencommons.in index 8217ae8..d7552cd 100644 --- a/tools/hotplug/NetBSD/rc.d/xencommons.in +++ b/tools/hotplug/NetBSD/rc.d/xencommons.in @@ -8,7 +8,7 @@ DIR=$(dirname "$0") . "${DIR}/xen-hotplugpath.sh" -LD_LIBRARY_PATH="${LIBDIR}" +LD_LIBRARY_PATH="${libdir}" export LD_LIBRARY_PATH name="xencommons" diff --git a/tools/hotplug/NetBSD/rc.d/xendomains b/tools/hotplug/NetBSD/rc.d/xendomains index 204a8f0..edc4495 100644 --- a/tools/hotplug/NetBSD/rc.d/xendomains +++ b/tools/hotplug/NetBSD/rc.d/xendomains @@ -30,7 +30,7 @@ DIR=$(dirname "$0") . "${DIR}/xen-hotplugpath.sh" -LD_LIBRARY_PATH="${LIBDIR}" +LD_LIBRARY_PATH="${libdir}" export LD_LIBRARY_PATH name="xendomains" diff --git a/tools/libfsimage/Rules.mk b/tools/libfsimage/Rules.mk index 8a23655..a0c6504 100644 --- a/tools/libfsimage/Rules.mk +++ b/tools/libfsimage/Rules.mk @@ -6,7 +6,7 @@ LDFLAGS += -L../common/ PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y)) -FSDIR = $(LIBDIR)/fs +FSDIR = $(libdir)/fs FSLIB = fsimage.so diff --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Makefile index a70219f..4840bc2 100644 --- a/tools/libfsimage/common/Makefile +++ b/tools/libfsimage/common/Makefile @@ -22,11 +22,11 @@ all: $(LIB) .PHONY: install install: all - $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) + $(INSTALL_DIR) $(DESTDIR)$(libdir) $(INSTALL_DIR) $(DESTDIR)$(includedir) - $(INSTALL_PROG) libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) - ln -sf libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libfsimage.so.$(MAJOR) - ln -sf libfsimage.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libfsimage.so + $(INSTALL_PROG) libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) + ln -sf libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libfsimage.so.$(MAJOR) + ln -sf libfsimage.so.$(MAJOR) $(DESTDIR)$(libdir)/libfsimage.so $(INSTALL_DATA) fsimage.h $(DESTDIR)$(includedir) $(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)$(includedir) $(INSTALL_DATA) fsimage_grub.h $(DESTDIR)$(includedir) diff --git a/tools/libvchan/Makefile b/tools/libvchan/Makefile index 3ce7c10..3c50fe6 100644 --- a/tools/libvchan/Makefile +++ b/tools/libvchan/Makefile @@ -42,13 +42,13 @@ vchan-node2: $(NODE2_OBJS) libxenvchan.so .PHONY: install install: all - $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) + $(INSTALL_DIR) $(DESTDIR)$(libdir) $(INSTALL_DIR) $(DESTDIR)$(includedir) - $(INSTALL_PROG) libxenvchan.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) - ln -sf libxenvchan.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenvchan.so.$(MAJOR) - ln -sf libxenvchan.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenvchan.so + $(INSTALL_PROG) libxenvchan.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) + ln -sf libxenvchan.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxenvchan.so.$(MAJOR) + ln -sf libxenvchan.so.$(MAJOR) $(DESTDIR)$(libdir)/libxenvchan.so $(INSTALL_DATA) libxenvchan.h $(DESTDIR)$(includedir) - $(INSTALL_DATA) libxenvchan.a $(DESTDIR)$(LIBDIR) + $(INSTALL_DATA) libxenvchan.a $(DESTDIR)$(libdir) .PHONY: clean clean: diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index f686f41..55782c8 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -162,17 +162,17 @@ libs: $(LIB) .PHONY: install install: build - $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) + $(INSTALL_DIR) $(DESTDIR)$(libdir) $(INSTALL_DIR) $(DESTDIR)$(includedir) - $(INSTALL_SHLIB) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) - $(INSTALL_DATA) libxenctrl.a $(DESTDIR)$(LIBDIR) - $(SYMLINK_SHLIB) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so.$(MAJOR) - $(SYMLINK_SHLIB) libxenctrl.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenctrl.so + $(INSTALL_SHLIB) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) + $(INSTALL_DATA) libxenctrl.a $(DESTDIR)$(libdir) + $(SYMLINK_SHLIB) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxenctrl.so.$(MAJOR) + $(SYMLINK_SHLIB) libxenctrl.so.$(MAJOR) $(DESTDIR)$(libdir)/libxenctrl.so $(INSTALL_DATA) include/xenctrl.h include/xenctrlosdep.h include/xentoollog.h $(DESTDIR)$(includedir) - $(INSTALL_SHLIB) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) - $(INSTALL_DATA) libxenguest.a $(DESTDIR)$(LIBDIR) - $(SYMLINK_SHLIB) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenguest.so.$(MAJOR) - $(SYMLINK_SHLIB) libxenguest.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenguest.so + $(INSTALL_SHLIB) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) + $(INSTALL_DATA) libxenguest.a $(DESTDIR)$(libdir) + $(SYMLINK_SHLIB) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxenguest.so.$(MAJOR) + $(SYMLINK_SHLIB) libxenguest.so.$(MAJOR) $(DESTDIR)$(libdir)/libxenguest.so $(INSTALL_DATA) include/xenguest.h $(DESTDIR)$(includedir) .PHONY: TAGS diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index c8b47bc..cc9c152 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -257,7 +257,7 @@ $(PKG_CONFIG): % : %.in Makefile .PHONY: install install: all $(INSTALL_DIR) $(DESTDIR)$(sbindir) - $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) + $(INSTALL_DIR) $(DESTDIR)$(libdir) $(INSTALL_DIR) $(DESTDIR)$(includedir) $(INSTALL_DIR) $(DESTDIR)$(BASH_COMPLETION_DIR) $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) @@ -265,14 +265,14 @@ install: all $(INSTALL_PROG) xl $(DESTDIR)$(sbindir) $(INSTALL_PROG) xen-init-dom0 $(DESTDIR)$(LIBEXEC_BIN) $(INSTALL_PROG) libxl-save-helper $(DESTDIR)$(LIBEXEC_BIN) - $(INSTALL_SHLIB) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) - $(SYMLINK_SHLIB) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenlight.so.$(MAJOR) - $(SYMLINK_SHLIB) libxenlight.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenlight.so - $(INSTALL_DATA) libxenlight.a $(DESTDIR)$(LIBDIR) - $(INSTALL_SHLIB) libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(DESTDIR)$(LIBDIR) - $(SYMLINK_SHLIB) libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(DESTDIR)$(LIBDIR)/libxlutil.so.$(XLUMAJOR) - $(SYMLINK_SHLIB) libxlutil.so.$(XLUMAJOR) $(DESTDIR)$(LIBDIR)/libxlutil.so - $(INSTALL_DATA) libxlutil.a $(DESTDIR)$(LIBDIR) + $(INSTALL_SHLIB) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) + $(SYMLINK_SHLIB) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxenlight.so.$(MAJOR) + $(SYMLINK_SHLIB) libxenlight.so.$(MAJOR) $(DESTDIR)$(libdir)/libxenlight.so + $(INSTALL_DATA) libxenlight.a $(DESTDIR)$(libdir) + $(INSTALL_SHLIB) libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(DESTDIR)$(libdir) + $(SYMLINK_SHLIB) libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(DESTDIR)$(libdir)/libxlutil.so.$(XLUMAJOR) + $(SYMLINK_SHLIB) libxlutil.so.$(XLUMAJOR) $(DESTDIR)$(libdir)/libxlutil.so + $(INSTALL_DATA) libxlutil.a $(DESTDIR)$(libdir) $(INSTALL_DATA) libxl.h libxl_event.h libxl_json.h _libxl_types.h _libxl_types_json.h _libxl_list.h libxl_utils.h libxl_uuid.h libxlutil.h $(DESTDIR)$(includedir) $(INSTALL_DATA) bash-completion $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh $(INSTALL_DATA) xenlight.pc $(DESTDIR)$(SHAREDIR)/pkgconfig/ diff --git a/tools/xenstat/libxenstat/Makefile b/tools/xenstat/libxenstat/Makefile index 3b58147..850d24a 100644 --- a/tools/xenstat/libxenstat/Makefile +++ b/tools/xenstat/libxenstat/Makefile @@ -57,10 +57,10 @@ src/libxenstat.so: src/libxenstat.so.$(MAJOR) .PHONY: install install: all $(INSTALL_DATA) src/xenstat.h $(DESTDIR)$(includedir) - $(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIBDIR)/libxenstat.a - $(INSTALL_PROG) src/libxenstat.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) - ln -sf libxenstat.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenstat.so.$(MAJOR) - ln -sf libxenstat.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenstat.so + $(INSTALL_DATA) $(LIB) $(DESTDIR)$(libdir)/libxenstat.a + $(INSTALL_PROG) src/libxenstat.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) + ln -sf libxenstat.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxenstat.so.$(MAJOR) + ln -sf libxenstat.so.$(MAJOR) $(DESTDIR)$(libdir)/libxenstat.so PYLIB=bindings/swig/python/_xenstat.so PYMOD=bindings/swig/python/xenstat.py diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index 4aec1f8..30f3b46 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -141,11 +141,11 @@ endif set -e ; for c in $(CLIENTS) ; do \ ln -f $(DESTDIR)$(bindir)/xenstore $(DESTDIR)$(bindir)/$${c} ; \ done - $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) - $(INSTALL_SHLIB) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) - ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenstore.so.$(MAJOR) - ln -sf libxenstore.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenstore.so - $(INSTALL_DATA) libxenstore.a $(DESTDIR)$(LIBDIR) + $(INSTALL_DIR) $(DESTDIR)$(libdir) + $(INSTALL_SHLIB) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) + ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxenstore.so.$(MAJOR) + ln -sf libxenstore.so.$(MAJOR) $(DESTDIR)$(libdir)/libxenstore.so + $(INSTALL_DATA) libxenstore.a $(DESTDIR)$(libdir) $(INSTALL_DATA) include/xenstore.h $(DESTDIR)$(includedir) $(INSTALL_DATA) include/xenstore_lib.h $(DESTDIR)$(includedir) $(INSTALL_DATA) include/compat/xs.h $(DESTDIR)$(includedir)/xenstore-compat/xs.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 Thu May 28 18:51:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:51:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2tS-0005ol-0D; Thu, 28 May 2015 18:51:02 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2tQ-0005oX-F2 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:51:00 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 56/18-26286-39367655; Thu, 28 May 2015 18:50:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1432839058!11084431!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9528 invoked from network); 28 May 2015 18:50:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 28 May 2015 18:50:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2tN-0003Dj-Pz for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:50:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2tN-0003SY-Oy for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:50:57 +0000 Date: Thu, 28 May 2015 18:50:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: replace private DOCDIR with automake docdir X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 057e61fba127ccaf4cb157aa7958437abfaff78e Author: Olaf Hering AuthorDate: Mon May 11 15:24:55 2015 +0000 Commit: Ian Campbell CommitDate: Thu May 21 15:12:11 2015 +0100 tools: replace private DOCDIR with automake docdir Reuse automake variable instead of inventing a private variable. The result of this command: git grep -wnl DOCDIR | xargs sed -i 's@DOCDIR@docdir@g' Signed-off-by: Olaf Hering Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Cc: Samuel Thibault Acked-by: Ian Campbell --- config/Paths.mk.in | 1 - docs/Makefile | 4 ++-- stubdom/Makefile | 4 ++-- tools/xenmon/Makefile | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/config/Paths.mk.in b/config/Paths.mk.in index 6db108a..ddd72df 100644 --- a/config/Paths.mk.in +++ b/config/Paths.mk.in @@ -37,7 +37,6 @@ LIBEXEC_INC := $(LIBEXEC)/include SHAREDIR := @SHAREDIR@ MAN1DIR := $(mandir)/man1 MAN8DIR := $(mandir)/man8 -DOCDIR := $(docdir) XEN_RUN_DIR := @XEN_RUN_DIR@ XEN_LOG_DIR := @XEN_LOG_DIR@ diff --git a/docs/Makefile b/docs/Makefile index 94965c7..60bc541 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -85,8 +85,8 @@ install-man-pages: man-pages .PHONY: install-html install-html: html txt figs - $(INSTALL_DIR) $(DESTDIR)$(DOCDIR) - [ ! -d html ] || cp -R html $(DESTDIR)$(DOCDIR) + $(INSTALL_DIR) $(DESTDIR)$(docdir) + [ ! -d html ] || cp -R html $(DESTDIR)$(docdir) .PHONY: install install: install-man-pages install-html diff --git a/stubdom/Makefile b/stubdom/Makefile index 3e01aa6..faa7c21 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -469,8 +469,8 @@ install: $(STUBDOMPATH) endif install-readme: - $(INSTALL_DIR) $(DESTDIR)$(DOCDIR) - $(INSTALL_DATA) README $(DESTDIR)$(DOCDIR)/README.stubdom + $(INSTALL_DIR) $(DESTDIR)$(docdir) + $(INSTALL_DATA) README $(DESTDIR)$(docdir)/README.stubdom install-ioemu: ioemu-stubdom $(INSTALL_DIR) "$(DESTDIR)$(LIBEXEC_BIN)" diff --git a/tools/xenmon/Makefile b/tools/xenmon/Makefile index a676d32..5095682 100644 --- a/tools/xenmon/Makefile +++ b/tools/xenmon/Makefile @@ -31,8 +31,8 @@ install: build $(INSTALL_PROG) xenbaked $(DESTDIR)$(sbindir)/xenbaked $(INSTALL_PROG) xentrace_setmask $(DESTDIR)$(sbindir)/xentrace_setmask $(INSTALL_PROG) xenmon.py $(DESTDIR)$(sbindir)/xenmon.py - $(INSTALL_DIR) $(DESTDIR)$(DOCDIR) - $(INSTALL_DATA) README $(DESTDIR)$(DOCDIR)/README.xenmon + $(INSTALL_DIR) $(DESTDIR)$(docdir) + $(INSTALL_DATA) README $(DESTDIR)$(docdir)/README.xenmon .PHONY: clean clean: -- 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 May 28 18:51:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:51:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2tS-0005ol-0D; Thu, 28 May 2015 18:51:02 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2tQ-0005oX-F2 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:51:00 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 56/18-26286-39367655; Thu, 28 May 2015 18:50:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1432839058!11084431!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.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9528 invoked from network); 28 May 2015 18:50:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 28 May 2015 18:50:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2tN-0003Dj-Pz for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:50:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2tN-0003SY-Oy for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:50:57 +0000 Date: Thu, 28 May 2015 18:50:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: replace private DOCDIR with automake docdir X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 057e61fba127ccaf4cb157aa7958437abfaff78e Author: Olaf Hering AuthorDate: Mon May 11 15:24:55 2015 +0000 Commit: Ian Campbell CommitDate: Thu May 21 15:12:11 2015 +0100 tools: replace private DOCDIR with automake docdir Reuse automake variable instead of inventing a private variable. The result of this command: git grep -wnl DOCDIR | xargs sed -i 's@DOCDIR@docdir@g' Signed-off-by: Olaf Hering Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Cc: Samuel Thibault Acked-by: Ian Campbell --- config/Paths.mk.in | 1 - docs/Makefile | 4 ++-- stubdom/Makefile | 4 ++-- tools/xenmon/Makefile | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/config/Paths.mk.in b/config/Paths.mk.in index 6db108a..ddd72df 100644 --- a/config/Paths.mk.in +++ b/config/Paths.mk.in @@ -37,7 +37,6 @@ LIBEXEC_INC := $(LIBEXEC)/include SHAREDIR := @SHAREDIR@ MAN1DIR := $(mandir)/man1 MAN8DIR := $(mandir)/man8 -DOCDIR := $(docdir) XEN_RUN_DIR := @XEN_RUN_DIR@ XEN_LOG_DIR := @XEN_LOG_DIR@ diff --git a/docs/Makefile b/docs/Makefile index 94965c7..60bc541 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -85,8 +85,8 @@ install-man-pages: man-pages .PHONY: install-html install-html: html txt figs - $(INSTALL_DIR) $(DESTDIR)$(DOCDIR) - [ ! -d html ] || cp -R html $(DESTDIR)$(DOCDIR) + $(INSTALL_DIR) $(DESTDIR)$(docdir) + [ ! -d html ] || cp -R html $(DESTDIR)$(docdir) .PHONY: install install: install-man-pages install-html diff --git a/stubdom/Makefile b/stubdom/Makefile index 3e01aa6..faa7c21 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -469,8 +469,8 @@ install: $(STUBDOMPATH) endif install-readme: - $(INSTALL_DIR) $(DESTDIR)$(DOCDIR) - $(INSTALL_DATA) README $(DESTDIR)$(DOCDIR)/README.stubdom + $(INSTALL_DIR) $(DESTDIR)$(docdir) + $(INSTALL_DATA) README $(DESTDIR)$(docdir)/README.stubdom install-ioemu: ioemu-stubdom $(INSTALL_DIR) "$(DESTDIR)$(LIBEXEC_BIN)" diff --git a/tools/xenmon/Makefile b/tools/xenmon/Makefile index a676d32..5095682 100644 --- a/tools/xenmon/Makefile +++ b/tools/xenmon/Makefile @@ -31,8 +31,8 @@ install: build $(INSTALL_PROG) xenbaked $(DESTDIR)$(sbindir)/xenbaked $(INSTALL_PROG) xentrace_setmask $(DESTDIR)$(sbindir)/xentrace_setmask $(INSTALL_PROG) xenmon.py $(DESTDIR)$(sbindir)/xenmon.py - $(INSTALL_DIR) $(DESTDIR)$(DOCDIR) - $(INSTALL_DATA) README $(DESTDIR)$(DOCDIR)/README.xenmon + $(INSTALL_DIR) $(DESTDIR)$(docdir) + $(INSTALL_DATA) README $(DESTDIR)$(docdir)/README.xenmon .PHONY: clean clean: -- 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 May 28 18:51:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:51: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 1Yy2tc-0005qN-4B; Thu, 28 May 2015 18:51:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2ta-0005q4-D5 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:51:10 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id D7/28-26286-D9367655; Thu, 28 May 2015 18:51:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1432839068!11017717!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.3 required=7.0 tests=MAILTO_TO_SPAM_ADDR X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6456 invoked from network); 28 May 2015 18:51:09 -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; 28 May 2015 18:51:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2tY-0003EI-08 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:51:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2tX-0003TC-UX for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:51:07 +0000 Date: Thu, 28 May 2015 18:51:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: Support (by ignoring) xl migrate --live X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ab373fcac40a50fcb35cf7a6ccd0243d7cd18ee0 Author: Ian Jackson AuthorDate: Thu May 14 13:41:26 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:12:11 2015 +0100 xl: Support (by ignoring) xl migrate --live xm migrate would do non-live migration (effectively, save, transfer and restore) by default, unless you specified --live. xl migrate always does live migration. Honour (by ignoring) --live for compatibility with old callers. Document this. (This patch should be backported as far as possible.) Reported-by: Matthew Vernon Signed-off-by: Ian Jackson CC: Matthew Vernon Acked-by: Ian Campbell --- docs/man/xl.pod.1 | 8 ++++++++ tools/libxl/xl_cmdimpl.c | 6 +++++- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/docs/man/xl.pod.1 b/docs/man/xl.pod.1 index 02bf531..e16dbf7 100644 --- a/docs/man/xl.pod.1 +++ b/docs/man/xl.pod.1 @@ -1520,6 +1520,14 @@ monitor types are: =back +=head1 IGNORED FOR COMPATIBILITY WITH XM + +xl is mostly command-line compatible with the old xm utility used with +the old Python xend. For compatibility, the following options are +ignored: + +=item B + =head1 TO BE DOCUMENTED We need better documentation for: diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 8eaf1c7..5f23c8b 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -4521,6 +4521,7 @@ int main_migrate(int argc, char **argv) int opt, daemonize = 1, monitor = 1, debug = 0; static struct option opts[] = { {"debug", 0, 0, 0x100}, + {"live", 0, 0, 0x200}, COMMON_LONG_OPTS, {0, 0, 0, 0} }; @@ -4539,9 +4540,12 @@ int main_migrate(int argc, char **argv) daemonize = 0; monitor = 0; break; - case 0x100: + case 0x100: /* --debug */ debug = 1; break; + case 0x200: /* --live */ + /* ignored for compatibility with xm */ + break; } domid = find_domain(argv[optind]); -- 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 May 28 18:51:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:51: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 1Yy2tc-0005qN-4B; Thu, 28 May 2015 18:51:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2ta-0005q4-D5 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:51:10 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id D7/28-26286-D9367655; Thu, 28 May 2015 18:51:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1432839068!11017717!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.3 required=7.0 tests=MAILTO_TO_SPAM_ADDR X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6456 invoked from network); 28 May 2015 18:51:09 -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; 28 May 2015 18:51:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2tY-0003EI-08 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:51:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2tX-0003TC-UX for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:51:07 +0000 Date: Thu, 28 May 2015 18:51:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: Support (by ignoring) xl migrate --live X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ab373fcac40a50fcb35cf7a6ccd0243d7cd18ee0 Author: Ian Jackson AuthorDate: Thu May 14 13:41:26 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:12:11 2015 +0100 xl: Support (by ignoring) xl migrate --live xm migrate would do non-live migration (effectively, save, transfer and restore) by default, unless you specified --live. xl migrate always does live migration. Honour (by ignoring) --live for compatibility with old callers. Document this. (This patch should be backported as far as possible.) Reported-by: Matthew Vernon Signed-off-by: Ian Jackson CC: Matthew Vernon Acked-by: Ian Campbell --- docs/man/xl.pod.1 | 8 ++++++++ tools/libxl/xl_cmdimpl.c | 6 +++++- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/docs/man/xl.pod.1 b/docs/man/xl.pod.1 index 02bf531..e16dbf7 100644 --- a/docs/man/xl.pod.1 +++ b/docs/man/xl.pod.1 @@ -1520,6 +1520,14 @@ monitor types are: =back +=head1 IGNORED FOR COMPATIBILITY WITH XM + +xl is mostly command-line compatible with the old xm utility used with +the old Python xend. For compatibility, the following options are +ignored: + +=item B + =head1 TO BE DOCUMENTED We need better documentation for: diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 8eaf1c7..5f23c8b 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -4521,6 +4521,7 @@ int main_migrate(int argc, char **argv) int opt, daemonize = 1, monitor = 1, debug = 0; static struct option opts[] = { {"debug", 0, 0, 0x100}, + {"live", 0, 0, 0x200}, COMMON_LONG_OPTS, {0, 0, 0, 0} }; @@ -4539,9 +4540,12 @@ int main_migrate(int argc, char **argv) daemonize = 0; monitor = 0; break; - case 0x100: + case 0x100: /* --debug */ debug = 1; break; + case 0x200: /* --live */ + /* ignored for compatibility with xm */ + break; } domid = find_domain(argv[optind]); -- 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 May 28 18:51:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:51: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 1Yy2tl-0005s0-6s; Thu, 28 May 2015 18:51:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2tk-0005rp-JI for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:51:20 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 12/34-02789-7A367655; Thu, 28 May 2015 18:51:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1432839078!13580940!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18333 invoked from network); 28 May 2015 18:51:19 -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; 28 May 2015 18:51:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2ti-0003EO-5o for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:51:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2ti-0003U0-4R for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:51:18 +0000 Date: Thu, 28 May 2015 18:51:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fix "xl mem-set" regression from 0c029c4da2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f5b43e95facdc17f925cb56a8963cd4531074034 Author: Jan Beulich AuthorDate: Wed Apr 22 13:02:16 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:16:11 2015 +0100 libxl: fix "xl mem-set" regression from 0c029c4da2 Said commit ("libxl_set_memory_target: retain the same maxmem offset on top of the current target") caused a regression for "xl mem-set" against Dom0: While prior to creation of the first domain this works, the first domain creation involving ballooning breaks. Due to "enforce" not being set in the domain creation case, and due to Dom0's initial ->max_pages (in the hypervisor) being UINT_MAX, the calculation of "memorykb" in the first "xl mem-set" adusting the target upwards subsequent to domain creation and termination may cause an overflow, resulting in Dom0's maximum getting to a very small value. This small maximum will the make the subsequent setting of the PoD target fail. Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- tools/libxc/include/xenctrl.h | 2 +- tools/libxc/xc_domain.c | 2 +- tools/libxl/libxl.c | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 09a7450..100b89c 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -1285,7 +1285,7 @@ int xc_getcpuinfo(xc_interface *xch, int max_cpus, int xc_domain_setmaxmem(xc_interface *xch, uint32_t domid, - unsigned int max_memkb); + uint64_t max_memkb); int xc_domain_set_memmap_limit(xc_interface *xch, uint32_t domid, diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index a7079a1..38d065f 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -635,7 +635,7 @@ int xc_shadow_control(xc_interface *xch, int xc_domain_setmaxmem(xc_interface *xch, uint32_t domid, - unsigned int max_memkb) + uint64_t max_memkb) { DECLARE_DOMCTL; domctl.cmd = XEN_DOMCTL_max_mem; diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index a6eb2df..9cc45b4 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4726,7 +4726,8 @@ int libxl_set_memory_target(libxl_ctx *ctx, uint32_t domid, { GC_INIT(ctx); int rc = 1, abort_transaction = 0; - uint32_t memorykb = 0, videoram = 0; + uint64_t memorykb; + uint32_t videoram = 0; uint32_t current_target_memkb = 0, new_target_memkb = 0; uint32_t current_max_memkb = 0; char *memmax, *endptr, *videoram_s = NULL, *target = NULL; @@ -4820,7 +4821,7 @@ retry_transaction: rc = xc_domain_setmaxmem(ctx->xch, domid, memorykb); if (rc != 0) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, - "xc_domain_setmaxmem domid=%d memkb=%d failed " + "xc_domain_setmaxmem domid=%u memkb=%"PRIu64" failed " "rc=%d\n", domid, memorykb, rc); abort_transaction = 1; 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 Thu May 28 18:51:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:51: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 1Yy2tl-0005s0-6s; Thu, 28 May 2015 18:51:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2tk-0005rp-JI for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:51:20 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 12/34-02789-7A367655; Thu, 28 May 2015 18:51:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1432839078!13580940!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18333 invoked from network); 28 May 2015 18:51:19 -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; 28 May 2015 18:51:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2ti-0003EO-5o for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:51:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2ti-0003U0-4R for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:51:18 +0000 Date: Thu, 28 May 2015 18:51:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: fix "xl mem-set" regression from 0c029c4da2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f5b43e95facdc17f925cb56a8963cd4531074034 Author: Jan Beulich AuthorDate: Wed Apr 22 13:02:16 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:16:11 2015 +0100 libxl: fix "xl mem-set" regression from 0c029c4da2 Said commit ("libxl_set_memory_target: retain the same maxmem offset on top of the current target") caused a regression for "xl mem-set" against Dom0: While prior to creation of the first domain this works, the first domain creation involving ballooning breaks. Due to "enforce" not being set in the domain creation case, and due to Dom0's initial ->max_pages (in the hypervisor) being UINT_MAX, the calculation of "memorykb" in the first "xl mem-set" adusting the target upwards subsequent to domain creation and termination may cause an overflow, resulting in Dom0's maximum getting to a very small value. This small maximum will the make the subsequent setting of the PoD target fail. Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- tools/libxc/include/xenctrl.h | 2 +- tools/libxc/xc_domain.c | 2 +- tools/libxl/libxl.c | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 09a7450..100b89c 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -1285,7 +1285,7 @@ int xc_getcpuinfo(xc_interface *xch, int max_cpus, int xc_domain_setmaxmem(xc_interface *xch, uint32_t domid, - unsigned int max_memkb); + uint64_t max_memkb); int xc_domain_set_memmap_limit(xc_interface *xch, uint32_t domid, diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index a7079a1..38d065f 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -635,7 +635,7 @@ int xc_shadow_control(xc_interface *xch, int xc_domain_setmaxmem(xc_interface *xch, uint32_t domid, - unsigned int max_memkb) + uint64_t max_memkb) { DECLARE_DOMCTL; domctl.cmd = XEN_DOMCTL_max_mem; diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index a6eb2df..9cc45b4 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4726,7 +4726,8 @@ int libxl_set_memory_target(libxl_ctx *ctx, uint32_t domid, { GC_INIT(ctx); int rc = 1, abort_transaction = 0; - uint32_t memorykb = 0, videoram = 0; + uint64_t memorykb; + uint32_t videoram = 0; uint32_t current_target_memkb = 0, new_target_memkb = 0; uint32_t current_max_memkb = 0; char *memmax, *endptr, *videoram_s = NULL, *target = NULL; @@ -4820,7 +4821,7 @@ retry_transaction: rc = xc_domain_setmaxmem(ctx->xch, domid, memorykb); if (rc != 0) { LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, - "xc_domain_setmaxmem domid=%d memkb=%d failed " + "xc_domain_setmaxmem domid=%u memkb=%"PRIu64" failed " "rc=%d\n", domid, memorykb, rc); abort_transaction = 1; 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 Thu May 28 18:51:34 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:51: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 1Yy2ty-0005to-9j; Thu, 28 May 2015 18:51:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2tx-0005tS-2W for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:51:33 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 67/FB-06457-1B367655; Thu, 28 May 2015 18:51:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1432839088!11093181!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17522 invoked from network); 28 May 2015 18:51:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 28 May 2015 18:51:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2ts-0003EW-Bm for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:51:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2ts-0003UM-AN for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:51:28 +0000 Date: Thu, 28 May 2015 18:51:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: fix typo in xl.cfg:vfb= X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0532775da4a505f2aa94bb1d0b5d4c8ada9128a1 Author: Olaf Hering AuthorDate: Fri May 15 06:23:11 2015 +0000 Commit: Ian Campbell CommitDate: Thu May 21 15:17:05 2015 +0100 docs: fix typo in xl.cfg:vfb= Use singular for option, it refers to vfb= itself. Signed-off-by: Olaf Hering Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell --- docs/man/xl.cfg.pod.5 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 0bbd3c3..2267884 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -528,7 +528,7 @@ value is optional if this is a guest domain. Specifies the paravirtual framebuffer devices which should be supplied to the domain. -This options does not control the emulated graphics card presented to +This option does not control the emulated graphics card presented to an HVM guest. See L below for how to configure the emulated device. If L options are used in a PV guest configuration, xl will pick up B, B, -- 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 May 28 18:51:34 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:51: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 1Yy2ty-0005to-9j; Thu, 28 May 2015 18:51:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2tx-0005tS-2W for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:51:33 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 67/FB-06457-1B367655; Thu, 28 May 2015 18:51:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1432839088!11093181!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17522 invoked from network); 28 May 2015 18:51:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 28 May 2015 18:51:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2ts-0003EW-Bm for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:51:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2ts-0003UM-AN for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:51:28 +0000 Date: Thu, 28 May 2015 18:51:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: fix typo in xl.cfg:vfb= X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0532775da4a505f2aa94bb1d0b5d4c8ada9128a1 Author: Olaf Hering AuthorDate: Fri May 15 06:23:11 2015 +0000 Commit: Ian Campbell CommitDate: Thu May 21 15:17:05 2015 +0100 docs: fix typo in xl.cfg:vfb= Use singular for option, it refers to vfb= itself. Signed-off-by: Olaf Hering Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell --- docs/man/xl.cfg.pod.5 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 0bbd3c3..2267884 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -528,7 +528,7 @@ value is optional if this is a guest domain. Specifies the paravirtual framebuffer devices which should be supplied to the domain. -This options does not control the emulated graphics card presented to +This option does not control the emulated graphics card presented to an HVM guest. See L below for how to configure the emulated device. If L options are used in a PV guest configuration, xl will pick up B, B, -- 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 May 28 18:51:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:51: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 1Yy2u5-0005vE-C9; Thu, 28 May 2015 18:51:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2u4-0005v1-UN for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:51:41 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id 91/C8-18733-CB367655; Thu, 28 May 2015 18:51:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1432839098!18273862!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13129 invoked from network); 28 May 2015 18:51:39 -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; 28 May 2015 18:51:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2u2-0003Ec-GR for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:51:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2u2-0003Uo-F5 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:51:38 +0000 Date: Thu, 28 May 2015 18:51:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: gic: Typo in comment in gic_remove_irq_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 ed60a28e08a303a4f9ae35ff941820eaf459a31c Author: Julien Grall AuthorDate: Fri May 15 16:17:41 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:17:33 2015 +0100 xen/arm: gic: Typo in comment in gic_remove_irq_from_guest Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/gic.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index f023e4f..125298c 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -182,7 +182,7 @@ int gic_remove_irq_from_guest(struct domain *d, unsigned int virq, { desc->handler->shutdown(desc); - /* EOI the IRQ it it has not been done by the guest */ + /* EOI the IRQ if it has not been done by the guest */ if ( test_bit(_IRQ_INPROGRESS, &desc->status) ) gic_hw_ops->deactivate_irq(desc); clear_bit(_IRQ_INPROGRESS, &desc->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 Thu May 28 18:51:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:51: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 1Yy2u5-0005vE-C9; Thu, 28 May 2015 18:51:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2u4-0005v1-UN for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:51:41 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id 91/C8-18733-CB367655; Thu, 28 May 2015 18:51:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1432839098!18273862!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13129 invoked from network); 28 May 2015 18:51:39 -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; 28 May 2015 18:51:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2u2-0003Ec-GR for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:51:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2u2-0003Uo-F5 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:51:38 +0000 Date: Thu, 28 May 2015 18:51:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: gic: Typo in comment in gic_remove_irq_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 ed60a28e08a303a4f9ae35ff941820eaf459a31c Author: Julien Grall AuthorDate: Fri May 15 16:17:41 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:17:33 2015 +0100 xen/arm: gic: Typo in comment in gic_remove_irq_from_guest Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/gic.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index f023e4f..125298c 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -182,7 +182,7 @@ int gic_remove_irq_from_guest(struct domain *d, unsigned int virq, { desc->handler->shutdown(desc); - /* EOI the IRQ it it has not been done by the guest */ + /* EOI the IRQ if it has not been done by the guest */ if ( test_bit(_IRQ_INPROGRESS, &desc->status) ) gic_hw_ops->deactivate_irq(desc); clear_bit(_IRQ_INPROGRESS, &desc->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 Thu May 28 18:51:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:51: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 1Yy2uF-0005x2-F5; Thu, 28 May 2015 18:51:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2uE-0005wq-U4 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:51:51 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id 08/8C-02824-6C367655; Thu, 28 May 2015 18:51:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1432839108!13560610!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21067 invoked from network); 28 May 2015 18:51:49 -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; 28 May 2015 18:51:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2uC-0003Ei-M7 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:51:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2uC-0003Vk-K5 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:51:48 +0000 Date: Thu, 28 May 2015 18:51:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: 'valid_devs' may be used uninitialized X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c38fe91822d98ce0d5224ff6bf3c11b63178134b Author: Charles Arnold AuthorDate: Fri May 15 11:06:04 2015 -0600 Commit: Ian Campbell CommitDate: Thu May 21 15:18:03 2015 +0100 libxl: 'valid_devs' may be used uninitialized Using gcc 4.8 to compile with -Werror. xl_cmdimpl.c:5493:8: error: 'valid_devs' may be used uninitialized in this function [-Werror=maybe-uninitialized] if (valid_devs == 0) ^ xl_cmdimpl.c:5455:9: note: 'valid_devs' was declared here int valid_devs; Signed-off-by: Charles Arnold Reviewed-by: Dario Faggioli Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 5f23c8b..186c4dd 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -5448,7 +5448,7 @@ static void output_topologyinfo(void) libxl_cputopology *cpuinfo; int i, nr; libxl_pcitopology *pciinfo; - int valid_devs; + int valid_devs = 0; cpuinfo = libxl_get_cpu_topology(ctx, &nr); -- 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 May 28 18:51:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:51: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 1Yy2uF-0005x2-F5; Thu, 28 May 2015 18:51:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2uE-0005wq-U4 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:51:51 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id 08/8C-02824-6C367655; Thu, 28 May 2015 18:51:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1432839108!13560610!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21067 invoked from network); 28 May 2015 18:51:49 -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; 28 May 2015 18:51:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2uC-0003Ei-M7 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:51:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2uC-0003Vk-K5 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:51:48 +0000 Date: Thu, 28 May 2015 18:51:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: 'valid_devs' may be used uninitialized X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c38fe91822d98ce0d5224ff6bf3c11b63178134b Author: Charles Arnold AuthorDate: Fri May 15 11:06:04 2015 -0600 Commit: Ian Campbell CommitDate: Thu May 21 15:18:03 2015 +0100 libxl: 'valid_devs' may be used uninitialized Using gcc 4.8 to compile with -Werror. xl_cmdimpl.c:5493:8: error: 'valid_devs' may be used uninitialized in this function [-Werror=maybe-uninitialized] if (valid_devs == 0) ^ xl_cmdimpl.c:5455:9: note: 'valid_devs' was declared here int valid_devs; Signed-off-by: Charles Arnold Reviewed-by: Dario Faggioli Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 5f23c8b..186c4dd 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -5448,7 +5448,7 @@ static void output_topologyinfo(void) libxl_cputopology *cpuinfo; int i, nr; libxl_pcitopology *pciinfo; - int valid_devs; + int valid_devs = 0; cpuinfo = libxl_get_cpu_topology(ctx, &nr); -- 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 May 28 18:52:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:52:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2uQ-0005ye-I3; Thu, 28 May 2015 18:52:02 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2uP-0005yT-M8 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:52:01 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id 18/43-18947-0D367655; Thu, 28 May 2015 18:52:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1432839119!18350175!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10017 invoked from network); 28 May 2015 18:51:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 28 May 2015 18:51:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2uM-0003Ev-Qc for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:51:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2uM-0003W9-Pe for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:51:58 +0000 Date: Thu, 28 May 2015 18:51:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] MAINTAINERS: Remove Frediano Ziglio from "HISILICON HIP04 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 ac695ccbe726c3bafdddc70c152fa387851cf9f0 Author: Julien Grall AuthorDate: Wed May 6 19:56:13 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:19:18 2015 +0100 MAINTAINERS: Remove Frediano Ziglio from "HISILICON HIP04 Support" His email address is bouncing from more than a month. Signed-off-by: Julien Grall Cc: Ian Jackson Cc: Keir Fraser Cc: Jan Beulich Cc: Zoltan Kiss Acked-by: Ian Campbell --- MAINTAINERS | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index c793c21..0372ef7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -139,7 +139,6 @@ F: xen/drivers/char/pl011.c F: xen/drivers/passthrough/arm/ HISILICON HIP04 SUPPORT -M: Frediano Ziglio M: Zoltan Kiss S: Supported F: xen/arch/arm/gic-hip04.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 Thu May 28 18:52:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:52:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2uQ-0005ye-I3; Thu, 28 May 2015 18:52:02 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2uP-0005yT-M8 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:52:01 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id 18/43-18947-0D367655; Thu, 28 May 2015 18:52:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1432839119!18350175!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10017 invoked from network); 28 May 2015 18:51:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 28 May 2015 18:51:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2uM-0003Ev-Qc for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:51:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2uM-0003W9-Pe for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:51:58 +0000 Date: Thu, 28 May 2015 18:51:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] MAINTAINERS: Remove Frediano Ziglio from "HISILICON HIP04 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 ac695ccbe726c3bafdddc70c152fa387851cf9f0 Author: Julien Grall AuthorDate: Wed May 6 19:56:13 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:19:18 2015 +0100 MAINTAINERS: Remove Frediano Ziglio from "HISILICON HIP04 Support" His email address is bouncing from more than a month. Signed-off-by: Julien Grall Cc: Ian Jackson Cc: Keir Fraser Cc: Jan Beulich Cc: Zoltan Kiss Acked-by: Ian Campbell --- MAINTAINERS | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index c793c21..0372ef7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -139,7 +139,6 @@ F: xen/drivers/char/pl011.c F: xen/drivers/passthrough/arm/ HISILICON HIP04 SUPPORT -M: Frediano Ziglio M: Zoltan Kiss S: Supported F: xen/arch/arm/gic-hip04.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 Thu May 28 18:52:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:52: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 1Yy2ua-00060B-Kp; Thu, 28 May 2015 18:52:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2uZ-0005zy-Q4 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:52:11 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 50/D2-03219-BD367655; Thu, 28 May 2015 18:52:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1432839129!5953791!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3153 invoked from network); 28 May 2015 18:52:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 May 2015 18:52:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2uX-0003FU-8F for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:52:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2uW-0003Wv-VN for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:52:09 +0000 Date: Thu, 28 May 2015 18:52:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: Fix wild memory allocations from c/s 250f0b4 and 85d78b4 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5cc5b25187eb36e8113f686289f3ad6cb5dd0cb3 Author: Andrew Cooper AuthorDate: Mon May 18 13:57:24 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:19:50 2015 +0100 tools: Fix wild memory allocations from c/s 250f0b4 and 85d78b4 These changesets cause the respective libxc functions to unconditonally dereference their max_cpus/nodes parameters as part of initial memory allocations. It will fail at obtaining the correct number of cpus/nodes from Xen, as the guest handles will not be NULL. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Boris Ostrovsky Acked-by: Wei Liu --- tools/libxl/libxl.c | 4 ++-- tools/misc/xenpm.c | 4 ++-- tools/python/xen/lowlevel/xc/xc.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 9cc45b4..9117b01 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -5106,7 +5106,7 @@ libxl_cputopology *libxl_get_cpu_topology(libxl_ctx *ctx, int *nb_cpu_out) xc_cputopo_t *cputopo; libxl_cputopology *ret = NULL; int i; - unsigned num_cpus; + unsigned num_cpus = 0; /* Setting buffer to NULL makes the call return number of CPUs */ if (xc_cputopoinfo(ctx->xch, &num_cpus, NULL)) @@ -5192,7 +5192,7 @@ libxl_numainfo *libxl_get_numainfo(libxl_ctx *ctx, int *nr) uint32_t *distance; libxl_numainfo *ret = NULL; int i, j; - unsigned num_nodes; + unsigned num_nodes = 0; if (xc_numainfo(ctx->xch, &num_nodes, NULL, NULL)) { LOGE(ERROR, "Unable to determine number of nodes"); diff --git a/tools/misc/xenpm.c b/tools/misc/xenpm.c index fe2c001..2f9bd8e 100644 --- a/tools/misc/xenpm.c +++ b/tools/misc/xenpm.c @@ -356,7 +356,7 @@ static void signal_int_handler(int signo) struct timeval tv; int cx_cap = 0, px_cap = 0; xc_cputopo_t *cputopo = NULL; - unsigned max_cpus; + unsigned max_cpus = 0; if ( xc_cputopoinfo(xc_handle, &max_cpus, NULL) != 0 ) { @@ -961,7 +961,7 @@ void scaling_governor_func(int argc, char *argv[]) void cpu_topology_func(int argc, char *argv[]) { xc_cputopo_t *cputopo = NULL; - unsigned max_cpus; + unsigned max_cpus = 0; int i, rc; if ( xc_cputopoinfo(xc_handle, &max_cpus, NULL) != 0 ) diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index fbd93db..c77e15b 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -1221,7 +1221,7 @@ static PyObject *pyxc_getcpuinfo(XcObject *self, PyObject *args, PyObject *kwds) static PyObject *pyxc_topologyinfo(XcObject *self) { xc_cputopo_t *cputopo = NULL; - unsigned i, num_cpus; + unsigned i, num_cpus = 0; PyObject *ret_obj = NULL; PyObject *cpu_to_core_obj, *cpu_to_socket_obj, *cpu_to_node_obj; @@ -1293,7 +1293,7 @@ out: static PyObject *pyxc_numainfo(XcObject *self) { - unsigned i, j, num_nodes; + unsigned i, j, num_nodes = 0; uint64_t free_heap; PyObject *ret_obj = NULL, *node_to_node_dist_list_obj; PyObject *node_to_memsize_obj, *node_to_memfree_obj; -- 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 May 28 18:52:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:52: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 1Yy2ua-00060B-Kp; Thu, 28 May 2015 18:52:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2uZ-0005zy-Q4 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:52:11 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 50/D2-03219-BD367655; Thu, 28 May 2015 18:52:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1432839129!5953791!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3153 invoked from network); 28 May 2015 18:52:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 May 2015 18:52:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2uX-0003FU-8F for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:52:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2uW-0003Wv-VN for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:52:09 +0000 Date: Thu, 28 May 2015 18:52:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: Fix wild memory allocations from c/s 250f0b4 and 85d78b4 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5cc5b25187eb36e8113f686289f3ad6cb5dd0cb3 Author: Andrew Cooper AuthorDate: Mon May 18 13:57:24 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:19:50 2015 +0100 tools: Fix wild memory allocations from c/s 250f0b4 and 85d78b4 These changesets cause the respective libxc functions to unconditonally dereference their max_cpus/nodes parameters as part of initial memory allocations. It will fail at obtaining the correct number of cpus/nodes from Xen, as the guest handles will not be NULL. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Boris Ostrovsky Acked-by: Wei Liu --- tools/libxl/libxl.c | 4 ++-- tools/misc/xenpm.c | 4 ++-- tools/python/xen/lowlevel/xc/xc.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 9cc45b4..9117b01 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -5106,7 +5106,7 @@ libxl_cputopology *libxl_get_cpu_topology(libxl_ctx *ctx, int *nb_cpu_out) xc_cputopo_t *cputopo; libxl_cputopology *ret = NULL; int i; - unsigned num_cpus; + unsigned num_cpus = 0; /* Setting buffer to NULL makes the call return number of CPUs */ if (xc_cputopoinfo(ctx->xch, &num_cpus, NULL)) @@ -5192,7 +5192,7 @@ libxl_numainfo *libxl_get_numainfo(libxl_ctx *ctx, int *nr) uint32_t *distance; libxl_numainfo *ret = NULL; int i, j; - unsigned num_nodes; + unsigned num_nodes = 0; if (xc_numainfo(ctx->xch, &num_nodes, NULL, NULL)) { LOGE(ERROR, "Unable to determine number of nodes"); diff --git a/tools/misc/xenpm.c b/tools/misc/xenpm.c index fe2c001..2f9bd8e 100644 --- a/tools/misc/xenpm.c +++ b/tools/misc/xenpm.c @@ -356,7 +356,7 @@ static void signal_int_handler(int signo) struct timeval tv; int cx_cap = 0, px_cap = 0; xc_cputopo_t *cputopo = NULL; - unsigned max_cpus; + unsigned max_cpus = 0; if ( xc_cputopoinfo(xc_handle, &max_cpus, NULL) != 0 ) { @@ -961,7 +961,7 @@ void scaling_governor_func(int argc, char *argv[]) void cpu_topology_func(int argc, char *argv[]) { xc_cputopo_t *cputopo = NULL; - unsigned max_cpus; + unsigned max_cpus = 0; int i, rc; if ( xc_cputopoinfo(xc_handle, &max_cpus, NULL) != 0 ) diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index fbd93db..c77e15b 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -1221,7 +1221,7 @@ static PyObject *pyxc_getcpuinfo(XcObject *self, PyObject *args, PyObject *kwds) static PyObject *pyxc_topologyinfo(XcObject *self) { xc_cputopo_t *cputopo = NULL; - unsigned i, num_cpus; + unsigned i, num_cpus = 0; PyObject *ret_obj = NULL; PyObject *cpu_to_core_obj, *cpu_to_socket_obj, *cpu_to_node_obj; @@ -1293,7 +1293,7 @@ out: static PyObject *pyxc_numainfo(XcObject *self) { - unsigned i, j, num_nodes; + unsigned i, j, num_nodes = 0; uint64_t free_heap; PyObject *ret_obj = NULL, *node_to_node_dist_list_obj; PyObject *node_to_memsize_obj, *node_to_memfree_obj; -- 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 May 28 18:52:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:52: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 1Yy2ul-000625-Qc; Thu, 28 May 2015 18:52:23 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2uk-00061t-G7 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:52:22 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id A5/FE-02812-5E367655; Thu, 28 May 2015 18:52:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1432839140!9413372!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3504 invoked from network); 28 May 2015 18:52:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 May 2015 18:52:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2ui-0003Fa-33 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:52:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2ui-0003XQ-0f for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:52:20 +0000 Date: Thu, 28 May 2015 18:52:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Drop support of platform where GICH_LR_HW is not working correctly X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 784c2d125ced1c3989b17089305f786347b31d44 Author: Julien Grall AuthorDate: Fri May 15 16:51:19 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:21:00 2015 +0100 xen/arm: Drop support of platform where GICH_LR_HW is not working correctly Until recently, a maintenance IRQ was requested for any IRQ injected to the guest on x-gene platform. The commit 50dcb3de603927db2fd87ba09e29c817415aaa44 "xen: arm: X-Gene Storm check GIC DIST address for EOI quirk" disable the quirk for boards using the new firmware. It is known that the quirk is fragile and cause performance regression. Given that firmware is available for people having the board, I think we can request the user to upgrade to the latest version. Signed-off-by: Julien Grall Cc: Pranavkumar Sawargaonkar Acked-by: Pranavkumar Sawargaonkar Acked-by: Ian Campbell --- xen/arch/arm/gic-hip04.c | 9 ++------- xen/arch/arm/gic-v2.c | 9 ++------- xen/arch/arm/gic.c | 4 ---- xen/arch/arm/platforms/xgene-storm.c | 15 ++++++--------- xen/include/asm-arm/platform.h | 5 ----- 5 files changed, 10 insertions(+), 32 deletions(-) diff --git a/xen/arch/arm/gic-hip04.c b/xen/arch/arm/gic-hip04.c index 6d527f1..2e4992d 100644 --- a/xen/arch/arm/gic-hip04.c +++ b/xen/arch/arm/gic-hip04.c @@ -421,13 +421,8 @@ static void hip04gic_update_lr(int lr, const struct pending_irq *p, ((p->irq & GICH_V2_LR_VIRTUAL_MASK) << GICH_V2_LR_VIRTUAL_SHIFT)); if ( p->desc != NULL ) - { - if ( platform_has_quirk(PLATFORM_QUIRK_GUEST_PIRQ_NEED_EOI) ) - lr_reg |= GICH_V2_LR_MAINTENANCE_IRQ; - else - lr_reg |= GICH_V2_LR_HW | ((p->desc->irq & GICH_V2_LR_PHYSICAL_MASK ) - << GICH_V2_LR_PHYSICAL_SHIFT); - } + lr_reg |= GICH_V2_LR_HW | ((p->desc->irq & GICH_V2_LR_PHYSICAL_MASK ) + << GICH_V2_LR_PHYSICAL_SHIFT); writel_gich(lr_reg, HIP04_GICH_LR + lr * 4); } diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index 80acc62..edf659b 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -413,13 +413,8 @@ static void gicv2_update_lr(int lr, const struct pending_irq *p, ((p->irq & GICH_V2_LR_VIRTUAL_MASK) << GICH_V2_LR_VIRTUAL_SHIFT)); if ( p->desc != NULL ) - { - if ( platform_has_quirk(PLATFORM_QUIRK_GUEST_PIRQ_NEED_EOI) ) - lr_reg |= GICH_V2_LR_MAINTENANCE_IRQ; - else - lr_reg |= GICH_V2_LR_HW | ((p->desc->irq & GICH_V2_LR_PHYSICAL_MASK ) - << GICH_V2_LR_PHYSICAL_SHIFT); - } + lr_reg |= GICH_V2_LR_HW | ((p->desc->irq & GICH_V2_LR_PHYSICAL_MASK ) + << GICH_V2_LR_PHYSICAL_SHIFT); writel_gich(lr_reg, GICH_LR + lr * 4); } diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 125298c..c41e82e 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -445,11 +445,7 @@ static void gic_update_one_lr(struct vcpu *v, int i) clear_bit(i, &this_cpu(lr_mask)); if ( p->desc != NULL ) - { clear_bit(_IRQ_INPROGRESS, &p->desc->status); - if ( platform_has_quirk(PLATFORM_QUIRK_GUEST_PIRQ_NEED_EOI) ) - gic_hw_ops->deactivate_irq(p->desc); - } clear_bit(GIC_IRQ_GUEST_VISIBLE, &p->status); clear_bit(GIC_IRQ_GUEST_ACTIVE, &p->status); p->lr = GIC_INVALID_LR; diff --git a/xen/arch/arm/platforms/xgene-storm.c b/xen/arch/arm/platforms/xgene-storm.c index c717360..1362bea 100644 --- a/xen/arch/arm/platforms/xgene-storm.c +++ b/xen/arch/arm/platforms/xgene-storm.c @@ -37,7 +37,6 @@ static u32 reset_mask; static bool reset_vals_valid = false; #define XGENE_SEC_GICV2_DIST_ADDR 0x78010000 -static u32 __read_mostly xgene_quirks = PLATFORM_QUIRK_GIC_64K_STRIDE; static void __init xgene_check_pirq_eoi(void) { @@ -60,20 +59,18 @@ static void __init xgene_check_pirq_eoi(void) /* * In old X-Gene Storm firmware and DT, secure mode addresses have - * been mentioned in GICv2 node. We have to use maintenance interrupt - * instead of EOI HW in this case. We check the GIC Distributor Base - * Address to maintain compatibility with older firmware. + * been mentioned in GICv2 node. EOI HW won't work in this case. + * We check the GIC Distributor Base Address to deny Xen booting + * with older firmware. */ if ( dbase == XGENE_SEC_GICV2_DIST_ADDR ) - { - xgene_quirks |= PLATFORM_QUIRK_GUEST_PIRQ_NEED_EOI; - printk("Xen: WARNING: OLD X-Gene Firmware, disabling PIRQ EOI mode\n"); - } + panic("OLD X-Gene Firmware is not supported by Xen.\n" + "Please upgrade your firmware to the latest version"); } static uint32_t xgene_storm_quirks(void) { - return xgene_quirks; + return PLATFORM_QUIRK_GIC_64K_STRIDE; } static int map_one_mmio(struct domain *d, const char *what, diff --git a/xen/include/asm-arm/platform.h b/xen/include/asm-arm/platform.h index 4eba37b..746e126 100644 --- a/xen/include/asm-arm/platform.h +++ b/xen/include/asm-arm/platform.h @@ -51,11 +51,6 @@ struct platform_desc { */ #define PLATFORM_QUIRK_GIC_64K_STRIDE (1 << 0) -/* - * Quirk for platforms where GICH_LR_HW does not work as expected. - */ -#define PLATFORM_QUIRK_GUEST_PIRQ_NEED_EOI (1 << 1) - void __init platform_init(void); int __init platform_init_time(void); int __init platform_specific_mapping(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 Thu May 28 18:52:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:52: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 1Yy2ul-000625-Qc; Thu, 28 May 2015 18:52:23 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2uk-00061t-G7 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:52:22 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id A5/FE-02812-5E367655; Thu, 28 May 2015 18:52:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1432839140!9413372!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3504 invoked from network); 28 May 2015 18:52:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 May 2015 18:52:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2ui-0003Fa-33 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:52:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2ui-0003XQ-0f for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:52:20 +0000 Date: Thu, 28 May 2015 18:52:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Drop support of platform where GICH_LR_HW is not working correctly X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 784c2d125ced1c3989b17089305f786347b31d44 Author: Julien Grall AuthorDate: Fri May 15 16:51:19 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:21:00 2015 +0100 xen/arm: Drop support of platform where GICH_LR_HW is not working correctly Until recently, a maintenance IRQ was requested for any IRQ injected to the guest on x-gene platform. The commit 50dcb3de603927db2fd87ba09e29c817415aaa44 "xen: arm: X-Gene Storm check GIC DIST address for EOI quirk" disable the quirk for boards using the new firmware. It is known that the quirk is fragile and cause performance regression. Given that firmware is available for people having the board, I think we can request the user to upgrade to the latest version. Signed-off-by: Julien Grall Cc: Pranavkumar Sawargaonkar Acked-by: Pranavkumar Sawargaonkar Acked-by: Ian Campbell --- xen/arch/arm/gic-hip04.c | 9 ++------- xen/arch/arm/gic-v2.c | 9 ++------- xen/arch/arm/gic.c | 4 ---- xen/arch/arm/platforms/xgene-storm.c | 15 ++++++--------- xen/include/asm-arm/platform.h | 5 ----- 5 files changed, 10 insertions(+), 32 deletions(-) diff --git a/xen/arch/arm/gic-hip04.c b/xen/arch/arm/gic-hip04.c index 6d527f1..2e4992d 100644 --- a/xen/arch/arm/gic-hip04.c +++ b/xen/arch/arm/gic-hip04.c @@ -421,13 +421,8 @@ static void hip04gic_update_lr(int lr, const struct pending_irq *p, ((p->irq & GICH_V2_LR_VIRTUAL_MASK) << GICH_V2_LR_VIRTUAL_SHIFT)); if ( p->desc != NULL ) - { - if ( platform_has_quirk(PLATFORM_QUIRK_GUEST_PIRQ_NEED_EOI) ) - lr_reg |= GICH_V2_LR_MAINTENANCE_IRQ; - else - lr_reg |= GICH_V2_LR_HW | ((p->desc->irq & GICH_V2_LR_PHYSICAL_MASK ) - << GICH_V2_LR_PHYSICAL_SHIFT); - } + lr_reg |= GICH_V2_LR_HW | ((p->desc->irq & GICH_V2_LR_PHYSICAL_MASK ) + << GICH_V2_LR_PHYSICAL_SHIFT); writel_gich(lr_reg, HIP04_GICH_LR + lr * 4); } diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index 80acc62..edf659b 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -413,13 +413,8 @@ static void gicv2_update_lr(int lr, const struct pending_irq *p, ((p->irq & GICH_V2_LR_VIRTUAL_MASK) << GICH_V2_LR_VIRTUAL_SHIFT)); if ( p->desc != NULL ) - { - if ( platform_has_quirk(PLATFORM_QUIRK_GUEST_PIRQ_NEED_EOI) ) - lr_reg |= GICH_V2_LR_MAINTENANCE_IRQ; - else - lr_reg |= GICH_V2_LR_HW | ((p->desc->irq & GICH_V2_LR_PHYSICAL_MASK ) - << GICH_V2_LR_PHYSICAL_SHIFT); - } + lr_reg |= GICH_V2_LR_HW | ((p->desc->irq & GICH_V2_LR_PHYSICAL_MASK ) + << GICH_V2_LR_PHYSICAL_SHIFT); writel_gich(lr_reg, GICH_LR + lr * 4); } diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 125298c..c41e82e 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -445,11 +445,7 @@ static void gic_update_one_lr(struct vcpu *v, int i) clear_bit(i, &this_cpu(lr_mask)); if ( p->desc != NULL ) - { clear_bit(_IRQ_INPROGRESS, &p->desc->status); - if ( platform_has_quirk(PLATFORM_QUIRK_GUEST_PIRQ_NEED_EOI) ) - gic_hw_ops->deactivate_irq(p->desc); - } clear_bit(GIC_IRQ_GUEST_VISIBLE, &p->status); clear_bit(GIC_IRQ_GUEST_ACTIVE, &p->status); p->lr = GIC_INVALID_LR; diff --git a/xen/arch/arm/platforms/xgene-storm.c b/xen/arch/arm/platforms/xgene-storm.c index c717360..1362bea 100644 --- a/xen/arch/arm/platforms/xgene-storm.c +++ b/xen/arch/arm/platforms/xgene-storm.c @@ -37,7 +37,6 @@ static u32 reset_mask; static bool reset_vals_valid = false; #define XGENE_SEC_GICV2_DIST_ADDR 0x78010000 -static u32 __read_mostly xgene_quirks = PLATFORM_QUIRK_GIC_64K_STRIDE; static void __init xgene_check_pirq_eoi(void) { @@ -60,20 +59,18 @@ static void __init xgene_check_pirq_eoi(void) /* * In old X-Gene Storm firmware and DT, secure mode addresses have - * been mentioned in GICv2 node. We have to use maintenance interrupt - * instead of EOI HW in this case. We check the GIC Distributor Base - * Address to maintain compatibility with older firmware. + * been mentioned in GICv2 node. EOI HW won't work in this case. + * We check the GIC Distributor Base Address to deny Xen booting + * with older firmware. */ if ( dbase == XGENE_SEC_GICV2_DIST_ADDR ) - { - xgene_quirks |= PLATFORM_QUIRK_GUEST_PIRQ_NEED_EOI; - printk("Xen: WARNING: OLD X-Gene Firmware, disabling PIRQ EOI mode\n"); - } + panic("OLD X-Gene Firmware is not supported by Xen.\n" + "Please upgrade your firmware to the latest version"); } static uint32_t xgene_storm_quirks(void) { - return xgene_quirks; + return PLATFORM_QUIRK_GIC_64K_STRIDE; } static int map_one_mmio(struct domain *d, const char *what, diff --git a/xen/include/asm-arm/platform.h b/xen/include/asm-arm/platform.h index 4eba37b..746e126 100644 --- a/xen/include/asm-arm/platform.h +++ b/xen/include/asm-arm/platform.h @@ -51,11 +51,6 @@ struct platform_desc { */ #define PLATFORM_QUIRK_GIC_64K_STRIDE (1 << 0) -/* - * Quirk for platforms where GICH_LR_HW does not work as expected. - */ -#define PLATFORM_QUIRK_GUEST_PIRQ_NEED_EOI (1 << 1) - void __init platform_init(void); int __init platform_init_time(void); int __init platform_specific_mapping(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 Thu May 28 18:52:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:52:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2uv-00063W-TH; Thu, 28 May 2015 18:52:33 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2uu-00063K-O0 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:52:32 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id CD/98-21300-0F367655; Thu, 28 May 2015 18:52:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1432839150!18336346!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28830 invoked from network); 28 May 2015 18:52:31 -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; 28 May 2015 18:52:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2us-0003Fi-9u for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:52:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2us-0003Xn-7d for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:52:30 +0000 Date: Thu, 28 May 2015 18:52:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: remove qemu-upstream_howto_use_it.markdown X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9d5eaa6e4c6db1d30ab898402a6505af3fab4d50 Author: Wei Liu AuthorDate: Mon May 18 17:37:22 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:21:34 2015 +0100 docs: remove qemu-upstream_howto_use_it.markdown QEMU upstream has been the default for several releases. The only setting described in that document is no longer required. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Cc: Jan Beulich Cc: Keir Fraser Cc: Tim Deegan Cc: Anthony Perard Acked-by: Ian Campbell --- docs/misc/qemu-upstream_howto_use_it.markdown | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/docs/misc/qemu-upstream_howto_use_it.markdown b/docs/misc/qemu-upstream_howto_use_it.markdown deleted file mode 100644 index 8370fac..0000000 --- a/docs/misc/qemu-upstream_howto_use_it.markdown +++ /dev/null @@ -1,12 +0,0 @@ -Using Upstream QEMU with Xen -============================ - -If you want to build with the QEMU unstable tree, follow the [QEMU -Upstream](http://wiki.xen.org/wiki/QEMU_Upstream) wiki page. - -Otherwise, QEMU/SeaBIOS is now integrated into the build system, so you just -have to specify the device model version in an `xl` config file: - - device_model_version = 'qemu-xen' - -The version of QEMU used in the build system is the last release of 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 Thu May 28 18:52:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:52:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2uv-00063W-TH; Thu, 28 May 2015 18:52:33 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2uu-00063K-O0 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:52:32 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id CD/98-21300-0F367655; Thu, 28 May 2015 18:52:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1432839150!18336346!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28830 invoked from network); 28 May 2015 18:52:31 -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; 28 May 2015 18:52:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2us-0003Fi-9u for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:52:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2us-0003Xn-7d for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:52:30 +0000 Date: Thu, 28 May 2015 18:52:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: remove qemu-upstream_howto_use_it.markdown X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9d5eaa6e4c6db1d30ab898402a6505af3fab4d50 Author: Wei Liu AuthorDate: Mon May 18 17:37:22 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:21:34 2015 +0100 docs: remove qemu-upstream_howto_use_it.markdown QEMU upstream has been the default for several releases. The only setting described in that document is no longer required. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Cc: Jan Beulich Cc: Keir Fraser Cc: Tim Deegan Cc: Anthony Perard Acked-by: Ian Campbell --- docs/misc/qemu-upstream_howto_use_it.markdown | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/docs/misc/qemu-upstream_howto_use_it.markdown b/docs/misc/qemu-upstream_howto_use_it.markdown deleted file mode 100644 index 8370fac..0000000 --- a/docs/misc/qemu-upstream_howto_use_it.markdown +++ /dev/null @@ -1,12 +0,0 @@ -Using Upstream QEMU with Xen -============================ - -If you want to build with the QEMU unstable tree, follow the [QEMU -Upstream](http://wiki.xen.org/wiki/QEMU_Upstream) wiki page. - -Otherwise, QEMU/SeaBIOS is now integrated into the build system, so you just -have to specify the device model version in an `xl` config file: - - device_model_version = 'qemu-xen' - -The version of QEMU used in the build system is the last release of 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 Thu May 28 18:52:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:52: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 1Yy2v6-000657-W6; Thu, 28 May 2015 18:52:44 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2v5-00064r-IW for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:52:43 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id B3/7B-32733-AF367655; Thu, 28 May 2015 18:52:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1432839160!12208977!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28366 invoked from network); 28 May 2015 18:52:41 -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; 28 May 2015 18:52:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2v2-0003Fo-Go for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:52:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2v2-0003Yw-Ej for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:52:40 +0000 Date: Thu, 28 May 2015 18:52:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/configure: Missing [ in the aio 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 ff1d08ae4812b83010a3cc31476838757b50c248 Author: Julien Grall AuthorDate: Wed May 20 14:02:07 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:23:02 2015 +0100 tools/configure: Missing [ in the aio check There was a missing [ in the aio check which lead to never check if aio is present on the platform. Signed-off-by: Julien Grall Acked-by: Ian Campbell [ ijc -- ran autogen.sh ] --- tools/configure | 2 +- tools/configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/configure b/tools/configure index e7c246d..0f3a63a 100755 --- a/tools/configure +++ b/tools/configure @@ -8167,7 +8167,7 @@ fi -if test "x$enable_blktap2" = "xyes"]; then : +if test "x$enable_blktap2" = "xyes"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for io_setup in -laio" >&5 $as_echo_n "checking for io_setup in -laio... " >&6; } diff --git a/tools/configure.ac b/tools/configure.ac index 58b6caa..1645c20 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -335,7 +335,7 @@ AC_CHECK_HEADER([lzo/lzo1x.h], [ AC_CHECK_LIB([lzo2], [lzo1x_decompress], [zlib="$zlib -DHAVE_LZO1X -llzo2"]) ]) AC_SUBST(zlib) -AS_IF(test "x$enable_blktap2" = "xyes"], [ +AS_IF([test "x$enable_blktap2" = "xyes"], [ AC_CHECK_LIB([aio], [io_setup], [], [AC_MSG_ERROR([Could not find libaio])]) ]) AC_SUBST(system_aio) -- 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 May 28 18:52:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:52: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 1Yy2v6-000657-W6; Thu, 28 May 2015 18:52:44 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2v5-00064r-IW for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:52:43 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id B3/7B-32733-AF367655; Thu, 28 May 2015 18:52:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1432839160!12208977!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28366 invoked from network); 28 May 2015 18:52:41 -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; 28 May 2015 18:52:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2v2-0003Fo-Go for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:52:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2v2-0003Yw-Ej for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:52:40 +0000 Date: Thu, 28 May 2015 18:52:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/configure: Missing [ in the aio 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 ff1d08ae4812b83010a3cc31476838757b50c248 Author: Julien Grall AuthorDate: Wed May 20 14:02:07 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:23:02 2015 +0100 tools/configure: Missing [ in the aio check There was a missing [ in the aio check which lead to never check if aio is present on the platform. Signed-off-by: Julien Grall Acked-by: Ian Campbell [ ijc -- ran autogen.sh ] --- tools/configure | 2 +- tools/configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/configure b/tools/configure index e7c246d..0f3a63a 100755 --- a/tools/configure +++ b/tools/configure @@ -8167,7 +8167,7 @@ fi -if test "x$enable_blktap2" = "xyes"]; then : +if test "x$enable_blktap2" = "xyes"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for io_setup in -laio" >&5 $as_echo_n "checking for io_setup in -laio... " >&6; } diff --git a/tools/configure.ac b/tools/configure.ac index 58b6caa..1645c20 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -335,7 +335,7 @@ AC_CHECK_HEADER([lzo/lzo1x.h], [ AC_CHECK_LIB([lzo2], [lzo1x_decompress], [zlib="$zlib -DHAVE_LZO1X -llzo2"]) ]) AC_SUBST(zlib) -AS_IF(test "x$enable_blktap2" = "xyes"], [ +AS_IF([test "x$enable_blktap2" = "xyes"], [ AC_CHECK_LIB([aio], [io_setup], [], [AC_MSG_ERROR([Could not find libaio])]) ]) AC_SUBST(system_aio) -- 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 May 28 18:52:55 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:52: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 1Yy2vH-00066b-2W; Thu, 28 May 2015 18:52:55 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2vF-00066R-Cf for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:52:53 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 4A/AA-03195-40467655; Thu, 28 May 2015 18:52:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1432839170!5953856!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.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5427 invoked from network); 28 May 2015 18:52:51 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 May 2015 18:52:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2vC-0003Fu-N2 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:52:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2vC-0003ZI-LJ for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:52:50 +0000 Date: Thu, 28 May 2015 18:52:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: Add AWK to set of tools checked for by configure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a42eac01cbfc08df246a889de0d8aca19d75aca8 Author: Ian Campbell AuthorDate: Wed May 20 15:38:55 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:25:23 2015 +0100 tools: Add AWK to set of tools checked for by configure We are going to need this to generate the userspace flask.h header. Signed-off-by: Ian Campbell Acked-by: Wei Liu [ ijc -- ran autogen.sh ] --- config/Tools.mk.in | 1 + tools/configure | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- tools/configure.ac | 2 ++ 3 files changed, 52 insertions(+), 1 deletions(-) diff --git a/config/Tools.mk.in b/config/Tools.mk.in index e7da99d..d67352e 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -23,6 +23,7 @@ AS86 := @AS86@ LD86 := @LD86@ BCC := @BCC@ IASL := @IASL@ +AWK := @AWK@ FETCHER := @FETCHER@ SEABIOS_PATH := @seabios_path@ OVMF_PATH := @ovmf_path@ diff --git a/tools/configure b/tools/configure index 0f3a63a..dfd8175 100755 --- a/tools/configure +++ b/tools/configure @@ -660,7 +660,6 @@ pyconfig PYTHONPATH CHECKPOLICY XENSTORED -AWK OCAMLFIND OCAMLBUILD OCAMLDOC @@ -679,6 +678,7 @@ INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM SET_MAKE +AWK IASL BCC LD86 @@ -830,6 +830,7 @@ AS86 LD86 BCC IASL +AWK CPP PKG_CONFIG PKG_CONFIG_PATH @@ -1545,6 +1546,7 @@ Some influential environment variables: LD86 Path to ld86 tool BCC Path to bcc tool IASL Path to iasl tool + AWK Path to awk tool CPP C preprocessor PKG_CONFIG path to pkg-config utility PKG_CONFIG_PATH @@ -4348,6 +4350,7 @@ LDFLAGS="$PREPEND_LDFLAGS $LDFLAGS $APPEND_LDFLAGS" + # Checks for programs. ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -5137,6 +5140,51 @@ if test x"${PERL}" = x"no" then as_fn_error $? "Unable to find perl, please install perl" "$LINENO" 5 fi +# Extract the first word of "awk", so it can be a program name with args. +set dummy awk; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_AWK+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $AWK in + [\\/]* | ?:[\\/]*) + ac_cv_path_AWK="$AWK" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_AWK="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_AWK" && ac_cv_path_AWK="no" + ;; +esac +fi +AWK=$ac_cv_path_AWK +if test -n "$AWK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +if test x"${AWK}" = x"no" +then + as_fn_error $? "Unable to find awk, please install awk" "$LINENO" 5 +fi # checking for ocamlc if test -n "$ac_tool_prefix"; then diff --git a/tools/configure.ac b/tools/configure.ac index 1645c20..9bf6450 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -247,6 +247,7 @@ AC_ARG_VAR([AS86], [Path to as86 tool]) AC_ARG_VAR([LD86], [Path to ld86 tool]) AC_ARG_VAR([BCC], [Path to bcc tool]) AC_ARG_VAR([IASL], [Path to iasl tool]) +AC_ARG_VAR([AWK], [Path to awk tool]) # Checks for programs. AC_PROG_CC @@ -255,6 +256,7 @@ AC_PROG_INSTALL AC_PATH_PROG([BISON], [bison]) AC_PATH_PROG([FLEX], [flex]) AX_PATH_PROG_OR_FAIL([PERL], [perl]) +AX_PATH_PROG_OR_FAIL([AWK], [awk]) AC_PROG_OCAML AC_PROG_FINDLIB -- 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 May 28 18:52:55 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:52: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 1Yy2vH-00066b-2W; Thu, 28 May 2015 18:52:55 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2vF-00066R-Cf for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:52:53 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 4A/AA-03195-40467655; Thu, 28 May 2015 18:52:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1432839170!5953856!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.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5427 invoked from network); 28 May 2015 18:52:51 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 May 2015 18:52:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2vC-0003Fu-N2 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:52:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2vC-0003ZI-LJ for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:52:50 +0000 Date: Thu, 28 May 2015 18:52:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: Add AWK to set of tools checked for by configure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a42eac01cbfc08df246a889de0d8aca19d75aca8 Author: Ian Campbell AuthorDate: Wed May 20 15:38:55 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:25:23 2015 +0100 tools: Add AWK to set of tools checked for by configure We are going to need this to generate the userspace flask.h header. Signed-off-by: Ian Campbell Acked-by: Wei Liu [ ijc -- ran autogen.sh ] --- config/Tools.mk.in | 1 + tools/configure | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- tools/configure.ac | 2 ++ 3 files changed, 52 insertions(+), 1 deletions(-) diff --git a/config/Tools.mk.in b/config/Tools.mk.in index e7da99d..d67352e 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -23,6 +23,7 @@ AS86 := @AS86@ LD86 := @LD86@ BCC := @BCC@ IASL := @IASL@ +AWK := @AWK@ FETCHER := @FETCHER@ SEABIOS_PATH := @seabios_path@ OVMF_PATH := @ovmf_path@ diff --git a/tools/configure b/tools/configure index 0f3a63a..dfd8175 100755 --- a/tools/configure +++ b/tools/configure @@ -660,7 +660,6 @@ pyconfig PYTHONPATH CHECKPOLICY XENSTORED -AWK OCAMLFIND OCAMLBUILD OCAMLDOC @@ -679,6 +678,7 @@ INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM SET_MAKE +AWK IASL BCC LD86 @@ -830,6 +830,7 @@ AS86 LD86 BCC IASL +AWK CPP PKG_CONFIG PKG_CONFIG_PATH @@ -1545,6 +1546,7 @@ Some influential environment variables: LD86 Path to ld86 tool BCC Path to bcc tool IASL Path to iasl tool + AWK Path to awk tool CPP C preprocessor PKG_CONFIG path to pkg-config utility PKG_CONFIG_PATH @@ -4348,6 +4350,7 @@ LDFLAGS="$PREPEND_LDFLAGS $LDFLAGS $APPEND_LDFLAGS" + # Checks for programs. ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -5137,6 +5140,51 @@ if test x"${PERL}" = x"no" then as_fn_error $? "Unable to find perl, please install perl" "$LINENO" 5 fi +# Extract the first word of "awk", so it can be a program name with args. +set dummy awk; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_AWK+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $AWK in + [\\/]* | ?:[\\/]*) + ac_cv_path_AWK="$AWK" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_AWK="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_AWK" && ac_cv_path_AWK="no" + ;; +esac +fi +AWK=$ac_cv_path_AWK +if test -n "$AWK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +if test x"${AWK}" = x"no" +then + as_fn_error $? "Unable to find awk, please install awk" "$LINENO" 5 +fi # checking for ocamlc if test -n "$ac_tool_prefix"; then diff --git a/tools/configure.ac b/tools/configure.ac index 1645c20..9bf6450 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -247,6 +247,7 @@ AC_ARG_VAR([AS86], [Path to as86 tool]) AC_ARG_VAR([LD86], [Path to ld86 tool]) AC_ARG_VAR([BCC], [Path to bcc tool]) AC_ARG_VAR([IASL], [Path to iasl tool]) +AC_ARG_VAR([AWK], [Path to awk tool]) # Checks for programs. AC_PROG_CC @@ -255,6 +256,7 @@ AC_PROG_INSTALL AC_PATH_PROG([BISON], [bison]) AC_PATH_PROG([FLEX], [flex]) AX_PATH_PROG_OR_FAIL([PERL], [perl]) +AX_PATH_PROG_OR_FAIL([AWK], [awk]) AC_PROG_OCAML AC_PROG_FINDLIB -- 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 May 28 18:53:05 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:53:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2vR-000686-55; Thu, 28 May 2015 18:53:05 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2vP-00067r-Aj for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:53:03 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 2F/9B-32733-E0467655; Thu, 28 May 2015 18:53:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1432839181!13701796!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8755 invoked from network); 28 May 2015 18:53:01 -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; 28 May 2015 18:53:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2vM-0003G3-S5 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:53:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2vM-0003Zh-Qj for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:53:00 +0000 Date: Thu, 28 May 2015 18:53:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: flask: Pass output directory as a parameter to mkflask.sh X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f06c84e0472b4a94883264432099b3858321c9bf Author: Ian Campbell AuthorDate: Wed May 20 15:38:56 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:25:35 2015 +0100 xen: flask: Pass output directory as a parameter to mkflask.sh When called from the tools side in a later patch we will want to direct its output to the appropriate place. Signed-off-by: Ian Campbell Acked-by: Wei Liu Acked-by: Daniel De Graaf --- xen/xsm/flask/Makefile | 2 +- xen/xsm/flask/policy/mkflask.sh | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/xen/xsm/flask/Makefile b/xen/xsm/flask/Makefile index 1256512..12fc3a9 100644 --- a/xen/xsm/flask/Makefile +++ b/xen/xsm/flask/Makefile @@ -22,7 +22,7 @@ ALL_H_FILES = $(FLASK_H_FILES) $(AV_H_FILES) $(obj-y) ss/built_in.o: $(ALL_H_FILES) $(FLASK_H_FILES): $(FLASK_H_DEPEND) - $(CONFIG_SHELL) policy/mkflask.sh $(AWK) $(FLASK_H_DEPEND) + $(CONFIG_SHELL) policy/mkflask.sh $(AWK) include $(FLASK_H_DEPEND) $(AV_H_FILES): $(AV_H_DEPEND) $(CONFIG_SHELL) policy/mkaccess_vector.sh $(AWK) $(AV_H_DEPEND) diff --git a/xen/xsm/flask/policy/mkflask.sh b/xen/xsm/flask/policy/mkflask.sh index e8d8fb5..9e24020 100644 --- a/xen/xsm/flask/policy/mkflask.sh +++ b/xen/xsm/flask/policy/mkflask.sh @@ -8,10 +8,13 @@ set -e awk=$1 shift 1 +output_dir=$1 +shift 1 + # output file -output_file="include/flask.h" -debug_file="include/class_to_string.h" -debug_file2="include/initial_sid_to_string.h" +output_file="$output_dir/flask.h" +debug_file="$output_dir/class_to_string.h" +debug_file2="$output_dir/initial_sid_to_string.h" cat $* | $awk " BEGIN { -- 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 May 28 18:53:05 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:53:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2vR-000686-55; Thu, 28 May 2015 18:53:05 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2vP-00067r-Aj for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:53:03 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 2F/9B-32733-E0467655; Thu, 28 May 2015 18:53:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1432839181!13701796!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8755 invoked from network); 28 May 2015 18:53:01 -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; 28 May 2015 18:53:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2vM-0003G3-S5 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:53:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2vM-0003Zh-Qj for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:53:00 +0000 Date: Thu, 28 May 2015 18:53:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: flask: Pass output directory as a parameter to mkflask.sh X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f06c84e0472b4a94883264432099b3858321c9bf Author: Ian Campbell AuthorDate: Wed May 20 15:38:56 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:25:35 2015 +0100 xen: flask: Pass output directory as a parameter to mkflask.sh When called from the tools side in a later patch we will want to direct its output to the appropriate place. Signed-off-by: Ian Campbell Acked-by: Wei Liu Acked-by: Daniel De Graaf --- xen/xsm/flask/Makefile | 2 +- xen/xsm/flask/policy/mkflask.sh | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/xen/xsm/flask/Makefile b/xen/xsm/flask/Makefile index 1256512..12fc3a9 100644 --- a/xen/xsm/flask/Makefile +++ b/xen/xsm/flask/Makefile @@ -22,7 +22,7 @@ ALL_H_FILES = $(FLASK_H_FILES) $(AV_H_FILES) $(obj-y) ss/built_in.o: $(ALL_H_FILES) $(FLASK_H_FILES): $(FLASK_H_DEPEND) - $(CONFIG_SHELL) policy/mkflask.sh $(AWK) $(FLASK_H_DEPEND) + $(CONFIG_SHELL) policy/mkflask.sh $(AWK) include $(FLASK_H_DEPEND) $(AV_H_FILES): $(AV_H_DEPEND) $(CONFIG_SHELL) policy/mkaccess_vector.sh $(AWK) $(AV_H_DEPEND) diff --git a/xen/xsm/flask/policy/mkflask.sh b/xen/xsm/flask/policy/mkflask.sh index e8d8fb5..9e24020 100644 --- a/xen/xsm/flask/policy/mkflask.sh +++ b/xen/xsm/flask/policy/mkflask.sh @@ -8,10 +8,13 @@ set -e awk=$1 shift 1 +output_dir=$1 +shift 1 + # output file -output_file="include/flask.h" -debug_file="include/class_to_string.h" -debug_file2="include/initial_sid_to_string.h" +output_file="$output_dir/flask.h" +debug_file="$output_dir/class_to_string.h" +debug_file2="$output_dir/initial_sid_to_string.h" cat $* | $awk " BEGIN { -- 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 May 28 18:53:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:53: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 1Yy2vd-00069r-7g; Thu, 28 May 2015 18:53:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2vb-00069f-Gq for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:53:15 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 38/2C-10437-A1467655; Thu, 28 May 2015 18:53:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1432839191!11065913!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1579 invoked from network); 28 May 2015 18:53:12 -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; 28 May 2015 18:53:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2vX-0003Gc-2X for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:53:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2vX-0003aF-0u for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:53:11 +0000 Date: Thu, 28 May 2015 18:53:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: flask: Restrict generated header to xen + tools X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit de7fa4cefd7bbfad2b8e75edbef835569a0dbb58 Author: Ian Campbell AuthorDate: Wed May 20 15:38:57 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:25:41 2015 +0100 xen: flask: Restrict generated header to xen + tools This isn't strictly necessary but since it is going to be exposed via tools/include in a later patch this will help prevent accidental leakage beyond the tools. Signed-off-by: Ian Campbell Acked-by: Wei Liu Acked-by: Daniel De Graaf --- xen/xsm/flask/policy/mkflask.sh | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/xsm/flask/policy/mkflask.sh b/xen/xsm/flask/policy/mkflask.sh index 9e24020..989a323 100644 --- a/xen/xsm/flask/policy/mkflask.sh +++ b/xen/xsm/flask/policy/mkflask.sh @@ -28,6 +28,7 @@ BEGIN { printf("#ifndef _SELINUX_FLASK_H_\n") > outfile; printf("#define _SELINUX_FLASK_H_\n") > outfile; + printf("\n#if defined(__XEN__) || defined(__XEN_TOOLS__)\n") > outfile; printf("\n/*\n * Security object class definitions\n */\n") > outfile; printf("/* This file is automatically generated. Do not edit. */\n") > debugfile; printf("/*\n * Security object class definitions\n */\n") > debugfile; @@ -91,6 +92,7 @@ END { for (i = 0; i < 34; i++) printf(" ") > outfile; printf("%d\n", sid_value) > outfile; + printf("\n#endif /* __XEN__ || __XEN_TOOLS__ */\n") > outfile; printf("\n#endif\n") > outfile; printf("};\n\n") > debugfile2; }' -- 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 May 28 18:53:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:53: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 1Yy2vd-00069r-7g; Thu, 28 May 2015 18:53:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2vb-00069f-Gq for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:53:15 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 38/2C-10437-A1467655; Thu, 28 May 2015 18:53:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1432839191!11065913!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1579 invoked from network); 28 May 2015 18:53:12 -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; 28 May 2015 18:53:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2vX-0003Gc-2X for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:53:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2vX-0003aF-0u for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:53:11 +0000 Date: Thu, 28 May 2015 18:53:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: flask: Restrict generated header to xen + tools X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit de7fa4cefd7bbfad2b8e75edbef835569a0dbb58 Author: Ian Campbell AuthorDate: Wed May 20 15:38:57 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:25:41 2015 +0100 xen: flask: Restrict generated header to xen + tools This isn't strictly necessary but since it is going to be exposed via tools/include in a later patch this will help prevent accidental leakage beyond the tools. Signed-off-by: Ian Campbell Acked-by: Wei Liu Acked-by: Daniel De Graaf --- xen/xsm/flask/policy/mkflask.sh | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/xsm/flask/policy/mkflask.sh b/xen/xsm/flask/policy/mkflask.sh index 9e24020..989a323 100644 --- a/xen/xsm/flask/policy/mkflask.sh +++ b/xen/xsm/flask/policy/mkflask.sh @@ -28,6 +28,7 @@ BEGIN { printf("#ifndef _SELINUX_FLASK_H_\n") > outfile; printf("#define _SELINUX_FLASK_H_\n") > outfile; + printf("\n#if defined(__XEN__) || defined(__XEN_TOOLS__)\n") > outfile; printf("\n/*\n * Security object class definitions\n */\n") > outfile; printf("/* This file is automatically generated. Do not edit. */\n") > debugfile; printf("/*\n * Security object class definitions\n */\n") > debugfile; @@ -91,6 +92,7 @@ END { for (i = 0; i < 34; i++) printf(" ") > outfile; printf("%d\n", sid_value) > outfile; + printf("\n#endif /* __XEN__ || __XEN_TOOLS__ */\n") > outfile; printf("\n#endif\n") > outfile; printf("};\n\n") > debugfile2; }' -- 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 May 28 18:53:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:53: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 1Yy2vl-0006BE-AI; Thu, 28 May 2015 18:53:25 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2vj-0006Ax-MG for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:53:23 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 60/BA-03224-32467655; Thu, 28 May 2015 18:53:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1432839201!5953931!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11527 invoked from network); 28 May 2015 18:53:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 May 2015 18:53:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2vh-0003Gi-8F for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:53:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2vh-0003ac-6W for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:53:21 +0000 Date: Thu, 28 May 2015 18:53:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: Expose XSM Flask initial SIDs list to tools X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 317cf71bc7d4674b48bc618903d3a375aa086e7a Author: Ian Campbell AuthorDate: Wed May 20 15:38:58 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:25:47 2015 +0100 tools: Expose XSM Flask initial SIDs list to tools By generating tools/include/xen-xsm/flask/flask.h using the same tool as used during the hypervisor build. Note that this is done regardless of whether XSM is enabled, since we want the tools to be agnostic to whether or not XSM is enabled in the hypervisor Signed-off-by: Ian Campbell Acked-by: Wei Liu Acked-by: Daniel De Graaf --- .gitignore | 1 + tools/include/Makefile | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c6185a0..3bc9cd9 100644 --- a/.gitignore +++ b/.gitignore @@ -147,6 +147,7 @@ tools/hotplug/Linux/xen-hotplug-common.sh tools/hotplug/Linux/xendomains tools/hotplug/NetBSD/rc.d/xencommons tools/include/xen/* +tools/include/xen-xsm/* tools/include/xen-foreign/*.(c|h|size) tools/include/xen-foreign/checker tools/libxl/libxlu_cfg_y.output diff --git a/tools/include/Makefile b/tools/include/Makefile index 3cd157a..dec8b3d 100644 --- a/tools/include/Makefile +++ b/tools/include/Makefile @@ -1,8 +1,11 @@ XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk +# Relative to $(XEN_ROOT)/xen/xsm/flask +FLASK_H_DEPEND := policy/initial_sids + .PHONY: all -all: xen-foreign xen/.dir +all: xen-foreign xen/.dir xen-xsm/.dir .PHONY: xen-foreign xen-foreign: @@ -19,6 +22,15 @@ xen/.dir: ln -s ../xen-foreign xen/foreign touch $@ +# Not xen/xsm as that clashes with link to +# $(XEN_ROOT)/xen/include/public/xsm above. +xen-xsm/.dir: $(XEN_ROOT)/xen/xsm/flask/policy/mkflask.sh \ + $(patsubst %,$(XEN_ROOT)/xen/xsm/flask/%,$(FLASK_H_DEPEND)) + mkdir -p xen-xsm/flask + cd $(XEN_ROOT)/xen/xsm/flask/ && \ + $(SHELL) policy/mkflask.sh $(AWK) $(CURDIR)/xen-xsm/flask $(FLASK_H_DEPEND) + touch $@ + .PHONY: install install: all $(INSTALL_DIR) $(DESTDIR)$(includedir)/xen/arch-x86 @@ -47,7 +59,7 @@ install: all .PHONY: clean clean: - rm -rf xen + rm -rf xen xen-xsm $(MAKE) -C xen-foreign clean -- 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 May 28 18:53:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:53: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 1Yy2vl-0006BE-AI; Thu, 28 May 2015 18:53:25 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2vj-0006Ax-MG for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:53:23 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 60/BA-03224-32467655; Thu, 28 May 2015 18:53:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1432839201!5953931!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11527 invoked from network); 28 May 2015 18:53:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 May 2015 18:53:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2vh-0003Gi-8F for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:53:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2vh-0003ac-6W for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:53:21 +0000 Date: Thu, 28 May 2015 18:53:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: Expose XSM Flask initial SIDs list to tools X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 317cf71bc7d4674b48bc618903d3a375aa086e7a Author: Ian Campbell AuthorDate: Wed May 20 15:38:58 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:25:47 2015 +0100 tools: Expose XSM Flask initial SIDs list to tools By generating tools/include/xen-xsm/flask/flask.h using the same tool as used during the hypervisor build. Note that this is done regardless of whether XSM is enabled, since we want the tools to be agnostic to whether or not XSM is enabled in the hypervisor Signed-off-by: Ian Campbell Acked-by: Wei Liu Acked-by: Daniel De Graaf --- .gitignore | 1 + tools/include/Makefile | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c6185a0..3bc9cd9 100644 --- a/.gitignore +++ b/.gitignore @@ -147,6 +147,7 @@ tools/hotplug/Linux/xen-hotplug-common.sh tools/hotplug/Linux/xendomains tools/hotplug/NetBSD/rc.d/xencommons tools/include/xen/* +tools/include/xen-xsm/* tools/include/xen-foreign/*.(c|h|size) tools/include/xen-foreign/checker tools/libxl/libxlu_cfg_y.output diff --git a/tools/include/Makefile b/tools/include/Makefile index 3cd157a..dec8b3d 100644 --- a/tools/include/Makefile +++ b/tools/include/Makefile @@ -1,8 +1,11 @@ XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk +# Relative to $(XEN_ROOT)/xen/xsm/flask +FLASK_H_DEPEND := policy/initial_sids + .PHONY: all -all: xen-foreign xen/.dir +all: xen-foreign xen/.dir xen-xsm/.dir .PHONY: xen-foreign xen-foreign: @@ -19,6 +22,15 @@ xen/.dir: ln -s ../xen-foreign xen/foreign touch $@ +# Not xen/xsm as that clashes with link to +# $(XEN_ROOT)/xen/include/public/xsm above. +xen-xsm/.dir: $(XEN_ROOT)/xen/xsm/flask/policy/mkflask.sh \ + $(patsubst %,$(XEN_ROOT)/xen/xsm/flask/%,$(FLASK_H_DEPEND)) + mkdir -p xen-xsm/flask + cd $(XEN_ROOT)/xen/xsm/flask/ && \ + $(SHELL) policy/mkflask.sh $(AWK) $(CURDIR)/xen-xsm/flask $(FLASK_H_DEPEND) + touch $@ + .PHONY: install install: all $(INSTALL_DIR) $(DESTDIR)$(includedir)/xen/arch-x86 @@ -47,7 +59,7 @@ install: all .PHONY: clean clean: - rm -rf xen + rm -rf xen xen-xsm $(MAKE) -C xen-foreign clean -- 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 May 28 18:53:36 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:53: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 1Yy2vw-0006DC-Fp; Thu, 28 May 2015 18:53:36 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2vu-0006D1-OA for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:53:34 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id FD/DE-03026-D2467655; Thu, 28 May 2015 18:53:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1432839211!5953953!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12604 invoked from network); 28 May 2015 18:53:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 May 2015 18:53:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2vr-0003Gq-CT for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:53:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2vr-0003az-BC for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:53:31 +0000 Date: Thu, 28 May 2015 18:53:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] flask/policy: add initial SIDs for domU/domDM X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 926158e2a14ff5b7edc6e32ce332efff52d1d17b Author: Daniel De Graaf AuthorDate: Wed May 20 15:38:59 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:25:53 2015 +0100 flask/policy: add initial SIDs for domU/domDM Add default security contexts to the XSM policy for use by the toolstack when a domain is created without specifying an explicit security label. Signed-off-by: Daniel De Graaf Acked-by: Ian Campbell --- docs/misc/xsm-flask.txt | 6 +++--- tools/flask/policy/policy/initial_sids | 4 ++++ tools/flask/policy/policy/modules/xen/xen.te | 11 +++-------- xen/xsm/flask/policy/initial_sids | 2 ++ 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/docs/misc/xsm-flask.txt b/docs/misc/xsm-flask.txt index d63a8a7..7249f40 100644 --- a/docs/misc/xsm-flask.txt +++ b/docs/misc/xsm-flask.txt @@ -213,9 +213,9 @@ that can be used without dom0 disaggregation. The main types for domUs are: - nomigrate_t is a domain that must be created via the nomigrate_t_building type, and whose memory cannot be read by dom0 once created -HVM domains with stubdomain device models use two types (one per domain): - - domHVM_t is an HVM domain that uses a stubdomain device model - - dm_dom_t is the device model for a domain with type domHVM_t +HVM domains with stubdomain device models also need a type for the stub domain. +The example policy defines dm_dom_t for the device model of a domU_t domain; +there are no device model types defined for the other domU types. One disadvantage of using type enforcement to enforce isolation is that a new type is needed for each group of domains. The user field can be used to address diff --git a/tools/flask/policy/policy/initial_sids b/tools/flask/policy/policy/initial_sids index 5de0bbf..6b7b7ef 100644 --- a/tools/flask/policy/policy/initial_sids +++ b/tools/flask/policy/policy/initial_sids @@ -12,3 +12,7 @@ sid irq gen_context(system_u:object_r:irq_t,s0) sid iomem gen_context(system_u:object_r:iomem_t,s0) sid ioport gen_context(system_u:object_r:ioport_t,s0) sid device gen_context(system_u:object_r:device_t,s0) + +# Initial SIDs used by the toolstack for domains without defined labels +sid domU gen_context(system_u:system_r:domU_t,s0) +sid domDM gen_context(system_u:system_r:dm_dom_t,s0) diff --git a/tools/flask/policy/policy/modules/xen/xen.te b/tools/flask/policy/policy/modules/xen/xen.te index e555d11..ce70639 100644 --- a/tools/flask/policy/policy/modules/xen/xen.te +++ b/tools/flask/policy/policy/modules/xen/xen.te @@ -151,18 +151,13 @@ domain_comms(domU_t, prot_domU_t) domain_comms(prot_domU_t, prot_domU_t) domain_self_comms(prot_domU_t) -# domHVM_t is meant to be paired with a qemu-dm stub domain of type dm_dom_t -declare_domain(domHVM_t) -create_domain(dom0_t, domHVM_t) -manage_domain(dom0_t, domHVM_t) -domain_comms(dom0_t, domHVM_t) -domain_self_comms(domHVM_t) - +# Device model for domU_t. You can define distinct types for device models for +# domains of other types, or add more make_device_model lines for this type. declare_domain(dm_dom_t) create_domain(dom0_t, dm_dom_t) manage_domain(dom0_t, dm_dom_t) domain_comms(dom0_t, dm_dom_t) -make_device_model(dom0_t, dm_dom_t, domHVM_t) +make_device_model(dom0_t, dm_dom_t, domU_t) # nomigrate_t must be built via the nomigrate_t_building label; once built, # dom0 cannot read its memory. diff --git a/xen/xsm/flask/policy/initial_sids b/xen/xsm/flask/policy/initial_sids index e508bde..7eca70d 100644 --- a/xen/xsm/flask/policy/initial_sids +++ b/xen/xsm/flask/policy/initial_sids @@ -13,4 +13,6 @@ sid ioport sid iomem sid irq sid device +sid domU +sid domDM # FLASK -- 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 May 28 18:53:36 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:53: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 1Yy2vw-0006DC-Fp; Thu, 28 May 2015 18:53:36 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2vu-0006D1-OA for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:53:34 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id FD/DE-03026-D2467655; Thu, 28 May 2015 18:53:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1432839211!5953953!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12604 invoked from network); 28 May 2015 18:53:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 May 2015 18:53:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2vr-0003Gq-CT for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:53:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2vr-0003az-BC for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:53:31 +0000 Date: Thu, 28 May 2015 18:53:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] flask/policy: add initial SIDs for domU/domDM X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 926158e2a14ff5b7edc6e32ce332efff52d1d17b Author: Daniel De Graaf AuthorDate: Wed May 20 15:38:59 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:25:53 2015 +0100 flask/policy: add initial SIDs for domU/domDM Add default security contexts to the XSM policy for use by the toolstack when a domain is created without specifying an explicit security label. Signed-off-by: Daniel De Graaf Acked-by: Ian Campbell --- docs/misc/xsm-flask.txt | 6 +++--- tools/flask/policy/policy/initial_sids | 4 ++++ tools/flask/policy/policy/modules/xen/xen.te | 11 +++-------- xen/xsm/flask/policy/initial_sids | 2 ++ 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/docs/misc/xsm-flask.txt b/docs/misc/xsm-flask.txt index d63a8a7..7249f40 100644 --- a/docs/misc/xsm-flask.txt +++ b/docs/misc/xsm-flask.txt @@ -213,9 +213,9 @@ that can be used without dom0 disaggregation. The main types for domUs are: - nomigrate_t is a domain that must be created via the nomigrate_t_building type, and whose memory cannot be read by dom0 once created -HVM domains with stubdomain device models use two types (one per domain): - - domHVM_t is an HVM domain that uses a stubdomain device model - - dm_dom_t is the device model for a domain with type domHVM_t +HVM domains with stubdomain device models also need a type for the stub domain. +The example policy defines dm_dom_t for the device model of a domU_t domain; +there are no device model types defined for the other domU types. One disadvantage of using type enforcement to enforce isolation is that a new type is needed for each group of domains. The user field can be used to address diff --git a/tools/flask/policy/policy/initial_sids b/tools/flask/policy/policy/initial_sids index 5de0bbf..6b7b7ef 100644 --- a/tools/flask/policy/policy/initial_sids +++ b/tools/flask/policy/policy/initial_sids @@ -12,3 +12,7 @@ sid irq gen_context(system_u:object_r:irq_t,s0) sid iomem gen_context(system_u:object_r:iomem_t,s0) sid ioport gen_context(system_u:object_r:ioport_t,s0) sid device gen_context(system_u:object_r:device_t,s0) + +# Initial SIDs used by the toolstack for domains without defined labels +sid domU gen_context(system_u:system_r:domU_t,s0) +sid domDM gen_context(system_u:system_r:dm_dom_t,s0) diff --git a/tools/flask/policy/policy/modules/xen/xen.te b/tools/flask/policy/policy/modules/xen/xen.te index e555d11..ce70639 100644 --- a/tools/flask/policy/policy/modules/xen/xen.te +++ b/tools/flask/policy/policy/modules/xen/xen.te @@ -151,18 +151,13 @@ domain_comms(domU_t, prot_domU_t) domain_comms(prot_domU_t, prot_domU_t) domain_self_comms(prot_domU_t) -# domHVM_t is meant to be paired with a qemu-dm stub domain of type dm_dom_t -declare_domain(domHVM_t) -create_domain(dom0_t, domHVM_t) -manage_domain(dom0_t, domHVM_t) -domain_comms(dom0_t, domHVM_t) -domain_self_comms(domHVM_t) - +# Device model for domU_t. You can define distinct types for device models for +# domains of other types, or add more make_device_model lines for this type. declare_domain(dm_dom_t) create_domain(dom0_t, dm_dom_t) manage_domain(dom0_t, dm_dom_t) domain_comms(dom0_t, dm_dom_t) -make_device_model(dom0_t, dm_dom_t, domHVM_t) +make_device_model(dom0_t, dm_dom_t, domU_t) # nomigrate_t must be built via the nomigrate_t_building label; once built, # dom0 cannot read its memory. diff --git a/xen/xsm/flask/policy/initial_sids b/xen/xsm/flask/policy/initial_sids index e508bde..7eca70d 100644 --- a/xen/xsm/flask/policy/initial_sids +++ b/xen/xsm/flask/policy/initial_sids @@ -13,4 +13,6 @@ sid ioport sid iomem sid irq sid device +sid domU +sid domDM # FLASK -- 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 May 28 18:53:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:53: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 1Yy2w5-0006Ed-IW; Thu, 28 May 2015 18:53:45 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2w4-0006EL-3Q for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:53:44 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id 9E/76-29123-73467655; Thu, 28 May 2015 18:53:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1432839221!10736365!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14571 invoked from network); 28 May 2015 18:53:42 -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; 28 May 2015 18:53:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2w1-0003H6-I7 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:53:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2w1-0003bu-Gk for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:53:41 +0000 Date: Thu, 28 May 2015 18:53:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: assign a default ssidref (XSM label) to guests X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b521422bd9c12719e6848c1be340df667ef41b52 Author: Ian Campbell AuthorDate: Wed May 20 15:39:00 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:25:53 2015 +0100 libxl: assign a default ssidref (XSM label) to guests We have now arranged for SECINITSID_DOMU and SECINITSID_DOMDM to be defined (correspondng to system_u:system_r:domU_t and system_u:system_r:dm_dom_t respectively in the default policy). Use these as the default for the SSID of every (stub)domain. Signed-off-by: Ian Campbell Cc: Daniel De Graaf Cc: Wei.Liu2@citrix.com Acked-by: Wei Liu Acked-by: Daniel De Graaf --- tools/libxl/libxl_create.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 0a2359e..86384d2 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -25,6 +25,8 @@ #include #include +#include + int libxl__domain_create_info_setdefault(libxl__gc *gc, libxl_domain_create_info *c_info) { @@ -42,6 +44,9 @@ int libxl__domain_create_info_setdefault(libxl__gc *gc, libxl_defbool_setdefault(&c_info->run_hotplug_scripts, true); libxl_defbool_setdefault(&c_info->driver_domain, false); + if (!c_info->ssidref) + c_info->ssidref = SECINITSID_DOMU; + return 0; } @@ -111,6 +116,10 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, libxl_defbool_setdefault(&b_info->device_model_stubdomain, false); + if (libxl_defbool_val(b_info->device_model_stubdomain) && + !b_info->device_model_ssidref) + b_info->device_model_ssidref = SECINITSID_DOMDM; + if (!b_info->device_model_version) { if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { if (libxl_defbool_val(b_info->device_model_stubdomain)) { -- 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 May 28 18:53:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:53: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 1Yy2w5-0006Ed-IW; Thu, 28 May 2015 18:53:45 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2w4-0006EL-3Q for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:53:44 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id 9E/76-29123-73467655; Thu, 28 May 2015 18:53:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1432839221!10736365!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14571 invoked from network); 28 May 2015 18:53:42 -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; 28 May 2015 18:53:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2w1-0003H6-I7 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:53:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2w1-0003bu-Gk for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:53:41 +0000 Date: Thu, 28 May 2015 18:53:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: assign a default ssidref (XSM label) to guests X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b521422bd9c12719e6848c1be340df667ef41b52 Author: Ian Campbell AuthorDate: Wed May 20 15:39:00 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:25:53 2015 +0100 libxl: assign a default ssidref (XSM label) to guests We have now arranged for SECINITSID_DOMU and SECINITSID_DOMDM to be defined (correspondng to system_u:system_r:domU_t and system_u:system_r:dm_dom_t respectively in the default policy). Use these as the default for the SSID of every (stub)domain. Signed-off-by: Ian Campbell Cc: Daniel De Graaf Cc: Wei.Liu2@citrix.com Acked-by: Wei Liu Acked-by: Daniel De Graaf --- tools/libxl/libxl_create.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 0a2359e..86384d2 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -25,6 +25,8 @@ #include #include +#include + int libxl__domain_create_info_setdefault(libxl__gc *gc, libxl_domain_create_info *c_info) { @@ -42,6 +44,9 @@ int libxl__domain_create_info_setdefault(libxl__gc *gc, libxl_defbool_setdefault(&c_info->run_hotplug_scripts, true); libxl_defbool_setdefault(&c_info->driver_domain, false); + if (!c_info->ssidref) + c_info->ssidref = SECINITSID_DOMU; + return 0; } @@ -111,6 +116,10 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, libxl_defbool_setdefault(&b_info->device_model_stubdomain, false); + if (libxl_defbool_val(b_info->device_model_stubdomain) && + !b_info->device_model_ssidref) + b_info->device_model_ssidref = SECINITSID_DOMDM; + if (!b_info->device_model_version) { if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { if (libxl_defbool_val(b_info->device_model_stubdomain)) { -- 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 May 28 18:53:56 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:53:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2wG-0006G4-LO; Thu, 28 May 2015 18:53:56 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2wE-0006Fs-Ts for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:53:55 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id CC/66-06739-24467655; Thu, 28 May 2015 18:53:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1432839232!17955111!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20760 invoked from network); 28 May 2015 18:53:52 -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; 28 May 2015 18:53:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2wB-0003HC-QS for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:53:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2wB-0003cG-Nw for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:53:51 +0000 Date: Thu, 28 May 2015 18:53:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: add configure --with-dumpdir=DIR option X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bf36d0792032a0245e4a17a64c8b9eb9e056f282 Author: Olaf Hering AuthorDate: Mon May 11 15:33:51 2015 +0000 Commit: Ian Campbell CommitDate: Thu May 21 15:57:26 2015 +0100 tools: add configure --with-dumpdir=DIR option The current base directory /var/xen/dump for domU dumps will be patched to /var/lib/xen/dump by most distros to follow FHS. This change does three things: - change the default from /var/xen/dump to /var/lib/xen/dump - provide a configure option to avoid patching the source. - update docs to refer to the new default location Signed-off-by: Olaf Hering Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Wei Liu Acked-by: Ian Campbell [ ijc -- s,/var,LOCALSTATEDIR, in help test, ran autogen.sh ] --- Config.mk | 2 +- INSTALL | 4 ++++ config/Paths.mk.in | 1 + configure | 16 ++++++++++++++++ docs/man/xl.cfg.pod.5 | 6 +++--- docs/man/xl.pod.1 | 2 +- m4/paths.m4 | 9 +++++++++ tools/Makefile | 2 +- tools/configure | 16 ++++++++++++++++ tools/libxl/xl_cmdimpl.c | 2 +- 10 files changed, 53 insertions(+), 7 deletions(-) diff --git a/Config.mk b/Config.mk index 46928ca..b21ccaa 100644 --- a/Config.mk +++ b/Config.mk @@ -159,7 +159,7 @@ endef BUILD_MAKE_VARS := sbindir bindir LIBEXEC LIBEXEC_BIN libdir SHAREDIR \ XENFIRMWAREDIR XEN_CONFIG_DIR XEN_SCRIPT_DIR XEN_LOCK_DIR \ - XEN_RUN_DIR XEN_PAGING_DIR + XEN_RUN_DIR XEN_PAGING_DIR XEN_DUMP_DIR buildmakevars2file = $(eval $(call buildmakevars2file-closure,$(1))) define buildmakevars2file-closure diff --git a/INSTALL b/INSTALL index a0f2e7b..10cf879 100644 --- a/INSTALL +++ b/INSTALL @@ -128,6 +128,10 @@ original xenstored will be used. Valid names are xenstored and oxenstored. --with-xenstored=name +The path where to store core dumps for domUs which are configured with +coredump-destroy or coredump-restart can be specified with this option. + --with-xen-dumpdir=DIR + Instead of starting the tools in dom0 with sysv runlevel scripts they can also be started by systemd. If this option is enabled xenstored will receive the communication socked directly from systemd. So starting it diff --git a/config/Paths.mk.in b/config/Paths.mk.in index ddd72df..d36504f 100644 --- a/config/Paths.mk.in +++ b/config/Paths.mk.in @@ -48,6 +48,7 @@ CONFIG_LEAF_DIR := @CONFIG_LEAF_DIR@ BASH_COMPLETION_DIR := $(CONFIG_DIR)/bash_completion.d XEN_LOCK_DIR := @XEN_LOCK_DIR@ XEN_PAGING_DIR := @XEN_PAGING_DIR@ +XEN_DUMP_DIR := @XEN_DUMP_DIR@ XENFIRMWAREDIR := @XENFIRMWAREDIR@ diff --git a/configure b/configure index 8a084c8..80b27d6 100755 --- a/configure +++ b/configure @@ -594,6 +594,7 @@ stubdom tools xen subdirs +XEN_DUMP_DIR XEN_PAGING_DIR XEN_LOCK_DIR XEN_SCRIPT_DIR @@ -658,6 +659,7 @@ ac_user_opts=' enable_option_checking with_initddir with_sysconfig_leaf_dir +with_xen_dumpdir enable_xen enable_tools enable_stubdom @@ -1297,6 +1299,8 @@ Optional Packages: options for runlevel scripts and daemons such as xenstored. This should be either "sysconfig" or "default". [sysconfig] + --with-xen-dumpdir=DIR Path to directory for domU crash dumps. + [LOCALSTATEDIR/lib/xen/dump] Report bugs to . Xen Hypervisor home page: . @@ -1919,6 +1923,15 @@ fi CONFIG_LEAF_DIR=$config_leaf_dir + +# Check whether --with-xen-dumpdir was given. +if test "${with_xen_dumpdir+set}" = set; then : + withval=$with_xen_dumpdir; xen_dumpdir_path=$withval +else + xen_dumpdir_path=$localstatedir/lib/xen/dump +fi + + if test "$libexecdir" = '${exec_prefix}/libexec' ; then case "$host_os" in *netbsd*) ;; @@ -1968,6 +1981,9 @@ esac XEN_PAGING_DIR=$localstatedir/lib/xen/xenpaging +XEN_DUMP_DIR=$xen_dumpdir_path + + case "$host_cpu" in i[3456]86|x86_64) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 2267884..a3e0e2e 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -360,12 +360,12 @@ destroy`. =item B -write a "coredump" of the domain to F and then +write a "coredump" of the domain to F and then destroy the domain. =item B -write a "coredump" of the domain to F and then +write a "coredump" of the domain to F and then restart the domain. =back @@ -1707,7 +1707,7 @@ See L for more information. =head1 FILES F -F +F =head1 BUGS diff --git a/docs/man/xl.pod.1 b/docs/man/xl.pod.1 index e16dbf7..b2bc362 100644 --- a/docs/man/xl.pod.1 +++ b/docs/man/xl.pod.1 @@ -280,7 +280,7 @@ Change the domain name of I to I. Dumps the virtual machine's memory for the specified domain to the I specified, without pausing the domain. The dump file will be written to a distribution specific directory for dump files. Such -as: /var/lib/xen/dump or /var/xen/dump. +as: /var/lib/xen/dump. =item B [I<--long>] diff --git a/m4/paths.m4 b/m4/paths.m4 index db74f55..63e0f6b 100644 --- a/m4/paths.m4 +++ b/m4/paths.m4 @@ -62,6 +62,12 @@ AC_ARG_WITH([sysconfig-leaf-dir], CONFIG_LEAF_DIR=$config_leaf_dir AC_SUBST(CONFIG_LEAF_DIR) +AC_ARG_WITH([xen-dumpdir], + AS_HELP_STRING([--with-xen-dumpdir=DIR], + [Path to directory for domU crash dumps. [LOCALSTATEDIR/lib/xen/dump]]), + [xen_dumpdir_path=$withval], + [xen_dumpdir_path=$localstatedir/lib/xen/dump]) + if test "$libexecdir" = '${exec_prefix}/libexec' ; then case "$host_os" in *netbsd*) ;; @@ -113,4 +119,7 @@ AC_SUBST(XEN_LOCK_DIR) XEN_PAGING_DIR=$localstatedir/lib/xen/xenpaging AC_SUBST(XEN_PAGING_DIR) + +XEN_DUMP_DIR=$xen_dumpdir_path +AC_SUBST(XEN_DUMP_DIR) ]) diff --git a/tools/Makefile b/tools/Makefile index 383d4ca..45cb4b2 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -58,7 +58,7 @@ build all: subdirs-all .PHONY: install install: subdirs-install - $(INSTALL_DIR) $(DESTDIR)/var/xen/dump + $(INSTALL_DIR) $(DESTDIR)$(XEN_DUMP_DIR) $(INSTALL_DIR) $(DESTDIR)/var/log/xen $(INSTALL_DIR) $(DESTDIR)/var/lib/xen diff --git a/tools/configure b/tools/configure index dfd8175..4c2928d 100755 --- a/tools/configure +++ b/tools/configure @@ -711,6 +711,7 @@ ocamltools monitors githttp rpath +XEN_DUMP_DIR XEN_PAGING_DIR XEN_LOCK_DIR XEN_SCRIPT_DIR @@ -785,6 +786,7 @@ enable_option_checking enable_largefile with_initddir with_sysconfig_leaf_dir +with_xen_dumpdir enable_rpath enable_githttp enable_monitors @@ -1487,6 +1489,8 @@ Optional Packages: options for runlevel scripts and daemons such as xenstored. This should be either "sysconfig" or "default". [sysconfig] + --with-xen-dumpdir=DIR Path to directory for domU crash dumps. + [LOCALSTATEDIR/lib/xen/dump] --with-linux-backend-modules="mod1 mod2" List of Linux backend module or modalias names to be autoloaded on startup. @@ -3883,6 +3887,15 @@ fi CONFIG_LEAF_DIR=$config_leaf_dir + +# Check whether --with-xen-dumpdir was given. +if test "${with_xen_dumpdir+set}" = set; then : + withval=$with_xen_dumpdir; xen_dumpdir_path=$withval +else + xen_dumpdir_path=$localstatedir/lib/xen/dump +fi + + if test "$libexecdir" = '${exec_prefix}/libexec' ; then case "$host_os" in *netbsd*) ;; @@ -3932,6 +3945,9 @@ esac XEN_PAGING_DIR=$localstatedir/lib/xen/xenpaging +XEN_DUMP_DIR=$xen_dumpdir_path + + # Enable/disable options diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 186c4dd..c858068 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2324,7 +2324,7 @@ static int handle_domain_death(uint32_t *r_domid, char *corefile; int rc; - if (asprintf(&corefile, "/var/xen/dump/%s", d_config->c_info.name) < 0) { + if (asprintf(&corefile, XEN_DUMP_DIR "/%s", d_config->c_info.name) < 0) { LOG("failed to construct core dump path"); } else { LOG("dumping core to %s", corefile); -- 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 May 28 18:53:56 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:53:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2wG-0006G4-LO; Thu, 28 May 2015 18:53:56 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2wE-0006Fs-Ts for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:53:55 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id CC/66-06739-24467655; Thu, 28 May 2015 18:53:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1432839232!17955111!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20760 invoked from network); 28 May 2015 18:53:52 -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; 28 May 2015 18:53:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2wB-0003HC-QS for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:53:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2wB-0003cG-Nw for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:53:51 +0000 Date: Thu, 28 May 2015 18:53:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: add configure --with-dumpdir=DIR option X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bf36d0792032a0245e4a17a64c8b9eb9e056f282 Author: Olaf Hering AuthorDate: Mon May 11 15:33:51 2015 +0000 Commit: Ian Campbell CommitDate: Thu May 21 15:57:26 2015 +0100 tools: add configure --with-dumpdir=DIR option The current base directory /var/xen/dump for domU dumps will be patched to /var/lib/xen/dump by most distros to follow FHS. This change does three things: - change the default from /var/xen/dump to /var/lib/xen/dump - provide a configure option to avoid patching the source. - update docs to refer to the new default location Signed-off-by: Olaf Hering Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Wei Liu Acked-by: Ian Campbell [ ijc -- s,/var,LOCALSTATEDIR, in help test, ran autogen.sh ] --- Config.mk | 2 +- INSTALL | 4 ++++ config/Paths.mk.in | 1 + configure | 16 ++++++++++++++++ docs/man/xl.cfg.pod.5 | 6 +++--- docs/man/xl.pod.1 | 2 +- m4/paths.m4 | 9 +++++++++ tools/Makefile | 2 +- tools/configure | 16 ++++++++++++++++ tools/libxl/xl_cmdimpl.c | 2 +- 10 files changed, 53 insertions(+), 7 deletions(-) diff --git a/Config.mk b/Config.mk index 46928ca..b21ccaa 100644 --- a/Config.mk +++ b/Config.mk @@ -159,7 +159,7 @@ endef BUILD_MAKE_VARS := sbindir bindir LIBEXEC LIBEXEC_BIN libdir SHAREDIR \ XENFIRMWAREDIR XEN_CONFIG_DIR XEN_SCRIPT_DIR XEN_LOCK_DIR \ - XEN_RUN_DIR XEN_PAGING_DIR + XEN_RUN_DIR XEN_PAGING_DIR XEN_DUMP_DIR buildmakevars2file = $(eval $(call buildmakevars2file-closure,$(1))) define buildmakevars2file-closure diff --git a/INSTALL b/INSTALL index a0f2e7b..10cf879 100644 --- a/INSTALL +++ b/INSTALL @@ -128,6 +128,10 @@ original xenstored will be used. Valid names are xenstored and oxenstored. --with-xenstored=name +The path where to store core dumps for domUs which are configured with +coredump-destroy or coredump-restart can be specified with this option. + --with-xen-dumpdir=DIR + Instead of starting the tools in dom0 with sysv runlevel scripts they can also be started by systemd. If this option is enabled xenstored will receive the communication socked directly from systemd. So starting it diff --git a/config/Paths.mk.in b/config/Paths.mk.in index ddd72df..d36504f 100644 --- a/config/Paths.mk.in +++ b/config/Paths.mk.in @@ -48,6 +48,7 @@ CONFIG_LEAF_DIR := @CONFIG_LEAF_DIR@ BASH_COMPLETION_DIR := $(CONFIG_DIR)/bash_completion.d XEN_LOCK_DIR := @XEN_LOCK_DIR@ XEN_PAGING_DIR := @XEN_PAGING_DIR@ +XEN_DUMP_DIR := @XEN_DUMP_DIR@ XENFIRMWAREDIR := @XENFIRMWAREDIR@ diff --git a/configure b/configure index 8a084c8..80b27d6 100755 --- a/configure +++ b/configure @@ -594,6 +594,7 @@ stubdom tools xen subdirs +XEN_DUMP_DIR XEN_PAGING_DIR XEN_LOCK_DIR XEN_SCRIPT_DIR @@ -658,6 +659,7 @@ ac_user_opts=' enable_option_checking with_initddir with_sysconfig_leaf_dir +with_xen_dumpdir enable_xen enable_tools enable_stubdom @@ -1297,6 +1299,8 @@ Optional Packages: options for runlevel scripts and daemons such as xenstored. This should be either "sysconfig" or "default". [sysconfig] + --with-xen-dumpdir=DIR Path to directory for domU crash dumps. + [LOCALSTATEDIR/lib/xen/dump] Report bugs to . Xen Hypervisor home page: . @@ -1919,6 +1923,15 @@ fi CONFIG_LEAF_DIR=$config_leaf_dir + +# Check whether --with-xen-dumpdir was given. +if test "${with_xen_dumpdir+set}" = set; then : + withval=$with_xen_dumpdir; xen_dumpdir_path=$withval +else + xen_dumpdir_path=$localstatedir/lib/xen/dump +fi + + if test "$libexecdir" = '${exec_prefix}/libexec' ; then case "$host_os" in *netbsd*) ;; @@ -1968,6 +1981,9 @@ esac XEN_PAGING_DIR=$localstatedir/lib/xen/xenpaging +XEN_DUMP_DIR=$xen_dumpdir_path + + case "$host_cpu" in i[3456]86|x86_64) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 2267884..a3e0e2e 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -360,12 +360,12 @@ destroy`. =item B -write a "coredump" of the domain to F and then +write a "coredump" of the domain to F and then destroy the domain. =item B -write a "coredump" of the domain to F and then +write a "coredump" of the domain to F and then restart the domain. =back @@ -1707,7 +1707,7 @@ See L for more information. =head1 FILES F -F +F =head1 BUGS diff --git a/docs/man/xl.pod.1 b/docs/man/xl.pod.1 index e16dbf7..b2bc362 100644 --- a/docs/man/xl.pod.1 +++ b/docs/man/xl.pod.1 @@ -280,7 +280,7 @@ Change the domain name of I to I. Dumps the virtual machine's memory for the specified domain to the I specified, without pausing the domain. The dump file will be written to a distribution specific directory for dump files. Such -as: /var/lib/xen/dump or /var/xen/dump. +as: /var/lib/xen/dump. =item B [I<--long>] diff --git a/m4/paths.m4 b/m4/paths.m4 index db74f55..63e0f6b 100644 --- a/m4/paths.m4 +++ b/m4/paths.m4 @@ -62,6 +62,12 @@ AC_ARG_WITH([sysconfig-leaf-dir], CONFIG_LEAF_DIR=$config_leaf_dir AC_SUBST(CONFIG_LEAF_DIR) +AC_ARG_WITH([xen-dumpdir], + AS_HELP_STRING([--with-xen-dumpdir=DIR], + [Path to directory for domU crash dumps. [LOCALSTATEDIR/lib/xen/dump]]), + [xen_dumpdir_path=$withval], + [xen_dumpdir_path=$localstatedir/lib/xen/dump]) + if test "$libexecdir" = '${exec_prefix}/libexec' ; then case "$host_os" in *netbsd*) ;; @@ -113,4 +119,7 @@ AC_SUBST(XEN_LOCK_DIR) XEN_PAGING_DIR=$localstatedir/lib/xen/xenpaging AC_SUBST(XEN_PAGING_DIR) + +XEN_DUMP_DIR=$xen_dumpdir_path +AC_SUBST(XEN_DUMP_DIR) ]) diff --git a/tools/Makefile b/tools/Makefile index 383d4ca..45cb4b2 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -58,7 +58,7 @@ build all: subdirs-all .PHONY: install install: subdirs-install - $(INSTALL_DIR) $(DESTDIR)/var/xen/dump + $(INSTALL_DIR) $(DESTDIR)$(XEN_DUMP_DIR) $(INSTALL_DIR) $(DESTDIR)/var/log/xen $(INSTALL_DIR) $(DESTDIR)/var/lib/xen diff --git a/tools/configure b/tools/configure index dfd8175..4c2928d 100755 --- a/tools/configure +++ b/tools/configure @@ -711,6 +711,7 @@ ocamltools monitors githttp rpath +XEN_DUMP_DIR XEN_PAGING_DIR XEN_LOCK_DIR XEN_SCRIPT_DIR @@ -785,6 +786,7 @@ enable_option_checking enable_largefile with_initddir with_sysconfig_leaf_dir +with_xen_dumpdir enable_rpath enable_githttp enable_monitors @@ -1487,6 +1489,8 @@ Optional Packages: options for runlevel scripts and daemons such as xenstored. This should be either "sysconfig" or "default". [sysconfig] + --with-xen-dumpdir=DIR Path to directory for domU crash dumps. + [LOCALSTATEDIR/lib/xen/dump] --with-linux-backend-modules="mod1 mod2" List of Linux backend module or modalias names to be autoloaded on startup. @@ -3883,6 +3887,15 @@ fi CONFIG_LEAF_DIR=$config_leaf_dir + +# Check whether --with-xen-dumpdir was given. +if test "${with_xen_dumpdir+set}" = set; then : + withval=$with_xen_dumpdir; xen_dumpdir_path=$withval +else + xen_dumpdir_path=$localstatedir/lib/xen/dump +fi + + if test "$libexecdir" = '${exec_prefix}/libexec' ; then case "$host_os" in *netbsd*) ;; @@ -3932,6 +3945,9 @@ esac XEN_PAGING_DIR=$localstatedir/lib/xen/xenpaging +XEN_DUMP_DIR=$xen_dumpdir_path + + # Enable/disable options diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 186c4dd..c858068 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2324,7 +2324,7 @@ static int handle_domain_death(uint32_t *r_domid, char *corefile; int rc; - if (asprintf(&corefile, "/var/xen/dump/%s", d_config->c_info.name) < 0) { + if (asprintf(&corefile, XEN_DUMP_DIR "/%s", d_config->c_info.name) < 0) { LOG("failed to construct core dump path"); } else { LOG("dumping core to %s", corefile); -- 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 May 28 18:54:05 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:54:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2wO-0006HR-O7; Thu, 28 May 2015 18:54:04 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2wO-0006HH-EU for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:54:04 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 3E/A9-21300-B4467655; Thu, 28 May 2015 18:54:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1432839242!12209192!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1570 invoked from network); 28 May 2015 18:54:03 -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; 28 May 2015 18:54:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2wM-0003Ho-1D for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:54:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2wL-0003cn-UT for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:54:01 +0000 Date: Thu, 28 May 2015 18:54:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: Move preinit_xen_time in ARM 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 52622e27206d48b7ca85ca909724734f3db4f15e Author: Julien Grall AuthorDate: Thu May 21 15:31:21 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:58:40 2015 +0100 xen: Move preinit_xen_time in ARM headers This function is ARM specific. It's has been added by mistake in the common code. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/include/asm-arm/time.h | 2 ++ xen/include/xen/time.h | 1 - 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/include/asm-arm/time.h b/xen/include/asm-arm/time.h index d544b5b..039039a 100644 --- a/xen/include/asm-arm/time.h +++ b/xen/include/asm-arm/time.h @@ -31,6 +31,8 @@ extern void __cpuinit init_timer_interrupt(void); /* Counter value at boot time */ extern uint64_t boot_count; +void preinit_xen_time(void); + #endif /* __ARM_TIME_H__ */ /* * Local variables: diff --git a/xen/include/xen/time.h b/xen/include/xen/time.h index bb19511..da4e8d7 100644 --- a/xen/include/xen/time.h +++ b/xen/include/xen/time.h @@ -12,7 +12,6 @@ #include extern int init_xen_time(void); -void preinit_xen_time(void); extern void cstate_restore_tsc(void); extern unsigned long cpu_khz; -- 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 May 28 18:54:05 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:54:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2wO-0006HR-O7; Thu, 28 May 2015 18:54:04 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2wO-0006HH-EU for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:54:04 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 3E/A9-21300-B4467655; Thu, 28 May 2015 18:54:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1432839242!12209192!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1570 invoked from network); 28 May 2015 18:54:03 -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; 28 May 2015 18:54:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2wM-0003Ho-1D for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:54:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2wL-0003cn-UT for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:54:01 +0000 Date: Thu, 28 May 2015 18:54:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: Move preinit_xen_time in ARM 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 52622e27206d48b7ca85ca909724734f3db4f15e Author: Julien Grall AuthorDate: Thu May 21 15:31:21 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 15:58:40 2015 +0100 xen: Move preinit_xen_time in ARM headers This function is ARM specific. It's has been added by mistake in the common code. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/include/asm-arm/time.h | 2 ++ xen/include/xen/time.h | 1 - 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/include/asm-arm/time.h b/xen/include/asm-arm/time.h index d544b5b..039039a 100644 --- a/xen/include/asm-arm/time.h +++ b/xen/include/asm-arm/time.h @@ -31,6 +31,8 @@ extern void __cpuinit init_timer_interrupt(void); /* Counter value at boot time */ extern uint64_t boot_count; +void preinit_xen_time(void); + #endif /* __ARM_TIME_H__ */ /* * Local variables: diff --git a/xen/include/xen/time.h b/xen/include/xen/time.h index bb19511..da4e8d7 100644 --- a/xen/include/xen/time.h +++ b/xen/include/xen/time.h @@ -12,7 +12,6 @@ #include extern int init_xen_time(void); -void preinit_xen_time(void); extern void cstate_restore_tsc(void); extern unsigned long cpu_khz; -- 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 May 28 18:54:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:54: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 1Yy2wZ-0006J0-Qg; Thu, 28 May 2015 18:54:15 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2wY-0006Io-Hh for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:54:14 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id EA/04-05057-55467655; Thu, 28 May 2015 18:54:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1432839252!8243308!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31070 invoked from network); 28 May 2015 18:54:13 -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; 28 May 2015 18:54:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2wW-0003Hu-5u for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:54:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2wW-0003dB-4t for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:54:12 +0000 Date: Thu, 28 May 2015 18:54:12 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: correct pod syntax X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c2d58b03d138a999ca7f1b894121489eba70b8e7 Author: Ian Campbell AuthorDate: Thu May 21 17:31:39 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 19:01:03 2015 +0100 docs: correct pod syntax Olaf reports: [ 146s] man/xl.pod.1 around line 1529: '=item' outside of any '=over' [ 146s] man/xl.pod.1 around line 1531: You forgot a '=back' before '=head1' [ 146s] POD document had syntax errors at /usr/bin/pod2text line 84. [ 146s] Makefile:167: recipe for target 'txt/man/xl.1.txt' failed [ 146s] make[1]: *** [txt/man/xl.1.txt] Error 255 Reported-by: Olaf Hering Signed-off-by: Ian Campbell Tested-by: Andrew Cooper --- docs/man/xl.pod.1 | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/docs/man/xl.pod.1 b/docs/man/xl.pod.1 index b2bc362..4eb929d 100644 --- a/docs/man/xl.pod.1 +++ b/docs/man/xl.pod.1 @@ -1526,8 +1526,12 @@ xl is mostly command-line compatible with the old xm utility used with the old Python xend. For compatibility, the following options are ignored: +=over 4 + =item B +=back + =head1 TO BE DOCUMENTED We need better documentation for: -- 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 May 28 18:54:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:54: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 1Yy2wZ-0006J0-Qg; Thu, 28 May 2015 18:54:15 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2wY-0006Io-Hh for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:54:14 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id EA/04-05057-55467655; Thu, 28 May 2015 18:54:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1432839252!8243308!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31070 invoked from network); 28 May 2015 18:54:13 -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; 28 May 2015 18:54:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2wW-0003Hu-5u for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:54:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2wW-0003dB-4t for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:54:12 +0000 Date: Thu, 28 May 2015 18:54:12 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: correct pod syntax X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c2d58b03d138a999ca7f1b894121489eba70b8e7 Author: Ian Campbell AuthorDate: Thu May 21 17:31:39 2015 +0100 Commit: Ian Campbell CommitDate: Thu May 21 19:01:03 2015 +0100 docs: correct pod syntax Olaf reports: [ 146s] man/xl.pod.1 around line 1529: '=item' outside of any '=over' [ 146s] man/xl.pod.1 around line 1531: You forgot a '=back' before '=head1' [ 146s] POD document had syntax errors at /usr/bin/pod2text line 84. [ 146s] Makefile:167: recipe for target 'txt/man/xl.1.txt' failed [ 146s] make[1]: *** [txt/man/xl.1.txt] Error 255 Reported-by: Olaf Hering Signed-off-by: Ian Campbell Tested-by: Andrew Cooper --- docs/man/xl.pod.1 | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/docs/man/xl.pod.1 b/docs/man/xl.pod.1 index b2bc362..4eb929d 100644 --- a/docs/man/xl.pod.1 +++ b/docs/man/xl.pod.1 @@ -1526,8 +1526,12 @@ xl is mostly command-line compatible with the old xm utility used with the old Python xend. For compatibility, the following options are ignored: +=over 4 + =item B +=back + =head1 TO BE DOCUMENTED We need better documentation for: -- 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 May 28 18:54:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:54: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 1Yy2wl-0006Ki-TP; Thu, 28 May 2015 18:54:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2wk-0006KY-J4 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:54:26 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id B3/BA-30151-16467655; Thu, 28 May 2015 18:54:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1432839262!18339710!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30700 invoked from network); 28 May 2015 18:54:23 -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; 28 May 2015 18:54:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2wg-0003I0-CN for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:54:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2wg-0003dX-AU for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:54:22 +0000 Date: Thu, 28 May 2015 18:54:22 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/VT-x: align segment table columns when dumping a VMCS X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4353035b716e0da43d48f555a987b50d031bbbe8 Author: Andrew Cooper AuthorDate: Fri May 22 10:09:27 2015 +0200 Commit: Jan Beulich CommitDate: Fri May 22 10:09:27 2015 +0200 x86/VT-x: align segment table columns when dumping a VMCS This makes it more succinct and easier to read. Before: (XEN) Sysenter RSP=0000000000000000 CS:RIP=0000:0000000000000000 (XEN) CS: sel=0x0008, attr=0x0c09b, limit=0xffffffff, base=0x0000000000000000 (XEN) DS: sel=0x0010, attr=0x0c093, limit=0xffffffff, base=0x0000000000000000 (XEN) SS: sel=0x0010, attr=0x0c093, limit=0xffffffff, base=0x0000000000000000 (XEN) ES: sel=0x0010, attr=0x0c093, limit=0xffffffff, base=0x0000000000000000 (XEN) FS: sel=0x0000, attr=0x00093, limit=0x0000ffff, base=0x0000000000000000 (XEN) GS: sel=0x0000, attr=0x00093, limit=0x0000ffff, base=0x0000000000000000 (XEN) GDTR: limit=0x00000017, base=0x0000000000102eb8 (XEN) LDTR: sel=0x0000, attr=0x00082, limit=0x0000ffff, base=0x0000000000000000 (XEN) IDTR: limit=0x0000ffff, base=0x0000000000000000 (XEN) TR: sel=0x0000, attr=0x0008b, limit=0x0000ffff, base=0x0000000000000000 (XEN) EFER = 0x0000000000000000 PAT = 0x0007040600070406 After: (XEN) Sysenter RSP=0000000000000000 CS:RIP=0000:0000000000000000 (XEN) sel attr limit base (XEN) CS: 0008 0c09b ffffffff 0000000000000000 (XEN) DS: 0010 0c093 ffffffff 0000000000000000 (XEN) SS: 0010 0c093 ffffffff 0000000000000000 (XEN) ES: 0010 0c093 ffffffff 0000000000000000 (XEN) FS: 0000 00093 0000ffff 0000000000000000 (XEN) GS: 0000 00093 0000ffff 0000000000000000 (XEN) GDTR: 00000017 0000000000102eb8 (XEN) LDTR: 0000 00082 0000ffff 0000000000000000 (XEN) IDTR: 0000ffff 0000000000000000 (XEN) TR: 0000 0008b 0000ffff 0000000000000000 (XEN) EFER = 0x0000000000000000 PAT = 0x0007040600070406 Signed-off-by: Andrew Cooper Acked-by: Kevin Tian --- xen/arch/x86/hvm/vmx/vmcs.c | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 355d1b5..877ec10 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -1639,8 +1639,7 @@ static void vmx_dump_sel(char *name, uint32_t selector) attr = vmr(selector + (GUEST_ES_AR_BYTES - GUEST_ES_SELECTOR)); limit = vmr(selector + (GUEST_ES_LIMIT - GUEST_ES_SELECTOR)); base = vmr(selector + (GUEST_ES_BASE - GUEST_ES_SELECTOR)); - printk("%s: sel=0x%04x, attr=0x%05x, limit=0x%08x, base=0x%016"PRIx64"\n", - name, sel, attr, limit, base); + printk("%s: %04x %05x %08x %016"PRIx64"\n", name, sel, attr, limit, base); } static void vmx_dump_sel2(char *name, uint32_t lim) @@ -1649,8 +1648,7 @@ static void vmx_dump_sel2(char *name, uint32_t lim) uint64_t base; limit = vmr(lim); base = vmr(lim + (GUEST_GDTR_BASE - GUEST_GDTR_LIMIT)); - printk("%s: limit=0x%08x, base=0x%016"PRIx64"\n", - name, limit, base); + printk("%s: %08x %016"PRIx64"\n", name, limit, base); } void vmcs_dump_vcpu(struct vcpu *v) @@ -1695,16 +1693,17 @@ void vmcs_dump_vcpu(struct vcpu *v) printk("Sysenter RSP=%016lx CS:RIP=%04x:%016lx\n", vmr(GUEST_SYSENTER_ESP), vmr32(GUEST_SYSENTER_CS), vmr(GUEST_SYSENTER_EIP)); - vmx_dump_sel("CS", GUEST_CS_SELECTOR); - vmx_dump_sel("DS", GUEST_DS_SELECTOR); - vmx_dump_sel("SS", GUEST_SS_SELECTOR); - vmx_dump_sel("ES", GUEST_ES_SELECTOR); - vmx_dump_sel("FS", GUEST_FS_SELECTOR); - vmx_dump_sel("GS", GUEST_GS_SELECTOR); + printk(" sel attr limit base\n"); + vmx_dump_sel(" CS", GUEST_CS_SELECTOR); + vmx_dump_sel(" DS", GUEST_DS_SELECTOR); + vmx_dump_sel(" SS", GUEST_SS_SELECTOR); + vmx_dump_sel(" ES", GUEST_ES_SELECTOR); + vmx_dump_sel(" FS", GUEST_FS_SELECTOR); + vmx_dump_sel(" GS", GUEST_GS_SELECTOR); vmx_dump_sel2("GDTR", GUEST_GDTR_LIMIT); vmx_dump_sel("LDTR", GUEST_LDTR_SELECTOR); vmx_dump_sel2("IDTR", GUEST_IDTR_LIMIT); - vmx_dump_sel("TR", GUEST_TR_SELECTOR); + vmx_dump_sel(" TR", GUEST_TR_SELECTOR); if ( (vmexit_ctl & (VM_EXIT_SAVE_GUEST_PAT | VM_EXIT_SAVE_GUEST_EFER)) || (vmentry_ctl & (VM_ENTRY_LOAD_GUEST_PAT | VM_ENTRY_LOAD_GUEST_EFER)) ) printk("EFER = 0x%016lx PAT = 0x%016lx\n", efer, vmr(GUEST_PAT)); -- 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 May 28 18:54:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:54: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 1Yy2wl-0006Ki-TP; Thu, 28 May 2015 18:54:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2wk-0006KY-J4 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:54:26 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id B3/BA-30151-16467655; Thu, 28 May 2015 18:54:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1432839262!18339710!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30700 invoked from network); 28 May 2015 18:54:23 -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; 28 May 2015 18:54:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2wg-0003I0-CN for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:54:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2wg-0003dX-AU for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:54:22 +0000 Date: Thu, 28 May 2015 18:54:22 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/VT-x: align segment table columns when dumping a VMCS X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4353035b716e0da43d48f555a987b50d031bbbe8 Author: Andrew Cooper AuthorDate: Fri May 22 10:09:27 2015 +0200 Commit: Jan Beulich CommitDate: Fri May 22 10:09:27 2015 +0200 x86/VT-x: align segment table columns when dumping a VMCS This makes it more succinct and easier to read. Before: (XEN) Sysenter RSP=0000000000000000 CS:RIP=0000:0000000000000000 (XEN) CS: sel=0x0008, attr=0x0c09b, limit=0xffffffff, base=0x0000000000000000 (XEN) DS: sel=0x0010, attr=0x0c093, limit=0xffffffff, base=0x0000000000000000 (XEN) SS: sel=0x0010, attr=0x0c093, limit=0xffffffff, base=0x0000000000000000 (XEN) ES: sel=0x0010, attr=0x0c093, limit=0xffffffff, base=0x0000000000000000 (XEN) FS: sel=0x0000, attr=0x00093, limit=0x0000ffff, base=0x0000000000000000 (XEN) GS: sel=0x0000, attr=0x00093, limit=0x0000ffff, base=0x0000000000000000 (XEN) GDTR: limit=0x00000017, base=0x0000000000102eb8 (XEN) LDTR: sel=0x0000, attr=0x00082, limit=0x0000ffff, base=0x0000000000000000 (XEN) IDTR: limit=0x0000ffff, base=0x0000000000000000 (XEN) TR: sel=0x0000, attr=0x0008b, limit=0x0000ffff, base=0x0000000000000000 (XEN) EFER = 0x0000000000000000 PAT = 0x0007040600070406 After: (XEN) Sysenter RSP=0000000000000000 CS:RIP=0000:0000000000000000 (XEN) sel attr limit base (XEN) CS: 0008 0c09b ffffffff 0000000000000000 (XEN) DS: 0010 0c093 ffffffff 0000000000000000 (XEN) SS: 0010 0c093 ffffffff 0000000000000000 (XEN) ES: 0010 0c093 ffffffff 0000000000000000 (XEN) FS: 0000 00093 0000ffff 0000000000000000 (XEN) GS: 0000 00093 0000ffff 0000000000000000 (XEN) GDTR: 00000017 0000000000102eb8 (XEN) LDTR: 0000 00082 0000ffff 0000000000000000 (XEN) IDTR: 0000ffff 0000000000000000 (XEN) TR: 0000 0008b 0000ffff 0000000000000000 (XEN) EFER = 0x0000000000000000 PAT = 0x0007040600070406 Signed-off-by: Andrew Cooper Acked-by: Kevin Tian --- xen/arch/x86/hvm/vmx/vmcs.c | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 355d1b5..877ec10 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -1639,8 +1639,7 @@ static void vmx_dump_sel(char *name, uint32_t selector) attr = vmr(selector + (GUEST_ES_AR_BYTES - GUEST_ES_SELECTOR)); limit = vmr(selector + (GUEST_ES_LIMIT - GUEST_ES_SELECTOR)); base = vmr(selector + (GUEST_ES_BASE - GUEST_ES_SELECTOR)); - printk("%s: sel=0x%04x, attr=0x%05x, limit=0x%08x, base=0x%016"PRIx64"\n", - name, sel, attr, limit, base); + printk("%s: %04x %05x %08x %016"PRIx64"\n", name, sel, attr, limit, base); } static void vmx_dump_sel2(char *name, uint32_t lim) @@ -1649,8 +1648,7 @@ static void vmx_dump_sel2(char *name, uint32_t lim) uint64_t base; limit = vmr(lim); base = vmr(lim + (GUEST_GDTR_BASE - GUEST_GDTR_LIMIT)); - printk("%s: limit=0x%08x, base=0x%016"PRIx64"\n", - name, limit, base); + printk("%s: %08x %016"PRIx64"\n", name, limit, base); } void vmcs_dump_vcpu(struct vcpu *v) @@ -1695,16 +1693,17 @@ void vmcs_dump_vcpu(struct vcpu *v) printk("Sysenter RSP=%016lx CS:RIP=%04x:%016lx\n", vmr(GUEST_SYSENTER_ESP), vmr32(GUEST_SYSENTER_CS), vmr(GUEST_SYSENTER_EIP)); - vmx_dump_sel("CS", GUEST_CS_SELECTOR); - vmx_dump_sel("DS", GUEST_DS_SELECTOR); - vmx_dump_sel("SS", GUEST_SS_SELECTOR); - vmx_dump_sel("ES", GUEST_ES_SELECTOR); - vmx_dump_sel("FS", GUEST_FS_SELECTOR); - vmx_dump_sel("GS", GUEST_GS_SELECTOR); + printk(" sel attr limit base\n"); + vmx_dump_sel(" CS", GUEST_CS_SELECTOR); + vmx_dump_sel(" DS", GUEST_DS_SELECTOR); + vmx_dump_sel(" SS", GUEST_SS_SELECTOR); + vmx_dump_sel(" ES", GUEST_ES_SELECTOR); + vmx_dump_sel(" FS", GUEST_FS_SELECTOR); + vmx_dump_sel(" GS", GUEST_GS_SELECTOR); vmx_dump_sel2("GDTR", GUEST_GDTR_LIMIT); vmx_dump_sel("LDTR", GUEST_LDTR_SELECTOR); vmx_dump_sel2("IDTR", GUEST_IDTR_LIMIT); - vmx_dump_sel("TR", GUEST_TR_SELECTOR); + vmx_dump_sel(" TR", GUEST_TR_SELECTOR); if ( (vmexit_ctl & (VM_EXIT_SAVE_GUEST_PAT | VM_EXIT_SAVE_GUEST_EFER)) || (vmentry_ctl & (VM_ENTRY_LOAD_GUEST_PAT | VM_ENTRY_LOAD_GUEST_EFER)) ) printk("EFER = 0x%016lx PAT = 0x%016lx\n", efer, vmr(GUEST_PAT)); -- 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 May 28 18:54:36 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:54: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 1Yy2wu-0006MP-21; Thu, 28 May 2015 18:54:36 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2wt-0006M6-3P for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:54:35 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 19/CA-30151-A6467655; Thu, 28 May 2015 18:54:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1432839272!18336699!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13197 invoked from network); 28 May 2015 18:54:33 -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; 28 May 2015 18:54:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2wq-0003I8-HA for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:54:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2wq-0003dx-FM for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:54:32 +0000 Date: Thu, 28 May 2015 18:54:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] public: restrict xen_arch_domainconfig visibility X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8529d6a48158034e54d3a1be37bc87c01bf40232 Author: Jan Beulich AuthorDate: Fri May 22 10:10:28 2015 +0200 Commit: Jan Beulich CommitDate: Fri May 22 10:10:28 2015 +0200 public: restrict xen_arch_domainconfig visibility As an extension to 931f5777c7 ("public: clarify xen_arch_domainconfig ABI statement") limit the respective definitions' visibility to hypervisor and tools. Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/include/public/arch-arm.h | 20 ++++++++++---------- xen/include/public/arch-x86/xen.h | 2 ++ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h index 2cbd323..6f24c5f 100644 --- a/xen/include/public/arch-arm.h +++ b/xen/include/public/arch-arm.h @@ -298,16 +298,6 @@ struct vcpu_guest_context { }; typedef struct vcpu_guest_context vcpu_guest_context_t; DEFINE_XEN_GUEST_HANDLE(vcpu_guest_context_t); -#endif - -struct arch_vcpu_info { -}; -typedef struct arch_vcpu_info arch_vcpu_info_t; - -struct arch_shared_info { -}; -typedef struct arch_shared_info arch_shared_info_t; -typedef uint64_t xen_callback_t; /* * struct xen_arch_domainconfig's ABI is covered by @@ -322,6 +312,16 @@ struct xen_arch_domainconfig { /* IN */ uint32_t nr_spis; }; +#endif /* __XEN__ || __XEN_TOOLS__ */ + +struct arch_vcpu_info { +}; +typedef struct arch_vcpu_info arch_vcpu_info_t; + +struct arch_shared_info { +}; +typedef struct arch_shared_info arch_shared_info_t; +typedef uint64_t xen_callback_t; #endif diff --git a/xen/include/public/arch-x86/xen.h b/xen/include/public/arch-x86/xen.h index 8a52c04..2ecc9c9 100644 --- a/xen/include/public/arch-x86/xen.h +++ b/xen/include/public/arch-x86/xen.h @@ -262,6 +262,7 @@ struct arch_shared_info { }; typedef struct arch_shared_info arch_shared_info_t; +#if defined(__XEN__) || defined(__XEN_TOOLS__) /* * struct xen_arch_domainconfig's ABI is covered by * XEN_DOMCTL_INTERFACE_VERSION. @@ -269,6 +270,7 @@ typedef struct arch_shared_info arch_shared_info_t; struct xen_arch_domainconfig { char dummy; }; +#endif #endif /* !__ASSEMBLY__ */ -- 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 May 28 18:54:36 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:54: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 1Yy2wu-0006MP-21; Thu, 28 May 2015 18:54:36 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2wt-0006M6-3P for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:54:35 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 19/CA-30151-A6467655; Thu, 28 May 2015 18:54:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1432839272!18336699!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13197 invoked from network); 28 May 2015 18:54:33 -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; 28 May 2015 18:54:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2wq-0003I8-HA for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:54:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2wq-0003dx-FM for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:54:32 +0000 Date: Thu, 28 May 2015 18:54:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] public: restrict xen_arch_domainconfig visibility X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8529d6a48158034e54d3a1be37bc87c01bf40232 Author: Jan Beulich AuthorDate: Fri May 22 10:10:28 2015 +0200 Commit: Jan Beulich CommitDate: Fri May 22 10:10:28 2015 +0200 public: restrict xen_arch_domainconfig visibility As an extension to 931f5777c7 ("public: clarify xen_arch_domainconfig ABI statement") limit the respective definitions' visibility to hypervisor and tools. Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/include/public/arch-arm.h | 20 ++++++++++---------- xen/include/public/arch-x86/xen.h | 2 ++ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h index 2cbd323..6f24c5f 100644 --- a/xen/include/public/arch-arm.h +++ b/xen/include/public/arch-arm.h @@ -298,16 +298,6 @@ struct vcpu_guest_context { }; typedef struct vcpu_guest_context vcpu_guest_context_t; DEFINE_XEN_GUEST_HANDLE(vcpu_guest_context_t); -#endif - -struct arch_vcpu_info { -}; -typedef struct arch_vcpu_info arch_vcpu_info_t; - -struct arch_shared_info { -}; -typedef struct arch_shared_info arch_shared_info_t; -typedef uint64_t xen_callback_t; /* * struct xen_arch_domainconfig's ABI is covered by @@ -322,6 +312,16 @@ struct xen_arch_domainconfig { /* IN */ uint32_t nr_spis; }; +#endif /* __XEN__ || __XEN_TOOLS__ */ + +struct arch_vcpu_info { +}; +typedef struct arch_vcpu_info arch_vcpu_info_t; + +struct arch_shared_info { +}; +typedef struct arch_shared_info arch_shared_info_t; +typedef uint64_t xen_callback_t; #endif diff --git a/xen/include/public/arch-x86/xen.h b/xen/include/public/arch-x86/xen.h index 8a52c04..2ecc9c9 100644 --- a/xen/include/public/arch-x86/xen.h +++ b/xen/include/public/arch-x86/xen.h @@ -262,6 +262,7 @@ struct arch_shared_info { }; typedef struct arch_shared_info arch_shared_info_t; +#if defined(__XEN__) || defined(__XEN_TOOLS__) /* * struct xen_arch_domainconfig's ABI is covered by * XEN_DOMCTL_INTERFACE_VERSION. @@ -269,6 +270,7 @@ typedef struct arch_shared_info arch_shared_info_t; struct xen_arch_domainconfig { char dummy; }; +#endif #endif /* !__ASSEMBLY__ */ -- 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 May 28 18:54:47 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:54: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 1Yy2x5-0006O5-4z; Thu, 28 May 2015 18:54:47 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2x3-0006Nu-Jl for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:54:45 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 5F/E9-10593-47467655; Thu, 28 May 2015 18:54:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1432839282!10987410!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3327 invoked from network); 28 May 2015 18:54:43 -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; 28 May 2015 18:54:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2x0-0003IE-O1 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:54:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2x0-0003fD-La for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:54:42 +0000 Date: Thu, 28 May 2015 18:54:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/cpuidle: get accurate C0 value with xenpm tool X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fbeef5570cdf024c35bb04b9469101c256093780 Author: Huaitong Han AuthorDate: Fri May 22 10:12:02 2015 +0200 Commit: Jan Beulich CommitDate: Fri May 22 10:12:02 2015 +0200 x86/cpuidle: get accurate C0 value with xenpm tool When checking the ACPI funciton of C-status, after 100 seconds sleep, the sampling value of C0 status from the xenpm tool decreases. Because C0=NOW()-C1-C2-C3-C4, when NOW() value is during idle time, NOW() value is bigger than last C-status update time, and C0 value is also bigger than ture value. if margin of the second error cannot make up for margin of the first error, the value of C0 would decrease. Signed-off-by: Huaitong Han Reviewed-by: Jan Beulich --- xen/arch/x86/acpi/cpu_idle.c | 125 +++++++++++++++++++++++++++------------- xen/arch/x86/cpu/mwait-idle.c | 7 +- xen/include/asm-x86/cpuidle.h | 2 + xen/include/xen/cpuidle.h | 1 + 4 files changed, 90 insertions(+), 45 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index d6613c9..95676dd 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -253,11 +253,32 @@ static char* acpi_cstate_method_name[] = "HALT" }; +static uint64_t get_stime_tick(void) { return (uint64_t)NOW(); } +static uint64_t stime_ticks_elapsed(uint64_t t1, uint64_t t2) { return t2 - t1; } +static uint64_t stime_tick_to_ns(uint64_t ticks) { return ticks; } + +static uint64_t get_acpi_pm_tick(void) { return (uint64_t)inl(pmtmr_ioport); } +static uint64_t acpi_pm_ticks_elapsed(uint64_t t1, uint64_t t2) +{ + if ( t2 >= t1 ) + return (t2 - t1); + else if ( !(acpi_gbl_FADT.flags & ACPI_FADT_32BIT_TIMER) ) + return (((0x00FFFFFF - t1) + t2 + 1) & 0x00FFFFFF); + else + return ((0xFFFFFFFF - t1) + t2 +1); +} + +uint64_t (*__read_mostly cpuidle_get_tick)(void) = get_acpi_pm_tick; +static uint64_t (*__read_mostly ticks_elapsed)(uint64_t, uint64_t) + = acpi_pm_ticks_elapsed; + static void print_acpi_power(uint32_t cpu, struct acpi_processor_power *power) { - uint32_t i, idle_usage = 0; - uint64_t res, idle_res = 0; - u32 usage; + uint64_t idle_res = 0, idle_usage = 0; + uint64_t last_state_update_tick, current_tick, current_stime; + uint64_t usage[ACPI_PROCESSOR_MAX_POWER] = { 0 }; + uint64_t res_tick[ACPI_PROCESSOR_MAX_POWER] = { 0 }; + unsigned int i; u8 last_state_idx; printk("==cpu%d==\n", cpu); @@ -265,28 +286,37 @@ static void print_acpi_power(uint32_t cpu, struct acpi_processor_power *power) printk("active state:\t\tC%d\n", last_state_idx); printk("max_cstate:\t\tC%d\n", max_cstate); printk("states:\n"); - + + spin_lock_irq(&power->stat_lock); + current_tick = cpuidle_get_tick(); + current_stime = NOW(); for ( i = 1; i < power->count; i++ ) { - spin_lock_irq(&power->stat_lock); - res = tick_to_ns(power->states[i].time); - usage = power->states[i].usage; - spin_unlock_irq(&power->stat_lock); + res_tick[i] = power->states[i].time; + usage[i] = power->states[i].usage; + } + last_state_update_tick = power->last_state_update_tick; + spin_unlock_irq(&power->stat_lock); + + res_tick[last_state_idx] += ticks_elapsed(last_state_update_tick, current_tick); + usage[last_state_idx]++; - idle_usage += usage; - idle_res += res; + for ( i = 1; i < power->count; i++ ) + { + idle_usage += usage[i]; + idle_res += tick_to_ns(res_tick[i]); printk((last_state_idx == i) ? " *" : " "); printk("C%d:\t", i); printk("type[C%d] ", power->states[i].type); printk("latency[%03d] ", power->states[i].latency); - printk("usage[%08d] ", usage); + printk("usage[%08"PRIu64"] ", usage[i]); printk("method[%5s] ", acpi_cstate_method_name[power->states[i].entry_method]); - printk("duration[%"PRId64"]\n", res); + printk("duration[%"PRIu64"]\n", tick_to_ns(res_tick[i])); } printk((last_state_idx == 0) ? " *" : " "); - printk("C0:\tusage[%08d] duration[%"PRId64"]\n", - idle_usage, NOW() - idle_res); + printk("C0:\tusage[%08"PRIu64"] duration[%"PRIu64"]\n", + usage[0] + idle_usage, current_stime - idle_res); print_hw_residencies(cpu); } @@ -314,25 +344,6 @@ static int __init cpu_idle_key_init(void) } __initcall(cpu_idle_key_init); -static uint64_t get_stime_tick(void) { return (uint64_t)NOW(); } -static uint64_t stime_ticks_elapsed(uint64_t t1, uint64_t t2) { return t2 - t1; } -static uint64_t stime_tick_to_ns(uint64_t ticks) { return ticks; } - -static uint64_t get_acpi_pm_tick(void) { return (uint64_t)inl(pmtmr_ioport); } -static uint64_t acpi_pm_ticks_elapsed(uint64_t t1, uint64_t t2) -{ - if ( t2 >= t1 ) - return (t2 - t1); - else if ( !(acpi_gbl_FADT.flags & ACPI_FADT_32BIT_TIMER) ) - return (((0x00FFFFFF - t1) + t2 + 1) & 0x00FFFFFF); - else - return ((0xFFFFFFFF - t1) + t2 +1); -} - -uint64_t (*__read_mostly cpuidle_get_tick)(void) = get_acpi_pm_tick; -static uint64_t (*__read_mostly ticks_elapsed)(uint64_t, uint64_t) - = acpi_pm_ticks_elapsed; - /* * The bit is set iff cpu use monitor/mwait to enter C state * with this flag set, CPU can be waken up from C state @@ -487,6 +498,17 @@ bool_t errata_c6_eoi_workaround(void) return (fix_needed && cpu_has_pending_apic_eoi()); } +void update_last_cx_stat(struct acpi_processor_power *power, + struct acpi_processor_cx *cx, uint64_t ticks) +{ + ASSERT(!local_irq_is_enabled()); + + spin_lock(&power->stat_lock); + power->last_state = cx; + power->last_state_update_tick = ticks; + spin_unlock(&power->stat_lock); +} + void update_idle_stats(struct acpi_processor_power *power, struct acpi_processor_cx *cx, uint64_t before, uint64_t after) @@ -502,6 +524,8 @@ void update_idle_stats(struct acpi_processor_power *power, power->last_residency = tick_to_ns(sleep_ticks) / 1000UL; cx->time += sleep_ticks; } + power->last_state = &power->states[0]; + power->last_state_update_tick = after; spin_unlock(&power->stat_lock); } @@ -558,7 +582,6 @@ static void acpi_processor_idle(void) if ( (cx->type == ACPI_STATE_C3) && errata_c6_eoi_workaround() ) cx = power->safe_state; - power->last_state = cx; /* * Sleep: @@ -575,6 +598,9 @@ static void acpi_processor_idle(void) t1 = cpuidle_get_tick(); /* Trace cpu idle entry */ TRACE_4D(TRC_PM_IDLE_ENTRY, cx->idx, t1, exp, pred); + + update_last_cx_stat(power, cx, t1); + /* Invoke C2 */ acpi_idle_do_entry(cx); /* Get end time (ticks) */ @@ -604,6 +630,8 @@ static void acpi_processor_idle(void) /* Trace cpu idle entry */ TRACE_4D(TRC_PM_IDLE_ENTRY, cx->idx, t1, exp, pred); + update_last_cx_stat(power, cx, t1); + /* * disable bus master * bm_check implies we need ARB_DIS @@ -1173,7 +1201,9 @@ int pmstat_get_cx_stat(uint32_t cpuid, struct pm_cx_stat *stat) { struct acpi_processor_power *power = processor_powers[cpuid]; uint64_t idle_usage = 0, idle_res = 0; - uint64_t usage[ACPI_PROCESSOR_MAX_POWER], res[ACPI_PROCESSOR_MAX_POWER]; + uint64_t last_state_update_tick, current_stime, current_tick; + uint64_t usage[ACPI_PROCESSOR_MAX_POWER] = { 0 }; + uint64_t res[ACPI_PROCESSOR_MAX_POWER] = { 0 }; unsigned int i, nr, nr_pc = 0, nr_cc = 0; if ( power == NULL ) @@ -1186,7 +1216,6 @@ int pmstat_get_cx_stat(uint32_t cpuid, struct pm_cx_stat *stat) return 0; } - stat->last = power->last_state ? power->last_state->idx : 0; stat->idle_time = get_cpu_idle_time(cpuid); nr = min(stat->nr, power->count); @@ -1194,9 +1223,12 @@ int pmstat_get_cx_stat(uint32_t cpuid, struct pm_cx_stat *stat) if ( pm_idle_save == NULL ) { stat->nr = 2; + stat->last = power->last_state ? power->last_state->idx : 0; usage[1] = idle_usage = 1; res[1] = idle_res = stat->idle_time; + + current_stime = NOW(); } else { @@ -1204,13 +1236,24 @@ int pmstat_get_cx_stat(uint32_t cpuid, struct pm_cx_stat *stat) stat->nr = power->count; + spin_lock_irq(&power->stat_lock); + current_tick = cpuidle_get_tick(); + current_stime = NOW(); for ( i = 1; i < nr; i++ ) { - spin_lock_irq(&power->stat_lock); usage[i] = power->states[i].usage; - res[i] = tick_to_ns(power->states[i].time); - spin_unlock_irq(&power->stat_lock); + res[i] = power->states[i].time; + } + last_state_update_tick = power->last_state_update_tick; + stat->last = power->last_state ? power->last_state->idx : 0; + spin_unlock_irq(&power->stat_lock); + usage[stat->last]++; + res[stat->last] += ticks_elapsed(last_state_update_tick, current_tick); + + for ( i = 1; i < nr; i++ ) + { + res[i] = tick_to_ns(res[i]); idle_usage += usage[i]; idle_res += res[i]; } @@ -1243,8 +1286,8 @@ int pmstat_get_cx_stat(uint32_t cpuid, struct pm_cx_stat *stat) #undef PUT_xC } - usage[0] = idle_usage; - res[0] = NOW() - idle_res; + usage[0] += idle_usage; + res[0] = current_stime - idle_res; if ( copy_to_guest(stat->triggers, usage, nr) || copy_to_guest(stat->residencies, res, nr) ) diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index 162e19b..91b76ec 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -564,7 +564,6 @@ static void mwait_idle(void) return; } - power->last_state = cx; eax = cx->address; cstate = ((eax >> MWAIT_SUBSTATE_SIZE) & MWAIT_CSTATE_MASK) + 1; @@ -583,6 +582,8 @@ static void mwait_idle(void) before = cpuidle_get_tick(); TRACE_4D(TRC_PM_IDLE_ENTRY, cx->type, before, exp, pred); + update_last_cx_stat(power, cx, before); + if (cpu_is_haltable(cpu)) mwait_idle_with_hints(eax, MWAIT_ECX_INTERRUPT_BREAK); @@ -593,15 +594,13 @@ static void mwait_idle(void) TRACE_6D(TRC_PM_IDLE_EXIT, cx->type, after, irq_traced[0], irq_traced[1], irq_traced[2], irq_traced[3]); + /* Now back in C0. */ update_idle_stats(power, cx, before, after); local_irq_enable(); if (!(lapic_timer_reliable_states & (1 << cstate))) lapic_timer_on(); - /* Now back in C0. */ - power->last_state = &power->states[0]; - sched_tick_resume(); cpufreq_dbs_timer_resume(); diff --git a/xen/include/asm-x86/cpuidle.h b/xen/include/asm-x86/cpuidle.h index 4d70677..46e614b 100644 --- a/xen/include/asm-x86/cpuidle.h +++ b/xen/include/asm-x86/cpuidle.h @@ -23,6 +23,8 @@ void acpi_dead_idle(void); void trace_exit_reason(u32 *irq_traced); void update_idle_stats(struct acpi_processor_power *, struct acpi_processor_cx *, uint64_t, uint64_t); +void update_last_cx_stat(struct acpi_processor_power *, + struct acpi_processor_cx *, uint64_t); /* * vcpu is urgent if vcpu is polling event channel diff --git a/xen/include/xen/cpuidle.h b/xen/include/xen/cpuidle.h index b7b9e8c..342f4fe 100644 --- a/xen/include/xen/cpuidle.h +++ b/xen/include/xen/cpuidle.h @@ -66,6 +66,7 @@ struct acpi_processor_power struct acpi_processor_cx *last_state; struct acpi_processor_cx *safe_state; void *gdata; /* governor specific data */ + u64 last_state_update_tick; u32 last_residency; u32 count; spinlock_t stat_lock; -- 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 May 28 18:54:47 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:54: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 1Yy2x5-0006O5-4z; Thu, 28 May 2015 18:54:47 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2x3-0006Nu-Jl for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:54:45 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 5F/E9-10593-47467655; Thu, 28 May 2015 18:54:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1432839282!10987410!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3327 invoked from network); 28 May 2015 18:54:43 -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; 28 May 2015 18:54:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2x0-0003IE-O1 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:54:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2x0-0003fD-La for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:54:42 +0000 Date: Thu, 28 May 2015 18:54:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/cpuidle: get accurate C0 value with xenpm tool X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fbeef5570cdf024c35bb04b9469101c256093780 Author: Huaitong Han AuthorDate: Fri May 22 10:12:02 2015 +0200 Commit: Jan Beulich CommitDate: Fri May 22 10:12:02 2015 +0200 x86/cpuidle: get accurate C0 value with xenpm tool When checking the ACPI funciton of C-status, after 100 seconds sleep, the sampling value of C0 status from the xenpm tool decreases. Because C0=NOW()-C1-C2-C3-C4, when NOW() value is during idle time, NOW() value is bigger than last C-status update time, and C0 value is also bigger than ture value. if margin of the second error cannot make up for margin of the first error, the value of C0 would decrease. Signed-off-by: Huaitong Han Reviewed-by: Jan Beulich --- xen/arch/x86/acpi/cpu_idle.c | 125 +++++++++++++++++++++++++++------------- xen/arch/x86/cpu/mwait-idle.c | 7 +- xen/include/asm-x86/cpuidle.h | 2 + xen/include/xen/cpuidle.h | 1 + 4 files changed, 90 insertions(+), 45 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index d6613c9..95676dd 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -253,11 +253,32 @@ static char* acpi_cstate_method_name[] = "HALT" }; +static uint64_t get_stime_tick(void) { return (uint64_t)NOW(); } +static uint64_t stime_ticks_elapsed(uint64_t t1, uint64_t t2) { return t2 - t1; } +static uint64_t stime_tick_to_ns(uint64_t ticks) { return ticks; } + +static uint64_t get_acpi_pm_tick(void) { return (uint64_t)inl(pmtmr_ioport); } +static uint64_t acpi_pm_ticks_elapsed(uint64_t t1, uint64_t t2) +{ + if ( t2 >= t1 ) + return (t2 - t1); + else if ( !(acpi_gbl_FADT.flags & ACPI_FADT_32BIT_TIMER) ) + return (((0x00FFFFFF - t1) + t2 + 1) & 0x00FFFFFF); + else + return ((0xFFFFFFFF - t1) + t2 +1); +} + +uint64_t (*__read_mostly cpuidle_get_tick)(void) = get_acpi_pm_tick; +static uint64_t (*__read_mostly ticks_elapsed)(uint64_t, uint64_t) + = acpi_pm_ticks_elapsed; + static void print_acpi_power(uint32_t cpu, struct acpi_processor_power *power) { - uint32_t i, idle_usage = 0; - uint64_t res, idle_res = 0; - u32 usage; + uint64_t idle_res = 0, idle_usage = 0; + uint64_t last_state_update_tick, current_tick, current_stime; + uint64_t usage[ACPI_PROCESSOR_MAX_POWER] = { 0 }; + uint64_t res_tick[ACPI_PROCESSOR_MAX_POWER] = { 0 }; + unsigned int i; u8 last_state_idx; printk("==cpu%d==\n", cpu); @@ -265,28 +286,37 @@ static void print_acpi_power(uint32_t cpu, struct acpi_processor_power *power) printk("active state:\t\tC%d\n", last_state_idx); printk("max_cstate:\t\tC%d\n", max_cstate); printk("states:\n"); - + + spin_lock_irq(&power->stat_lock); + current_tick = cpuidle_get_tick(); + current_stime = NOW(); for ( i = 1; i < power->count; i++ ) { - spin_lock_irq(&power->stat_lock); - res = tick_to_ns(power->states[i].time); - usage = power->states[i].usage; - spin_unlock_irq(&power->stat_lock); + res_tick[i] = power->states[i].time; + usage[i] = power->states[i].usage; + } + last_state_update_tick = power->last_state_update_tick; + spin_unlock_irq(&power->stat_lock); + + res_tick[last_state_idx] += ticks_elapsed(last_state_update_tick, current_tick); + usage[last_state_idx]++; - idle_usage += usage; - idle_res += res; + for ( i = 1; i < power->count; i++ ) + { + idle_usage += usage[i]; + idle_res += tick_to_ns(res_tick[i]); printk((last_state_idx == i) ? " *" : " "); printk("C%d:\t", i); printk("type[C%d] ", power->states[i].type); printk("latency[%03d] ", power->states[i].latency); - printk("usage[%08d] ", usage); + printk("usage[%08"PRIu64"] ", usage[i]); printk("method[%5s] ", acpi_cstate_method_name[power->states[i].entry_method]); - printk("duration[%"PRId64"]\n", res); + printk("duration[%"PRIu64"]\n", tick_to_ns(res_tick[i])); } printk((last_state_idx == 0) ? " *" : " "); - printk("C0:\tusage[%08d] duration[%"PRId64"]\n", - idle_usage, NOW() - idle_res); + printk("C0:\tusage[%08"PRIu64"] duration[%"PRIu64"]\n", + usage[0] + idle_usage, current_stime - idle_res); print_hw_residencies(cpu); } @@ -314,25 +344,6 @@ static int __init cpu_idle_key_init(void) } __initcall(cpu_idle_key_init); -static uint64_t get_stime_tick(void) { return (uint64_t)NOW(); } -static uint64_t stime_ticks_elapsed(uint64_t t1, uint64_t t2) { return t2 - t1; } -static uint64_t stime_tick_to_ns(uint64_t ticks) { return ticks; } - -static uint64_t get_acpi_pm_tick(void) { return (uint64_t)inl(pmtmr_ioport); } -static uint64_t acpi_pm_ticks_elapsed(uint64_t t1, uint64_t t2) -{ - if ( t2 >= t1 ) - return (t2 - t1); - else if ( !(acpi_gbl_FADT.flags & ACPI_FADT_32BIT_TIMER) ) - return (((0x00FFFFFF - t1) + t2 + 1) & 0x00FFFFFF); - else - return ((0xFFFFFFFF - t1) + t2 +1); -} - -uint64_t (*__read_mostly cpuidle_get_tick)(void) = get_acpi_pm_tick; -static uint64_t (*__read_mostly ticks_elapsed)(uint64_t, uint64_t) - = acpi_pm_ticks_elapsed; - /* * The bit is set iff cpu use monitor/mwait to enter C state * with this flag set, CPU can be waken up from C state @@ -487,6 +498,17 @@ bool_t errata_c6_eoi_workaround(void) return (fix_needed && cpu_has_pending_apic_eoi()); } +void update_last_cx_stat(struct acpi_processor_power *power, + struct acpi_processor_cx *cx, uint64_t ticks) +{ + ASSERT(!local_irq_is_enabled()); + + spin_lock(&power->stat_lock); + power->last_state = cx; + power->last_state_update_tick = ticks; + spin_unlock(&power->stat_lock); +} + void update_idle_stats(struct acpi_processor_power *power, struct acpi_processor_cx *cx, uint64_t before, uint64_t after) @@ -502,6 +524,8 @@ void update_idle_stats(struct acpi_processor_power *power, power->last_residency = tick_to_ns(sleep_ticks) / 1000UL; cx->time += sleep_ticks; } + power->last_state = &power->states[0]; + power->last_state_update_tick = after; spin_unlock(&power->stat_lock); } @@ -558,7 +582,6 @@ static void acpi_processor_idle(void) if ( (cx->type == ACPI_STATE_C3) && errata_c6_eoi_workaround() ) cx = power->safe_state; - power->last_state = cx; /* * Sleep: @@ -575,6 +598,9 @@ static void acpi_processor_idle(void) t1 = cpuidle_get_tick(); /* Trace cpu idle entry */ TRACE_4D(TRC_PM_IDLE_ENTRY, cx->idx, t1, exp, pred); + + update_last_cx_stat(power, cx, t1); + /* Invoke C2 */ acpi_idle_do_entry(cx); /* Get end time (ticks) */ @@ -604,6 +630,8 @@ static void acpi_processor_idle(void) /* Trace cpu idle entry */ TRACE_4D(TRC_PM_IDLE_ENTRY, cx->idx, t1, exp, pred); + update_last_cx_stat(power, cx, t1); + /* * disable bus master * bm_check implies we need ARB_DIS @@ -1173,7 +1201,9 @@ int pmstat_get_cx_stat(uint32_t cpuid, struct pm_cx_stat *stat) { struct acpi_processor_power *power = processor_powers[cpuid]; uint64_t idle_usage = 0, idle_res = 0; - uint64_t usage[ACPI_PROCESSOR_MAX_POWER], res[ACPI_PROCESSOR_MAX_POWER]; + uint64_t last_state_update_tick, current_stime, current_tick; + uint64_t usage[ACPI_PROCESSOR_MAX_POWER] = { 0 }; + uint64_t res[ACPI_PROCESSOR_MAX_POWER] = { 0 }; unsigned int i, nr, nr_pc = 0, nr_cc = 0; if ( power == NULL ) @@ -1186,7 +1216,6 @@ int pmstat_get_cx_stat(uint32_t cpuid, struct pm_cx_stat *stat) return 0; } - stat->last = power->last_state ? power->last_state->idx : 0; stat->idle_time = get_cpu_idle_time(cpuid); nr = min(stat->nr, power->count); @@ -1194,9 +1223,12 @@ int pmstat_get_cx_stat(uint32_t cpuid, struct pm_cx_stat *stat) if ( pm_idle_save == NULL ) { stat->nr = 2; + stat->last = power->last_state ? power->last_state->idx : 0; usage[1] = idle_usage = 1; res[1] = idle_res = stat->idle_time; + + current_stime = NOW(); } else { @@ -1204,13 +1236,24 @@ int pmstat_get_cx_stat(uint32_t cpuid, struct pm_cx_stat *stat) stat->nr = power->count; + spin_lock_irq(&power->stat_lock); + current_tick = cpuidle_get_tick(); + current_stime = NOW(); for ( i = 1; i < nr; i++ ) { - spin_lock_irq(&power->stat_lock); usage[i] = power->states[i].usage; - res[i] = tick_to_ns(power->states[i].time); - spin_unlock_irq(&power->stat_lock); + res[i] = power->states[i].time; + } + last_state_update_tick = power->last_state_update_tick; + stat->last = power->last_state ? power->last_state->idx : 0; + spin_unlock_irq(&power->stat_lock); + usage[stat->last]++; + res[stat->last] += ticks_elapsed(last_state_update_tick, current_tick); + + for ( i = 1; i < nr; i++ ) + { + res[i] = tick_to_ns(res[i]); idle_usage += usage[i]; idle_res += res[i]; } @@ -1243,8 +1286,8 @@ int pmstat_get_cx_stat(uint32_t cpuid, struct pm_cx_stat *stat) #undef PUT_xC } - usage[0] = idle_usage; - res[0] = NOW() - idle_res; + usage[0] += idle_usage; + res[0] = current_stime - idle_res; if ( copy_to_guest(stat->triggers, usage, nr) || copy_to_guest(stat->residencies, res, nr) ) diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index 162e19b..91b76ec 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -564,7 +564,6 @@ static void mwait_idle(void) return; } - power->last_state = cx; eax = cx->address; cstate = ((eax >> MWAIT_SUBSTATE_SIZE) & MWAIT_CSTATE_MASK) + 1; @@ -583,6 +582,8 @@ static void mwait_idle(void) before = cpuidle_get_tick(); TRACE_4D(TRC_PM_IDLE_ENTRY, cx->type, before, exp, pred); + update_last_cx_stat(power, cx, before); + if (cpu_is_haltable(cpu)) mwait_idle_with_hints(eax, MWAIT_ECX_INTERRUPT_BREAK); @@ -593,15 +594,13 @@ static void mwait_idle(void) TRACE_6D(TRC_PM_IDLE_EXIT, cx->type, after, irq_traced[0], irq_traced[1], irq_traced[2], irq_traced[3]); + /* Now back in C0. */ update_idle_stats(power, cx, before, after); local_irq_enable(); if (!(lapic_timer_reliable_states & (1 << cstate))) lapic_timer_on(); - /* Now back in C0. */ - power->last_state = &power->states[0]; - sched_tick_resume(); cpufreq_dbs_timer_resume(); diff --git a/xen/include/asm-x86/cpuidle.h b/xen/include/asm-x86/cpuidle.h index 4d70677..46e614b 100644 --- a/xen/include/asm-x86/cpuidle.h +++ b/xen/include/asm-x86/cpuidle.h @@ -23,6 +23,8 @@ void acpi_dead_idle(void); void trace_exit_reason(u32 *irq_traced); void update_idle_stats(struct acpi_processor_power *, struct acpi_processor_cx *, uint64_t, uint64_t); +void update_last_cx_stat(struct acpi_processor_power *, + struct acpi_processor_cx *, uint64_t); /* * vcpu is urgent if vcpu is polling event channel diff --git a/xen/include/xen/cpuidle.h b/xen/include/xen/cpuidle.h index b7b9e8c..342f4fe 100644 --- a/xen/include/xen/cpuidle.h +++ b/xen/include/xen/cpuidle.h @@ -66,6 +66,7 @@ struct acpi_processor_power struct acpi_processor_cx *last_state; struct acpi_processor_cx *safe_state; void *gdata; /* governor specific data */ + u64 last_state_update_tick; u32 last_residency; u32 count; spinlock_t stat_lock; -- 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 May 28 18:55:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:55:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2xU-0006Py-8V; Thu, 28 May 2015 18:55:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2xS-0006Pp-Vn for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:55:11 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 38/57-02789-E8467655; Thu, 28 May 2015 18:55:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1432839308!12182579!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9990 invoked from network); 28 May 2015 18:55:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 May 2015 18:55:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2xQ-0003Iu-6O for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:55:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2xL-0003gG-4k for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:55:03 +0000 Date: Thu, 28 May 2015 18:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: fix uninitialized rc in shadow_track_dirty_vram() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 38276296f21200bf7faf66012da24c52e7f053d2 Author: Jan Beulich AuthorDate: Fri May 22 10:13:30 2015 +0200 Commit: Jan Beulich CommitDate: Fri May 22 10:13:30 2015 +0200 x86/shadow: fix uninitialized rc in shadow_track_dirty_vram() Commit bd1b4a71b3 ("x86/shadow: fix shadow_track_dirty_vram to work on hvm guests"), trying to mirror its HAP counterpart, deleted a couple of assignments to rc without making sure rc is initialized on all paths. Coverity ID: 1299410 Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 9e9d19f..654bacc 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3518,7 +3518,7 @@ int shadow_track_dirty_vram(struct domain *d, unsigned long nr, XEN_GUEST_HANDLE_64(uint8) guest_dirty_bitmap) { - int rc; + int rc = 0; unsigned long end_pfn = begin_pfn + nr; unsigned long dirty_size = (nr + 7) / 8; int flush_tlb = 0; @@ -3550,10 +3550,7 @@ int shadow_track_dirty_vram(struct domain *d, } if ( !nr ) - { - rc = 0; goto out; - } dirty_bitmap = vzalloc(dirty_size); if ( dirty_bitmap == 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 May 28 18:55:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:55:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2xU-0006Py-8V; Thu, 28 May 2015 18:55:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2xS-0006Pp-Vn for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:55:11 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 38/57-02789-E8467655; Thu, 28 May 2015 18:55:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1432839308!12182579!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9990 invoked from network); 28 May 2015 18:55:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 May 2015 18:55:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2xQ-0003Iu-6O for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:55:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2xL-0003gG-4k for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:55:03 +0000 Date: Thu, 28 May 2015 18:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/shadow: fix uninitialized rc in shadow_track_dirty_vram() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 38276296f21200bf7faf66012da24c52e7f053d2 Author: Jan Beulich AuthorDate: Fri May 22 10:13:30 2015 +0200 Commit: Jan Beulich CommitDate: Fri May 22 10:13:30 2015 +0200 x86/shadow: fix uninitialized rc in shadow_track_dirty_vram() Commit bd1b4a71b3 ("x86/shadow: fix shadow_track_dirty_vram to work on hvm guests"), trying to mirror its HAP counterpart, deleted a couple of assignments to rc without making sure rc is initialized on all paths. Coverity ID: 1299410 Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 9e9d19f..654bacc 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3518,7 +3518,7 @@ int shadow_track_dirty_vram(struct domain *d, unsigned long nr, XEN_GUEST_HANDLE_64(uint8) guest_dirty_bitmap) { - int rc; + int rc = 0; unsigned long end_pfn = begin_pfn + nr; unsigned long dirty_size = (nr + 7) / 8; int flush_tlb = 0; @@ -3550,10 +3550,7 @@ int shadow_track_dirty_vram(struct domain *d, } if ( !nr ) - { - rc = 0; goto out; - } dirty_bitmap = vzalloc(dirty_size); if ( dirty_bitmap == 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 May 28 18:55:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:55: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 1Yy2xc-0006Rq-Ns; Thu, 28 May 2015 18:55:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2xa-0006RV-TH for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:55:19 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 43/5C-03224-69467655; Thu, 28 May 2015 18:55:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1432839293!13560978!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13814 invoked from network); 28 May 2015 18:54:53 -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; 28 May 2015 18:54:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2xA-0003IN-To for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:54:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2xA-0003fZ-Sp for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:54:52 +0000 Date: Thu, 28 May 2015 18:54:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/irq: limit the maximum number of domain PIRQs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 75d28c917094b0e264874e92e8980b00a372b99f Author: Andrew Cooper AuthorDate: Fri May 22 10:13:04 2015 +0200 Commit: Jan Beulich CommitDate: Fri May 22 10:13:04 2015 +0200 x86/irq: limit the maximum number of domain PIRQs c/s 7e73a6e "have architectures specify the number of PIRQs a hardware domain gets" increased the default number of pirqs for dom0, as 256 was found to be too low in some cases. However, it didn't account for the upper bound presented by the domains EOI bitmap, registered with the PHYSDEVOP_pirq_eoi_gmfn_v* hypercall. On a server with 240 cpus, Xen was observed to be attempting to clear the EOI bit for dom0's pirq 0xb40f, which hit a pagefault. Signed-off-by: Andrew Cooper --- xen/arch/x86/io_apic.c | 4 ++++ xen/arch/x86/irq.c | 6 ++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index 976c0c5..6f66562 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -2614,6 +2614,10 @@ unsigned int arch_hwdom_irqs(domid_t domid) if ( !domid ) n = min(n, dom0_max_vcpus()); n = min(nr_irqs_gsi + n * NR_DYNAMIC_VECTORS, nr_irqs); + + /* Bounded by the domain pirq eoi bitmap gfn. */ + n = min_t(unsigned int, n, PAGE_SIZE * BITS_PER_BYTE); + printk("Dom%d has maximum %u PIRQs\n", domid, n); return n; diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 1a21917..fe1ee33 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -1073,13 +1073,19 @@ bool_t cpu_has_pending_apic_eoi(void) static inline void set_pirq_eoi(struct domain *d, unsigned int irq) { if ( d->arch.pirq_eoi_map ) + { + ASSERT(irq < PAGE_SIZE * BITS_PER_BYTE); set_bit(irq, d->arch.pirq_eoi_map); + } } static inline void clear_pirq_eoi(struct domain *d, unsigned int irq) { if ( d->arch.pirq_eoi_map ) + { + ASSERT(irq < PAGE_SIZE * BITS_PER_BYTE); clear_bit(irq, d->arch.pirq_eoi_map); + } } static void set_eoi_ready(void *data); -- 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 May 28 18:55:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:55: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 1Yy2xc-0006Rq-Ns; Thu, 28 May 2015 18:55:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2xa-0006RV-TH for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:55:19 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 43/5C-03224-69467655; Thu, 28 May 2015 18:55:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1432839293!13560978!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13814 invoked from network); 28 May 2015 18:54:53 -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; 28 May 2015 18:54:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2xA-0003IN-To for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:54:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2xA-0003fZ-Sp for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:54:52 +0000 Date: Thu, 28 May 2015 18:54:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/irq: limit the maximum number of domain PIRQs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 75d28c917094b0e264874e92e8980b00a372b99f Author: Andrew Cooper AuthorDate: Fri May 22 10:13:04 2015 +0200 Commit: Jan Beulich CommitDate: Fri May 22 10:13:04 2015 +0200 x86/irq: limit the maximum number of domain PIRQs c/s 7e73a6e "have architectures specify the number of PIRQs a hardware domain gets" increased the default number of pirqs for dom0, as 256 was found to be too low in some cases. However, it didn't account for the upper bound presented by the domains EOI bitmap, registered with the PHYSDEVOP_pirq_eoi_gmfn_v* hypercall. On a server with 240 cpus, Xen was observed to be attempting to clear the EOI bit for dom0's pirq 0xb40f, which hit a pagefault. Signed-off-by: Andrew Cooper --- xen/arch/x86/io_apic.c | 4 ++++ xen/arch/x86/irq.c | 6 ++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index 976c0c5..6f66562 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -2614,6 +2614,10 @@ unsigned int arch_hwdom_irqs(domid_t domid) if ( !domid ) n = min(n, dom0_max_vcpus()); n = min(nr_irqs_gsi + n * NR_DYNAMIC_VECTORS, nr_irqs); + + /* Bounded by the domain pirq eoi bitmap gfn. */ + n = min_t(unsigned int, n, PAGE_SIZE * BITS_PER_BYTE); + printk("Dom%d has maximum %u PIRQs\n", domid, n); return n; diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 1a21917..fe1ee33 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -1073,13 +1073,19 @@ bool_t cpu_has_pending_apic_eoi(void) static inline void set_pirq_eoi(struct domain *d, unsigned int irq) { if ( d->arch.pirq_eoi_map ) + { + ASSERT(irq < PAGE_SIZE * BITS_PER_BYTE); set_bit(irq, d->arch.pirq_eoi_map); + } } static inline void clear_pirq_eoi(struct domain *d, unsigned int irq) { if ( d->arch.pirq_eoi_map ) + { + ASSERT(irq < PAGE_SIZE * BITS_PER_BYTE); clear_bit(irq, d->arch.pirq_eoi_map); + } } static void set_eoi_ready(void *data); -- 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 May 28 18:55:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:55: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 1Yy2xg-0006T2-QY; Thu, 28 May 2015 18:55:24 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2xf-0006Sd-CF for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:55:23 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 50/9A-21300-A9467655; Thu, 28 May 2015 18:55:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1432839319!12209409!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8006 invoked from network); 28 May 2015 18:55:20 -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; 28 May 2015 18:55:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2xb-0003J2-3V for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:55:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2xa-0003gf-Rp for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:55:19 +0000 Date: Thu, 28 May 2015 18:55:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: move syscall trampolines off the stack X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7a66ac8d1633297be79fefbf920f0e02c71041d3 Author: Jan Beulich AuthorDate: Fri May 22 10:45:43 2015 +0200 Commit: Jan Beulich CommitDate: Fri May 22 10:45:43 2015 +0200 x86: move syscall trampolines off the stack This is needed as stacks are going to become non-executable. Use separate stub pages (shared among suitable CPUs on the same node) instead. Stub areas (currently 128 bytes each) are being split into two parts - a fixed usage one (the syscall ones) and dynamically usable space, which will be used by subsequent changes to hold dynamically generated code during instruction eumlation. While sharing physical pages among certain CPUs on the same node, for now the virtual mappings get established in distinct pages for each CPU. This isn't a strict requirement, but simplifies VA space management for this initial implementation: Sharing VA space would require additional tracking of which areas are currently in use. If the VA and/or TLB overhead turned out to be a problem, such extra code could easily be added. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/setup.c | 4 ++ xen/arch/x86/smpboot.c | 71 +++++++++++++++++++++++++- xen/arch/x86/x86_64/compat/entry.S | 15 +++++- xen/arch/x86/x86_64/entry.S | 24 ++++----- xen/arch/x86/x86_64/traps.c | 98 +++++++++++++++++++---------------- xen/arch/x86/xen.lds.S | 3 + xen/include/asm-x86/config.h | 4 ++ xen/include/asm-x86/page.h | 8 ++-- xen/include/asm-x86/processor.h | 14 +++++- xen/include/asm-x86/x86_64/page.h | 1 + 10 files changed, 177 insertions(+), 65 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 2cc9185..e808ea9 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1271,6 +1271,10 @@ void __init noreturn __start_xen(unsigned long mbi_p) init_idle_domain(); + this_cpu(stubs.addr) = alloc_stub_page(smp_processor_id(), + &this_cpu(stubs).mfn); + BUG_ON(!this_cpu(stubs.addr)); + trap_init(); rcu_init(); diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 116c8f8..2289284 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -603,6 +604,43 @@ static int do_boot_cpu(int apicid, int cpu) return rc; } +#define STUB_BUF_CPU_OFFS(cpu) (((cpu) & (STUBS_PER_PAGE - 1)) * STUB_BUF_SIZE) + +unsigned long alloc_stub_page(unsigned int cpu, unsigned long *mfn) +{ + unsigned long stub_va; + struct page_info *pg; + + BUILD_BUG_ON(STUBS_PER_PAGE & (STUBS_PER_PAGE - 1)); + + if ( *mfn ) + pg = mfn_to_page(*mfn); + else + { + nodeid_t node = cpu_to_node(cpu); + unsigned int memflags = node != NUMA_NO_NODE ? MEMF_node(node) : 0; + + pg = alloc_domheap_page(NULL, memflags); + if ( !pg ) + return 0; + + unmap_domain_page(memset(__map_domain_page(pg), 0xcc, PAGE_SIZE)); + } + + stub_va = XEN_VIRT_END - (cpu + 1) * PAGE_SIZE; + if ( map_pages_to_xen(stub_va, page_to_mfn(pg), 1, + PAGE_HYPERVISOR_RX | MAP_SMALL_PAGES) ) + { + if ( !*mfn ) + free_domheap_page(pg); + stub_va = 0; + } + else if ( !*mfn ) + *mfn = page_to_mfn(pg); + + return stub_va; +} + void cpu_exit_clear(unsigned int cpu) { cpu_uninit(cpu); @@ -616,6 +654,23 @@ static void cpu_smpboot_free(unsigned int cpu) free_cpumask_var(per_cpu(cpu_sibling_mask, cpu)); free_cpumask_var(per_cpu(cpu_core_mask, cpu)); + if ( per_cpu(stubs.addr, cpu) ) + { + unsigned long mfn = per_cpu(stubs.mfn, cpu); + unsigned char *stub_page = map_domain_page(mfn); + unsigned int i; + + memset(stub_page + STUB_BUF_CPU_OFFS(cpu), 0xcc, STUB_BUF_SIZE); + for ( i = 0; i < STUBS_PER_PAGE; ++i ) + if ( stub_page[i * STUB_BUF_SIZE] != 0xcc ) + break; + unmap_domain_page(stub_page); + destroy_xen_mappings(per_cpu(stubs.addr, cpu) & PAGE_MASK, + (per_cpu(stubs.addr, cpu) | ~PAGE_MASK) + 1); + if ( i == STUBS_PER_PAGE ) + free_domheap_page(mfn_to_page(mfn)); + } + order = get_order_from_pages(NR_RESERVED_GDT_PAGES); free_xenheap_pages(per_cpu(gdt_table, cpu), order); @@ -635,9 +690,10 @@ static void cpu_smpboot_free(unsigned int cpu) static int cpu_smpboot_alloc(unsigned int cpu) { - unsigned int order, memflags = 0; + unsigned int i, order, memflags = 0; nodeid_t node = cpu_to_node(cpu); struct desc_struct *gdt; + unsigned long stub_page; if ( node != NUMA_NO_NODE ) memflags = MEMF_node(node); @@ -667,6 +723,19 @@ static int cpu_smpboot_alloc(unsigned int cpu) goto oom; memcpy(idt_tables[cpu], idt_table, IDT_ENTRIES * sizeof(idt_entry_t)); + for ( stub_page = 0, i = cpu & ~(STUBS_PER_PAGE - 1); + i < nr_cpu_ids && i <= (cpu | (STUBS_PER_PAGE - 1)); ++i ) + if ( cpu_online(i) && cpu_to_node(i) == node ) + { + per_cpu(stubs.mfn, cpu) = per_cpu(stubs.mfn, i); + break; + } + BUG_ON(i == cpu); + stub_page = alloc_stub_page(cpu, &per_cpu(stubs.mfn, cpu)); + if ( !stub_page ) + goto oom; + per_cpu(stubs.addr, cpu) = stub_page + STUB_BUF_CPU_OFFS(cpu); + if ( zalloc_cpumask_var(&per_cpu(cpu_sibling_mask, cpu)) && zalloc_cpumask_var(&per_cpu(cpu_core_mask, cpu)) ) return 0; diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S index 5b0af61..46f340b 100644 --- a/xen/arch/x86/x86_64/compat/entry.S +++ b/xen/arch/x86/x86_64/compat/entry.S @@ -219,7 +219,20 @@ ENTRY(compat_post_handle_exception) movb $0,TRAPBOUNCE_flags(%rdx) jmp compat_test_all_events -ENTRY(compat_syscall) +/* See lstar_enter for entry register state. */ +ENTRY(cstar_enter) + sti + movq 8(%rsp),%rax /* Restore %rax. */ + movq $FLAT_KERNEL_SS,8(%rsp) + pushq %r11 + pushq $FLAT_USER_CS32 + pushq %rcx + pushq $0 + SAVE_VOLATILE TRAP_syscall + GET_CURRENT(%rbx) + movq VCPU_domain(%rbx),%rcx + cmpb $0,DOMAIN_is_32bit_pv(%rcx) + je switch_to_kernel cmpb $0,VCPU_syscall32_disables_events(%rbx) movzwl VCPU_syscall32_sel(%rbx),%esi movq VCPU_syscall32_addr(%rbx),%rax diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 7e63e64..4a37642 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -13,9 +13,8 @@ #include #include - ALIGN /* %rbx: struct vcpu */ -switch_to_kernel: +ENTRY(switch_to_kernel) leaq VCPU_trap_bounce(%rbx),%rdx /* TB_eip = (32-bit syscall && syscall32_addr) ? * syscall32_addr : syscall_addr */ @@ -113,23 +112,22 @@ restore_all_xen: * When entering SYSCALL from user mode: * Vector directly to the registered arch.syscall_addr. * - * Initial work is done by per-CPU stack trampolines. At this point %rsp - * has been initialised to point at the correct Xen stack, and %rsp, %rflags - * and %cs have been saved. All other registers are still to be saved onto - * the stack, starting with %rip, and an appropriate %ss must be saved into - * the space left by the trampoline. + * Initial work is done by per-CPU trampolines. At this point %rsp has been + * initialised to point at the correct Xen stack, %rsp has been saved, and + * %rax needs to be restored from the %ss save slot. All other registers are + * still to be saved onto the stack, starting with RFLAGS, and an appropriate + * %ss must be saved into the space left by the trampoline. */ -ENTRY(syscall_enter) +ENTRY(lstar_enter) sti - movl $FLAT_KERNEL_SS,24(%rsp) + movq 8(%rsp),%rax /* Restore %rax. */ + movq $FLAT_KERNEL_SS,8(%rsp) + pushq %r11 + pushq $FLAT_KERNEL_CS64 pushq %rcx pushq $0 - movq 24(%rsp),%r11 /* Re-load user RFLAGS into %r11 before saving */ SAVE_VOLATILE TRAP_syscall GET_CURRENT(%rbx) - movq VCPU_domain(%rbx),%rcx - testb $1,DOMAIN_is_32bit_pv(%rcx) - jnz compat_syscall testb $TF_kernel_mode,VCPU_thread_flags(%rbx) jz switch_to_kernel diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index fc35aba..117a133 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -337,70 +337,78 @@ unsigned long do_iret(void) return 0; } -static int write_stack_trampoline( - char *stack, char *stack_bottom, uint16_t cs_seg) +static unsigned int write_stub_trampoline( + unsigned char *stub, unsigned long stub_va, + unsigned long stack_bottom, unsigned long target_va) { - /* movq %rsp, saversp(%rip) */ - stack[0] = 0x48; - stack[1] = 0x89; - stack[2] = 0x25; - *(u32 *)&stack[3] = (stack_bottom - &stack[7]) - 16; - - /* leaq saversp(%rip), %rsp */ - stack[7] = 0x48; - stack[8] = 0x8d; - stack[9] = 0x25; - *(u32 *)&stack[10] = (stack_bottom - &stack[14]) - 16; - - /* pushq %r11 */ - stack[14] = 0x41; - stack[15] = 0x53; - - /* pushq $ */ - stack[16] = 0x68; - *(u32 *)&stack[17] = cs_seg; - - /* movq $syscall_enter,%r11 */ - stack[21] = 0x49; - stack[22] = 0xbb; - *(void **)&stack[23] = (void *)syscall_enter; - - /* jmpq *%r11 */ - stack[31] = 0x41; - stack[32] = 0xff; - stack[33] = 0xe3; - - return 34; + /* movabsq %rax, stack_bottom - 8 */ + stub[0] = 0x48; + stub[1] = 0xa3; + *(uint64_t *)&stub[2] = stack_bottom - 8; + + /* movq %rsp, %rax */ + stub[10] = 0x48; + stub[11] = 0x89; + stub[12] = 0xe0; + + /* movabsq $stack_bottom - 8, %rsp */ + stub[13] = 0x48; + stub[14] = 0xbc; + *(uint64_t *)&stub[15] = stack_bottom - 8; + + /* pushq %rax */ + stub[23] = 0x50; + + /* jmp target_va */ + stub[24] = 0xe9; + *(int32_t *)&stub[25] = target_va - (stub_va + 29); + + /* Round up to a multiple of 16 bytes. */ + return 32; } +DEFINE_PER_CPU(struct stubs, stubs); +void lstar_enter(void); +void cstar_enter(void); + void __devinit subarch_percpu_traps_init(void) { - char *stack_bottom, *stack; - - stack_bottom = (char *)get_stack_bottom(); - stack = (char *)((unsigned long)stack_bottom & ~(STACK_SIZE - 1)); + unsigned long stack_bottom = get_stack_bottom(); + unsigned long stub_va = this_cpu(stubs.addr); + unsigned char *stub_page; + unsigned int offset; /* IST_MAX IST pages + 1 syscall page + 1 guard page + primary stack. */ BUILD_BUG_ON((IST_MAX + 2) * PAGE_SIZE + PRIMARY_STACK_SIZE > STACK_SIZE); - /* Trampoline for SYSCALL entry from long mode. */ - stack = &stack[IST_MAX * PAGE_SIZE]; /* Skip the IST stacks. */ - wrmsrl(MSR_LSTAR, (unsigned long)stack); - stack += write_stack_trampoline(stack, stack_bottom, FLAT_KERNEL_CS64); + stub_page = map_domain_page(this_cpu(stubs.mfn)); + + /* Trampoline for SYSCALL entry from 64-bit mode. */ + wrmsrl(MSR_LSTAR, stub_va); + offset = write_stub_trampoline(stub_page + (stub_va & ~PAGE_MASK), + stub_va, stack_bottom, + (unsigned long)lstar_enter); + stub_va += offset; if ( boot_cpu_data.x86_vendor == X86_VENDOR_INTEL || boot_cpu_data.x86_vendor == X86_VENDOR_CENTAUR ) { /* SYSENTER entry. */ - wrmsrl(MSR_IA32_SYSENTER_ESP, (unsigned long)stack_bottom); + wrmsrl(MSR_IA32_SYSENTER_ESP, stack_bottom); wrmsrl(MSR_IA32_SYSENTER_EIP, (unsigned long)sysenter_entry); wrmsr(MSR_IA32_SYSENTER_CS, __HYPERVISOR_CS, 0); } /* Trampoline for SYSCALL entry from compatibility mode. */ - stack = (char *)L1_CACHE_ALIGN((unsigned long)stack); - wrmsrl(MSR_CSTAR, (unsigned long)stack); - stack += write_stack_trampoline(stack, stack_bottom, FLAT_USER_CS32); + wrmsrl(MSR_CSTAR, stub_va); + offset += write_stub_trampoline(stub_page + (stub_va & ~PAGE_MASK), + stub_va, stack_bottom, + (unsigned long)cstar_enter); + + /* Don't consume more than half of the stub space here. */ + ASSERT(offset <= STUB_BUF_SIZE / 2); + + unmap_domain_page(stub_page); /* Common SYSCALL parameters. */ wrmsr(MSR_STAR, 0, (FLAT_RING3_CS32<<16) | __HYPERVISOR_CS); diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index 4699a04..5fc6c9f 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -217,4 +217,7 @@ SECTIONS .comment 0 : { *(.comment) } } +ASSERT(__image_base__ > XEN_VIRT_START || + _end <= XEN_VIRT_END - NR_CPUS * PAGE_SIZE, + "Xen image overlaps stubs area") ASSERT(kexec_reloc_size - kexec_reloc <= PAGE_SIZE, "kexec_reloc is too large") diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 7700c77..3e9be83 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -94,6 +94,10 @@ /* Primary stack is restricted to 8kB by guard pages. */ #define PRIMARY_STACK_SIZE 8192 +/* Total size of syscall and emulation stubs. */ +#define STUB_BUF_SHIFT (L1_CACHE_SHIFT > 7 ? L1_CACHE_SHIFT : 7) +#define STUB_BUF_SIZE (1 << STUB_BUF_SHIFT) + /* Return value for zero-size _xmalloc(), distinguished from NULL. */ #define ZERO_BLOCK_PTR ((void *)0xBAD0BAD0BAD0BAD0UL) diff --git a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h index 27c2ae7..ef1e86f 100644 --- a/xen/include/asm-x86/page.h +++ b/xen/include/asm-x86/page.h @@ -323,10 +323,10 @@ void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t); #define _PAGE_GNTTAB 0 #endif -#define __PAGE_HYPERVISOR \ - (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED) -#define __PAGE_HYPERVISOR_NOCACHE \ - (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_PCD | _PAGE_ACCESSED) +#define __PAGE_HYPERVISOR_RX (_PAGE_PRESENT | _PAGE_ACCESSED) +#define __PAGE_HYPERVISOR (__PAGE_HYPERVISOR_RX | \ + _PAGE_DIRTY | _PAGE_RW) +#define __PAGE_HYPERVISOR_NOCACHE (__PAGE_HYPERVISOR | _PAGE_PCD) #define MAP_SMALL_PAGES _PAGE_AVAIL0 /* don't use superpages mappings */ diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index a9b4e06..fb2c2fc 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -532,12 +532,24 @@ void trap_nop(void); void enable_nmis(void); void do_reserved_trap(struct cpu_user_regs *regs); -void syscall_enter(void); void sysenter_entry(void); void sysenter_eflags_saved(void); void compat_hypercall(void); void int80_direct_trap(void); +#define STUBS_PER_PAGE (PAGE_SIZE / STUB_BUF_SIZE) + +struct stubs { + union { + void(*func)(void); + unsigned long addr; + }; + unsigned long mfn; +}; + +DECLARE_PER_CPU(struct stubs, stubs); +unsigned long alloc_stub_page(unsigned int cpu, unsigned long *mfn); + extern int hypercall(void); int cpuid_hypervisor_leaves( uint32_t idx, uint32_t sub_idx, diff --git a/xen/include/asm-x86/x86_64/page.h b/xen/include/asm-x86/x86_64/page.h index 1d54587..fd2f700 100644 --- a/xen/include/asm-x86/x86_64/page.h +++ b/xen/include/asm-x86/x86_64/page.h @@ -148,6 +148,7 @@ typedef l4_pgentry_t root_pgentry_t; #define _PAGE_GUEST_KERNEL (1U<<12) #define PAGE_HYPERVISOR (__PAGE_HYPERVISOR | _PAGE_GLOBAL) +#define PAGE_HYPERVISOR_RX (__PAGE_HYPERVISOR_RX | _PAGE_GLOBAL) #define PAGE_HYPERVISOR_NOCACHE (__PAGE_HYPERVISOR_NOCACHE | _PAGE_GLOBAL) #endif /* __X86_64_PAGE_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 Thu May 28 18:55:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:55: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 1Yy2xg-0006T2-QY; Thu, 28 May 2015 18:55:24 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2xf-0006Sd-CF for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:55:23 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 50/9A-21300-A9467655; Thu, 28 May 2015 18:55:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1432839319!12209409!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8006 invoked from network); 28 May 2015 18:55:20 -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; 28 May 2015 18:55:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2xb-0003J2-3V for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:55:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2xa-0003gf-Rp for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:55:19 +0000 Date: Thu, 28 May 2015 18:55:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: move syscall trampolines off the stack X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7a66ac8d1633297be79fefbf920f0e02c71041d3 Author: Jan Beulich AuthorDate: Fri May 22 10:45:43 2015 +0200 Commit: Jan Beulich CommitDate: Fri May 22 10:45:43 2015 +0200 x86: move syscall trampolines off the stack This is needed as stacks are going to become non-executable. Use separate stub pages (shared among suitable CPUs on the same node) instead. Stub areas (currently 128 bytes each) are being split into two parts - a fixed usage one (the syscall ones) and dynamically usable space, which will be used by subsequent changes to hold dynamically generated code during instruction eumlation. While sharing physical pages among certain CPUs on the same node, for now the virtual mappings get established in distinct pages for each CPU. This isn't a strict requirement, but simplifies VA space management for this initial implementation: Sharing VA space would require additional tracking of which areas are currently in use. If the VA and/or TLB overhead turned out to be a problem, such extra code could easily be added. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/setup.c | 4 ++ xen/arch/x86/smpboot.c | 71 +++++++++++++++++++++++++- xen/arch/x86/x86_64/compat/entry.S | 15 +++++- xen/arch/x86/x86_64/entry.S | 24 ++++----- xen/arch/x86/x86_64/traps.c | 98 +++++++++++++++++++---------------- xen/arch/x86/xen.lds.S | 3 + xen/include/asm-x86/config.h | 4 ++ xen/include/asm-x86/page.h | 8 ++-- xen/include/asm-x86/processor.h | 14 +++++- xen/include/asm-x86/x86_64/page.h | 1 + 10 files changed, 177 insertions(+), 65 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 2cc9185..e808ea9 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1271,6 +1271,10 @@ void __init noreturn __start_xen(unsigned long mbi_p) init_idle_domain(); + this_cpu(stubs.addr) = alloc_stub_page(smp_processor_id(), + &this_cpu(stubs).mfn); + BUG_ON(!this_cpu(stubs.addr)); + trap_init(); rcu_init(); diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 116c8f8..2289284 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -603,6 +604,43 @@ static int do_boot_cpu(int apicid, int cpu) return rc; } +#define STUB_BUF_CPU_OFFS(cpu) (((cpu) & (STUBS_PER_PAGE - 1)) * STUB_BUF_SIZE) + +unsigned long alloc_stub_page(unsigned int cpu, unsigned long *mfn) +{ + unsigned long stub_va; + struct page_info *pg; + + BUILD_BUG_ON(STUBS_PER_PAGE & (STUBS_PER_PAGE - 1)); + + if ( *mfn ) + pg = mfn_to_page(*mfn); + else + { + nodeid_t node = cpu_to_node(cpu); + unsigned int memflags = node != NUMA_NO_NODE ? MEMF_node(node) : 0; + + pg = alloc_domheap_page(NULL, memflags); + if ( !pg ) + return 0; + + unmap_domain_page(memset(__map_domain_page(pg), 0xcc, PAGE_SIZE)); + } + + stub_va = XEN_VIRT_END - (cpu + 1) * PAGE_SIZE; + if ( map_pages_to_xen(stub_va, page_to_mfn(pg), 1, + PAGE_HYPERVISOR_RX | MAP_SMALL_PAGES) ) + { + if ( !*mfn ) + free_domheap_page(pg); + stub_va = 0; + } + else if ( !*mfn ) + *mfn = page_to_mfn(pg); + + return stub_va; +} + void cpu_exit_clear(unsigned int cpu) { cpu_uninit(cpu); @@ -616,6 +654,23 @@ static void cpu_smpboot_free(unsigned int cpu) free_cpumask_var(per_cpu(cpu_sibling_mask, cpu)); free_cpumask_var(per_cpu(cpu_core_mask, cpu)); + if ( per_cpu(stubs.addr, cpu) ) + { + unsigned long mfn = per_cpu(stubs.mfn, cpu); + unsigned char *stub_page = map_domain_page(mfn); + unsigned int i; + + memset(stub_page + STUB_BUF_CPU_OFFS(cpu), 0xcc, STUB_BUF_SIZE); + for ( i = 0; i < STUBS_PER_PAGE; ++i ) + if ( stub_page[i * STUB_BUF_SIZE] != 0xcc ) + break; + unmap_domain_page(stub_page); + destroy_xen_mappings(per_cpu(stubs.addr, cpu) & PAGE_MASK, + (per_cpu(stubs.addr, cpu) | ~PAGE_MASK) + 1); + if ( i == STUBS_PER_PAGE ) + free_domheap_page(mfn_to_page(mfn)); + } + order = get_order_from_pages(NR_RESERVED_GDT_PAGES); free_xenheap_pages(per_cpu(gdt_table, cpu), order); @@ -635,9 +690,10 @@ static void cpu_smpboot_free(unsigned int cpu) static int cpu_smpboot_alloc(unsigned int cpu) { - unsigned int order, memflags = 0; + unsigned int i, order, memflags = 0; nodeid_t node = cpu_to_node(cpu); struct desc_struct *gdt; + unsigned long stub_page; if ( node != NUMA_NO_NODE ) memflags = MEMF_node(node); @@ -667,6 +723,19 @@ static int cpu_smpboot_alloc(unsigned int cpu) goto oom; memcpy(idt_tables[cpu], idt_table, IDT_ENTRIES * sizeof(idt_entry_t)); + for ( stub_page = 0, i = cpu & ~(STUBS_PER_PAGE - 1); + i < nr_cpu_ids && i <= (cpu | (STUBS_PER_PAGE - 1)); ++i ) + if ( cpu_online(i) && cpu_to_node(i) == node ) + { + per_cpu(stubs.mfn, cpu) = per_cpu(stubs.mfn, i); + break; + } + BUG_ON(i == cpu); + stub_page = alloc_stub_page(cpu, &per_cpu(stubs.mfn, cpu)); + if ( !stub_page ) + goto oom; + per_cpu(stubs.addr, cpu) = stub_page + STUB_BUF_CPU_OFFS(cpu); + if ( zalloc_cpumask_var(&per_cpu(cpu_sibling_mask, cpu)) && zalloc_cpumask_var(&per_cpu(cpu_core_mask, cpu)) ) return 0; diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S index 5b0af61..46f340b 100644 --- a/xen/arch/x86/x86_64/compat/entry.S +++ b/xen/arch/x86/x86_64/compat/entry.S @@ -219,7 +219,20 @@ ENTRY(compat_post_handle_exception) movb $0,TRAPBOUNCE_flags(%rdx) jmp compat_test_all_events -ENTRY(compat_syscall) +/* See lstar_enter for entry register state. */ +ENTRY(cstar_enter) + sti + movq 8(%rsp),%rax /* Restore %rax. */ + movq $FLAT_KERNEL_SS,8(%rsp) + pushq %r11 + pushq $FLAT_USER_CS32 + pushq %rcx + pushq $0 + SAVE_VOLATILE TRAP_syscall + GET_CURRENT(%rbx) + movq VCPU_domain(%rbx),%rcx + cmpb $0,DOMAIN_is_32bit_pv(%rcx) + je switch_to_kernel cmpb $0,VCPU_syscall32_disables_events(%rbx) movzwl VCPU_syscall32_sel(%rbx),%esi movq VCPU_syscall32_addr(%rbx),%rax diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 7e63e64..4a37642 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -13,9 +13,8 @@ #include #include - ALIGN /* %rbx: struct vcpu */ -switch_to_kernel: +ENTRY(switch_to_kernel) leaq VCPU_trap_bounce(%rbx),%rdx /* TB_eip = (32-bit syscall && syscall32_addr) ? * syscall32_addr : syscall_addr */ @@ -113,23 +112,22 @@ restore_all_xen: * When entering SYSCALL from user mode: * Vector directly to the registered arch.syscall_addr. * - * Initial work is done by per-CPU stack trampolines. At this point %rsp - * has been initialised to point at the correct Xen stack, and %rsp, %rflags - * and %cs have been saved. All other registers are still to be saved onto - * the stack, starting with %rip, and an appropriate %ss must be saved into - * the space left by the trampoline. + * Initial work is done by per-CPU trampolines. At this point %rsp has been + * initialised to point at the correct Xen stack, %rsp has been saved, and + * %rax needs to be restored from the %ss save slot. All other registers are + * still to be saved onto the stack, starting with RFLAGS, and an appropriate + * %ss must be saved into the space left by the trampoline. */ -ENTRY(syscall_enter) +ENTRY(lstar_enter) sti - movl $FLAT_KERNEL_SS,24(%rsp) + movq 8(%rsp),%rax /* Restore %rax. */ + movq $FLAT_KERNEL_SS,8(%rsp) + pushq %r11 + pushq $FLAT_KERNEL_CS64 pushq %rcx pushq $0 - movq 24(%rsp),%r11 /* Re-load user RFLAGS into %r11 before saving */ SAVE_VOLATILE TRAP_syscall GET_CURRENT(%rbx) - movq VCPU_domain(%rbx),%rcx - testb $1,DOMAIN_is_32bit_pv(%rcx) - jnz compat_syscall testb $TF_kernel_mode,VCPU_thread_flags(%rbx) jz switch_to_kernel diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index fc35aba..117a133 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -337,70 +337,78 @@ unsigned long do_iret(void) return 0; } -static int write_stack_trampoline( - char *stack, char *stack_bottom, uint16_t cs_seg) +static unsigned int write_stub_trampoline( + unsigned char *stub, unsigned long stub_va, + unsigned long stack_bottom, unsigned long target_va) { - /* movq %rsp, saversp(%rip) */ - stack[0] = 0x48; - stack[1] = 0x89; - stack[2] = 0x25; - *(u32 *)&stack[3] = (stack_bottom - &stack[7]) - 16; - - /* leaq saversp(%rip), %rsp */ - stack[7] = 0x48; - stack[8] = 0x8d; - stack[9] = 0x25; - *(u32 *)&stack[10] = (stack_bottom - &stack[14]) - 16; - - /* pushq %r11 */ - stack[14] = 0x41; - stack[15] = 0x53; - - /* pushq $ */ - stack[16] = 0x68; - *(u32 *)&stack[17] = cs_seg; - - /* movq $syscall_enter,%r11 */ - stack[21] = 0x49; - stack[22] = 0xbb; - *(void **)&stack[23] = (void *)syscall_enter; - - /* jmpq *%r11 */ - stack[31] = 0x41; - stack[32] = 0xff; - stack[33] = 0xe3; - - return 34; + /* movabsq %rax, stack_bottom - 8 */ + stub[0] = 0x48; + stub[1] = 0xa3; + *(uint64_t *)&stub[2] = stack_bottom - 8; + + /* movq %rsp, %rax */ + stub[10] = 0x48; + stub[11] = 0x89; + stub[12] = 0xe0; + + /* movabsq $stack_bottom - 8, %rsp */ + stub[13] = 0x48; + stub[14] = 0xbc; + *(uint64_t *)&stub[15] = stack_bottom - 8; + + /* pushq %rax */ + stub[23] = 0x50; + + /* jmp target_va */ + stub[24] = 0xe9; + *(int32_t *)&stub[25] = target_va - (stub_va + 29); + + /* Round up to a multiple of 16 bytes. */ + return 32; } +DEFINE_PER_CPU(struct stubs, stubs); +void lstar_enter(void); +void cstar_enter(void); + void __devinit subarch_percpu_traps_init(void) { - char *stack_bottom, *stack; - - stack_bottom = (char *)get_stack_bottom(); - stack = (char *)((unsigned long)stack_bottom & ~(STACK_SIZE - 1)); + unsigned long stack_bottom = get_stack_bottom(); + unsigned long stub_va = this_cpu(stubs.addr); + unsigned char *stub_page; + unsigned int offset; /* IST_MAX IST pages + 1 syscall page + 1 guard page + primary stack. */ BUILD_BUG_ON((IST_MAX + 2) * PAGE_SIZE + PRIMARY_STACK_SIZE > STACK_SIZE); - /* Trampoline for SYSCALL entry from long mode. */ - stack = &stack[IST_MAX * PAGE_SIZE]; /* Skip the IST stacks. */ - wrmsrl(MSR_LSTAR, (unsigned long)stack); - stack += write_stack_trampoline(stack, stack_bottom, FLAT_KERNEL_CS64); + stub_page = map_domain_page(this_cpu(stubs.mfn)); + + /* Trampoline for SYSCALL entry from 64-bit mode. */ + wrmsrl(MSR_LSTAR, stub_va); + offset = write_stub_trampoline(stub_page + (stub_va & ~PAGE_MASK), + stub_va, stack_bottom, + (unsigned long)lstar_enter); + stub_va += offset; if ( boot_cpu_data.x86_vendor == X86_VENDOR_INTEL || boot_cpu_data.x86_vendor == X86_VENDOR_CENTAUR ) { /* SYSENTER entry. */ - wrmsrl(MSR_IA32_SYSENTER_ESP, (unsigned long)stack_bottom); + wrmsrl(MSR_IA32_SYSENTER_ESP, stack_bottom); wrmsrl(MSR_IA32_SYSENTER_EIP, (unsigned long)sysenter_entry); wrmsr(MSR_IA32_SYSENTER_CS, __HYPERVISOR_CS, 0); } /* Trampoline for SYSCALL entry from compatibility mode. */ - stack = (char *)L1_CACHE_ALIGN((unsigned long)stack); - wrmsrl(MSR_CSTAR, (unsigned long)stack); - stack += write_stack_trampoline(stack, stack_bottom, FLAT_USER_CS32); + wrmsrl(MSR_CSTAR, stub_va); + offset += write_stub_trampoline(stub_page + (stub_va & ~PAGE_MASK), + stub_va, stack_bottom, + (unsigned long)cstar_enter); + + /* Don't consume more than half of the stub space here. */ + ASSERT(offset <= STUB_BUF_SIZE / 2); + + unmap_domain_page(stub_page); /* Common SYSCALL parameters. */ wrmsr(MSR_STAR, 0, (FLAT_RING3_CS32<<16) | __HYPERVISOR_CS); diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index 4699a04..5fc6c9f 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -217,4 +217,7 @@ SECTIONS .comment 0 : { *(.comment) } } +ASSERT(__image_base__ > XEN_VIRT_START || + _end <= XEN_VIRT_END - NR_CPUS * PAGE_SIZE, + "Xen image overlaps stubs area") ASSERT(kexec_reloc_size - kexec_reloc <= PAGE_SIZE, "kexec_reloc is too large") diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 7700c77..3e9be83 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -94,6 +94,10 @@ /* Primary stack is restricted to 8kB by guard pages. */ #define PRIMARY_STACK_SIZE 8192 +/* Total size of syscall and emulation stubs. */ +#define STUB_BUF_SHIFT (L1_CACHE_SHIFT > 7 ? L1_CACHE_SHIFT : 7) +#define STUB_BUF_SIZE (1 << STUB_BUF_SHIFT) + /* Return value for zero-size _xmalloc(), distinguished from NULL. */ #define ZERO_BLOCK_PTR ((void *)0xBAD0BAD0BAD0BAD0UL) diff --git a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h index 27c2ae7..ef1e86f 100644 --- a/xen/include/asm-x86/page.h +++ b/xen/include/asm-x86/page.h @@ -323,10 +323,10 @@ void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t); #define _PAGE_GNTTAB 0 #endif -#define __PAGE_HYPERVISOR \ - (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED) -#define __PAGE_HYPERVISOR_NOCACHE \ - (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_PCD | _PAGE_ACCESSED) +#define __PAGE_HYPERVISOR_RX (_PAGE_PRESENT | _PAGE_ACCESSED) +#define __PAGE_HYPERVISOR (__PAGE_HYPERVISOR_RX | \ + _PAGE_DIRTY | _PAGE_RW) +#define __PAGE_HYPERVISOR_NOCACHE (__PAGE_HYPERVISOR | _PAGE_PCD) #define MAP_SMALL_PAGES _PAGE_AVAIL0 /* don't use superpages mappings */ diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index a9b4e06..fb2c2fc 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -532,12 +532,24 @@ void trap_nop(void); void enable_nmis(void); void do_reserved_trap(struct cpu_user_regs *regs); -void syscall_enter(void); void sysenter_entry(void); void sysenter_eflags_saved(void); void compat_hypercall(void); void int80_direct_trap(void); +#define STUBS_PER_PAGE (PAGE_SIZE / STUB_BUF_SIZE) + +struct stubs { + union { + void(*func)(void); + unsigned long addr; + }; + unsigned long mfn; +}; + +DECLARE_PER_CPU(struct stubs, stubs); +unsigned long alloc_stub_page(unsigned int cpu, unsigned long *mfn); + extern int hypercall(void); int cpuid_hypervisor_leaves( uint32_t idx, uint32_t sub_idx, diff --git a/xen/include/asm-x86/x86_64/page.h b/xen/include/asm-x86/x86_64/page.h index 1d54587..fd2f700 100644 --- a/xen/include/asm-x86/x86_64/page.h +++ b/xen/include/asm-x86/x86_64/page.h @@ -148,6 +148,7 @@ typedef l4_pgentry_t root_pgentry_t; #define _PAGE_GUEST_KERNEL (1U<<12) #define PAGE_HYPERVISOR (__PAGE_HYPERVISOR | _PAGE_GLOBAL) +#define PAGE_HYPERVISOR_RX (__PAGE_HYPERVISOR_RX | _PAGE_GLOBAL) #define PAGE_HYPERVISOR_NOCACHE (__PAGE_HYPERVISOR_NOCACHE | _PAGE_GLOBAL) #endif /* __X86_64_PAGE_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 Thu May 28 18:55:36 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:55: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 1Yy2xr-0006Vu-Vl; Thu, 28 May 2015 18:55:35 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2xq-0006Va-7T for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:55:34 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id 4E/67-06739-5A467655; Thu, 28 May 2015 18:55:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1432839329!10736705!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23681 invoked from network); 28 May 2015 18:55:30 -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; 28 May 2015 18:55:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2xl-0003JD-A7 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:55:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2xl-0003h1-8V for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:55:29 +0000 Date: Thu, 28 May 2015 18:55:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86emul: move stubs off the stack X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 95668b015384879d36e2f3f0bd38b85fdcd34ef1 Author: Jan Beulich AuthorDate: Fri May 22 10:46:32 2015 +0200 Commit: Jan Beulich CommitDate: Fri May 22 10:46:32 2015 +0200 x86emul: move stubs off the stack This is needed as stacks are going to become non-executable. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- tools/tests/x86_emulator/x86_emulate.c | 4 ++ xen/arch/x86/x86_emulate.c | 16 +++++++++ xen/arch/x86/x86_emulate/x86_emulate.c | 55 ++++++++++++++++++++++---------- xen/arch/x86/x86_emulate/x86_emulate.h | 13 +++++++ 4 files changed, 71 insertions(+), 17 deletions(-) diff --git a/tools/tests/x86_emulator/x86_emulate.c b/tools/tests/x86_emulator/x86_emulate.c index ef9bfe9..0b3b34a 100644 --- a/tools/tests/x86_emulator/x86_emulate.c +++ b/tools/tests/x86_emulator/x86_emulate.c @@ -17,4 +17,8 @@ typedef bool bool_t; #define __packed __attribute__((packed)) #include "x86_emulate/x86_emulate.h" + +#define get_stub(stb) ((void *)((stb).addr = (uintptr_t)(stb).buf)) +#define put_stub(stb) + #include "x86_emulate/x86_emulate.c" diff --git a/xen/arch/x86/x86_emulate.c b/xen/arch/x86/x86_emulate.c index 79b4ab3..51c8e44 100644 --- a/xen/arch/x86/x86_emulate.c +++ b/xen/arch/x86/x86_emulate.c @@ -9,6 +9,7 @@ * Keir Fraser */ +#include #include #include /* mark_regs_dirty() */ #include /* current_cpu_info */ @@ -17,8 +18,23 @@ /* Avoid namespace pollution. */ #undef cmpxchg #undef cpuid +#undef wbinvd #define cpu_has_amd_erratum(nr) \ cpu_has_amd_erratum(¤t_cpu_data, AMD_ERRATUM_##nr) +#define get_stub(stb) ({ \ + BUILD_BUG_ON(STUB_BUF_SIZE / 2 < MAX_INST_LEN + 1); \ + (stb).addr = this_cpu(stubs.addr) + STUB_BUF_SIZE / 2; \ + ((stb).ptr = map_domain_page(this_cpu(stubs.mfn))) + \ + ((stb).addr & ~PAGE_MASK); \ +}) +#define put_stub(stb) ({ \ + if ( (stb).ptr ) \ + { \ + unmap_domain_page((stb).ptr); \ + (stb).ptr = NULL; \ + } \ +}) + #include "x86_emulate/x86_emulate.c" diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index d43ca4e..c017c69 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -717,11 +717,15 @@ do{ struct fpu_insn_ctxt fic; \ } while (0) #define emulate_fpu_insn_stub(_bytes...) \ -do{ uint8_t stub[] = { _bytes, 0xc3 }; \ - struct fpu_insn_ctxt fic = { .insn_bytes = sizeof(stub)-1 }; \ +do { \ + uint8_t *buf = get_stub(stub); \ + unsigned int _nr = sizeof((uint8_t[]){ _bytes }); \ + struct fpu_insn_ctxt fic = { .insn_bytes = _nr }; \ + memcpy(buf, ((uint8_t[]){ _bytes, 0xc3 }), _nr + 1); \ get_fpu(X86EMUL_FPU_fpu, &fic); \ - (*(void(*)(void))stub)(); \ + stub.func(); \ put_fpu(&fic); \ + put_stub(stub); \ } while (0) static unsigned long _get_rep_prefix( @@ -1458,6 +1462,7 @@ x86_emulate( struct operand src = { .reg = REG_POISON }; struct operand dst = { .reg = REG_POISON }; enum x86_swint_type swint_type; + struct x86_emulate_stub stub = {}; DECLARE_ALIGNED(mmval_t, mmval); /* * Data operand effective address (usually computed from ModRM). @@ -3792,6 +3797,7 @@ x86_emulate( done: _put_fpu(); + put_stub(stub); return rc; twobyte_insn: @@ -4007,9 +4013,15 @@ x86_emulate( /* {,v}movss xmm,xmm/m32 */ /* {,v}movsd xmm,xmm/m64 */ { - uint8_t stub[] = { 0x3e, 0x3e, 0x0f, b, modrm, 0xc3 }; - struct fpu_insn_ctxt fic = { .insn_bytes = sizeof(stub)-1 }; - + uint8_t *buf = get_stub(stub); + struct fpu_insn_ctxt fic = { .insn_bytes = 5 }; + + buf[0] = 0x3e; + buf[1] = 0x3e; + buf[2] = 0x0f; + buf[3] = b; + buf[4] = modrm; + buf[5] = 0xc3; if ( vex.opcx == vex_none ) { if ( vex.pfx & VEX_PREFIX_DOUBLE_MASK ) @@ -4017,7 +4029,7 @@ x86_emulate( else vcpu_must_have_sse(); ea.bytes = 16; - SET_SSE_PREFIX(stub[0], vex.pfx); + SET_SSE_PREFIX(buf[0], vex.pfx); get_fpu(X86EMUL_FPU_xmm, &fic); } else @@ -4044,15 +4056,16 @@ x86_emulate( /* convert memory operand to (%rAX) */ rex_prefix &= ~REX_B; vex.b = 1; - stub[4] &= 0x38; + buf[4] &= 0x38; } if ( !rc ) { - copy_REX_VEX(stub, rex_prefix, vex); - asm volatile ( "call *%0" : : "r" (stub), "a" (mmvalp) + copy_REX_VEX(buf, rex_prefix, vex); + asm volatile ( "call *%0" : : "r" (stub.func), "a" (mmvalp) : "memory" ); } put_fpu(&fic); + put_stub(stub); if ( !rc && (b & 1) && (ea.type == OP_MEM) ) rc = ops->write(ea.mem.seg, ea.mem.off, mmvalp, ea.bytes, ctxt); @@ -4242,9 +4255,15 @@ x86_emulate( /* {,v}movdq{a,u} xmm,xmm/m128 */ /* vmovdq{a,u} ymm,ymm/m256 */ { - uint8_t stub[] = { 0x3e, 0x3e, 0x0f, b, modrm, 0xc3 }; - struct fpu_insn_ctxt fic = { .insn_bytes = sizeof(stub)-1 }; - + uint8_t *buf = get_stub(stub); + struct fpu_insn_ctxt fic = { .insn_bytes = 5 }; + + buf[0] = 0x3e; + buf[1] = 0x3e; + buf[2] = 0x0f; + buf[3] = b; + buf[4] = modrm; + buf[5] = 0xc3; if ( vex.opcx == vex_none ) { switch ( vex.pfx ) @@ -4252,7 +4271,7 @@ x86_emulate( case vex_66: case vex_f3: vcpu_must_have_sse2(); - stub[0] = 0x66; /* movdqa */ + buf[0] = 0x66; /* movdqa */ get_fpu(X86EMUL_FPU_xmm, &fic); ea.bytes = 16; break; @@ -4288,15 +4307,16 @@ x86_emulate( /* convert memory operand to (%rAX) */ rex_prefix &= ~REX_B; vex.b = 1; - stub[4] &= 0x38; + buf[4] &= 0x38; } if ( !rc ) { - copy_REX_VEX(stub, rex_prefix, vex); - asm volatile ( "call *%0" : : "r" (stub), "a" (mmvalp) + copy_REX_VEX(buf, rex_prefix, vex); + asm volatile ( "call *%0" : : "r" (stub.func), "a" (mmvalp) : "memory" ); } put_fpu(&fic); + put_stub(stub); if ( !rc && (b != 0x6f) && (ea.type == OP_MEM) ) rc = ops->write(ea.mem.seg, ea.mem.off, mmvalp, ea.bytes, ctxt); @@ -4638,5 +4658,6 @@ x86_emulate( cannot_emulate: _put_fpu(); + put_stub(stub); return X86EMUL_UNHANDLEABLE; } diff --git a/xen/arch/x86/x86_emulate/x86_emulate.h b/xen/arch/x86/x86_emulate/x86_emulate.h index c55063d..064b8f4 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.h +++ b/xen/arch/x86/x86_emulate/x86_emulate.h @@ -429,6 +429,19 @@ struct x86_emulate_ctxt } retire; }; +struct x86_emulate_stub { + union { + void (*func)(void); + uintptr_t addr; + }; +#ifdef __XEN__ + void *ptr; +#else + /* Room for one insn and a (single byte) RET. */ + uint8_t buf[MAX_INST_LEN + 1]; +#endif +}; + /* * x86_emulate: Emulate an instruction. * Returns -1 on failure, 0 on success. -- 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 May 28 18:55:36 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:55: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 1Yy2xr-0006Vu-Vl; Thu, 28 May 2015 18:55:35 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2xq-0006Va-7T for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:55:34 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id 4E/67-06739-5A467655; Thu, 28 May 2015 18:55:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1432839329!10736705!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23681 invoked from network); 28 May 2015 18:55:30 -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; 28 May 2015 18:55:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2xl-0003JD-A7 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:55:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2xl-0003h1-8V for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:55:29 +0000 Date: Thu, 28 May 2015 18:55:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86emul: move stubs off the stack X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 95668b015384879d36e2f3f0bd38b85fdcd34ef1 Author: Jan Beulich AuthorDate: Fri May 22 10:46:32 2015 +0200 Commit: Jan Beulich CommitDate: Fri May 22 10:46:32 2015 +0200 x86emul: move stubs off the stack This is needed as stacks are going to become non-executable. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- tools/tests/x86_emulator/x86_emulate.c | 4 ++ xen/arch/x86/x86_emulate.c | 16 +++++++++ xen/arch/x86/x86_emulate/x86_emulate.c | 55 ++++++++++++++++++++++---------- xen/arch/x86/x86_emulate/x86_emulate.h | 13 +++++++ 4 files changed, 71 insertions(+), 17 deletions(-) diff --git a/tools/tests/x86_emulator/x86_emulate.c b/tools/tests/x86_emulator/x86_emulate.c index ef9bfe9..0b3b34a 100644 --- a/tools/tests/x86_emulator/x86_emulate.c +++ b/tools/tests/x86_emulator/x86_emulate.c @@ -17,4 +17,8 @@ typedef bool bool_t; #define __packed __attribute__((packed)) #include "x86_emulate/x86_emulate.h" + +#define get_stub(stb) ((void *)((stb).addr = (uintptr_t)(stb).buf)) +#define put_stub(stb) + #include "x86_emulate/x86_emulate.c" diff --git a/xen/arch/x86/x86_emulate.c b/xen/arch/x86/x86_emulate.c index 79b4ab3..51c8e44 100644 --- a/xen/arch/x86/x86_emulate.c +++ b/xen/arch/x86/x86_emulate.c @@ -9,6 +9,7 @@ * Keir Fraser */ +#include #include #include /* mark_regs_dirty() */ #include /* current_cpu_info */ @@ -17,8 +18,23 @@ /* Avoid namespace pollution. */ #undef cmpxchg #undef cpuid +#undef wbinvd #define cpu_has_amd_erratum(nr) \ cpu_has_amd_erratum(¤t_cpu_data, AMD_ERRATUM_##nr) +#define get_stub(stb) ({ \ + BUILD_BUG_ON(STUB_BUF_SIZE / 2 < MAX_INST_LEN + 1); \ + (stb).addr = this_cpu(stubs.addr) + STUB_BUF_SIZE / 2; \ + ((stb).ptr = map_domain_page(this_cpu(stubs.mfn))) + \ + ((stb).addr & ~PAGE_MASK); \ +}) +#define put_stub(stb) ({ \ + if ( (stb).ptr ) \ + { \ + unmap_domain_page((stb).ptr); \ + (stb).ptr = NULL; \ + } \ +}) + #include "x86_emulate/x86_emulate.c" diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index d43ca4e..c017c69 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -717,11 +717,15 @@ do{ struct fpu_insn_ctxt fic; \ } while (0) #define emulate_fpu_insn_stub(_bytes...) \ -do{ uint8_t stub[] = { _bytes, 0xc3 }; \ - struct fpu_insn_ctxt fic = { .insn_bytes = sizeof(stub)-1 }; \ +do { \ + uint8_t *buf = get_stub(stub); \ + unsigned int _nr = sizeof((uint8_t[]){ _bytes }); \ + struct fpu_insn_ctxt fic = { .insn_bytes = _nr }; \ + memcpy(buf, ((uint8_t[]){ _bytes, 0xc3 }), _nr + 1); \ get_fpu(X86EMUL_FPU_fpu, &fic); \ - (*(void(*)(void))stub)(); \ + stub.func(); \ put_fpu(&fic); \ + put_stub(stub); \ } while (0) static unsigned long _get_rep_prefix( @@ -1458,6 +1462,7 @@ x86_emulate( struct operand src = { .reg = REG_POISON }; struct operand dst = { .reg = REG_POISON }; enum x86_swint_type swint_type; + struct x86_emulate_stub stub = {}; DECLARE_ALIGNED(mmval_t, mmval); /* * Data operand effective address (usually computed from ModRM). @@ -3792,6 +3797,7 @@ x86_emulate( done: _put_fpu(); + put_stub(stub); return rc; twobyte_insn: @@ -4007,9 +4013,15 @@ x86_emulate( /* {,v}movss xmm,xmm/m32 */ /* {,v}movsd xmm,xmm/m64 */ { - uint8_t stub[] = { 0x3e, 0x3e, 0x0f, b, modrm, 0xc3 }; - struct fpu_insn_ctxt fic = { .insn_bytes = sizeof(stub)-1 }; - + uint8_t *buf = get_stub(stub); + struct fpu_insn_ctxt fic = { .insn_bytes = 5 }; + + buf[0] = 0x3e; + buf[1] = 0x3e; + buf[2] = 0x0f; + buf[3] = b; + buf[4] = modrm; + buf[5] = 0xc3; if ( vex.opcx == vex_none ) { if ( vex.pfx & VEX_PREFIX_DOUBLE_MASK ) @@ -4017,7 +4029,7 @@ x86_emulate( else vcpu_must_have_sse(); ea.bytes = 16; - SET_SSE_PREFIX(stub[0], vex.pfx); + SET_SSE_PREFIX(buf[0], vex.pfx); get_fpu(X86EMUL_FPU_xmm, &fic); } else @@ -4044,15 +4056,16 @@ x86_emulate( /* convert memory operand to (%rAX) */ rex_prefix &= ~REX_B; vex.b = 1; - stub[4] &= 0x38; + buf[4] &= 0x38; } if ( !rc ) { - copy_REX_VEX(stub, rex_prefix, vex); - asm volatile ( "call *%0" : : "r" (stub), "a" (mmvalp) + copy_REX_VEX(buf, rex_prefix, vex); + asm volatile ( "call *%0" : : "r" (stub.func), "a" (mmvalp) : "memory" ); } put_fpu(&fic); + put_stub(stub); if ( !rc && (b & 1) && (ea.type == OP_MEM) ) rc = ops->write(ea.mem.seg, ea.mem.off, mmvalp, ea.bytes, ctxt); @@ -4242,9 +4255,15 @@ x86_emulate( /* {,v}movdq{a,u} xmm,xmm/m128 */ /* vmovdq{a,u} ymm,ymm/m256 */ { - uint8_t stub[] = { 0x3e, 0x3e, 0x0f, b, modrm, 0xc3 }; - struct fpu_insn_ctxt fic = { .insn_bytes = sizeof(stub)-1 }; - + uint8_t *buf = get_stub(stub); + struct fpu_insn_ctxt fic = { .insn_bytes = 5 }; + + buf[0] = 0x3e; + buf[1] = 0x3e; + buf[2] = 0x0f; + buf[3] = b; + buf[4] = modrm; + buf[5] = 0xc3; if ( vex.opcx == vex_none ) { switch ( vex.pfx ) @@ -4252,7 +4271,7 @@ x86_emulate( case vex_66: case vex_f3: vcpu_must_have_sse2(); - stub[0] = 0x66; /* movdqa */ + buf[0] = 0x66; /* movdqa */ get_fpu(X86EMUL_FPU_xmm, &fic); ea.bytes = 16; break; @@ -4288,15 +4307,16 @@ x86_emulate( /* convert memory operand to (%rAX) */ rex_prefix &= ~REX_B; vex.b = 1; - stub[4] &= 0x38; + buf[4] &= 0x38; } if ( !rc ) { - copy_REX_VEX(stub, rex_prefix, vex); - asm volatile ( "call *%0" : : "r" (stub), "a" (mmvalp) + copy_REX_VEX(buf, rex_prefix, vex); + asm volatile ( "call *%0" : : "r" (stub.func), "a" (mmvalp) : "memory" ); } put_fpu(&fic); + put_stub(stub); if ( !rc && (b != 0x6f) && (ea.type == OP_MEM) ) rc = ops->write(ea.mem.seg, ea.mem.off, mmvalp, ea.bytes, ctxt); @@ -4638,5 +4658,6 @@ x86_emulate( cannot_emulate: _put_fpu(); + put_stub(stub); return X86EMUL_UNHANDLEABLE; } diff --git a/xen/arch/x86/x86_emulate/x86_emulate.h b/xen/arch/x86/x86_emulate/x86_emulate.h index c55063d..064b8f4 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.h +++ b/xen/arch/x86/x86_emulate/x86_emulate.h @@ -429,6 +429,19 @@ struct x86_emulate_ctxt } retire; }; +struct x86_emulate_stub { + union { + void (*func)(void); + uintptr_t addr; + }; +#ifdef __XEN__ + void *ptr; +#else + /* Room for one insn and a (single byte) RET. */ + uint8_t buf[MAX_INST_LEN + 1]; +#endif +}; + /* * x86_emulate: Emulate an instruction. * Returns -1 on failure, 0 on success. -- 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 May 28 18:55:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:55:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2y0-0006Xk-2t; Thu, 28 May 2015 18:55:44 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2xy-0006XG-2B for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:55:42 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 51/9B-13047-DA467655; Thu, 28 May 2015 18:55:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1432839339!18319459!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26566 invoked from network); 28 May 2015 18:55:40 -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; 28 May 2015 18:55:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2xv-0003JJ-FW for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:55:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2xv-0003hz-EK for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:55:39 +0000 Date: Thu, 28 May 2015 18:55:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: move I/O emulation stubs off the stack X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 09104d3e0c8d9392828863fb7a60eac68b9a60fb Author: Jan Beulich AuthorDate: Fri May 22 10:48:42 2015 +0200 Commit: Jan Beulich CommitDate: Fri May 22 10:48:42 2015 +0200 x86: move I/O emulation stubs off the stack This is needed as stacks are going to become non-executable. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/traps.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 4b42b2d..91701a2 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -2006,7 +2006,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) ? (*(u32 *)®s->reg = (val)) \ : (*(u16 *)®s->reg = (val))) unsigned long code_base, code_limit; - char io_emul_stub[32]; + char *io_emul_stub = NULL; void (*io_emul)(struct cpu_user_regs *) __attribute__((__regparm__(1))); uint64_t val; @@ -2191,10 +2191,13 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) /* * Very likely to be an I/O instruction (IN/OUT). - * Build an on-stack stub to execute the instruction with full guest - * GPR context. This is needed for some systems which (ab)use IN/OUT + * Build an stub to execute the instruction with full guest GPR + * context. This is needed for some systems which (ab)use IN/OUT * to communicate with BIOS code in system-management mode. */ + io_emul_stub = map_domain_page(this_cpu(stubs.mfn)) + + (this_cpu(stubs.addr) & ~PAGE_MASK) + + STUB_BUF_SIZE / 2; /* movq $host_to_guest_gpr_switch,%rcx */ io_emul_stub[0] = 0x48; io_emul_stub[1] = 0xb9; @@ -2210,9 +2213,10 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) io_emul_stub[14] = 0x90; /* ret (jumps to guest_to_host_gpr_switch) */ io_emul_stub[15] = 0xc3; + BUILD_BUG_ON(STUB_BUF_SIZE / 2 < 16); /* Handy function-typed pointer to the stub. */ - io_emul = (void *)io_emul_stub; + io_emul = (void *)(this_cpu(stubs.addr) + STUB_BUF_SIZE / 2); if ( ioemul_handle_quirk ) ioemul_handle_quirk(opcode, &io_emul_stub[12], regs); @@ -2777,9 +2781,13 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) done: instruction_done(regs, eip, bpmatch); skip: + if ( io_emul_stub ) + unmap_domain_page(io_emul_stub); return EXCRET_fault_fixed; fail: + if ( io_emul_stub ) + unmap_domain_page(io_emul_stub); 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 Thu May 28 18:55:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:55:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2y0-0006Xk-2t; Thu, 28 May 2015 18:55:44 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2xy-0006XG-2B for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:55:42 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 51/9B-13047-DA467655; Thu, 28 May 2015 18:55:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1432839339!18319459!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26566 invoked from network); 28 May 2015 18:55:40 -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; 28 May 2015 18:55:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2xv-0003JJ-FW for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:55:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2xv-0003hz-EK for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:55:39 +0000 Date: Thu, 28 May 2015 18:55:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: move I/O emulation stubs off the stack X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 09104d3e0c8d9392828863fb7a60eac68b9a60fb Author: Jan Beulich AuthorDate: Fri May 22 10:48:42 2015 +0200 Commit: Jan Beulich CommitDate: Fri May 22 10:48:42 2015 +0200 x86: move I/O emulation stubs off the stack This is needed as stacks are going to become non-executable. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/traps.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 4b42b2d..91701a2 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -2006,7 +2006,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) ? (*(u32 *)®s->reg = (val)) \ : (*(u16 *)®s->reg = (val))) unsigned long code_base, code_limit; - char io_emul_stub[32]; + char *io_emul_stub = NULL; void (*io_emul)(struct cpu_user_regs *) __attribute__((__regparm__(1))); uint64_t val; @@ -2191,10 +2191,13 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) /* * Very likely to be an I/O instruction (IN/OUT). - * Build an on-stack stub to execute the instruction with full guest - * GPR context. This is needed for some systems which (ab)use IN/OUT + * Build an stub to execute the instruction with full guest GPR + * context. This is needed for some systems which (ab)use IN/OUT * to communicate with BIOS code in system-management mode. */ + io_emul_stub = map_domain_page(this_cpu(stubs.mfn)) + + (this_cpu(stubs.addr) & ~PAGE_MASK) + + STUB_BUF_SIZE / 2; /* movq $host_to_guest_gpr_switch,%rcx */ io_emul_stub[0] = 0x48; io_emul_stub[1] = 0xb9; @@ -2210,9 +2213,10 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) io_emul_stub[14] = 0x90; /* ret (jumps to guest_to_host_gpr_switch) */ io_emul_stub[15] = 0xc3; + BUILD_BUG_ON(STUB_BUF_SIZE / 2 < 16); /* Handy function-typed pointer to the stub. */ - io_emul = (void *)io_emul_stub; + io_emul = (void *)(this_cpu(stubs.addr) + STUB_BUF_SIZE / 2); if ( ioemul_handle_quirk ) ioemul_handle_quirk(opcode, &io_emul_stub[12], regs); @@ -2777,9 +2781,13 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) done: instruction_done(regs, eip, bpmatch); skip: + if ( io_emul_stub ) + unmap_domain_page(io_emul_stub); return EXCRET_fault_fixed; fail: + if ( io_emul_stub ) + unmap_domain_page(io_emul_stub); 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 Thu May 28 18:55:55 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:55: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 1Yy2yB-0006a3-5s; Thu, 28 May 2015 18:55:55 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2y8-0006Za-ST for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:55:53 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 85/AC-03561-8B467655; Thu, 28 May 2015 18:55:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1432839349!5954256!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.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5476 invoked from network); 28 May 2015 18:55:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 May 2015 18:55:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2y5-0003JP-Mi for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:55:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2y5-0003iL-KZ for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:55:49 +0000 Date: Thu, 28 May 2015 18:55:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: switch default mapping attributes to non-executable X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit abcf15fa8f8b6e22430a364391d5d4ca20de999f Author: Jan Beulich AuthorDate: Fri May 22 10:50:14 2015 +0200 Commit: Jan Beulich CommitDate: Fri May 22 10:50:14 2015 +0200 x86: switch default mapping attributes to non-executable Only a very limited subset of mappings need to be done as executable ones; in particular the direct mapping should not be executable to limit the damage attackers can cause by exploiting security relevant bugs. The EFI change at once includes an adjustment to set NX only when supported by the hardware. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/domain.c | 2 +- xen/arch/x86/domain_page.c | 2 +- xen/arch/x86/mm.c | 8 ++++---- xen/arch/x86/setup.c | 8 ++++++-- xen/arch/x86/x86_64/mm.c | 29 ++++++++++++++++++++++++++++- xen/common/efi/boot.c | 4 ++-- xen/include/asm-x86/page.h | 6 +++++- xen/include/asm-x86/x86_64/page.h | 15 +++++++++++++-- 8 files changed, 60 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 6e9464c..db073a6 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -293,7 +293,7 @@ struct vcpu_guest_context *alloc_vcpu_guest_context(void) free_vcpu_guest_context(NULL); return NULL; } - __set_fixmap(idx - i, page_to_mfn(pg), __PAGE_HYPERVISOR); + __set_fixmap(idx - i, page_to_mfn(pg), __PAGE_HYPERVISOR_RW); per_cpu(vgc_pages[i], cpu) = pg; } return (void *)fix_to_virt(idx); diff --git a/xen/arch/x86/domain_page.c b/xen/arch/x86/domain_page.c index 158a164..5f6f397 100644 --- a/xen/arch/x86/domain_page.c +++ b/xen/arch/x86/domain_page.c @@ -160,7 +160,7 @@ void *map_domain_page(unsigned long mfn) spin_unlock(&dcache->lock); - l1e_write(&MAPCACHE_L1ENT(idx), l1e_from_pfn(mfn, __PAGE_HYPERVISOR)); + l1e_write(&MAPCACHE_L1ENT(idx), l1e_from_pfn(mfn, __PAGE_HYPERVISOR_RW)); out: local_irq_restore(flags); diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 74e146d..7a7a854 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -4412,7 +4412,7 @@ long set_gdt(struct vcpu *v, for ( i = 0; i < nr_pages; i++ ) { v->arch.pv_vcpu.gdt_frames[i] = frames[i]; - l1e_write(&pl1e[i], l1e_from_pfn(frames[i], __PAGE_HYPERVISOR)); + l1e_write(&pl1e[i], l1e_from_pfn(frames[i], __PAGE_HYPERVISOR_RW)); } xfree(pfns); @@ -6003,7 +6003,7 @@ int create_perdomain_mapping(struct domain *d, unsigned long va, if ( !IS_NIL(ppg) ) *ppg++ = pg; l1tab[l1_table_offset(va)] = - l1e_from_page(pg, __PAGE_HYPERVISOR | _PAGE_AVAIL0); + l1e_from_page(pg, __PAGE_HYPERVISOR_RW | _PAGE_AVAIL0); l2e_add_flags(*pl2e, _PAGE_AVAIL0); } else @@ -6132,7 +6132,7 @@ void memguard_init(void) (unsigned long)__va(start), start >> PAGE_SHIFT, (__pa(&_end) + PAGE_SIZE - 1 - start) >> PAGE_SHIFT, - __PAGE_HYPERVISOR|MAP_SMALL_PAGES); + __PAGE_HYPERVISOR_RW|MAP_SMALL_PAGES); BUG_ON(start != xen_phys_start); map_pages_to_xen( XEN_VIRT_START, @@ -6145,7 +6145,7 @@ static void __memguard_change_range(void *p, unsigned long l, int guard) { unsigned long _p = (unsigned long)p; unsigned long _l = (unsigned long)l; - unsigned int flags = __PAGE_HYPERVISOR | MAP_SMALL_PAGES; + unsigned int flags = __PAGE_HYPERVISOR_RW | MAP_SMALL_PAGES; /* Ensure we are dealing with a page-aligned whole number of pages. */ ASSERT((_p&~PAGE_MASK) == 0); diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index e808ea9..8e21859 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -901,7 +901,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) /* The only data mappings to be relocated are in the Xen area. */ pl2e = __va(__pa(l2_xenmap)); *pl2e++ = l2e_from_pfn(xen_phys_start >> PAGE_SHIFT, - PAGE_HYPERVISOR | _PAGE_PSE); + PAGE_HYPERVISOR_RWX | _PAGE_PSE); for ( i = 1; i < L2_PAGETABLE_ENTRIES; i++, pl2e++ ) { if ( !(l2e_get_flags(*pl2e) & _PAGE_PRESENT) ) @@ -1088,7 +1088,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) /* This range must not be passed to the boot allocator and * must also not be mapped with _PAGE_GLOBAL. */ map_pages_to_xen((unsigned long)__va(map_e), PFN_DOWN(map_e), - PFN_DOWN(e - map_e), __PAGE_HYPERVISOR); + PFN_DOWN(e - map_e), __PAGE_HYPERVISOR_RW); } if ( s < map_s ) { @@ -1424,6 +1424,10 @@ void __init noreturn __start_xen(unsigned long mbi_p) if ( cpu_has_smap ) write_cr4(read_cr4() & ~X86_CR4_SMAP); + printk("%sNX (Execute Disable) protection %sactive\n", + cpu_has_nx ? XENLOG_INFO : XENLOG_WARNING "Warning: ", + cpu_has_nx ? "" : "not "); + /* * We're going to setup domain0 using the module(s) that we stashed safely * above our heap. The second module, if present, is an initrd ramdisk. diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index a771a01..e58de58 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -895,6 +895,33 @@ void __init subarch_init_memory(void) share_xen_page_with_privileged_guests(page, XENSHARE_readonly); } } + + /* Mark low 16Mb of direct map NX if hardware supports it. */ + if ( !cpu_has_nx ) + return; + + v = DIRECTMAP_VIRT_START + (1UL << 20); + l3e = l4e_to_l3e(idle_pg_table[l4_table_offset(v)])[l3_table_offset(v)]; + ASSERT(l3e_get_flags(l3e) & _PAGE_PRESENT); + do { + l2e = l3e_to_l2e(l3e)[l2_table_offset(v)]; + ASSERT(l2e_get_flags(l2e) & _PAGE_PRESENT); + if ( l2e_get_flags(l2e) & _PAGE_PSE ) + { + l2e_add_flags(l2e, _PAGE_NX_BIT); + l3e_to_l2e(l3e)[l2_table_offset(v)] = l2e; + v += 1 << L2_PAGETABLE_SHIFT; + } + else + { + l1_pgentry_t l1e = l2e_to_l1e(l2e)[l1_table_offset(v)]; + + ASSERT(l1e_get_flags(l1e) & _PAGE_PRESENT); + l1e_add_flags(l1e, _PAGE_NX_BIT); + l2e_to_l1e(l2e)[l1_table_offset(v)] = l1e; + v += 1 << L1_PAGETABLE_SHIFT; + } + } while ( v < DIRECTMAP_VIRT_START + (16UL << 20) ); } long subarch_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) @@ -1359,7 +1386,7 @@ int memory_add(unsigned long spfn, unsigned long epfn, unsigned int pxm) if ( i < spfn ) i = spfn; ret = map_pages_to_xen((unsigned long)mfn_to_virt(i), i, - epfn - i, __PAGE_HYPERVISOR); + epfn - i, __PAGE_HYPERVISOR_RW); if ( ret ) return ret; } diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index f5e179b..ef8476c 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -1162,7 +1162,7 @@ void __init efi_init_memory(void) EFI_MEMORY_DESCRIPTOR *desc = efi_memmap + i; u64 len = desc->NumberOfPages << EFI_PAGE_SHIFT; unsigned long smfn, emfn; - unsigned int prot = PAGE_HYPERVISOR; + unsigned int prot = PAGE_HYPERVISOR_RWX; printk(XENLOG_INFO " %013" PRIx64 "-%013" PRIx64 " type=%u attr=%016" PRIx64 "\n", @@ -1195,7 +1195,7 @@ void __init efi_init_memory(void) if ( desc->Attribute & EFI_MEMORY_WP ) prot &= _PAGE_RW; if ( desc->Attribute & EFI_MEMORY_XP ) - prot |= _PAGE_NX_BIT; + prot |= _PAGE_NX; if ( pfn_to_pdx(emfn - 1) < (DIRECTMAP_SIZE >> PAGE_SHIFT) && !(smfn & pfn_hole_mask) && diff --git a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h index ef1e86f..e26daaf 100644 --- a/xen/include/asm-x86/page.h +++ b/xen/include/asm-x86/page.h @@ -306,7 +306,8 @@ void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t); #define _PAGE_AVAIL1 _AC(0x400,U) #define _PAGE_AVAIL2 _AC(0x800,U) #define _PAGE_AVAIL _AC(0xE00,U) -#define _PAGE_PSE_PAT _AC(0x1000,U) +#define _PAGE_PSE_PAT _AC(0x1000,U) +#define _PAGE_NX (cpu_has_nx ? _PAGE_NX_BIT : 0) /* non-architectural flags */ #define _PAGE_PAGED 0x2000U #define _PAGE_SHARED 0x4000U @@ -323,6 +324,9 @@ void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t); #define _PAGE_GNTTAB 0 #endif +#define __PAGE_HYPERVISOR_RO (_PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_NX) +#define __PAGE_HYPERVISOR_RW (__PAGE_HYPERVISOR_RO | \ + _PAGE_DIRTY | _PAGE_RW) #define __PAGE_HYPERVISOR_RX (_PAGE_PRESENT | _PAGE_ACCESSED) #define __PAGE_HYPERVISOR (__PAGE_HYPERVISOR_RX | \ _PAGE_DIRTY | _PAGE_RW) diff --git a/xen/include/asm-x86/x86_64/page.h b/xen/include/asm-x86/x86_64/page.h index fd2f700..19ab4d0 100644 --- a/xen/include/asm-x86/x86_64/page.h +++ b/xen/include/asm-x86/x86_64/page.h @@ -147,9 +147,20 @@ typedef l4_pgentry_t root_pgentry_t; */ #define _PAGE_GUEST_KERNEL (1U<<12) -#define PAGE_HYPERVISOR (__PAGE_HYPERVISOR | _PAGE_GLOBAL) +#define PAGE_HYPERVISOR_RO (__PAGE_HYPERVISOR_RO | _PAGE_GLOBAL) +#define PAGE_HYPERVISOR_RW (__PAGE_HYPERVISOR_RW | _PAGE_GLOBAL) #define PAGE_HYPERVISOR_RX (__PAGE_HYPERVISOR_RX | _PAGE_GLOBAL) -#define PAGE_HYPERVISOR_NOCACHE (__PAGE_HYPERVISOR_NOCACHE | _PAGE_GLOBAL) +#define PAGE_HYPERVISOR_RWX (__PAGE_HYPERVISOR | _PAGE_GLOBAL) + +#ifdef __ASSEMBLY__ +/* Dependency on NX being available can't be expressed. */ +# define PAGE_HYPERVISOR PAGE_HYPERVISOR_RWX +# define PAGE_HYPERVISOR_NOCACHE (__PAGE_HYPERVISOR_NOCACHE | _PAGE_GLOBAL) +#else +# define PAGE_HYPERVISOR PAGE_HYPERVISOR_RW +# define PAGE_HYPERVISOR_NOCACHE (__PAGE_HYPERVISOR_NOCACHE | \ + _PAGE_GLOBAL | _PAGE_NX) +#endif #endif /* __X86_64_PAGE_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 Thu May 28 18:55:55 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:55: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 1Yy2yB-0006a3-5s; Thu, 28 May 2015 18:55:55 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2y8-0006Za-ST for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:55:53 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 85/AC-03561-8B467655; Thu, 28 May 2015 18:55:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1432839349!5954256!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.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5476 invoked from network); 28 May 2015 18:55:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 May 2015 18:55:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2y5-0003JP-Mi for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:55:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2y5-0003iL-KZ for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:55:49 +0000 Date: Thu, 28 May 2015 18:55:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: switch default mapping attributes to non-executable X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit abcf15fa8f8b6e22430a364391d5d4ca20de999f Author: Jan Beulich AuthorDate: Fri May 22 10:50:14 2015 +0200 Commit: Jan Beulich CommitDate: Fri May 22 10:50:14 2015 +0200 x86: switch default mapping attributes to non-executable Only a very limited subset of mappings need to be done as executable ones; in particular the direct mapping should not be executable to limit the damage attackers can cause by exploiting security relevant bugs. The EFI change at once includes an adjustment to set NX only when supported by the hardware. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/domain.c | 2 +- xen/arch/x86/domain_page.c | 2 +- xen/arch/x86/mm.c | 8 ++++---- xen/arch/x86/setup.c | 8 ++++++-- xen/arch/x86/x86_64/mm.c | 29 ++++++++++++++++++++++++++++- xen/common/efi/boot.c | 4 ++-- xen/include/asm-x86/page.h | 6 +++++- xen/include/asm-x86/x86_64/page.h | 15 +++++++++++++-- 8 files changed, 60 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 6e9464c..db073a6 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -293,7 +293,7 @@ struct vcpu_guest_context *alloc_vcpu_guest_context(void) free_vcpu_guest_context(NULL); return NULL; } - __set_fixmap(idx - i, page_to_mfn(pg), __PAGE_HYPERVISOR); + __set_fixmap(idx - i, page_to_mfn(pg), __PAGE_HYPERVISOR_RW); per_cpu(vgc_pages[i], cpu) = pg; } return (void *)fix_to_virt(idx); diff --git a/xen/arch/x86/domain_page.c b/xen/arch/x86/domain_page.c index 158a164..5f6f397 100644 --- a/xen/arch/x86/domain_page.c +++ b/xen/arch/x86/domain_page.c @@ -160,7 +160,7 @@ void *map_domain_page(unsigned long mfn) spin_unlock(&dcache->lock); - l1e_write(&MAPCACHE_L1ENT(idx), l1e_from_pfn(mfn, __PAGE_HYPERVISOR)); + l1e_write(&MAPCACHE_L1ENT(idx), l1e_from_pfn(mfn, __PAGE_HYPERVISOR_RW)); out: local_irq_restore(flags); diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 74e146d..7a7a854 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -4412,7 +4412,7 @@ long set_gdt(struct vcpu *v, for ( i = 0; i < nr_pages; i++ ) { v->arch.pv_vcpu.gdt_frames[i] = frames[i]; - l1e_write(&pl1e[i], l1e_from_pfn(frames[i], __PAGE_HYPERVISOR)); + l1e_write(&pl1e[i], l1e_from_pfn(frames[i], __PAGE_HYPERVISOR_RW)); } xfree(pfns); @@ -6003,7 +6003,7 @@ int create_perdomain_mapping(struct domain *d, unsigned long va, if ( !IS_NIL(ppg) ) *ppg++ = pg; l1tab[l1_table_offset(va)] = - l1e_from_page(pg, __PAGE_HYPERVISOR | _PAGE_AVAIL0); + l1e_from_page(pg, __PAGE_HYPERVISOR_RW | _PAGE_AVAIL0); l2e_add_flags(*pl2e, _PAGE_AVAIL0); } else @@ -6132,7 +6132,7 @@ void memguard_init(void) (unsigned long)__va(start), start >> PAGE_SHIFT, (__pa(&_end) + PAGE_SIZE - 1 - start) >> PAGE_SHIFT, - __PAGE_HYPERVISOR|MAP_SMALL_PAGES); + __PAGE_HYPERVISOR_RW|MAP_SMALL_PAGES); BUG_ON(start != xen_phys_start); map_pages_to_xen( XEN_VIRT_START, @@ -6145,7 +6145,7 @@ static void __memguard_change_range(void *p, unsigned long l, int guard) { unsigned long _p = (unsigned long)p; unsigned long _l = (unsigned long)l; - unsigned int flags = __PAGE_HYPERVISOR | MAP_SMALL_PAGES; + unsigned int flags = __PAGE_HYPERVISOR_RW | MAP_SMALL_PAGES; /* Ensure we are dealing with a page-aligned whole number of pages. */ ASSERT((_p&~PAGE_MASK) == 0); diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index e808ea9..8e21859 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -901,7 +901,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) /* The only data mappings to be relocated are in the Xen area. */ pl2e = __va(__pa(l2_xenmap)); *pl2e++ = l2e_from_pfn(xen_phys_start >> PAGE_SHIFT, - PAGE_HYPERVISOR | _PAGE_PSE); + PAGE_HYPERVISOR_RWX | _PAGE_PSE); for ( i = 1; i < L2_PAGETABLE_ENTRIES; i++, pl2e++ ) { if ( !(l2e_get_flags(*pl2e) & _PAGE_PRESENT) ) @@ -1088,7 +1088,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) /* This range must not be passed to the boot allocator and * must also not be mapped with _PAGE_GLOBAL. */ map_pages_to_xen((unsigned long)__va(map_e), PFN_DOWN(map_e), - PFN_DOWN(e - map_e), __PAGE_HYPERVISOR); + PFN_DOWN(e - map_e), __PAGE_HYPERVISOR_RW); } if ( s < map_s ) { @@ -1424,6 +1424,10 @@ void __init noreturn __start_xen(unsigned long mbi_p) if ( cpu_has_smap ) write_cr4(read_cr4() & ~X86_CR4_SMAP); + printk("%sNX (Execute Disable) protection %sactive\n", + cpu_has_nx ? XENLOG_INFO : XENLOG_WARNING "Warning: ", + cpu_has_nx ? "" : "not "); + /* * We're going to setup domain0 using the module(s) that we stashed safely * above our heap. The second module, if present, is an initrd ramdisk. diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index a771a01..e58de58 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -895,6 +895,33 @@ void __init subarch_init_memory(void) share_xen_page_with_privileged_guests(page, XENSHARE_readonly); } } + + /* Mark low 16Mb of direct map NX if hardware supports it. */ + if ( !cpu_has_nx ) + return; + + v = DIRECTMAP_VIRT_START + (1UL << 20); + l3e = l4e_to_l3e(idle_pg_table[l4_table_offset(v)])[l3_table_offset(v)]; + ASSERT(l3e_get_flags(l3e) & _PAGE_PRESENT); + do { + l2e = l3e_to_l2e(l3e)[l2_table_offset(v)]; + ASSERT(l2e_get_flags(l2e) & _PAGE_PRESENT); + if ( l2e_get_flags(l2e) & _PAGE_PSE ) + { + l2e_add_flags(l2e, _PAGE_NX_BIT); + l3e_to_l2e(l3e)[l2_table_offset(v)] = l2e; + v += 1 << L2_PAGETABLE_SHIFT; + } + else + { + l1_pgentry_t l1e = l2e_to_l1e(l2e)[l1_table_offset(v)]; + + ASSERT(l1e_get_flags(l1e) & _PAGE_PRESENT); + l1e_add_flags(l1e, _PAGE_NX_BIT); + l2e_to_l1e(l2e)[l1_table_offset(v)] = l1e; + v += 1 << L1_PAGETABLE_SHIFT; + } + } while ( v < DIRECTMAP_VIRT_START + (16UL << 20) ); } long subarch_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) @@ -1359,7 +1386,7 @@ int memory_add(unsigned long spfn, unsigned long epfn, unsigned int pxm) if ( i < spfn ) i = spfn; ret = map_pages_to_xen((unsigned long)mfn_to_virt(i), i, - epfn - i, __PAGE_HYPERVISOR); + epfn - i, __PAGE_HYPERVISOR_RW); if ( ret ) return ret; } diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index f5e179b..ef8476c 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -1162,7 +1162,7 @@ void __init efi_init_memory(void) EFI_MEMORY_DESCRIPTOR *desc = efi_memmap + i; u64 len = desc->NumberOfPages << EFI_PAGE_SHIFT; unsigned long smfn, emfn; - unsigned int prot = PAGE_HYPERVISOR; + unsigned int prot = PAGE_HYPERVISOR_RWX; printk(XENLOG_INFO " %013" PRIx64 "-%013" PRIx64 " type=%u attr=%016" PRIx64 "\n", @@ -1195,7 +1195,7 @@ void __init efi_init_memory(void) if ( desc->Attribute & EFI_MEMORY_WP ) prot &= _PAGE_RW; if ( desc->Attribute & EFI_MEMORY_XP ) - prot |= _PAGE_NX_BIT; + prot |= _PAGE_NX; if ( pfn_to_pdx(emfn - 1) < (DIRECTMAP_SIZE >> PAGE_SHIFT) && !(smfn & pfn_hole_mask) && diff --git a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h index ef1e86f..e26daaf 100644 --- a/xen/include/asm-x86/page.h +++ b/xen/include/asm-x86/page.h @@ -306,7 +306,8 @@ void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t); #define _PAGE_AVAIL1 _AC(0x400,U) #define _PAGE_AVAIL2 _AC(0x800,U) #define _PAGE_AVAIL _AC(0xE00,U) -#define _PAGE_PSE_PAT _AC(0x1000,U) +#define _PAGE_PSE_PAT _AC(0x1000,U) +#define _PAGE_NX (cpu_has_nx ? _PAGE_NX_BIT : 0) /* non-architectural flags */ #define _PAGE_PAGED 0x2000U #define _PAGE_SHARED 0x4000U @@ -323,6 +324,9 @@ void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t); #define _PAGE_GNTTAB 0 #endif +#define __PAGE_HYPERVISOR_RO (_PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_NX) +#define __PAGE_HYPERVISOR_RW (__PAGE_HYPERVISOR_RO | \ + _PAGE_DIRTY | _PAGE_RW) #define __PAGE_HYPERVISOR_RX (_PAGE_PRESENT | _PAGE_ACCESSED) #define __PAGE_HYPERVISOR (__PAGE_HYPERVISOR_RX | \ _PAGE_DIRTY | _PAGE_RW) diff --git a/xen/include/asm-x86/x86_64/page.h b/xen/include/asm-x86/x86_64/page.h index fd2f700..19ab4d0 100644 --- a/xen/include/asm-x86/x86_64/page.h +++ b/xen/include/asm-x86/x86_64/page.h @@ -147,9 +147,20 @@ typedef l4_pgentry_t root_pgentry_t; */ #define _PAGE_GUEST_KERNEL (1U<<12) -#define PAGE_HYPERVISOR (__PAGE_HYPERVISOR | _PAGE_GLOBAL) +#define PAGE_HYPERVISOR_RO (__PAGE_HYPERVISOR_RO | _PAGE_GLOBAL) +#define PAGE_HYPERVISOR_RW (__PAGE_HYPERVISOR_RW | _PAGE_GLOBAL) #define PAGE_HYPERVISOR_RX (__PAGE_HYPERVISOR_RX | _PAGE_GLOBAL) -#define PAGE_HYPERVISOR_NOCACHE (__PAGE_HYPERVISOR_NOCACHE | _PAGE_GLOBAL) +#define PAGE_HYPERVISOR_RWX (__PAGE_HYPERVISOR | _PAGE_GLOBAL) + +#ifdef __ASSEMBLY__ +/* Dependency on NX being available can't be expressed. */ +# define PAGE_HYPERVISOR PAGE_HYPERVISOR_RWX +# define PAGE_HYPERVISOR_NOCACHE (__PAGE_HYPERVISOR_NOCACHE | _PAGE_GLOBAL) +#else +# define PAGE_HYPERVISOR PAGE_HYPERVISOR_RW +# define PAGE_HYPERVISOR_NOCACHE (__PAGE_HYPERVISOR_NOCACHE | \ + _PAGE_GLOBAL | _PAGE_NX) +#endif #endif /* __X86_64_PAGE_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 Thu May 28 18:56:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:56: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 1Yy2yJ-0006bt-8W; Thu, 28 May 2015 18:56:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2yH-0006bZ-VL for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:56:02 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 3C/7D-03195-1C467655; Thu, 28 May 2015 18:56:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1432839360!13515391!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21248 invoked from network); 28 May 2015 18:56:00 -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; 28 May 2015 18:56:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2yF-0003JY-T6 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:55:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2yF-0003iw-Ri for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:55:59 +0000 Date: Thu, 28 May 2015 18:55:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] use ULL for GB and MB 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 e37ac1386f80c3af56452c8e442a4e1adbcf9b59 Author: Julien Grall AuthorDate: Fri May 22 17:33:39 2015 +0200 Commit: Jan Beulich CommitDate: Fri May 22 17:33:39 2015 +0200 use ULL for GB and MB macros On 32bit, GB(4) doesn't fit on an unsigned long. Modify MB to avoid further issue. Also, fix a couple of printf format in x86 which breaks after using unsigned long long. Signed-off-by: Julien Grall --- xen/arch/x86/apic.c | 2 +- xen/arch/x86/io_apic.c | 2 +- xen/include/xen/config.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index 499e70f..2c9ae4e 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -992,7 +992,7 @@ void __init init_apic_mappings(void) apic_phys = mp_lapic_addr; set_fixmap_nocache(FIX_APIC_BASE, apic_phys); - apic_printk(APIC_VERBOSE, "mapped APIC to %08lx (%08lx)\n", APIC_BASE, + apic_printk(APIC_VERBOSE, "mapped APIC to %08Lx (%08lx)\n", APIC_BASE, apic_phys); __next: diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index 6f66562..7d4ee5d 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -2546,7 +2546,7 @@ void __init init_ioapic_mappings(void) clear_page(__va(ioapic_phys)); } set_fixmap_nocache(idx, ioapic_phys); - apic_printk(APIC_VERBOSE, "mapped IOAPIC to %08lx (%08lx)\n", + apic_printk(APIC_VERBOSE, "mapped IOAPIC to %08Lx (%08lx)\n", __fix_to_virt(idx), ioapic_phys); idx++; diff --git a/xen/include/xen/config.h b/xen/include/xen/config.h index 6478a0a..f7258c7 100644 --- a/xen/include/xen/config.h +++ b/xen/include/xen/config.h @@ -69,8 +69,8 @@ #define __force #define __bitwise -#define MB(_mb) (_AC(_mb, UL) << 20) -#define GB(_gb) (_AC(_gb, UL) << 30) +#define MB(_mb) (_AC(_mb, ULL) << 20) +#define GB(_gb) (_AC(_gb, ULL) << 30) #define __STR(...) #__VA_ARGS__ #define STR(...) __STR(__VA_ARGS__) -- 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 May 28 18:56:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:56: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 1Yy2yJ-0006bt-8W; Thu, 28 May 2015 18:56:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2yH-0006bZ-VL for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:56:02 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 3C/7D-03195-1C467655; Thu, 28 May 2015 18:56:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1432839360!13515391!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21248 invoked from network); 28 May 2015 18:56:00 -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; 28 May 2015 18:56:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2yF-0003JY-T6 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:55:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2yF-0003iw-Ri for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:55:59 +0000 Date: Thu, 28 May 2015 18:55:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] use ULL for GB and MB 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 e37ac1386f80c3af56452c8e442a4e1adbcf9b59 Author: Julien Grall AuthorDate: Fri May 22 17:33:39 2015 +0200 Commit: Jan Beulich CommitDate: Fri May 22 17:33:39 2015 +0200 use ULL for GB and MB macros On 32bit, GB(4) doesn't fit on an unsigned long. Modify MB to avoid further issue. Also, fix a couple of printf format in x86 which breaks after using unsigned long long. Signed-off-by: Julien Grall --- xen/arch/x86/apic.c | 2 +- xen/arch/x86/io_apic.c | 2 +- xen/include/xen/config.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index 499e70f..2c9ae4e 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -992,7 +992,7 @@ void __init init_apic_mappings(void) apic_phys = mp_lapic_addr; set_fixmap_nocache(FIX_APIC_BASE, apic_phys); - apic_printk(APIC_VERBOSE, "mapped APIC to %08lx (%08lx)\n", APIC_BASE, + apic_printk(APIC_VERBOSE, "mapped APIC to %08Lx (%08lx)\n", APIC_BASE, apic_phys); __next: diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index 6f66562..7d4ee5d 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -2546,7 +2546,7 @@ void __init init_ioapic_mappings(void) clear_page(__va(ioapic_phys)); } set_fixmap_nocache(idx, ioapic_phys); - apic_printk(APIC_VERBOSE, "mapped IOAPIC to %08lx (%08lx)\n", + apic_printk(APIC_VERBOSE, "mapped IOAPIC to %08Lx (%08lx)\n", __fix_to_virt(idx), ioapic_phys); idx++; diff --git a/xen/include/xen/config.h b/xen/include/xen/config.h index 6478a0a..f7258c7 100644 --- a/xen/include/xen/config.h +++ b/xen/include/xen/config.h @@ -69,8 +69,8 @@ #define __force #define __bitwise -#define MB(_mb) (_AC(_mb, UL) << 20) -#define GB(_gb) (_AC(_gb, UL) << 30) +#define MB(_mb) (_AC(_mb, ULL) << 20) +#define GB(_gb) (_AC(_gb, ULL) << 30) #define __STR(...) #__VA_ARGS__ #define STR(...) __STR(__VA_ARGS__) -- 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 May 28 18:56:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:56: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 1Yy2yT-0006eM-EJ; Thu, 28 May 2015 18:56:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2yS-0006e8-Ag for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:56:12 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 39/41-03026-BC467655; Thu, 28 May 2015 18:56:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1432839370!5954305!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7390 invoked from network); 28 May 2015 18:56:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 May 2015 18:56:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2yQ-0003K6-2E for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:56:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2yQ-0003jU-0V for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:56:10 +0000 Date: Thu, 28 May 2015 18:56:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/cpuidle: prevent out of bounds array 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 1cfb320b88588bb42e95eb49fba69358802b771e Author: Jan Beulich AuthorDate: Fri May 22 17:34:51 2015 +0200 Commit: Jan Beulich CommitDate: Fri May 22 17:34:51 2015 +0200 x86/cpuidle: prevent out of bounds array access ... resulting from fbeef5570c ("x86/cpuidle: get accurate C0 value with xenpm tool"). For consistency also no longer account an unknown state to C0 in pmstat_get_cx_stat(). Reported-by: Andrew Cooper Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/acpi/cpu_idle.c | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index 95676dd..36bbb8b 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -279,7 +279,7 @@ static void print_acpi_power(uint32_t cpu, struct acpi_processor_power *power) uint64_t usage[ACPI_PROCESSOR_MAX_POWER] = { 0 }; uint64_t res_tick[ACPI_PROCESSOR_MAX_POWER] = { 0 }; unsigned int i; - u8 last_state_idx; + signed int last_state_idx; printk("==cpu%d==\n", cpu); last_state_idx = power->last_state ? power->last_state->idx : -1; @@ -298,8 +298,12 @@ static void print_acpi_power(uint32_t cpu, struct acpi_processor_power *power) last_state_update_tick = power->last_state_update_tick; spin_unlock_irq(&power->stat_lock); - res_tick[last_state_idx] += ticks_elapsed(last_state_update_tick, current_tick); - usage[last_state_idx]++; + if ( last_state_idx >= 0 ) + { + res_tick[last_state_idx] += ticks_elapsed(last_state_update_tick, + current_tick); + usage[last_state_idx]++; + } for ( i = 1; i < power->count; i++ ) { @@ -1233,6 +1237,7 @@ int pmstat_get_cx_stat(uint32_t cpuid, struct pm_cx_stat *stat) else { struct hw_residencies hw_res; + signed int last_state_idx; stat->nr = power->count; @@ -1245,11 +1250,18 @@ int pmstat_get_cx_stat(uint32_t cpuid, struct pm_cx_stat *stat) res[i] = power->states[i].time; } last_state_update_tick = power->last_state_update_tick; - stat->last = power->last_state ? power->last_state->idx : 0; + last_state_idx = power->last_state ? power->last_state->idx : -1; spin_unlock_irq(&power->stat_lock); - usage[stat->last]++; - res[stat->last] += ticks_elapsed(last_state_update_tick, current_tick); + if ( last_state_idx >= 0 ) + { + usage[last_state_idx]++; + res[last_state_idx] += ticks_elapsed(last_state_update_tick, + current_tick); + stat->last = last_state_idx; + } + else + stat->last = 0; for ( i = 1; i < nr; 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 Thu May 28 18:56:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:56: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 1Yy2yT-0006eM-EJ; Thu, 28 May 2015 18:56:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2yS-0006e8-Ag for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:56:12 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 39/41-03026-BC467655; Thu, 28 May 2015 18:56:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1432839370!5954305!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7390 invoked from network); 28 May 2015 18:56:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 May 2015 18:56:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2yQ-0003K6-2E for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:56:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2yQ-0003jU-0V for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:56:10 +0000 Date: Thu, 28 May 2015 18:56:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/cpuidle: prevent out of bounds array 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 1cfb320b88588bb42e95eb49fba69358802b771e Author: Jan Beulich AuthorDate: Fri May 22 17:34:51 2015 +0200 Commit: Jan Beulich CommitDate: Fri May 22 17:34:51 2015 +0200 x86/cpuidle: prevent out of bounds array access ... resulting from fbeef5570c ("x86/cpuidle: get accurate C0 value with xenpm tool"). For consistency also no longer account an unknown state to C0 in pmstat_get_cx_stat(). Reported-by: Andrew Cooper Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/acpi/cpu_idle.c | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index 95676dd..36bbb8b 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -279,7 +279,7 @@ static void print_acpi_power(uint32_t cpu, struct acpi_processor_power *power) uint64_t usage[ACPI_PROCESSOR_MAX_POWER] = { 0 }; uint64_t res_tick[ACPI_PROCESSOR_MAX_POWER] = { 0 }; unsigned int i; - u8 last_state_idx; + signed int last_state_idx; printk("==cpu%d==\n", cpu); last_state_idx = power->last_state ? power->last_state->idx : -1; @@ -298,8 +298,12 @@ static void print_acpi_power(uint32_t cpu, struct acpi_processor_power *power) last_state_update_tick = power->last_state_update_tick; spin_unlock_irq(&power->stat_lock); - res_tick[last_state_idx] += ticks_elapsed(last_state_update_tick, current_tick); - usage[last_state_idx]++; + if ( last_state_idx >= 0 ) + { + res_tick[last_state_idx] += ticks_elapsed(last_state_update_tick, + current_tick); + usage[last_state_idx]++; + } for ( i = 1; i < power->count; i++ ) { @@ -1233,6 +1237,7 @@ int pmstat_get_cx_stat(uint32_t cpuid, struct pm_cx_stat *stat) else { struct hw_residencies hw_res; + signed int last_state_idx; stat->nr = power->count; @@ -1245,11 +1250,18 @@ int pmstat_get_cx_stat(uint32_t cpuid, struct pm_cx_stat *stat) res[i] = power->states[i].time; } last_state_update_tick = power->last_state_update_tick; - stat->last = power->last_state ? power->last_state->idx : 0; + last_state_idx = power->last_state ? power->last_state->idx : -1; spin_unlock_irq(&power->stat_lock); - usage[stat->last]++; - res[stat->last] += ticks_elapsed(last_state_update_tick, current_tick); + if ( last_state_idx >= 0 ) + { + usage[last_state_idx]++; + res[last_state_idx] += ticks_elapsed(last_state_update_tick, + current_tick); + stat->last = last_state_idx; + } + else + stat->last = 0; for ( i = 1; i < nr; 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 Thu May 28 18:56:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:56: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 1Yy2ye-0006o3-H6; Thu, 28 May 2015 18:56:24 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2yd-0006jI-22 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:56:23 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id 95/05-00727-6D467655; Thu, 28 May 2015 18:56:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1432839380!7328532!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8683 invoked from network); 28 May 2015 18:56:21 -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; 28 May 2015 18:56:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2ya-0003KC-Cg for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:56:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2ya-0003k3-6r for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:56:20 +0000 Date: Thu, 28 May 2015 18:56:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: x86: copy back tsc info, not pointer to tsc info in domctl X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f057af7aad462aa9dde5b6ec7aff279c3e70d0e9 Author: Ian Campbell AuthorDate: Tue May 26 12:14:47 2015 +0100 Commit: Ian Campbell CommitDate: Tue May 26 14:21:04 2015 +0100 xen: x86: copy back tsc info, not pointer to tsc info in domctl In 38b37ed82705 "x86/domctl: cleanup", XEN_DOMCTL_gettscinfo was changed to use the standard copyback mechanism. However the output TSC Info is a guerst handle, i.e. a pointer to the location for the information, copyback just copies the unchanged pointer back. Switch back to fetching the details into a local struct and explicitly copying it back. This caused test failures in the Cambridge instance of osstest, but not for some reason in the production instance. Signed-off-by: Ian Campbell Reviewed-by: Andrew Cooper --- xen/arch/x86/domctl.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 684259b..a9ccf58 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -703,13 +703,16 @@ long arch_do_domctl( ret = -EINVAL; else { + xen_guest_tsc_info_t info = { 0 }; + domain_pause(d); - tsc_get_info(d, &domctl->u.tsc_info.info.tsc_mode, - &domctl->u.tsc_info.info.elapsed_nsec, - &domctl->u.tsc_info.info.gtsc_khz, - &domctl->u.tsc_info.info.incarnation); + tsc_get_info(d, &info.tsc_mode, + &info.elapsed_nsec, + &info.gtsc_khz, + &info.incarnation); domain_unpause(d); - copyback = 1; + if ( copy_to_guest(domctl->u.tsc_info.out_info, &info, 1) ) + ret = -EFAULT; } 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 Thu May 28 18:56:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:56: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 1Yy2ye-0006o3-H6; Thu, 28 May 2015 18:56:24 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2yd-0006jI-22 for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:56:23 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id 95/05-00727-6D467655; Thu, 28 May 2015 18:56:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1432839380!7328532!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8683 invoked from network); 28 May 2015 18:56:21 -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; 28 May 2015 18:56:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2ya-0003KC-Cg for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:56:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2ya-0003k3-6r for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:56:20 +0000 Date: Thu, 28 May 2015 18:56:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: x86: copy back tsc info, not pointer to tsc info in domctl X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f057af7aad462aa9dde5b6ec7aff279c3e70d0e9 Author: Ian Campbell AuthorDate: Tue May 26 12:14:47 2015 +0100 Commit: Ian Campbell CommitDate: Tue May 26 14:21:04 2015 +0100 xen: x86: copy back tsc info, not pointer to tsc info in domctl In 38b37ed82705 "x86/domctl: cleanup", XEN_DOMCTL_gettscinfo was changed to use the standard copyback mechanism. However the output TSC Info is a guerst handle, i.e. a pointer to the location for the information, copyback just copies the unchanged pointer back. Switch back to fetching the details into a local struct and explicitly copying it back. This caused test failures in the Cambridge instance of osstest, but not for some reason in the production instance. Signed-off-by: Ian Campbell Reviewed-by: Andrew Cooper --- xen/arch/x86/domctl.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 684259b..a9ccf58 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -703,13 +703,16 @@ long arch_do_domctl( ret = -EINVAL; else { + xen_guest_tsc_info_t info = { 0 }; + domain_pause(d); - tsc_get_info(d, &domctl->u.tsc_info.info.tsc_mode, - &domctl->u.tsc_info.info.elapsed_nsec, - &domctl->u.tsc_info.info.gtsc_khz, - &domctl->u.tsc_info.info.incarnation); + tsc_get_info(d, &info.tsc_mode, + &info.elapsed_nsec, + &info.gtsc_khz, + &info.incarnation); domain_unpause(d); - copyback = 1; + if ( copy_to_guest(domctl->u.tsc_info.out_info, &info, 1) ) + ret = -EFAULT; } 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 Thu May 28 18:56:34 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:56: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 1Yy2yo-00072e-Jq; Thu, 28 May 2015 18:56:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2yn-00072H-5q for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:56:33 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id C7/CC-24518-0E467655; Thu, 28 May 2015 18:56:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1432839390!11051291!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32502 invoked from network); 28 May 2015 18:56:31 -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; 28 May 2015 18:56:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2yk-0003KK-It for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:56:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2yk-0003kS-Gf for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:56:30 +0000 Date: Thu, 28 May 2015 18:56:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: Simplify TSC domctls by removing double info field X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6b05648d12ea2a797d6ef9ebc074ee0c03646bce Author: Ian Campbell AuthorDate: Tue May 26 12:14:48 2015 +0100 Commit: Ian Campbell CommitDate: Tue May 26 14:21:11 2015 +0100 xen: Simplify TSC domctls by removing double info field There is no need to have this twice and we can simply inline xen_guest_tsc_info into xen_domctl_tsc_info as well. Signed-off-by: Ian Campbell Reviewed-by: Andrew Cooper Acked-by: Jan Beulich --- tools/libxc/xc_domain.c | 23 ++++++++--------------- xen/arch/x86/domctl.c | 21 +++++++++------------ xen/include/public/domctl.h | 9 ++------- 3 files changed, 19 insertions(+), 34 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 38d065f..1ff6d0a 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -760,10 +760,10 @@ int xc_domain_set_tsc_info(xc_interface *xch, DECLARE_DOMCTL; domctl.cmd = XEN_DOMCTL_settscinfo; domctl.domain = (domid_t)domid; - domctl.u.tsc_info.info.tsc_mode = tsc_mode; - domctl.u.tsc_info.info.elapsed_nsec = elapsed_nsec; - domctl.u.tsc_info.info.gtsc_khz = gtsc_khz; - domctl.u.tsc_info.info.incarnation = incarnation; + domctl.u.tsc_info.tsc_mode = tsc_mode; + domctl.u.tsc_info.elapsed_nsec = elapsed_nsec; + domctl.u.tsc_info.gtsc_khz = gtsc_khz; + domctl.u.tsc_info.incarnation = incarnation; return do_domctl(xch, &domctl); } @@ -776,24 +776,17 @@ int xc_domain_get_tsc_info(xc_interface *xch, { int rc; DECLARE_DOMCTL; - DECLARE_HYPERCALL_BUFFER(xen_guest_tsc_info_t, info); - - info = xc_hypercall_buffer_alloc(xch, info, sizeof(*info)); - if ( info == NULL ) - return -1; domctl.cmd = XEN_DOMCTL_gettscinfo; domctl.domain = (domid_t)domid; - set_xen_guest_handle(domctl.u.tsc_info.out_info, info); rc = do_domctl(xch, &domctl); if ( rc == 0 ) { - *tsc_mode = info->tsc_mode; - *elapsed_nsec = info->elapsed_nsec; - *gtsc_khz = info->gtsc_khz; - *incarnation = info->incarnation; + *tsc_mode = domctl.u.tsc_info.tsc_mode; + *elapsed_nsec = domctl.u.tsc_info.elapsed_nsec; + *gtsc_khz = domctl.u.tsc_info.gtsc_khz; + *incarnation = domctl.u.tsc_info.incarnation; } - xc_hypercall_buffer_free(xch, info); return rc; } diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index a9ccf58..e9f76d0 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -703,16 +703,13 @@ long arch_do_domctl( ret = -EINVAL; else { - xen_guest_tsc_info_t info = { 0 }; - domain_pause(d); - tsc_get_info(d, &info.tsc_mode, - &info.elapsed_nsec, - &info.gtsc_khz, - &info.incarnation); + tsc_get_info(d, &domctl->u.tsc_info.tsc_mode, + &domctl->u.tsc_info.elapsed_nsec, + &domctl->u.tsc_info.gtsc_khz, + &domctl->u.tsc_info.incarnation); domain_unpause(d); - if ( copy_to_guest(domctl->u.tsc_info.out_info, &info, 1) ) - ret = -EFAULT; + copyback = 1; } break; @@ -722,10 +719,10 @@ long arch_do_domctl( else { domain_pause(d); - tsc_set_info(d, domctl->u.tsc_info.info.tsc_mode, - domctl->u.tsc_info.info.elapsed_nsec, - domctl->u.tsc_info.info.gtsc_khz, - domctl->u.tsc_info.info.incarnation); + tsc_set_info(d, domctl->u.tsc_info.tsc_mode, + domctl->u.tsc_info.elapsed_nsec, + domctl->u.tsc_info.gtsc_khz, + domctl->u.tsc_info.incarnation); domain_unpause(d); } break; diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 5d15f2a..53cdf08 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -699,18 +699,13 @@ typedef struct xen_domctl_disable_migrate { /* XEN_DOMCTL_gettscinfo */ /* XEN_DOMCTL_settscinfo */ -struct xen_guest_tsc_info { +typedef struct xen_domctl_tsc_info { + /* IN/OUT */ uint32_t tsc_mode; uint32_t gtsc_khz; uint32_t incarnation; uint32_t pad; uint64_aligned_t elapsed_nsec; -}; -typedef struct xen_guest_tsc_info xen_guest_tsc_info_t; -DEFINE_XEN_GUEST_HANDLE(xen_guest_tsc_info_t); -typedef struct xen_domctl_tsc_info { - XEN_GUEST_HANDLE_64(xen_guest_tsc_info_t) out_info; /* OUT */ - xen_guest_tsc_info_t info; /* IN */ } xen_domctl_tsc_info_t; /* XEN_DOMCTL_gdbsx_guestmemio guest mem io */ -- 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 May 28 18:56:34 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:56: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 1Yy2yo-00072e-Jq; Thu, 28 May 2015 18:56:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2yn-00072H-5q for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:56:33 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id C7/CC-24518-0E467655; Thu, 28 May 2015 18:56:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1432839390!11051291!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32502 invoked from network); 28 May 2015 18:56:31 -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; 28 May 2015 18:56:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2yk-0003KK-It for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:56:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2yk-0003kS-Gf for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:56:30 +0000 Date: Thu, 28 May 2015 18:56:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: Simplify TSC domctls by removing double info field X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6b05648d12ea2a797d6ef9ebc074ee0c03646bce Author: Ian Campbell AuthorDate: Tue May 26 12:14:48 2015 +0100 Commit: Ian Campbell CommitDate: Tue May 26 14:21:11 2015 +0100 xen: Simplify TSC domctls by removing double info field There is no need to have this twice and we can simply inline xen_guest_tsc_info into xen_domctl_tsc_info as well. Signed-off-by: Ian Campbell Reviewed-by: Andrew Cooper Acked-by: Jan Beulich --- tools/libxc/xc_domain.c | 23 ++++++++--------------- xen/arch/x86/domctl.c | 21 +++++++++------------ xen/include/public/domctl.h | 9 ++------- 3 files changed, 19 insertions(+), 34 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 38d065f..1ff6d0a 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -760,10 +760,10 @@ int xc_domain_set_tsc_info(xc_interface *xch, DECLARE_DOMCTL; domctl.cmd = XEN_DOMCTL_settscinfo; domctl.domain = (domid_t)domid; - domctl.u.tsc_info.info.tsc_mode = tsc_mode; - domctl.u.tsc_info.info.elapsed_nsec = elapsed_nsec; - domctl.u.tsc_info.info.gtsc_khz = gtsc_khz; - domctl.u.tsc_info.info.incarnation = incarnation; + domctl.u.tsc_info.tsc_mode = tsc_mode; + domctl.u.tsc_info.elapsed_nsec = elapsed_nsec; + domctl.u.tsc_info.gtsc_khz = gtsc_khz; + domctl.u.tsc_info.incarnation = incarnation; return do_domctl(xch, &domctl); } @@ -776,24 +776,17 @@ int xc_domain_get_tsc_info(xc_interface *xch, { int rc; DECLARE_DOMCTL; - DECLARE_HYPERCALL_BUFFER(xen_guest_tsc_info_t, info); - - info = xc_hypercall_buffer_alloc(xch, info, sizeof(*info)); - if ( info == NULL ) - return -1; domctl.cmd = XEN_DOMCTL_gettscinfo; domctl.domain = (domid_t)domid; - set_xen_guest_handle(domctl.u.tsc_info.out_info, info); rc = do_domctl(xch, &domctl); if ( rc == 0 ) { - *tsc_mode = info->tsc_mode; - *elapsed_nsec = info->elapsed_nsec; - *gtsc_khz = info->gtsc_khz; - *incarnation = info->incarnation; + *tsc_mode = domctl.u.tsc_info.tsc_mode; + *elapsed_nsec = domctl.u.tsc_info.elapsed_nsec; + *gtsc_khz = domctl.u.tsc_info.gtsc_khz; + *incarnation = domctl.u.tsc_info.incarnation; } - xc_hypercall_buffer_free(xch, info); return rc; } diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index a9ccf58..e9f76d0 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -703,16 +703,13 @@ long arch_do_domctl( ret = -EINVAL; else { - xen_guest_tsc_info_t info = { 0 }; - domain_pause(d); - tsc_get_info(d, &info.tsc_mode, - &info.elapsed_nsec, - &info.gtsc_khz, - &info.incarnation); + tsc_get_info(d, &domctl->u.tsc_info.tsc_mode, + &domctl->u.tsc_info.elapsed_nsec, + &domctl->u.tsc_info.gtsc_khz, + &domctl->u.tsc_info.incarnation); domain_unpause(d); - if ( copy_to_guest(domctl->u.tsc_info.out_info, &info, 1) ) - ret = -EFAULT; + copyback = 1; } break; @@ -722,10 +719,10 @@ long arch_do_domctl( else { domain_pause(d); - tsc_set_info(d, domctl->u.tsc_info.info.tsc_mode, - domctl->u.tsc_info.info.elapsed_nsec, - domctl->u.tsc_info.info.gtsc_khz, - domctl->u.tsc_info.info.incarnation); + tsc_set_info(d, domctl->u.tsc_info.tsc_mode, + domctl->u.tsc_info.elapsed_nsec, + domctl->u.tsc_info.gtsc_khz, + domctl->u.tsc_info.incarnation); domain_unpause(d); } break; diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 5d15f2a..53cdf08 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -699,18 +699,13 @@ typedef struct xen_domctl_disable_migrate { /* XEN_DOMCTL_gettscinfo */ /* XEN_DOMCTL_settscinfo */ -struct xen_guest_tsc_info { +typedef struct xen_domctl_tsc_info { + /* IN/OUT */ uint32_t tsc_mode; uint32_t gtsc_khz; uint32_t incarnation; uint32_t pad; uint64_aligned_t elapsed_nsec; -}; -typedef struct xen_guest_tsc_info xen_guest_tsc_info_t; -DEFINE_XEN_GUEST_HANDLE(xen_guest_tsc_info_t); -typedef struct xen_domctl_tsc_info { - XEN_GUEST_HANDLE_64(xen_guest_tsc_info_t) out_info; /* OUT */ - xen_guest_tsc_info_t info; /* IN */ } xen_domctl_tsc_info_t; /* XEN_DOMCTL_gdbsx_guestmemio guest mem io */ -- 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 May 28 18:56:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:56:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2yy-00079i-MY; Thu, 28 May 2015 18:56:44 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2yx-00079L-KN for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:56:43 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 05/3C-30151-AE467655; Thu, 28 May 2015 18:56:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1432839400!18320527!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32542 invoked from network); 28 May 2015 18:56:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 28 May 2015 18:56:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2yu-0003KQ-Pb for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:56:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2yu-0003le-NM for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:56:40 +0000 Date: Thu, 28 May 2015 18:56:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d6b6bd8374ac30597495d457829ce7ad6e8b7016 Author: Ian Jackson AuthorDate: Wed May 27 16:54:07 2015 +0100 Commit: Ian Jackson CommitDate: Wed May 27 16:54:07 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index b21ccaa..052e17c 100644 --- a/Config.mk +++ b/Config.mk @@ -266,9 +266,9 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.8.0 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= 3b45fcf0c163b9cff4d8115f7b75b42918a9b1b5 -# Thu Apr 9 19:49:24 2015 +0100 -# qemu-trad: xenstore: use relative path for device-model node +QEMU_TRADITIONAL_REVISION ?= 4de1422ea306832b6ef2cba34e9febb73dd139a7 +# Wed May 6 09:48:59 2015 +0200 +# fdc: force the fifo access to be in bounds of the allocated buffer # Specify which qemu-dm to use. This may be `ioemu' to use the old # Mercurial in-tree version, or a local directory, or a git URL. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu May 28 18:56:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2015 18:56:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2yy-00079i-MY; Thu, 28 May 2015 18:56:44 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2yx-00079L-KN for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:56:43 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 05/3C-30151-AE467655; Thu, 28 May 2015 18:56:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1432839400!18320527!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32542 invoked from network); 28 May 2015 18:56:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 28 May 2015 18:56:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yy2yu-0003KQ-Pb for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:56:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Yy2yu-0003le-NM for xen-changelog@lists.xensource.com; Thu, 28 May 2015 18:56:40 +0000 Date: Thu, 28 May 2015 18:56:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d6b6bd8374ac30597495d457829ce7ad6e8b7016 Author: Ian Jackson AuthorDate: Wed May 27 16:54:07 2015 +0100 Commit: Ian Jackson CommitDate: Wed May 27 16:54:07 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index b21ccaa..052e17c 100644 --- a/Config.mk +++ b/Config.mk @@ -266,9 +266,9 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.8.0 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= 3b45fcf0c163b9cff4d8115f7b75b42918a9b1b5 -# Thu Apr 9 19:49:24 2015 +0100 -# qemu-trad: xenstore: use relative path for device-model node +QEMU_TRADITIONAL_REVISION ?= 4de1422ea306832b6ef2cba34e9febb73dd139a7 +# Wed May 6 09:48:59 2015 +0200 +# fdc: force the fifo access to be in bounds of the allocated buffer # Specify which qemu-dm to use. This may be `ioemu' to use the old # Mercurial in-tree version, or a local directory, or a git URL. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 29 18:55:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2015 18:55: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 1YyPR0-00069Q-CO; Fri, 29 May 2015 18:55:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YyPQy-00069K-UH for xen-changelog@lists.xensource.com; Fri, 29 May 2015 18:55:09 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id 42/C8-18733-C06B8655; Fri, 29 May 2015 18:55:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1432925706!18673481!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12789 invoked from network); 29 May 2015 18:55:07 -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; 29 May 2015 18:55:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YyPQs-0002kP-GR for xen-changelog@lists.xensource.com; Fri, 29 May 2015 18:55:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YyPQs-0006Vw-2x for xen-changelog@lists.xensource.com; Fri, 29 May 2015 18:55:02 +0000 Date: Fri, 29 May 2015 18:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5624637dc81624dc13f8db559def61538cccbafe Author: Ian Jackson AuthorDate: Wed May 27 16:56:15 2015 +0100 Commit: Ian Jackson CommitDate: Wed May 27 16:56:15 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 89dd55a..f7f9190 100644 --- a/Config.mk +++ b/Config.mk @@ -246,9 +246,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= a03c5a74e1774aeabcda55ecbfb2887027787755 -# Tue Mar 31 16:27:45 2015 +0100 -# xen: limit guest control of PCI command register +QEMU_TAG ?= c8c6ba08684f2fb8600df479b49c5511d6fed41a +# Wed May 6 09:48:59 2015 +0200 +# fdc: force the fifo access to be in bounds of the allocated buffer # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri May 29 18:55:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2015 18:55: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 1YyPR0-00069Q-CO; Fri, 29 May 2015 18:55:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YyPQy-00069K-UH for xen-changelog@lists.xensource.com; Fri, 29 May 2015 18:55:09 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id 42/C8-18733-C06B8655; Fri, 29 May 2015 18:55:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1432925706!18673481!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12789 invoked from network); 29 May 2015 18:55:07 -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; 29 May 2015 18:55:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YyPQs-0002kP-GR for xen-changelog@lists.xensource.com; Fri, 29 May 2015 18:55:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1YyPQs-0006Vw-2x for xen-changelog@lists.xensource.com; Fri, 29 May 2015 18:55:02 +0000 Date: Fri, 29 May 2015 18:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5624637dc81624dc13f8db559def61538cccbafe Author: Ian Jackson AuthorDate: Wed May 27 16:56:15 2015 +0100 Commit: Ian Jackson CommitDate: Wed May 27 16:56:15 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 89dd55a..f7f9190 100644 --- a/Config.mk +++ b/Config.mk @@ -246,9 +246,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= a03c5a74e1774aeabcda55ecbfb2887027787755 -# Tue Mar 31 16:27:45 2015 +0100 -# xen: limit guest control of PCI command register +QEMU_TAG ?= c8c6ba08684f2fb8600df479b49c5511d6fed41a +# Wed May 6 09:48:59 2015 +0200 +# fdc: force the fifo access to be in bounds of the allocated buffer # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog